Skip to content

D
doxverilog
Commit 4fa6a604 authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files
Options

Release-1.4.2

parent b91d710e
Hide whitespace changes
Inline Side-by-side
Showing with 905 additions and 565 deletions
INSTALL
View file @ 4fa6a604
DOXYGEN Version 1.4.1-20050315 DOXYGEN Version 1.4.2
Please read the installation section of the manual Please read the installation section of the manual
(http://www.doxygen.org/install.html) for instructions. (http://www.doxygen.org/install.html) for instructions.
-------- --------
Dimitri van Heesch (15 March 2005) Dimitri van Heesch (28 March 2005)
README
View file @ 4fa6a604
DOXYGEN Version 1.4.1_20050315 DOXYGEN Version 1.4.2
Please read INSTALL for compilation instructions. Please read INSTALL for compilation instructions.
...@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives. ...@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.
Enjoy, Enjoy,
Dimitri van Heesch (dimitri@stack.nl) (15 March 2005) Dimitri van Heesch (dimitri@stack.nl) (28 March 2005)
VERSION
View file @ 4fa6a604
1.4.1-20050315 1.4.2
doc/index.doc
View file @ 4fa6a604
...@@ -27,7 +27,7 @@ Version: $(VERSION) ...@@ -27,7 +27,7 @@ Version: $(VERSION)
<h2>Introduction</h2> <h2>Introduction</h2>
Doxygen is a documentation system for C++, C, Java, Objective-C, IDL Doxygen is a documentation system for C++, C, Java, Objective-C, IDL
(Corba and Microsoft flavors) and to some extent PHP, C#, D, and ActionScript. (Corba and Microsoft flavors) and to some extent PHP, C#, and D.
It can help you in three ways: It can help you in three ways:
<ol> <ol>
......
doc/language.doc
View file @ 4fa6a604
...@@ -23,7 +23,7 @@ text fragments, generated by doxygen, can be produced in languages other ...@@ -23,7 +23,7 @@ text fragments, generated by doxygen, can be produced in languages other
than English (the default). The output language is chosen through the than English (the default). The output language is chosen through the
configuration file (with default name and known as Doxyfile). configuration file (with default name and known as Doxyfile).
Currently (version 1.4.1-20050314), 30 languages Currently (version 1.4.1-20050315), 30 languages
are supported (sorted alphabetically): are supported (sorted alphabetically):
Afrikaans, Brazilian Portuguese, Catalan, Chinese, Chinese Afrikaans, Brazilian Portuguese, Catalan, Chinese, Chinese
Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French, Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French,
...@@ -60,13 +60,13 @@ when the translator was updated. ...@@ -60,13 +60,13 @@ when the translator was updated.
<td>Brazilian Portuguese</td> <td>Brazilian Portuguese</td>
<td>Fabio "FJTC" Jun Takada Chino</td> <td>Fabio "FJTC" Jun Takada Chino</td>
<td>jun-chino at uol dot com dot br</td> <td>jun-chino at uol dot com dot br</td>
<td>1.4.1</td> <td>up-to-date</td>
</tr> </tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>Catalan</td> <td>Catalan</td>
<td>Albert Mora</td> <td>Maximiliano Pin<br>Albert Mora</td>
<td>amora at iua dot upf dot es</td> <td>mcpin at emtesistemas dot com<br>amora at iua dot upf dot es</td>
<td>1.2.17</td> <td>1.4.1</td>
</tr> </tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>Chinese</td> <td>Chinese</td>
...@@ -84,7 +84,7 @@ when the translator was updated. ...@@ -84,7 +84,7 @@ when the translator was updated.
<td>Croatian</td> <td>Croatian</td>
<td>Boris Bralo</td> <td>Boris Bralo</td>
<td>boris.bralo at zg dot htnet dot hr</td> <td>boris.bralo at zg dot htnet dot hr</td>
<td>1.4.1</td> <td>up-to-date</td>
</tr> </tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>Czech</td> <td>Czech</td>
...@@ -126,7 +126,7 @@ when the translator was updated. ...@@ -126,7 +126,7 @@ when the translator was updated.
<td>German</td> <td>German</td>
<td>Jens Seidel</td> <td>Jens Seidel</td>
<td>jensseidel at users dot sf dot net</td> <td>jensseidel at users dot sf dot net</td>
<td>1.4.1</td> <td>up-to-date</td>
</tr> </tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>Greek</td> <td>Greek</td>
...@@ -144,7 +144,7 @@ when the translator was updated. ...@@ -144,7 +144,7 @@ when the translator was updated.
<td>Italian</td> <td>Italian</td>
<td>Alessandro Falappa<br>Ahmed Aldo Faisal</td> <td>Alessandro Falappa<br>Ahmed Aldo Faisal</td>
<td>alessandro at falappa dot net<br>aaf23 at cam dot ac dot uk</td> <td>alessandro at falappa dot net<br>aaf23 at cam dot ac dot uk</td>
<td>1.4.1</td> <td>up-to-date</td>
</tr> </tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>Japanese</td> <td>Japanese</td>
...@@ -162,7 +162,7 @@ when the translator was updated. ...@@ -162,7 +162,7 @@ when the translator was updated.
<td>Korean</td> <td>Korean</td>
<td>SooYoung Jung<br>Richard Kim</td> <td>SooYoung Jung<br>Richard Kim</td>
<td>jung5000 at gmail dot com<br>ryk at dspwiz dot com</td> <td>jung5000 at gmail dot com<br>ryk at dspwiz dot com</td>
<td>1.4.01</td> <td>1.4.1</td>
</tr> </tr>
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
<td>KoreanEn</td> <td>KoreanEn</td>
...@@ -259,9 +259,10 @@ when the translator was updated. ...@@ -259,9 +259,10 @@ when the translator was updated.
\hline \hline
Afrikaans & Johan Prinsloo & {\tt\tiny johan@zippysnoek.com} & 1.3.9 \\ Afrikaans & Johan Prinsloo & {\tt\tiny johan@zippysnoek.com} & 1.3.9 \\
\hline \hline
Brazilian Portuguese & Fabio "FJTC" Jun Takada Chino & {\tt\tiny jun-chino@uol.com.br} & 1.4.1 \\ Brazilian Portuguese & Fabio "FJTC" Jun Takada Chino & {\tt\tiny jun-chino@uol.com.br} & up-to-date \\
\hline \hline
Catalan & Albert Mora & {\tt\tiny amora@iua.upf.es} & 1.2.17 \\ Catalan & Maximiliano Pin & {\tt\tiny mcpin@emtesistemas.com} & 1.4.1 \\
~ & Albert Mora & {\tt\tiny amora@iua.upf.es} & ~ \\
\hline \hline
Chinese & Li Daobing & {\tt\tiny lidaobing@gmail.com} & 1.4.1 \\ Chinese & Li Daobing & {\tt\tiny lidaobing@gmail.com} & 1.4.1 \\
~ & Wei Liu & {\tt\tiny liuwei@asiainfo.com} & ~ \\ ~ & Wei Liu & {\tt\tiny liuwei@asiainfo.com} & ~ \\
...@@ -269,7 +270,7 @@ when the translator was updated. ...@@ -269,7 +270,7 @@ when the translator was updated.
Chinese Traditional & Daniel YC Lin & {\tt\tiny daniel@twpda.com} & 1.3.8 \\ Chinese Traditional & Daniel YC Lin & {\tt\tiny daniel@twpda.com} & 1.3.8 \\
~ & Gary Lee & {\tt\tiny garylee@ecosine.com.tw} & ~ \\ ~ & Gary Lee & {\tt\tiny garylee@ecosine.com.tw} & ~ \\
\hline \hline
Croatian & Boris Bralo & {\tt\tiny boris.bralo@zg.htnet.hr} & 1.4.1 \\ Croatian & Boris Bralo & {\tt\tiny boris.bralo@zg.htnet.hr} & up-to-date \\
\hline \hline
Czech & Petr P\v{r}ikryl & {\tt\tiny prikrylp@skil.cz} & up-to-date \\ Czech & Petr P\v{r}ikryl & {\tt\tiny prikrylp@skil.cz} & up-to-date \\
\hline \hline
...@@ -283,14 +284,14 @@ when the translator was updated. ...@@ -283,14 +284,14 @@ when the translator was updated.
\hline \hline
French & Xavier Outhier & {\tt\tiny xouthier@yahoo.fr} & 1.4.1 \\ French & Xavier Outhier & {\tt\tiny xouthier@yahoo.fr} & 1.4.1 \\
\hline \hline
German & Jens Seidel & {\tt\tiny jensseidel@users.sf.net} & 1.4.1 \\ German & Jens Seidel & {\tt\tiny jensseidel@users.sf.net} & up-to-date \\
\hline \hline
Greek & Harry Kalogirou & {\tt\tiny harkal@rainbow.cs.unipi.gr} & 1.2.11 \\ Greek & Harry Kalogirou & {\tt\tiny harkal@rainbow.cs.unipi.gr} & 1.2.11 \\
\hline \hline
Hungarian & \'{A}kos Kiss & {\tt\tiny akiss@users.sourceforge.net} & 1.4.1 \\ Hungarian & \'{A}kos Kiss & {\tt\tiny akiss@users.sourceforge.net} & 1.4.1 \\
~ & F\"{o}ldv\'{a}ri Gy\"{o}rgy & {\tt\tiny foldvari lost@cyberspace} & ~ \\ ~ & F\"{o}ldv\'{a}ri Gy\"{o}rgy & {\tt\tiny foldvari lost@cyberspace} & ~ \\
\hline \hline
Italian & Alessandro Falappa & {\tt\tiny alessandro@falappa.net} & 1.4.1 \\ Italian & Alessandro Falappa & {\tt\tiny alessandro@falappa.net} & up-to-date \\
~ & Ahmed Aldo Faisal & {\tt\tiny aaf23@cam.ac.uk} & ~ \\ ~ & Ahmed Aldo Faisal & {\tt\tiny aaf23@cam.ac.uk} & ~ \\
\hline \hline
Japanese & Ryunosuke Satoh & {\tt\tiny sun594@hotmail.com} & 1.3.9 \\ Japanese & Ryunosuke Satoh & {\tt\tiny sun594@hotmail.com} & 1.3.9 \\
...@@ -299,7 +300,7 @@ when the translator was updated. ...@@ -299,7 +300,7 @@ when the translator was updated.
\hline \hline
JapaneseEn & see the Japanese language & {\tt\tiny ~} & English based \\ JapaneseEn & see the Japanese language & {\tt\tiny ~} & English based \\
\hline \hline
Korean & SooYoung Jung & {\tt\tiny jung5000@gmail.com} & 1.4.01 \\ Korean & SooYoung Jung & {\tt\tiny jung5000@gmail.com} & 1.4.1 \\
~ & Richard Kim & {\tt\tiny ryk@dspwiz.com} & ~ \\ ~ & Richard Kim & {\tt\tiny ryk@dspwiz.com} & ~ \\
\hline \hline
KoreanEn & see the Korean language & {\tt\tiny ~} & English based \\ KoreanEn & see the Korean language & {\tt\tiny ~} & English based \\
......
doc/maintainers.txt
View file @ 4fa6a604
...@@ -16,6 +16,7 @@ TranslatorBrazilian ...@@ -16,6 +16,7 @@ TranslatorBrazilian
Fabio "FJTC" Jun Takada Chino: jun-chino@uol.com.br Fabio "FJTC" Jun Takada Chino: jun-chino@uol.com.br
TranslatorCatalan TranslatorCatalan
Maximiliano Pin: mcpin@emtesistemas.com
Albert Mora: amora@iua.upf.es Albert Mora: amora@iua.upf.es
TranslatorChinese TranslatorChinese
......
doc/translator_report.txt
View file @ 4fa6a604
(1.4.1-20050314) (1.4.1-20050315)
Doxygen supports the following 30 languages (sorted alphabetically): Doxygen supports the following 30 languages (sorted alphabetically):
...@@ -8,7 +8,7 @@ German, Greek, Hungarian, Italian, Japanese (+En), Korean (+En), ...@@ -8,7 +8,7 @@ German, Greek, Hungarian, Italian, Japanese (+En), Korean (+En),
Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, Serbian, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, Serbian,
Slovak, Slovene, Spanish, Swedish, and Ukrainian. Slovak, Slovene, Spanish, Swedish, and Ukrainian.
Of them, 5 translators are up-to-date, 25 translators are based on Of them, 9 translators are up-to-date, 21 translators are based on
some adapter class, and 2 are English based. some adapter class, and 2 are English based.
---------------------------------------------------------------------- ----------------------------------------------------------------------
...@@ -17,9 +17,13 @@ alphabetically). This means that they derive from the Translator class ...@@ -17,9 +17,13 @@ alphabetically). This means that they derive from the Translator class
and they implement all 192 of the required methods. Anyway, there and they implement all 192 of the required methods. Anyway, there
still may be some details listed even for them: still may be some details listed even for them:
TranslatorBrazilian -- Remove the obsolete methods (never used).
TranslatorCroatian
TranslatorCzech TranslatorCzech
TranslatorDutch -- Remove the obsolete methods (never used). TranslatorDutch -- Remove the obsolete methods (never used).
TranslatorEnglish -- Remove the obsolete methods (never used). TranslatorEnglish -- Remove the obsolete methods (never used).
TranslatorGerman -- Remove the obsolete methods (never used).
TranslatorItalian
TranslatorRussian TranslatorRussian
TranslatorSwedish TranslatorSwedish
...@@ -33,16 +37,11 @@ must be implemented to become up-to-date: ...@@ -33,16 +37,11 @@ must be implemented to become up-to-date:
TranslatorSerbian 1.4.1 1 method to implement TranslatorSerbian 1.4.1 1 method to implement
TranslatorRomanian 1.4.1 1 method to implement TranslatorRomanian 1.4.1 1 method to implement
TranslatorPolish 1.4.1 1 method to implement TranslatorPolish 1.4.1 1 method to implement
TranslatorKorean 1.4.01 1 method to implement TranslatorKorean 1.4.1 1 method to implement
Note: Change the base class to TranslatorAdapter_1_4_1.
TranslatorItalian 1.4.1 1 method to implement
TranslatorHungarian 1.4.1 1 method to implement TranslatorHungarian 1.4.1 1 method to implement
TranslatorGerman 1.4.1 1 method to implement
TranslatorFrench 1.4.1 1 method to implement TranslatorFrench 1.4.1 1 method to implement
TranslatorCroatian 1.4.1 1 method to implement
TranslatorChinese 1.4.1 1 method to implement TranslatorChinese 1.4.1 1 method to implement
TranslatorBrazilian 1.4.1 1 method to implement TranslatorCatalan 1.4.1 1 method to implement
TranslatorNorwegian 1.3.9 7 methods to implement TranslatorNorwegian 1.3.9 7 methods to implement
TranslatorJapanese 1.3.9 7 methods to implement TranslatorJapanese 1.3.9 7 methods to implement
TranslatorDanish 1.3.9 7 methods to implement TranslatorDanish 1.3.9 7 methods to implement
...@@ -52,7 +51,6 @@ must be implemented to become up-to-date: ...@@ -52,7 +51,6 @@ must be implemented to become up-to-date:
TranslatorChinesetraditional 1.3.8 8 methods to implement TranslatorChinesetraditional 1.3.8 8 methods to implement
TranslatorPortuguese 1.3.3 12 methods to implement TranslatorPortuguese 1.3.3 12 methods to implement
TranslatorSlovak 1.2.18 21 methods to implement TranslatorSlovak 1.2.18 21 methods to implement
TranslatorCatalan 1.2.17 22 methods to implement
TranslatorSlovene 1.2.16 23 methods to implement TranslatorSlovene 1.2.16 23 methods to implement
TranslatorGreek 1.2.11 26 methods to implement TranslatorGreek 1.2.11 26 methods to implement
TranslatorFinnish obsolete 95 methods to implement TranslatorFinnish obsolete 95 methods to implement
...@@ -100,14 +98,10 @@ TranslatorAfrikaans (TranslatorAdapter_1_3_9) 7 methods to implement ...@@ -100,14 +98,10 @@ TranslatorAfrikaans (TranslatorAdapter_1_3_9) 7 methods to implement
virtual QCString trNoDescriptionAvailable() virtual QCString trNoDescriptionAvailable()
TranslatorBrazilian (TranslatorAdapter_1_4_1) 1 method to implement TranslatorBrazilian (Translator)
------------------- -------------------
Implements 191 of the required methods. Implements 192 of the required methods.
Missing methods (should be implemented):
virtual QCString trOverloadText()
Obsolete methods (should be removed, never used): Obsolete methods (should be removed, never used):
...@@ -123,35 +117,14 @@ TranslatorBrazilian (TranslatorAdapter_1_4_1) 1 method to implement ...@@ -123,35 +117,14 @@ TranslatorBrazilian (TranslatorAdapter_1_4_1) 1 method to implement
virtual QCString trNoDescriptionAvailable() virtual QCString trNoDescriptionAvailable()
TranslatorCatalan (TranslatorAdapter_1_2_17) 22 methods to implement TranslatorCatalan (TranslatorAdapter_1_4_1) 1 method to implement
----------------- -----------------
Implements 170 of the required methods. Implements 191 of the required methods.
Missing methods (should be implemented): Missing methods (should be implemented):
virtual QCString trOverloadText() virtual QCString trOverloadText()
virtual QCString trEventDocumentation()
virtual QCString trDirIndex()
virtual QCString trPackageMembers()
virtual QCString trStaticPackageMembers()
virtual QCString trDirDocumentation()
virtual QCString trSearchResultsTitle()
virtual QCString trDirectories()
virtual QCString trDeprecatedList()
virtual QCString trDirDescription()
virtual QCString trStaticPackageAttribs()
virtual QCString trCallGraph()
virtual QCString trPackageTypes()
virtual QCString trSearchResults(int numDocuments)
virtual QCString trPackageAttribs()
virtual QCString trSearchMatches()
virtual QCString trEvents()
virtual QCString trSourceFile(QCString & filename)
virtual QCString trDirReference(const char * dirName)
virtual QCString trDir(bool first_capital, bool singular)
virtual QCString trSearchForIndex()
virtual QCString trAll()
Obsolete methods (should be removed, never used): Obsolete methods (should be removed, never used):
...@@ -207,16 +180,6 @@ TranslatorChinesetraditional (TranslatorAdapter_1_3_8) 8 methods to implement ...@@ -207,16 +180,6 @@ TranslatorChinesetraditional (TranslatorAdapter_1_3_8) 8 methods to implement
virtual QCString trNoDescriptionAvailable() virtual QCString trNoDescriptionAvailable()
TranslatorCroatian (TranslatorAdapter_1_4_1) 1 method to implement
------------------
Implements 191 of the required methods.
Missing methods (should be implemented):
virtual QCString trOverloadText()
TranslatorDanish (TranslatorAdapter_1_3_9) 7 methods to implement TranslatorDanish (TranslatorAdapter_1_3_9) 7 methods to implement
---------------- ----------------
...@@ -423,14 +386,10 @@ TranslatorFrench (TranslatorAdapter_1_4_1) 1 method to implement ...@@ -423,14 +386,10 @@ TranslatorFrench (TranslatorAdapter_1_4_1) 1 method to implement
virtual QCString trNoDescriptionAvailable() virtual QCString trNoDescriptionAvailable()
TranslatorGerman (TranslatorAdapter_1_4_1) 1 method to implement TranslatorGerman (Translator)
---------------- ----------------
Implements 191 of the required methods. Implements 192 of the required methods.
Missing methods (should be implemented):
virtual QCString trOverloadText()
Obsolete methods (should be removed, never used): Obsolete methods (should be removed, never used):
...@@ -517,29 +476,6 @@ TranslatorHungarian (TranslatorAdapter_1_4_1) 1 method to implement ...@@ -517,29 +476,6 @@ TranslatorHungarian (TranslatorAdapter_1_4_1) 1 method to implement
QCString trNoDescriptionAvailable() QCString trNoDescriptionAvailable()
TranslatorItalian (TranslatorAdapter_1_4_1) 1 method to implement
-----------------
Implements 191 of the required methods.
Missing methods (should be implemented):
virtual QCString trOverloadText()
Obsolete methods (should be removed, never used):
QCString trHeaderFilesDescription()
virtual QCString trField(bool first_capital, bool singular)
virtual QCString trPackageDocumentation()
QCString trSources()
QCString trReimplementedForInternalReasons()
virtual QCString trInterfaces()
QCString trHeaderFiles()
QCString trBugsAndLimitations()
QCString trEnumerationValueDocumentation()
QCString trNoDescriptionAvailable()
TranslatorJapanese (TranslatorAdapter_1_3_9) 7 methods to implement TranslatorJapanese (TranslatorAdapter_1_3_9) 7 methods to implement
------------------ ------------------
...@@ -583,7 +519,7 @@ TranslatorJapaneseEn (TranslatorEnglish) 187 methods to implement ...@@ -583,7 +519,7 @@ TranslatorJapaneseEn (TranslatorEnglish) 187 methods to implement
virtual QCString latexLanguageSupportCommand() virtual QCString latexLanguageSupportCommand()
TranslatorKorean (TranslatorAdapter_1_3_9) 1 method to implement TranslatorKorean (TranslatorAdapter_1_4_1) 1 method to implement
---------------- ----------------
Implements 191 of the required methods. Implements 191 of the required methods.
...@@ -592,19 +528,6 @@ TranslatorKorean (TranslatorAdapter_1_3_9) 1 method to implement ...@@ -592,19 +528,6 @@ TranslatorKorean (TranslatorAdapter_1_3_9) 1 method to implement
virtual QCString trOverloadText() virtual QCString trOverloadText()
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()
TranslatorKoreanEn (TranslatorEnglish) 187 methods to implement TranslatorKoreanEn (TranslatorEnglish) 187 methods to implement
------------------ ------------------
......
packages/rpm/doxygen.spec
View file @ 4fa6a604
Summary: A documentation system for C/C++. Summary: A documentation system for C/C++.
Name: doxygen Name: doxygen
Version: 1.4.1_20050315 Version: 1.4.2
Release: 1 Release: 1
Epoch: 1 Epoch: 1
Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
......
src/code.l
View file @ 4fa6a604
...@@ -1994,6 +1994,11 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP} ...@@ -1994,6 +1994,11 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
<Body>{KEYWORD}/([^a-z_A-Z0-9]) { <Body>{KEYWORD}/([^a-z_A-Z0-9]) {
startFontClass("keyword"); startFontClass("keyword");
codifyLines(yytext); codifyLines(yytext);
if (QCString(yytext)=="typedef")
{
addType();
g_name+=yytext;
}
endFontClass(); endFontClass();
} }
<Body>{KEYWORD}/{B}* { <Body>{KEYWORD}/{B}* {
......
src/commentscan.l
View file @ 4fa6a604
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "membergroup.h" #include "membergroup.h"
#include "reflist.h" #include "reflist.h"
#include "code.h" #include "code.h"
#include "debug.h"
// forward declarations // forward declarations
static void handleBrief(const QCString &); static void handleBrief(const QCString &);
...@@ -602,9 +603,19 @@ static inline void setOutput(OutputContext ctx) ...@@ -602,9 +603,19 @@ static inline void setOutput(OutputContext ctx)
switch(inContext) switch(inContext)
{ {
case OutputDoc: case OutputDoc:
if (current->docFile.isEmpty())
{
current->docFile = yyFileName;
current->docLine = yyLineNr;
}
pOutputString = &current->doc; pOutputString = &current->doc;
break; break;
case OutputBrief: case OutputBrief:
if (current->briefFile.isEmpty())
{
current->briefFile = yyFileName;
current->briefLine = yyLineNr;
}
pOutputString = &current->brief; pOutputString = &current->brief;
break; break;
case OutputXRef: case OutputXRef:
...@@ -667,8 +678,7 @@ OL [oO][lL] ...@@ -667,8 +678,7 @@ OL [oO][lL]
DL [dD][lL] DL [dD][lL]
IMG [iI][mM][gG] IMG [iI][mM][gG]
HR [hH][rR] HR [hH][rR]
CODE [cC][oO][dD][eE] DETAILEDHTML {PRE}|{UL}|{TABLE}|{OL}|{DL}|{P}|[Hh][1-6]|{IMG}|{HR}
DETAILEDHTML {PRE}|{UL}|{TABLE}|{OL}|{DL}|{P}|[Hh][1-6]|{IMG}|{HR}|{CODE}
BN [ \t\n\r] BN [ \t\n\r]
BL [ \t\r]*"\n" BL [ \t\r]*"\n"
B [ \t] B [ \t]
...@@ -1421,7 +1431,7 @@ SCOPENAME "$"?(({ID}?{BN}*"::"{BN}*)*)((~{BN}*)?{ID}) ...@@ -1421,7 +1431,7 @@ SCOPENAME "$"?(({ID}?{BN}*"::"{BN}*)*)((~{BN}*)?{ID})
BEGIN( Comment ); BEGIN( Comment );
} }
} }
<SkipGuardedSection>{CMD}"else"/{NW}] { <SkipGuardedSection>{CMD}"else"/{NW} {
if (guards.isEmpty()) if (guards.isEmpty())
{ {
warn(yyFileName,yyLineNr, warn(yyFileName,yyLineNr,
...@@ -2011,18 +2021,16 @@ bool parseCommentBlock(/* in,out */ Entry *curEntry, ...@@ -2011,18 +2021,16 @@ bool parseCommentBlock(/* in,out */ Entry *curEntry,
{ {
//fprintf(stderr,"parseCommentBlock() isBrief=%d isJavaDocStyle=%d lineNr=%d\n", //fprintf(stderr,"parseCommentBlock() isBrief=%d isJavaDocStyle=%d lineNr=%d\n",
// isBrief,isJavaDocStyle,lineNr); // isBrief,isJavaDocStyle,lineNr);
initParser(); initParser();
guards.setAutoDelete(TRUE); guards.setAutoDelete(TRUE);
guards.clear(); guards.clear();
//current_root = rootEntry;
current = curEntry; current = curEntry;
//previous = prevEntry;
inputString = comment; inputString = comment;
if (inputString==0) return FALSE; // avoid empty strings if (inputString==0) return FALSE; // avoid empty strings
inputPosition = 0; inputPosition = 0;
yyLineNr = lineNr; yyLineNr = lineNr;
yyFileName = fileName; yyFileName = fileName;
//inBody = foundInBody;
protection = prot; protection = prot;
needNewEntry = FALSE; needNewEntry = FALSE;
xrefKind = XRef_None; xrefKind = XRef_None;
...@@ -2040,11 +2048,20 @@ bool parseCommentBlock(/* in,out */ Entry *curEntry, ...@@ -2040,11 +2048,20 @@ bool parseCommentBlock(/* in,out */ Entry *curEntry,
warn(yyFileName,yyLineNr,"Documentation block ended in the middle of a conditional section!"); 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()) if (current->section==Entry::FILEDOC_SEC && current->doc.isEmpty())
{ {
// to allow a comment block with just a @file command. // to allow a comment block with just a @file command.
current->doc="\n\n"; 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(); checkFormula();
prot = protection; prot = protection;
......
src/compound.xsd
View file @ 4fa6a604
...@@ -548,12 +548,11 @@ ...@@ -548,12 +548,11 @@
</xsd:sequence> </xsd:sequence>
</xsd:complexType> </xsd:complexType>
<xsd:complexType name="docParamName"> <xsd:complexType name="docParamName" mixed="true">
<xsd:simpleContent> <xsd:sequence>
<xsd:extension base="xsd:string"> <xsd:element name="ref" type="refTextType" minOccurs="0" maxOccurs="1" />
<xsd:attribute name="direction" type="DoxParamDir" use="optional" /> </xsd:sequence>
</xsd:extension> <xsd:attribute name="direction" type="DoxParamDir" use="optional" />
</xsd:simpleContent>
</xsd:complexType> </xsd:complexType>
<xsd:complexType name="docXRefSectType"> <xsd:complexType name="docXRefSectType">
......
src/compound_xsd.h
View file @ 4fa6a604
...@@ -548,12 +548,11 @@ ...@@ -548,12 +548,11 @@
" </xsd:sequence>\n" " </xsd:sequence>\n"
" </xsd:complexType>\n" " </xsd:complexType>\n"
"\n" "\n"
" <xsd:complexType name=\"docParamName\">\n" " <xsd:complexType name=\"docParamName\" mixed=\"true\">\n"
" <xsd:simpleContent>\n" " <xsd:sequence>\n"
" <xsd:extension base=\"xsd:string\">\n" " <xsd:element name=\"ref\" type=\"refTextType\" minOccurs=\"0\" maxOccurs=\"1\" />\n"
" <xsd:attribute name=\"direction\" type=\"DoxParamDir\" use=\"optional\" />\n" " </xsd:sequence>\n"
" </xsd:extension>\n" " <xsd:attribute name=\"direction\" type=\"DoxParamDir\" use=\"optional\" />\n"
" </xsd:simpleContent>\n"
" </xsd:complexType>\n" " </xsd:complexType>\n"
"\n" "\n"
" <xsd:complexType name=\"docXRefSectType\">\n" " <xsd:complexType name=\"docXRefSectType\">\n"
......
src/debug.cpp
View file @ 4fa6a604
...@@ -18,9 +18,61 @@ ...@@ -18,9 +18,61 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <qdict.h>
#include "qtbc.h" #include "qtbc.h"
#include "debug.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; Debug::DebugMask Debug::curMask = Debug::Quiet;
int Debug::curPrio = 0; int Debug::curPrio = 0;
...@@ -38,29 +90,8 @@ void Debug::print(DebugMask mask,int prio,const char *fmt,...) ...@@ -38,29 +90,8 @@ void Debug::print(DebugMask mask,int prio,const char *fmt,...)
static int labelToEnumValue(const char *l) static int labelToEnumValue(const char *l)
{ {
QCString label=l; QCString label=l;
label=label.lower(); Debug::DebugMask *event = g_labelMapper.find(label.lower());
if (label=="findmembers") if (event) return *event; else return 0;
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;
} }
void Debug::setFlag(const char *lab) void Debug::setFlag(const char *lab)
...@@ -82,3 +113,4 @@ bool Debug::isFlagSet(DebugMask mask) ...@@ -82,3 +113,4 @@ bool Debug::isFlagSet(DebugMask mask)
{ {
return (curMask & mask)!=0; return (curMask & mask)!=0;
} }
src/debug.h
View file @ 4fa6a604
...@@ -29,10 +29,11 @@ class Debug ...@@ -29,10 +29,11 @@ class Debug
Preprocessor = 0x00000008, Preprocessor = 0x00000008,
Classes = 0x00000010, Classes = 0x00000010,
CommentCnv = 0x00000020, CommentCnv = 0x00000020,
Validate = 0x00000040, CommentScan = 0x00000040,
PrintTree = 0x00000080, Validate = 0x00000080,
Time = 0x00000100, PrintTree = 0x00000100,
ExtCmd = 0x00000200 Time = 0x00000200,
ExtCmd = 0x00000400
}; };
static void print(DebugMask mask,int prio,const char *fmt,...); static void print(DebugMask mask,int prio,const char *fmt,...);
static void setFlag(const char *label); static void setFlag(const char *label);
......
src/declinfo.h
View file @ 4fa6a604
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <stdio.h> #include <stdio.h>
extern void parseFuncDecl(const QCString &decl, extern void parseFuncDecl(const QCString &decl,
bool objC,
QCString &clName, QCString &clName,
QCString &type, QCString &type,
QCString &name, QCString &name,
......
src/declinfo.l
View file @ 4fa6a604
...@@ -48,6 +48,7 @@ static int sharpCount; ...@@ -48,6 +48,7 @@ static int sharpCount;
static bool classTempListFound; static bool classTempListFound;
static bool funcTempListFound; static bool funcTempListFound;
static QCString exceptionString; static QCString exceptionString;
static bool insideObjC;
static void addType() static void addType()
{ {
...@@ -117,6 +118,16 @@ ID ([a-z_A-Z][a-z_A-Z0-9]*)|(@[0-9]+) ...@@ -117,6 +118,16 @@ ID ([a-z_A-Z][a-z_A-Z0-9]*)|(@[0-9]+)
name += yytext; name += yytext;
BEGIN(Operator); 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, <Start>(~{B}*)?{ID}/({B}*"["{B}*"]")* { // the []'s are for Java,
// the / was add to deal with multi- // the / was add to deal with multi-
// dimensional C++ arrays like A[][15] // dimensional C++ arrays like A[][15]
...@@ -213,7 +224,7 @@ ID ([a-z_A-Z][a-z_A-Z0-9]*)|(@[0-9]+) ...@@ -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) QCString &n,QCString &a,QCString &ftl,QCString &exc)
{ {
inputString = decl; inputString = decl;
...@@ -222,6 +233,7 @@ void parseFuncDecl(const QCString &decl,QCString &cl,QCString &t, ...@@ -222,6 +233,7 @@ void parseFuncDecl(const QCString &decl,QCString &cl,QCString &t,
inputPosition = 0; inputPosition = 0;
classTempListFound = FALSE; classTempListFound = FALSE;
funcTempListFound = FALSE; funcTempListFound = FALSE;
insideObjC = objC;
scope.resize(0); scope.resize(0);
className.resize(0); className.resize(0);
classTempList.resize(0); classTempList.resize(0);
......
src/definition.cpp
View file @ 4fa6a604
...@@ -217,10 +217,10 @@ void Definition::setDocumentation(const char *d,const char *docFile,int docLine, ...@@ -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) void Definition::setBriefDescription(const char *b,const char *briefFile,int briefLine)
{ {
if (b==0) return; 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(); m_brief=QCString(b).stripWhiteSpace();
int bl=m_brief.length(); 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)) switch(m_brief.at(bl-1))
{ {
......
src/docparser.cpp
View file @ 4fa6a604
...@@ -41,9 +41,16 @@ ...@@ -41,9 +41,16 @@
#include "searchindex.h" #include "searchindex.h"
#include "language.h" #include "language.h"
// debug off
#define DBG(x) do {} while(0) #define DBG(x) do {} while(0)
// debug to stdout
//#define DBG(x) printf x //#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) 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__)); //#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) ...@@ -3347,7 +3354,8 @@ int DocParamList::parse(const QString &cmdName)
g_hasReturnCommand=TRUE; g_hasReturnCommand=TRUE;
checkArgumentName(g_token->name,FALSE); checkArgumentName(g_token->name,FALSE);
} }
m_params.append(g_token->name); //m_params.append(g_token->name);
handleLinkedWord(this,m_params);
tok=doctokenizerYYlex(); tok=doctokenizerYYlex();
} }
doctokenizerYYsetStatePara(); doctokenizerYYsetStatePara();
......
src/docparser.h
View file @ 4fa6a604
...@@ -206,7 +206,7 @@ class DocLinkedWord : public DocNode ...@@ -206,7 +206,7 @@ class DocLinkedWord : public DocNode
const QString &ref,const QString &file, const QString &ref,const QString &file,
const QString &anchor); const QString &anchor);
QString word() const { return m_word; } QString word() const { return m_word; }
Kind kind() const { return Kind_Word; } Kind kind() const { return Kind_LinkedWord; }
DocNode *parent() const { return m_parent; } DocNode *parent() const { return m_parent; }
QString file() const { return m_file; } QString file() const { return m_file; }
QString relPath() const { return m_relPath; } QString relPath() const { return m_relPath; }
...@@ -993,7 +993,8 @@ class DocParamList : public DocNode ...@@ -993,7 +993,8 @@ class DocParamList : public DocNode
virtual ~DocParamList() { delete m_paragraph; } virtual ~DocParamList() { delete m_paragraph; }
Kind kind() const { return Kind_ParamList; } Kind kind() const { return Kind_ParamList; }
DocNode *parent() const { return m_parent; } DocNode *parent() const { return m_parent; }
const QStrList &parameters() { return m_params; } //const QStrList &parameters() { return m_params; }
const QList<DocNode> &parameters() { return m_params; }
DocParamSect::Type type() const { return m_type; } DocParamSect::Type type() const { return m_type; }
DocParamSect::Direction direction() const { return m_dir; } DocParamSect::Direction direction() const { return m_dir; }
void markFirst(bool b=TRUE) { m_isFirst=b; } void markFirst(bool b=TRUE) { m_isFirst=b; }
...@@ -1011,7 +1012,8 @@ class DocParamList : public DocNode ...@@ -1011,7 +1012,8 @@ class DocParamList : public DocNode
private: private:
DocNode * m_parent; DocNode * m_parent;
DocPara * m_paragraph; DocPara * m_paragraph;
QStrList m_params; //QStrList m_params;
QList<DocNode> m_params;
DocParamSect::Type m_type; DocParamSect::Type m_type;
DocParamSect::Direction m_dir; DocParamSect::Direction m_dir;
bool m_isFirst; bool m_isFirst;
......
src/doxygen.cpp
View file @ 4fa6a604
...@@ -1909,7 +1909,7 @@ static void buildVarList(Entry *root) ...@@ -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 // find the scope of this variable
Entry *p = root->parent; Entry *p = root->parent;
...@@ -1939,7 +1939,7 @@ static void buildVarList(Entry *root) ...@@ -1939,7 +1939,7 @@ static void buildVarList(Entry *root)
addVariableToClass(root, // entry addVariableToClass(root, // entry
cd, // class to add member to cd, // class to add member to
MemberDef::Friend, // type of member MemberDef::Friend, // type of member
root->name, // name of the member name, // name of the member
FALSE, // from Anonymous scope FALSE, // from Anonymous scope
0, // anonymous member 0, // anonymous member
Public, // protection Public, // protection
...@@ -1986,11 +1986,12 @@ static void buildVarList(Entry *root) ...@@ -1986,11 +1986,12 @@ static void buildVarList(Entry *root)
if (!scope.isEmpty() && !name.isEmpty() && (cd=getClass(scope))) if (!scope.isEmpty() && !name.isEmpty() && (cd=getClass(scope)))
{ {
// TODO: clean up this mess!
MemberDef *md=0; MemberDef *md=0;
#if 0
// if cd is an annonymous scope we insert the member // 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 indentDepth=0;
int si=scope.find('@'); int si=scope.find('@');
//int anonyScopes = 0; //int anonyScopes = 0;
...@@ -2019,14 +2020,16 @@ static void buildVarList(Entry *root) ...@@ -2019,14 +2020,16 @@ static void buildVarList(Entry *root)
); );
added=TRUE; 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; added=TRUE;
} }
} }
} }
#endif
//printf("name=`%s' scope=%s scope.right=%s indentDepth=%d anonyScopes=%d\n", //printf("name=`%s' scope=%s scope.right=%s indentDepth=%d anonyScopes=%d\n",
// name.data(),scope.data(), // name.data(),scope.data(),
// scope.right(scope.length()-si).data(), // scope.right(scope.length()-si).data(),
...@@ -2266,7 +2269,8 @@ static void buildFunctionList(Entry *root) ...@@ -2266,7 +2269,8 @@ static void buildFunctionList(Entry *root)
int te=rname.find('>'); int te=rname.find('>');
if (ts==-1 || te==-1) if (ts==-1 || te==-1)
{ {
isMember=TRUE; NamespaceDef *nd = Doxygen::namespaceSDict.find(rname.left(memIndex));
isMember=nd==0;
} }
else else
{ {
...@@ -2289,11 +2293,12 @@ static void buildFunctionList(Entry *root) ...@@ -2289,11 +2293,12 @@ static void buildFunctionList(Entry *root)
addMethodToClass(root,cd,rname,isFriend); addMethodToClass(root,cd,rname,isFriend);
} }
else if (root->parent && 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 && !isMember &&
(root->relates.isEmpty() || root->relatesDup) && (root->relates.isEmpty() || root->relatesDup) &&
root->type.left(7)!="extern " && root->type.left(7)!="extern " && root->type.left(8)!="typedef "
root->type.left(8)!="typedef "
) )
// no member => unrelated function // no member => unrelated function
{ {
...@@ -4341,10 +4346,10 @@ static void findMember(Entry *root, ...@@ -4341,10 +4346,10 @@ static void findMember(Entry *root,
Debug::print(Debug::FindMembers,0, Debug::print(Debug::FindMembers,0,
"findMember(root=%p,funcDecl=`%s',related=`%s',overload=%d," "findMember(root=%p,funcDecl=`%s',related=`%s',overload=%d,"
"isFunc=%d mGrpId=%d tArgList=%p (#=%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,funcDecl.data(),root->relates.data(),overloaded,isFunc,root->mGrpId,
root->tArgLists,root->tArgLists ? root->tArgLists->count() : 0, root->tArgLists,root->tArgLists ? root->tArgLists->count() : 0,
root->memSpec root->memSpec,root->objc
); );
QCString scopeName; QCString scopeName;
...@@ -4427,7 +4432,7 @@ static void findMember(Entry *root, ...@@ -4427,7 +4432,7 @@ static void findMember(Entry *root,
else else
{ {
// extract information from the declarations // extract information from the declarations
parseFuncDecl(funcDecl,scopeName,funcType,funcName, parseFuncDecl(funcDecl,root->objc,scopeName,funcType,funcName,
funcArgs,funcTempList,exceptions funcArgs,funcTempList,exceptions
); );
} }
...@@ -4648,6 +4653,11 @@ static void findMember(Entry *root, ...@@ -4648,6 +4653,11 @@ static void findMember(Entry *root,
if (!namespaceName.isEmpty()) nd=getResolvedNamespace(namespaceName); if (!namespaceName.isEmpty()) nd=getResolvedNamespace(namespaceName);
ClassDef *tcd=findClassDefinition(fd,nd,scopeName); 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", //printf("Looking for %s inside nd=%s result=%p\n",
// scopeName.data(),nd?nd->name().data():"<none>",tcd); // scopeName.data(),nd?nd->name().data():"<none>",tcd);
...@@ -5179,6 +5189,16 @@ static void findMember(Entry *root, ...@@ -5179,6 +5189,16 @@ static void findMember(Entry *root,
Doxygen::memberNameSDict.append(funcName,mn); 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 else
{ {
...@@ -6124,7 +6144,7 @@ static void generateClassDocs() ...@@ -6124,7 +6144,7 @@ static void generateClassDocs()
writeHierarchicalIndex(*outputList); writeHierarchicalIndex(*outputList);
msg("Generating member index...\n"); msg("Generating member index...\n");
writeMemberIndex(*outputList); writeClassMemberIndex(*outputList);
if (Doxygen::exampleSDict->count()>0) if (Doxygen::exampleSDict->count()>0)
{ {
...@@ -7196,9 +7216,12 @@ static bool patternMatch(QFileInfo *fi,QStrList *patList) ...@@ -7196,9 +7216,12 @@ static bool patternMatch(QFileInfo *fi,QStrList *patList)
bool found=FALSE; bool found=FALSE;
if (patList) if (patList)
{ {
char *pattern=patList->first(); QCString pattern=patList->first();
while (pattern && !found) 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); //printf("Matching `%s' against pattern `%s'\n",fi->fileName().data(),pattern);
#if defined(_WIN32) // windows #if defined(_WIN32) // windows
QRegExp re(pattern,FALSE,TRUE); // case insensitive match QRegExp re(pattern,FALSE,TRUE); // case insensitive match
......
src/formula.cpp
View file @ 4fa6a604
...@@ -103,7 +103,9 @@ void FormulaList::generateBitmaps(const char *path) ...@@ -103,7 +103,9 @@ void FormulaList::generateBitmaps(const char *path)
{ {
//printf("Running latex...\n"); //printf("Running latex...\n");
//system("latex _formulas.tex </dev/null >/dev/null"); //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"); err("Problems running latex. Check your installation or look for typos in _formulas.tex!\n");
formulaError=TRUE; formulaError=TRUE;
......
src/htmldocvisitor.cpp
View file @ 4fa6a604
...@@ -903,13 +903,22 @@ void HtmlDocVisitor::visitPre(DocParamList *pl) ...@@ -903,13 +903,22 @@ void HtmlDocVisitor::visitPre(DocParamList *pl)
m_t << "]</tt>&nbsp;"; m_t << "]</tt>&nbsp;";
} }
m_t << "</td><td valign=\"top\"><em>"; m_t << "</td><td valign=\"top\"><em>";
QStrListIterator li(pl->parameters()); //QStrListIterator li(pl->parameters());
const char *s; //const char *s;
QListIterator<DocNode> li(pl->parameters());
DocNode *param;
bool first=TRUE; bool first=TRUE;
for (li.toFirst();(s=li.current());++li) for (li.toFirst();(param=li.current());++li)
{ {
if (!first) m_t << ","; else first=FALSE; 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>&nbsp;</td><td>"; m_t << "</em>&nbsp;</td><td>";
} }
......
src/htmlgen.cpp
View file @ 4fa6a604
...@@ -57,7 +57,7 @@ static const char *defaultStyleSheet = ...@@ -57,7 +57,7 @@ static const char *defaultStyleSheet =
" font-size: 120%;\n" " font-size: 120%;\n"
"}\n" "}\n"
"H3 {\n" "H3 {\n"
" font-size: 110%;\n" " font-size: 100%;\n"
"}\n" "}\n"
"CAPTION { font-weight: bold }\n" "CAPTION { font-weight: bold }\n"
"DIV.qindex {\n" "DIV.qindex {\n"
...@@ -126,7 +126,7 @@ static const char *defaultStyleSheet = ...@@ -126,7 +126,7 @@ static const char *defaultStyleSheet =
"DL.el { margin-left: -1cm }\n" "DL.el { margin-left: -1cm }\n"
".fragment {\n" ".fragment {\n"
" font-family: Fixed, monospace;\n" " font-family: Fixed, monospace;\n"
" font-size: 90%;\n" " font-size: 95%;\n"
"}\n" "}\n"
"PRE.fragment {\n" "PRE.fragment {\n"
" border: 1px solid #CCCCCC;\n" " border: 1px solid #CCCCCC;\n"
......
src/htmlhelp.cpp
View file @ 4fa6a604
...@@ -37,6 +37,7 @@ struct IndexField ...@@ -37,6 +37,7 @@ struct IndexField
QCString url; QCString url;
QCString anchor; QCString anchor;
bool link; bool link;
bool reversed;
}; };
class IndexFieldList : public QList<IndexField> class IndexFieldList : public QList<IndexField>
...@@ -72,7 +73,8 @@ class HtmlHelpIndex ...@@ -72,7 +73,8 @@ class HtmlHelpIndex
HtmlHelpIndex(); HtmlHelpIndex();
~HtmlHelpIndex(); ~HtmlHelpIndex();
void addItem(const char *first,const char *second, 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); void writeFields(QTextStream &t);
private: private:
IndexFieldList *list; IndexFieldList *list;
...@@ -104,9 +106,12 @@ HtmlHelpIndex::~HtmlHelpIndex() ...@@ -104,9 +106,12 @@ HtmlHelpIndex::~HtmlHelpIndex()
* \param anchor the anchor of the documentation within the page. * \param anchor the anchor of the documentation within the page.
* \param hasLink if true, the url (without anchor) can be used in the * \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. * 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, 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; QCString key = level1;
if (level2) key+= (QCString)"?" + level2; if (level2) key+= (QCString)"?" + level2;
...@@ -115,10 +120,11 @@ void HtmlHelpIndex::addItem(const char *level1,const char *level2, ...@@ -115,10 +120,11 @@ void HtmlHelpIndex::addItem(const char *level1,const char *level2,
//printf(">>>>>>>>> HtmlHelpIndex::addItem(%s,%s,%s,%s)\n", //printf(">>>>>>>>> HtmlHelpIndex::addItem(%s,%s,%s,%s)\n",
// level1,level2,url,anchor); // level1,level2,url,anchor);
IndexField *f = new IndexField; IndexField *f = new IndexField;
f->name = key; f->name = key;
f->url = url; f->url = url;
f->anchor = anchor; f->anchor = anchor;
f->link = hasLink; f->link = hasLink;
f->reversed = reversed;
list->inSort(f); list->inSort(f);
dict->insert(key,f); dict->insert(key,f);
} }
...@@ -199,7 +205,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t) ...@@ -199,7 +205,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t)
{ {
t << " <LI><OBJECT type=\"text/sitemap\">"; t << " <LI><OBJECT type=\"text/sitemap\">";
t << "<param name=\"Local\" value=\"" << f->url << Doxygen::htmlFileExtension; 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 << "\">";
t << "<param name=\"Name\" value=\"" << level1 << "\">" t << "<param name=\"Name\" value=\"" << level1 << "\">"
"</OBJECT>\n"; "</OBJECT>\n";
...@@ -210,7 +216,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t) ...@@ -210,7 +216,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t)
{ {
t << " <LI><OBJECT type=\"text/sitemap\">"; t << " <LI><OBJECT type=\"text/sitemap\">";
t << "<param name=\"Local\" value=\"" << f->url << Doxygen::htmlFileExtension; 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 << "\">";
t << "<param name=\"Name\" value=\"" << level1 << "\">" t << "<param name=\"Name\" value=\"" << level1 << "\">"
"</OBJECT>\n"; "</OBJECT>\n";
...@@ -245,6 +251,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t) ...@@ -245,6 +251,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t)
} }
lastLevel1 = level1.copy(); lastLevel1 = level1.copy();
} }
if (level2Started) t << " </UL>" << endl;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
...@@ -551,7 +558,7 @@ void HtmlHelp::addContentsItem(bool isDir, ...@@ -551,7 +558,7 @@ void HtmlHelp::addContentsItem(bool isDir,
void HtmlHelp::addIndexItem(const char *level1, const char *level2, void HtmlHelp::addIndexItem(const char *level1, const char *level2,
const char *ref, const char *anchor) const char *ref, const char *anchor)
{ {
index->addItem(level1,level2,ref,anchor,TRUE); index->addItem(level1,level2,ref,anchor,TRUE,FALSE);
index->addItem(level2,level1,ref,anchor,TRUE); index->addItem(level2,level1,ref,anchor,TRUE,TRUE);
} }
src/index.cpp
View file @ 4fa6a604
...@@ -92,7 +92,6 @@ void countDataStructures() ...@@ -92,7 +92,6 @@ void countDataStructures()
static void startIndexHierarchy(OutputList &ol,int level) static void startIndexHierarchy(OutputList &ol,int level)
{ {
// UGLY HACK!
ol.pushGeneratorState(); ol.pushGeneratorState();
ol.disable(OutputGenerator::Man); ol.disable(OutputGenerator::Man);
ol.disable(OutputGenerator::Html); ol.disable(OutputGenerator::Html);
...@@ -106,7 +105,6 @@ static void startIndexHierarchy(OutputList &ol,int level) ...@@ -106,7 +105,6 @@ static void startIndexHierarchy(OutputList &ol,int level)
static void endIndexHierarchy(OutputList &ol,int level) static void endIndexHierarchy(OutputList &ol,int level)
{ {
// UGLY HACK!
ol.pushGeneratorState(); ol.pushGeneratorState();
ol.disable(OutputGenerator::Man); ol.disable(OutputGenerator::Man);
ol.disable(OutputGenerator::Html); ol.disable(OutputGenerator::Html);
...@@ -1695,7 +1693,7 @@ void writeQuickMemberIndex(OutputList &ol,bool *charUsed,int page, ...@@ -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; if (documentedClassMembers[hl]==0) return;
...@@ -1791,31 +1789,34 @@ static void writeMemberIndexFiltered(OutputList &ol, ClassMemberHighlight hl) ...@@ -1791,31 +1789,34 @@ static void writeMemberIndexFiltered(OutputList &ol, ClassMemberHighlight hl)
ol.popGeneratorState(); ol.popGeneratorState();
} }
void writeMemberIndex(OutputList &ol) void writeClassMemberIndex(OutputList &ol)
{ {
writeMemberIndexFiltered(ol,CMHL_All); writeClassMemberIndexFiltered(ol,CMHL_All);
writeMemberIndexFiltered(ol,CMHL_Functions); writeClassMemberIndexFiltered(ol,CMHL_Functions);
writeMemberIndexFiltered(ol,CMHL_Variables); writeClassMemberIndexFiltered(ol,CMHL_Variables);
writeMemberIndexFiltered(ol,CMHL_Typedefs); writeClassMemberIndexFiltered(ol,CMHL_Typedefs);
writeMemberIndexFiltered(ol,CMHL_Enums); writeClassMemberIndexFiltered(ol,CMHL_Enums);
writeMemberIndexFiltered(ol,CMHL_EnumValues); writeClassMemberIndexFiltered(ol,CMHL_EnumValues);
writeMemberIndexFiltered(ol,CMHL_Properties); writeClassMemberIndexFiltered(ol,CMHL_Properties);
writeMemberIndexFiltered(ol,CMHL_Events); writeClassMemberIndexFiltered(ol,CMHL_Events);
writeMemberIndexFiltered(ol,CMHL_Related); writeClassMemberIndexFiltered(ol,CMHL_Related);
QCString title = theTranslator->trCompoundMembers(); if (documentedClassMembers[CMHL_All]>0)
bool &generateHtml = Config_getBool("GENERATE_HTML") ; {
bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP"); QCString title = theTranslator->trCompoundMembers();
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW"); bool &generateHtml = Config_getBool("GENERATE_HTML") ;
if (hasHtmlHelp) bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
{ bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
HtmlHelp *htmlHelp = HtmlHelp::getInstance(); if (hasHtmlHelp)
htmlHelp->addContentsItem(FALSE,title,"functions"); {
} HtmlHelp *htmlHelp = HtmlHelp::getInstance();
if (hasFtvHelp) htmlHelp->addContentsItem(FALSE,title,"functions");
{ }
FTVHelp *ftvHelp = FTVHelp::getInstance(); if (hasFtvHelp)
ftvHelp->addContentsItem(FALSE,0,"functions",0,title); {
FTVHelp *ftvHelp = FTVHelp::getInstance();
ftvHelp->addContentsItem(FALSE,0,"functions",0,title);
}
} }
} }
...@@ -2193,19 +2194,22 @@ void writeFileMemberIndex(OutputList &ol) ...@@ -2193,19 +2194,22 @@ void writeFileMemberIndex(OutputList &ol)
writeFileMemberIndexFiltered(ol,FMHL_EnumValues); writeFileMemberIndexFiltered(ol,FMHL_EnumValues);
writeFileMemberIndexFiltered(ol,FMHL_Defines); writeFileMemberIndexFiltered(ol,FMHL_Defines);
QCString title = theTranslator->trFileMembers(); if (documentedFileMembers[FMHL_All]>0)
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(); QCString title = theTranslator->trFileMembers();
htmlHelp->addContentsItem(FALSE,title,"globals"); bool &generateHtml = Config_getBool("GENERATE_HTML") ;
} bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
if (hasFtvHelp) bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
{ if (hasHtmlHelp)
FTVHelp *ftvHelp = FTVHelp::getInstance(); {
ftvHelp->addContentsItem(FALSE,0,"globals",0,title); 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) ...@@ -2309,19 +2313,22 @@ void writeNamespaceMemberIndex(OutputList &ol)
writeNamespaceMemberIndexFiltered(ol,NMHL_Enums); writeNamespaceMemberIndexFiltered(ol,NMHL_Enums);
writeNamespaceMemberIndexFiltered(ol,NMHL_EnumValues); writeNamespaceMemberIndexFiltered(ol,NMHL_EnumValues);
QCString title = theTranslator->trNamespaceMembers(); if (documentedNamespaceMembers[NMHL_All]>0)
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(); QCString title = theTranslator->trNamespaceMembers();
ftvHelp->addContentsItem(FALSE,0,"namespacemembers",0,title); 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);
}
} }
} }
......
src/index.h
View file @ 4fa6a604
...@@ -49,24 +49,28 @@ void writeIndex(OutputList &ol); ...@@ -49,24 +49,28 @@ void writeIndex(OutputList &ol);
void writeHierarchicalIndex(OutputList &ol); void writeHierarchicalIndex(OutputList &ol);
void writeAlphabeticalIndex(OutputList &ol); void writeAlphabeticalIndex(OutputList &ol);
void writeClassHierarchy(OutputList &ol); void writeClassHierarchy(OutputList &ol);
void writeFileIndex(OutputList &ol);
void writeSourceIndex(OutputList &ol);
void writeAnnotatedIndex(OutputList &ol); void writeAnnotatedIndex(OutputList &ol);
void writeAnnotatedClassList(OutputList &ol); void writeAnnotatedClassList(OutputList &ol);
void writeMemberIndex(OutputList &ol);
void writeMemberList(OutputList &ol,bool useSections); void writeMemberList(OutputList &ol,bool useSections);
void writeSourceIndex(OutputList &ol);
void writeHeaderIndex(OutputList &ol); void writeHeaderIndex(OutputList &ol);
void writeHeaderFileList(OutputList &ol); void writeHeaderFileList(OutputList &ol);
void writeExampleIndex(OutputList &ol); void writeExampleIndex(OutputList &ol);
void writePageIndex(OutputList &ol); void writePageIndex(OutputList &ol);
void writeFileMemberIndex(OutputList &ol); void writeFileIndex(OutputList &ol);
void writeNamespaceIndex(OutputList &ol);
void writeGroupIndex(OutputList &ol); void writeGroupIndex(OutputList &ol);
void writeDirIndex(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 writeNamespaceMemberIndex(OutputList &ol);
void writeGraphicalClassHierarchy(OutputList &ol); void writeGraphicalClassHierarchy(OutputList &ol);
void writeGraphInfo(OutputList &ol); void writeGraphInfo(OutputList &ol);
void writePackageIndex(OutputList &ol);
void countDataStructures(); void countDataStructures();
......
src/latexdocvisitor.cpp
View file @ 4fa6a604
...@@ -909,14 +909,23 @@ void LatexDocVisitor::visitPre(DocParamList *pl) ...@@ -909,14 +909,23 @@ void LatexDocVisitor::visitPre(DocParamList *pl)
m_t << "} "; m_t << "} ";
} }
m_t << "{\\em "; m_t << "{\\em ";
QStrListIterator li(pl->parameters()); //QStrListIterator li(pl->parameters());
const char *s; //const char *s;
QListIterator<DocNode> li(pl->parameters());
DocNode *param;
bool first=TRUE; bool first=TRUE;
for (li.toFirst();(s=li.current());++li) for (li.toFirst();(param=li.current());++li)
{ {
if (!first) m_t << ","; else first=FALSE; if (!first) m_t << ","; else first=FALSE;
m_insideItem=TRUE; 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_insideItem=FALSE;
} }
m_t << "}]"; m_t << "}]";
......
src/mandocvisitor.cpp
View file @ 4fa6a604
...@@ -804,13 +804,22 @@ void ManDocVisitor::visitPre(DocParamList *pl) ...@@ -804,13 +804,22 @@ void ManDocVisitor::visitPre(DocParamList *pl)
{ {
if (m_hide) return; if (m_hide) return;
m_t << "\\fI"; m_t << "\\fI";
QStrListIterator li(pl->parameters()); //QStrListIterator li(pl->parameters());
const char *s; //const char *s;
QListIterator<DocNode> li(pl->parameters());
DocNode *param;
bool first=TRUE; bool first=TRUE;
for (li.toFirst();(s=li.current());++li) for (li.toFirst();(param=li.current());++li)
{ {
if (!first) m_t << ","; else first=FALSE; 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 "; m_t << "\\fP ";
} }
......
src/pagedef.cpp
View file @ 4fa6a604
...@@ -59,7 +59,7 @@ void PageDef::writeDocumentation(OutputList &ol) ...@@ -59,7 +59,7 @@ void PageDef::writeDocumentation(OutputList &ol)
startFile(ol,pageName,pageName,title()); startFile(ol,pageName,pageName,title());
if (getOuterScope()!=Doxygen::globalScope) if (getOuterScope()!=Doxygen::globalScope && !Config_getBool("DISABLE_INDEX"))
{ {
getOuterScope()->writeNavigationPath(ol); getOuterScope()->writeNavigationPath(ol);
} }
......
src/perlmodgen.cpp
View file @ 4fa6a604
...@@ -1165,10 +1165,21 @@ void PerlModDocVisitor::visitPre(DocParamList *pl) ...@@ -1165,10 +1165,21 @@ void PerlModDocVisitor::visitPre(DocParamList *pl)
leaveText(); leaveText();
m_output.openHash() m_output.openHash()
.openList("parameters"); .openList("parameters");
QStrListIterator li(pl->parameters()); //QStrListIterator li(pl->parameters());
const char *s; //const char *s;
for (li.toFirst();(s=li.current());++li) 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() m_output.openHash()
.addFieldQuotedString("name", s) .addFieldQuotedString("name", s)
.closeHash(); .closeHash();
......
src/printdocvisitor.h
View file @ 4fa6a604
...@@ -547,12 +547,23 @@ class PrintDocVisitor : public DocVisitor ...@@ -547,12 +547,23 @@ class PrintDocVisitor : public DocVisitor
void visitPre(DocParamList *pl) void visitPre(DocParamList *pl)
{ {
indent_pre(); indent_pre();
QStrListIterator sli(pl->parameters()); //QStrListIterator sli(pl->parameters());
const char *s; QListIterator<DocNode> sli(pl->parameters());
//const char *s;
DocNode *param;
printf("<parameters>"); 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"); printf("\n");
} }
......
src/rtfdocvisitor.cpp
View file @ 4fa6a604
...@@ -1150,13 +1150,22 @@ void RTFDocVisitor::visitPre(DocParamList *pl) ...@@ -1150,13 +1150,22 @@ void RTFDocVisitor::visitPre(DocParamList *pl)
if (m_hide) return; if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocParamList)}\n"); DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocParamList)}\n");
m_t << "{\\i "; m_t << "{\\i ";
QStrListIterator li(pl->parameters()); //QStrListIterator li(pl->parameters());
const char *s; //const char *s;
QListIterator<DocNode> li(pl->parameters());
DocNode *param;
bool first=TRUE; bool first=TRUE;
for (li.toFirst();(s=li.current());++li) for (li.toFirst();(param=li.current());++li)
{ {
if (!first) m_t << ","; else first=FALSE; 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_t << "} ";
m_lastIsPara=TRUE; m_lastIsPara=TRUE;
......
src/scanner.l
View file @ 4fa6a604
...@@ -213,6 +213,7 @@ static void initParser() ...@@ -213,6 +213,7 @@ static void initParser()
lastDefGroup.groupname.resize(0); lastDefGroup.groupname.resize(0);
insideFormula = FALSE; insideFormula = FALSE;
insideCode=FALSE; insideCode=FALSE;
previous = 0;
} }
static void initEntry() static void initEntry()
...@@ -225,6 +226,7 @@ static void initEntry() ...@@ -225,6 +226,7 @@ static void initEntry()
current->mGrpId = memberGroupId; current->mGrpId = memberGroupId;
current->relates = memberGroupRelates.copy(); current->relates = memberGroupRelates.copy();
current->inside = memberGroupInside.copy(); current->inside = memberGroupInside.copy();
current->objc = insideObjC;
if (!autoGroupStack.isEmpty()) if (!autoGroupStack.isEmpty())
{ {
//printf("Appending group %s\n",autoGroupStack.top()->groupname.data()); //printf("Appending group %s\n",autoGroupStack.top()->groupname.data());
...@@ -1133,6 +1135,7 @@ IDLATTR ("["[^\]]*"]"){BN}* ...@@ -1133,6 +1135,7 @@ IDLATTR ("["[^\]]*"]"){BN}*
current->bodyLine = yyLineNr; current->bodyLine = yyLineNr;
current->section = Entry::FUNCTION_SEC; current->section = Entry::FUNCTION_SEC;
current->protection = protection = Public ; current->protection = protection = Public ;
current->objc = TRUE;
current->virt = Virtual; current->virt = Virtual;
current->stat=yytext[0]=='+'; current->stat=yytext[0]=='+';
current->mtype = mtype = Method; current->mtype = mtype = Method;
...@@ -2141,7 +2144,10 @@ IDLATTR ("["[^\]]*"]"){BN}* ...@@ -2141,7 +2144,10 @@ IDLATTR ("["[^\]]*"]"){BN}*
<FindMembers,FindFields>("//"([!/]?){B}*{CMD}"{")|("/*"([!*]?){B}*{CMD}"{") { <FindMembers,FindFields>("//"([!/]?){B}*{CMD}"{")|("/*"([!*]?){B}*{CMD}"{") {
#ifdef COMMENTSCAN #ifdef COMMENTSCAN
Entry *tmp = current; Entry *tmp = current;
current = previous; if (previous)
{
current = previous;
}
handleGroupStartCommand(current->name); handleGroupStartCommand(current->name);
current = tmp; current = tmp;
initEntry(); initEntry();
...@@ -2749,7 +2755,7 @@ IDLATTR ("["[^\]]*"]"){BN}* ...@@ -2749,7 +2755,7 @@ IDLATTR ("["[^\]]*"]"){BN}*
unput(';'); unput(';');
BEGIN( MemberSpec ) ; 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(); lineCount();
int i=0,l=yyleng,j; int i=0,l=yyleng,j;
while (i<l && (!isId(yytext[i]))) i++; while (i<l && (!isId(yytext[i]))) i++;
...@@ -6405,7 +6411,7 @@ static void parseCompounds(Entry *rt) ...@@ -6405,7 +6411,7 @@ static void parseCompounds(Entry *rt)
setContext(); setContext();
yyLineNr = ce->startLine ; yyLineNr = ce->startLine ;
insideObjC = ce->objc; 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(); //current->reset();
if (current) delete current; if (current) delete current;
current = new Entry; current = new Entry;
...@@ -6621,6 +6627,7 @@ void handleGroupStartCommand(const char *header) ...@@ -6621,6 +6627,7 @@ void handleGroupStartCommand(const char *header)
void handleGroupEndCommand() void handleGroupEndCommand()
{ {
endGroup(); endGroup();
previous=0;
} }
......
src/translator_br.h
View file @ 4fa6a604
...@@ -12,9 +12,11 @@ ...@@ -12,9 +12,11 @@
* *
* Brazilian Portuguese version by * Brazilian Portuguese version by
* Fabio "FJTC" Jun Takada Chino <jun-chino at uol.com.br> * 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: * History:
* 1.4.1
* - Method trOverloadText() added.
* 1.3.9 * 1.3.9
* - Updated to Doxygen 1.3.9 * - Updated to Doxygen 1.3.9
* 1.3.8 * 1.3.8
...@@ -34,7 +36,7 @@ ...@@ -34,7 +36,7 @@
#ifndef TRANSLATOR_BR_H #ifndef TRANSLATOR_BR_H
#define TRANSLATOR_BR_H #define TRANSLATOR_BR_H
class TranslatorBrazilian : public TranslatorAdapter_1_4_1 class TranslatorBrazilian : public Translator
{ {
public: public:
...@@ -1597,5 +1599,19 @@ class TranslatorBrazilian : public TranslatorAdapter_1_4_1 ...@@ -1597,5 +1599,19 @@ class TranslatorBrazilian : public TranslatorAdapter_1_4_1
if (!singular) result+="s"; if (!singular) result+="s";
return result; 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 método provido por conveniência. "
"Ele difere do método acima apenas na lista de "
"argumentos que devem ser utilizados.";
}
}; };
#endif #endif
src/translator_ca.h
View file @ 4fa6a604
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
// Translator class (by the local maintainer) when the localized // Translator class (by the local maintainer) when the localized
// translator is made up-to-date again. // translator is made up-to-date again.
class TranslatorCatalan : public TranslatorAdapter_1_2_17 class TranslatorCatalan : public TranslatorAdapter_1_4_1
{ {
public: public:
...@@ -87,40 +87,40 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -87,40 +87,40 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! subscript for the related functions. */ /*! subscript for the related functions. */
virtual QCString trRelatedSubscript() virtual QCString trRelatedSubscript()
{ return "(Remarcar que aquestes funcions no són 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. */ /*! header that is put before the detailed description of files, classes and namespaces. */
virtual QCString trDetailedDescription() virtual QCString trDetailedDescription()
{ return "Descripció detallada"; } { return "Descripció Detallada"; }
/*! header that is put before the list of typedefs. */ /*! header that is put before the list of typedefs. */
virtual QCString trMemberTypedefDocumentation() 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. */ /*! header that is put before the list of enumerations. */
virtual QCString trMemberEnumerationDocumentation() 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. */ /*! header that is put before the list of member functions. */
virtual QCString trMemberFunctionDocumentation() 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. */ /*! header that is put before the list of member attributes. */
virtual QCString trMemberDataDocumentation() virtual QCString trMemberDataDocumentation()
{ {
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{ {
return "Documentació dels camps"; return "Documentació dels Camps";
} }
else else
{ {
return "Documentació de les dades membre"; return "Documentació de les Dades Membre";
} }
} }
/*! this is the text of a link put after brief descriptions. */ /*! this is the text of a link put after brief descriptions. */
virtual QCString trMore() virtual QCString trMore()
{ return "Més..."; } { return "Més..."; }
/*! put in the class documentation */ /*! put in the class documentation */
virtual QCString trListOfAllMembers() virtual QCString trListOfAllMembers()
...@@ -128,11 +128,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -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 */ /*! used as the title of the "list of all members" page of a class */
virtual QCString trMemberList() 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 */ /*! this is the first part of a sentence that is followed by a class name */
virtual QCString trThisIsTheListOfAllMembers() 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 */ /*! this is the remainder of the sentence after the class name */
virtual QCString trIncludingInheritedMembers() virtual QCString trIncludingInheritedMembers()
...@@ -142,7 +142,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -142,7 +142,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
* parameter s is name of the project name. * parameter s is name of the project name.
*/ */
virtual QCString trGeneratedAutomatically(const char *s) virtual QCString trGeneratedAutomatically(const char *s)
{ QCString result="Generat automàticament per Doxygen"; { QCString result="Generat automàticament per Doxygen";
if (s) result+=(QCString)" per a "+s; if (s) result+=(QCString)" per a "+s;
result+=" a partir del codi font."; result+=" a partir del codi font.";
return result; return result;
...@@ -166,7 +166,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -166,7 +166,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
* compounds or files (see the \\group command). * compounds or files (see the \\group command).
*/ */
virtual QCString trModules() virtual QCString trModules()
{ return "Mòduls"; } { return "Mòduls"; }
/*! This is put above each page as a link to the class hierarchy */ /*! This is put above each page as a link to the class hierarchy */
virtual QCString trClassHierarchy() virtual QCString trClassHierarchy()
...@@ -181,28 +181,28 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -181,28 +181,28 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
} }
else else
{ {
return "Llistes Compostes"; return "Llista de Classes";
} }
} }
/*! This is put above each page as a link to the list of documented files */ /*! This is put above each page as a link to the list of documented files */
virtual QCString trFileList() 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 */ /*! This is put above each page as a link to the list of all verbatim headers */
virtual QCString trHeaderFiles() virtual QCString trHeaderFiles()
{ return "Fitxers d'encapçalaments"; } { return "Fitxers d'encapçalaments"; }
/*! This is put above each page as a link to all members of compounds. */ /*! This is put above each page as a link to all members of compounds. */
virtual QCString trCompoundMembers() virtual QCString trCompoundMembers()
{ {
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{ {
return "Camps de dades"; return "Camps de Dades";
} }
else else
{ {
return "Membres compostos"; return "Membres de Classes";
} }
} }
...@@ -215,13 +215,13 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -215,13 +215,13 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
} }
else else
{ {
return "Arxius membres"; return "Membres de Fitxers";
} }
} }
/*! This is put above each page as a link to all related pages. */ /*! This is put above each page as a link to all related pages. */
virtual QCString trRelatedPages() virtual QCString trRelatedPages()
{ return "Pàgines relacionades"; } { return "Pàgines Relacionades"; }
/*! This is put above each page as a link to all examples. */ /*! This is put above each page as a link to all examples. */
virtual QCString trExamples() virtual QCString trExamples()
...@@ -233,14 +233,14 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -233,14 +233,14 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! This is an introduction to the class hierarchy. */ /*! This is an introduction to the class hierarchy. */
virtual QCString trClassHierarchyDescription() virtual QCString trClassHierarchyDescription()
{ return "Aquesta llista d'herència està ordenada toscament, " { return "Aquesta llista d'herència està ordenada toscament, "
"però no completa, de forma alfabètica:"; "però no completa, de forma alfabètica:";
} }
/*! This is an introduction to the list with all files. */ /*! This is an introduction to the list with all files. */
virtual QCString trFileListDescription(bool extractAll) 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 "; if (!extractAll) result+="documentats ";
result+="acompanyats amb breus descripcions:"; result+="acompanyats amb breus descripcions:";
return result; return result;
...@@ -252,19 +252,19 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -252,19 +252,19 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{ {
return "Aquestes són les estructures de dades acompanyades amb breus descripcions:"; return "Aquestes són les estructures de dades acompanyades amb breus descripcions:";
} }
else else
{ {
return "Aquestes són les classes, estructures, " return "Aquestes són les classes, estructures, "
"unions i interfícies acompnyades amb breus descripcions:"; "unions i interfícies acompanyades amb breus descripcions:";
} }
} }
/*! This is an introduction to the page with all class members. */ /*! This is an introduction to the page with all class members. */
virtual QCString trCompoundMembersDescription(bool extractAll) 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")) if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{ {
result+="camps d'estructures i unions"; result+="camps d'estructures i unions";
...@@ -275,29 +275,29 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -275,29 +275,29 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
} }
if (!extractAll) if (!extractAll)
{ {
result+="documentats "; result+=" documentats";
} }
result+=" amb enllaços a "; result+=" amb enllaços a ";
if (!extractAll) if (!extractAll)
{ {
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) 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 else
{ {
result+="la documentació de la classe per a cada membre:"; result+="la documentació de la classe per a cada membre:";
} }
} }
else else
{ {
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{ {
result+="les estructures/unions que pertanyen a:"; result+="les estructures/unions a que pertanyen:";
} }
else else
{ {
result+="les classes que pertanyen:"; result+="les classes a que pertanyen:";
} }
} }
return result; return result;
...@@ -305,65 +305,65 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -305,65 +305,65 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! This is an introduction to the page with all file members. */ /*! This is an introduction to the page with all file members. */
virtual QCString trFileMembersDescription(bool extractAll) 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")) if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{ {
result+="totes les funcions, variables, definicions, enumeracions, i definicions de tipus"; result+="totes les funcions, variables, definicions, enumeracions, i definicions de tipus";
if (!extractAll) result+="documentades "; if (!extractAll) result+=" documentades";
} }
else else
{ {
result+="tots els membres de l'arxiu"; result+="tots els membres de fitxers";
if (!extractAll) result+="documentat "; if (!extractAll) result+=" documentats";
} }
result+=" amb enllaços "; result+=" amb enllaços ";
if (extractAll) if (extractAll)
result+="als arxius als quals corresponen:"; result+="als fitxers als quals corresponen:";
else else
result+="a la documentació:"; result+="a la documentació:";
return result; return result;
} }
/*! This is an introduction to the page with the list of all header files. */ /*! This is an introduction to the page with the list of all header files. */
virtual QCString trHeaderFilesDescription() virtual QCString trHeaderFilesDescription()
{ return "Aquesta és la llista d'arxius d'encapçalament 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 */ /*! This is an introduction to the page with the list of all examples */
virtual QCString trExamplesDescription() 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 */ /*! This is an introduction to the page with the list of related pages */
virtual QCString trRelatedPagesDescription() virtual QCString trRelatedPagesDescription()
{ return "Aquesta és la llista de totes les pàgines 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 */ /*! This is an introduction to the page with the list of class/file groups */
virtual QCString trModulesDescription() virtual QCString trModulesDescription()
{ return "Aquesta és la llista de mòduls:"; } { return "Aquesta és la llista de mòduls:"; }
/*! This sentences is used in the annotated class/file lists if no brief /*! This sentences is used in the annotated class/file lists if no brief
* description is given. * description is given.
*/ */
virtual QCString trNoDescriptionAvailable() 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) // index titles (the project name is prepended for these)
/*! This is used in HTML as the title of index.html. */ /*! This is used in HTML as the title of index.html. */
virtual QCString trDocumentation() virtual QCString trDocumentation()
{ return "Documentació"; } { return ": Documentació"; }
/*! This is used in LaTeX as the title of the chapter with the /*! This is used in LaTeX as the title of the chapter with the
* index of all groups. * index of all groups.
*/ */
virtual QCString trModuleIndex() virtual QCString trModuleIndex()
{ return "Índex de Mòduls"; } { return "Índex de Mòduls"; }
/*! This is used in LaTeX as the title of the chapter with the /*! This is used in LaTeX as the title of the chapter with the
* class hierarchy. * class hierarchy.
*/ */
virtual QCString trHierarchicalIndex() virtual QCString trHierarchicalIndex()
{ return "Índex Jeràrquic"; } { return "Índex Jeràrquic"; }
/*! This is used in LaTeX as the title of the chapter with the /*! This is used in LaTeX as the title of the chapter with the
* annotated compound index. * annotated compound index.
...@@ -372,11 +372,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -372,11 +372,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
{ {
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{ {
return "Índex d'Estructures de Dades"; return "Índex d'Estructures de Dades";
} }
else else
{ {
return "Índex Compost"; return "Índex de Classes";
} }
} }
...@@ -384,13 +384,13 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -384,13 +384,13 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
* list of all files. * list of all files.
*/ */
virtual QCString trFileIndex() virtual QCString trFileIndex()
{ return "Índex d'Arxius"; } { return "Índex de Fitxers"; }
/*! This is used in LaTeX as the title of the chapter containing /*! This is used in LaTeX as the title of the chapter containing
* the documentation of all groups. * the documentation of all groups.
*/ */
virtual QCString trModuleDocumentation() virtual QCString trModuleDocumentation()
{ return "Documentació dels mòduls"; } { return "Documentació dels Mòduls"; }
/*! This is used in LaTeX as the title of the chapter containing /*! This is used in LaTeX as the title of the chapter containing
* the documentation of all classes, structs and unions. * the documentation of all classes, structs and unions.
...@@ -399,11 +399,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -399,11 +399,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
{ {
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{ {
return "Documentació de les Estructures de Dades"; return "Documentació de les Estructures de Dades";
} }
else else
{ {
return "Documentació de les Classes"; return "Documentació de les Classes";
} }
} }
...@@ -411,23 +411,23 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -411,23 +411,23 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
* the documentation of all files. * the documentation of all files.
*/ */
virtual QCString trFileDocumentation() virtual QCString trFileDocumentation()
{ return "Documentació dels Arxius"; } { return "Documentació dels Fitxers"; }
/*! This is used in LaTeX as the title of the chapter containing /*! This is used in LaTeX as the title of the chapter containing
* the documentation of all examples. * the documentation of all examples.
*/ */
virtual QCString trExampleDocumentation() virtual QCString trExampleDocumentation()
{ return "Documentació dels Exemples"; } { return "Documentació dels Exemples"; }
/*! This is used in LaTeX as the title of the chapter containing /*! This is used in LaTeX as the title of the chapter containing
* the documentation of all related pages. * the documentation of all related pages.
*/ */
virtual QCString trPageDocumentation() virtual QCString trPageDocumentation()
{ return "Documentació de les pàgines"; } { return "Documentació de les Pàgines"; }
/*! This is used in LaTeX as the title of the document */ /*! This is used in LaTeX as the title of the document */
virtual QCString trReferenceManual() virtual QCString trReferenceManual()
{ return "Manual de Referència"; } { return "Manual de Referència"; }
/*! This is used in the documentation of a file as a header before the /*! This is used in the documentation of a file as a header before the
* list of defines * list of defines
...@@ -475,43 +475,43 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -475,43 +475,43 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
* documentation blocks for defines * documentation blocks for defines
*/ */
virtual QCString trDefineDocumentation() 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 /*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for function prototypes * of documentation blocks for function prototypes
*/ */
virtual QCString trFunctionPrototypeDocumentation() 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 /*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for typedefs * of documentation blocks for typedefs
*/ */
virtual QCString trTypedefDocumentation() 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 /*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for enumeration types * of documentation blocks for enumeration types
*/ */
virtual QCString trEnumerationTypeDocumentation() 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 /*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for enumeration values * of documentation blocks for enumeration values
*/ */
virtual QCString trEnumerationValueDocumentation() 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 /*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for functions * of documentation blocks for functions
*/ */
virtual QCString trFunctionDocumentation() 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 /*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for variables * of documentation blocks for variables
*/ */
virtual QCString trVariableDocumentation() 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 /*! This is used in the documentation of a file/namespace/group before
* the list of links to documented compounds * the list of links to documented compounds
...@@ -524,7 +524,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -524,7 +524,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
} }
else else
{ {
return "Compostos"; return "Classes";
} }
} }
...@@ -548,12 +548,12 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -548,12 +548,12 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! this text is put before a class diagram */ /*! this text is put before a class diagram */
virtual QCString trClassDiagram(const char *clName) virtual QCString trClassDiagram(const char *clName)
{ {
return (QCString)"Diagrama d'Herència per a "+clName+":"; return (QCString)"Diagrama d'Herència per a "+clName+":";
} }
/*! this text is generated when the \\internal command is used. */ /*! this text is generated when the \\internal command is used. */
virtual QCString trForInternalUseOnly() 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. */ /*! this text is generated when the \\reimp command is used. */
virtual QCString trReimplementedForInternalReasons() virtual QCString trReimplementedForInternalReasons()
...@@ -561,7 +561,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -561,7 +561,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! this text is generated when the \\warning command is used. */ /*! this text is generated when the \\warning command is used. */
virtual QCString trWarning() virtual QCString trWarning()
{ return "Atenció"; } { return "Atenció"; }
/*! this text is generated when the \\bug command is used. */ /*! this text is generated when the \\bug command is used. */
virtual QCString trBugsAndLimitations() virtual QCString trBugsAndLimitations()
...@@ -569,7 +569,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -569,7 +569,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! this text is generated when the \\version command is used. */ /*! this text is generated when the \\version command is used. */
virtual QCString trVersion() virtual QCString trVersion()
{ return "Versió"; } { return "Versió"; }
/*! this text is generated when the \\date command is used. */ /*! this text is generated when the \\date command is used. */
virtual QCString trDate() virtual QCString trDate()
...@@ -581,11 +581,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -581,11 +581,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! this text is generated when the \\sa command is used. */ /*! this text is generated when the \\sa command is used. */
virtual QCString trSeeAlso() virtual QCString trSeeAlso()
{ return "Mireu també"; } { return "Mireu també"; }
/*! this text is generated when the \\param command is used. */ /*! this text is generated when the \\param command is used. */
virtual QCString trParameters() virtual QCString trParameters()
{ return "Paràmetres"; } { return "Paràmetres"; }
/*! this text is generated when the \\exception command is used. */ /*! this text is generated when the \\exception command is used. */
virtual QCString trExceptions() virtual QCString trExceptions()
...@@ -606,7 +606,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -606,7 +606,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! used as an introduction to the namespace list */ /*! used as an introduction to the namespace list */
virtual QCString trNamespaceListDescription(bool extractAll) virtual QCString trNamespaceListDescription(bool extractAll)
{ {
QCString result="Aquests són tots els espais de noms "; QCString result="Aquests són tots els espais de noms ";
if (!extractAll) result+="documentats "; if (!extractAll) result+="documentats ";
result+="amb breus descripcions:"; result+="amb breus descripcions:";
return result; return result;
...@@ -626,7 +626,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -626,7 +626,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
* related classes * related classes
*/ */
virtual QCString trRelatedFunctionDocumentation() virtual QCString trRelatedFunctionDocumentation()
{ return "Documentació de funcions amigues i relacionades"; } { return "Documentació de funcions amigues i relacionades"; }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// new since 0.49-990425 // new since 0.49-990425
...@@ -637,16 +637,16 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -637,16 +637,16 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
ClassDef::CompoundType compType, ClassDef::CompoundType compType,
bool isTemplate) bool isTemplate)
{ {
QCString result="Referència de la"; QCString result="Referència de";
switch(compType) switch(compType)
{ {
case ClassDef::Class: result+=" Classe "; break; case ClassDef::Class: result+=" la Classe "; break;
case ClassDef::Struct: result+=" Estructura "; break; case ClassDef::Struct: result+=" l'Estructura "; break;
case ClassDef::Union: result+=" Unió "; break; case ClassDef::Union: result+=" la Unió "; break;
case ClassDef::Interface: result+=" Interfície "; break; case ClassDef::Interface: result+=" la Interfície "; break;
case ClassDef::Protocol: result+=" Protocol "; break; // translate me! case ClassDef::Protocol: result+="l Protocol "; break;
case ClassDef::Category: result+=" Category "; break; // translate me! case ClassDef::Category: result+=" la Categoria "; break;
case ClassDef::Exception: result+=" Excepció "; break; case ClassDef::Exception: result+=" l'Excepció "; break;
} }
if (isTemplate) result+="Template "; if (isTemplate) result+="Template ";
result+=(QCString)clName; result+=(QCString)clName;
...@@ -656,7 +656,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -656,7 +656,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! used as the title of the HTML page of a file */ /*! used as the title of the HTML page of a file */
virtual QCString trFileReference(const char *fileName) virtual QCString trFileReference(const char *fileName)
{ {
QCString result="Referència de l'Arxiu "; QCString result="Referència del Fitxer ";
result+=fileName; result+=fileName;
return result; return result;
} }
...@@ -664,31 +664,31 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -664,31 +664,31 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! used as the title of the HTML page of a namespace */ /*! used as the title of the HTML page of a namespace */
virtual QCString trNamespaceReference(const char *namespaceName) virtual QCString trNamespaceReference(const char *namespaceName)
{ {
QCString result="Referència de l'Espai de Noms "; QCString result="Referència de l'Espai de Noms ";
result+=namespaceName; result+=namespaceName;
return result; return result;
} }
virtual QCString trPublicMembers() virtual QCString trPublicMembers()
{ return "Mètodes públics"; } { return "Mètodes públics"; }
virtual QCString trPublicSlots() virtual QCString trPublicSlots()
{ return "Slots públics"; } { return "Slots públics"; }
virtual QCString trSignals() virtual QCString trSignals()
{ return "Senyals"; } { return "Senyals"; }
virtual QCString trStaticPublicMembers() virtual QCString trStaticPublicMembers()
{ return "Mètodes Públics Estàtics"; } { return "Mètodes Públics Estàtics"; }
virtual QCString trProtectedMembers() virtual QCString trProtectedMembers()
{ return "Mètodes Protegits"; } { return "Mètodes Protegits"; }
virtual QCString trProtectedSlots() virtual QCString trProtectedSlots()
{ return "Slots Protegits"; } { return "Slots Protegits"; }
virtual QCString trStaticProtectedMembers() virtual QCString trStaticProtectedMembers()
{ return "Mètodes Protegits Estàtics"; } { return "Mètodes Protegits Estàtics"; }
virtual QCString trPrivateMembers() virtual QCString trPrivateMembers()
{ return "Mètodes Privats"; } { return "Mètodes Privats"; }
virtual QCString trPrivateSlots() virtual QCString trPrivateSlots()
{ return "Slots Privats"; } { return "Slots Privats"; }
virtual QCString trStaticPrivateMembers() virtual QCString trStaticPrivateMembers()
{ return "Mètodes Privats Estàtics"; } { return "Mètodes Privats Estàtics"; }
/*! this function is used to produce a comma-separated list of items. /*! this function is used to produce a comma-separated list of items.
* use generateMarker(i) to indicate where item i should be put. * use generateMarker(i) to indicate where item i should be put.
...@@ -720,7 +720,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -720,7 +720,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
*/ */
virtual QCString trInheritsList(int numEntries) 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, /*! used in class documentation to produce a list of super classes,
...@@ -728,7 +728,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -728,7 +728,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
*/ */
virtual QCString trInheritedByList(int numEntries) 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 /*! used in member documentation blocks to produce a list of
...@@ -754,11 +754,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -754,11 +754,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! This is an introduction to the page with all namespace members */ /*! This is an introduction to the page with all namespace members */
virtual QCString trNamespaceMemberDescription(bool extractAll) 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 "; if (!extractAll) result+="documentats ";
result+="amb enllaços a "; result+="amb enllaços a ";
if (extractAll) 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 else
result+="l'espai de noms al qual corresponen:"; result+="l'espai de noms al qual corresponen:";
return result; return result;
...@@ -767,13 +767,13 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -767,13 +767,13 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
* index of all namespaces. * index of all namespaces.
*/ */
virtual QCString trNamespaceIndex() 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 /*! This is used in LaTeX as the title of the chapter containing
* the documentation of all namespaces. * the documentation of all namespaces.
*/ */
virtual QCString trNamespaceDocumentation() virtual QCString trNamespaceDocumentation()
{ return "Documentació de l'Espai de Noms"; } { return "Documentació de l'Espai de Noms"; }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// new since 0.49-990522 // new since 0.49-990522
...@@ -796,22 +796,22 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -796,22 +796,22 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
bool single) bool single)
{ // here s is one of " Class", " Struct" or " Union" { // here s is one of " Class", " Struct" or " Union"
// single is true implies a single file // single is true implies a single file
QCString result=(QCString)"La documentació d'aquesta "; QCString result=(QCString)"La documentació d'aquest";
switch(compType) switch(compType)
{ {
case ClassDef::Class: result+="classe"; break; case ClassDef::Class: result+="a classe"; break;
case ClassDef::Struct: result+="estructura"; break; case ClassDef::Struct: result+="a estructura"; break;
case ClassDef::Union: result+="unió"; break; case ClassDef::Union: result+="a unió"; break;
case ClassDef::Interface: result+="interfície"; break; case ClassDef::Interface: result+="a interfície"; break;
case ClassDef::Protocol: result+="protocol"; break; // translate me! case ClassDef::Protocol: result+=" protocol"; break;
case ClassDef::Category: result+="category"; break; // translate me! case ClassDef::Category: result+="a categoria"; break;
case ClassDef::Exception: result+="excepció"; break; case ClassDef::Exception: result+="a excepció"; break;
} }
result+=" es va generar a partir del"; result+=" es va generar a partir del";
if (!single) result+="s"; if (!single) result+="s";
result+=" següent"; result+=" següent";
if (!single) result+="s"; if (!single) result+="s";
result+=" arxiu"; result+=" fitxer";
if (!single) result+="s:"; else result+=":"; if (!single) result+="s:"; else result+=":";
return result; return result;
} }
...@@ -820,7 +820,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -820,7 +820,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
* list. * list.
*/ */
virtual QCString trAlphabeticalList() virtual QCString trAlphabeticalList()
{ return "Llista Alfabètica"; } { return "Llista Alfabètica"; }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// new since 0.49-990901 // new since 0.49-990901
...@@ -833,7 +833,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -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) /*! This is in the (quick) index as a link to the main page (index.html)
*/ */
virtual QCString trMainPage() virtual QCString trMainPage()
{ return "Pàgina principal"; } { return "Pàgina principal"; }
/*! This is used in references to page that are put in the LaTeX /*! This is used in references to page that are put in the LaTeX
* documentation. It should be an abbreviation of the word page. * documentation. It should be an abbreviation of the word page.
...@@ -851,11 +851,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -851,11 +851,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
} }
virtual QCString trDefinedAtLineInSourceFile() virtual QCString trDefinedAtLineInSourceFile()
{ {
return "Definició a la línia @0 de l'arxiu @1."; return "Definició a la línia @0 del fitxer @1.";
} }
virtual QCString trDefinedInSourceFile() 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 ...@@ -874,37 +874,37 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! this text is put before a collaboration diagram */ /*! this text is put before a collaboration diagram */
virtual QCString trCollaborationDiagram(const char *clName) virtual QCString trCollaborationDiagram(const char *clName)
{ {
return (QCString)"Diagrama de col·laboració per a "+clName+":"; return (QCString)"Diagrama de col·laboració per a "+clName+":";
} }
/*! this text is put before an include dependency graph */ /*! this text is put before an include dependency graph */
virtual QCString trInclDepGraph(const char *fName) virtual QCString trInclDepGraph(const char *fName)
{ {
return (QCString)"Inclou el graf de dependències per a "+fName+":"; return (QCString)"Inclou el graf de dependències per a "+fName+":";
} }
/*! header that is put before the list of constructor/destructors. */ /*! header that is put before the list of constructor/destructors. */
virtual QCString trConstructorDocumentation() 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. */ /*! Used in the file documentation to point to the corresponding sources. */
virtual QCString trGotoSourceCode() 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. */ /*! Used in the file sources to point to the corresponding documentation. */
virtual QCString trGotoDocumentation() virtual QCString trGotoDocumentation()
{ {
return "Veure la documentació d'aquest fitxer."; return "Veure la documentació d'aquest fitxer.";
} }
/*! Text for the \\pre command */ /*! Text for the \\pre command */
virtual QCString trPrecondition() virtual QCString trPrecondition()
{ {
return "Precondició"; return "Precondició";
} }
/*! Text for the \\post command */ /*! Text for the \\post command */
virtual QCString trPostcondition() virtual QCString trPostcondition()
{ {
return "Postcondició"; return "Postcondició";
} }
/*! Text for the \\invariant command */ /*! Text for the \\invariant command */
virtual QCString trInvariant() virtual QCString trInvariant()
...@@ -923,11 +923,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -923,11 +923,11 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
} }
virtual QCString trGraphicalHierarchy() virtual QCString trGraphicalHierarchy()
{ {
return "Jerarquia Gràfica de la Classe"; return "Jerarquia Gràfica de la Classe";
} }
virtual QCString trGotoGraphicalHierarchy() virtual QCString trGotoGraphicalHierarchy()
{ {
return "Veure la jerarquia gràfica de la classe"; return "Veure la jerarquia gràfica de la classe";
} }
virtual QCString trGotoTextualHierarchy() virtual QCString trGotoTextualHierarchy()
{ {
...@@ -935,7 +935,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -935,7 +935,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
} }
virtual QCString trPageIndex() virtual QCString trPageIndex()
{ {
return "Pàgina Índex"; return "Índex de Pàgines";
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
...@@ -948,7 +948,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -948,7 +948,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
} }
virtual QCString trPublicTypes() virtual QCString trPublicTypes()
{ {
return "Tipus Públics"; return "Tipus Públics";
} }
virtual QCString trPublicAttribs() virtual QCString trPublicAttribs()
{ {
...@@ -958,12 +958,12 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -958,12 +958,12 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
} }
else else
{ {
return "Atributs Públics"; return "Atributs Públics";
} }
} }
virtual QCString trStaticPublicAttribs() virtual QCString trStaticPublicAttribs()
{ {
return "Atributs Públics Estàtics"; return "Atributs Públics Estàtics";
} }
virtual QCString trProtectedTypes() virtual QCString trProtectedTypes()
{ {
...@@ -975,7 +975,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -975,7 +975,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
} }
virtual QCString trStaticProtectedAttribs() virtual QCString trStaticProtectedAttribs()
{ {
return "Atributs Protegits Estàtics"; return "Atributs Protegits Estàtics";
} }
virtual QCString trPrivateTypes() virtual QCString trPrivateTypes()
{ {
...@@ -987,7 +987,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -987,7 +987,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
} }
virtual QCString trStaticPrivateAttribs() virtual QCString trStaticPrivateAttribs()
{ {
return "Atributs Privats Estàtics"; return "Atributs Privats Estàtics";
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
...@@ -1019,12 +1019,12 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -1019,12 +1019,12 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
} }
virtual QCString trAttention() virtual QCString trAttention()
{ {
return "Atenció"; return "Atenció";
} }
virtual QCString trInclByDepGraph() virtual QCString trInclByDepGraph()
{ {
return "Aquest gràfic mostra quins arxius inclouen, " return "Aquest gràfic mostra quins fitxers inclouen, "
"de forma directa o indirecta, aquest arxiu:"; "de forma directa o indirecta, aquest fitxer:";
} }
virtual QCString trSince() virtual QCString trSince()
{ {
...@@ -1038,7 +1038,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -1038,7 +1038,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! title of the graph legend page */ /*! title of the graph legend page */
virtual QCString trLegendTitle() virtual QCString trLegendTitle()
{ {
return "Llegenda del Gràfic"; return "Llegenda del Gràfic";
} }
/*! page explaining how the dot graph's should be interpreted /*! page explaining how the dot graph's should be interpreted
* The %A in the text below are to prevent link to classes called "A". * 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 ...@@ -1046,22 +1046,22 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
virtual QCString trLegendDocs() virtual QCString trLegendDocs()
{ {
return return
"Aquesta pàgina explica com s'interpreten els gràfics generats per doxygen.<p>\n" "Aquesta pàgina explica com s'interpreten els gràfics generats per doxygen.<p>\n"
"Considera aquest exemple:\n" "Considera aquest exemple:\n"
"\\code\n" "\\code\n"
"/*! Classe invisible per culpa del retall */\n" "/*! Classe invisible per culpa del retall */\n"
"class Invisible { };\n\n" "class Invisible { };\n\n"
"/*! Classe truncada, l'herència està amagada */\n" "/*! Classe truncada, l'herència està amagada */\n"
"class Truncated : public Invisible { };\n\n" "class Truncated : public Invisible { };\n\n"
"/* Classe no documentada amb comentaris doxygen */\n" "/* Classe no documentada amb comentaris doxygen */\n"
"class Undocumented { };\n\n" "class Undocumented { };\n\n"
"/*! Classe heredada amb herència pública */\n" "/*! Classe heredada amb herència pública */\n"
"class PublicBase : public Truncated { };\n\n" "class PublicBase : public Truncated { };\n\n"
"/*! Una classe Template */\n" "/*! Una classe Template */\n"
"template<class T> class Templ { };\n\n" "template<class T> class Templ { };\n\n"
"/*! Classe heredada utilitzant herència protegida */\n" "/*! Classe heredada utilitzant herència protegida */\n"
"class ProtectedBase { };\n\n" "class ProtectedBase { };\n\n"
"/*! Classe heredada utiltzant herència privada */\n" "/*! Classe heredada utiltzant herència privada */\n"
"class PrivateBase { };\n\n" "class PrivateBase { };\n\n"
"/*! Classe usada per la classe heretada */\n" "/*! Classe usada per la classe heretada */\n"
"class Used { };\n\n" "class Used { };\n\n"
...@@ -1076,26 +1076,26 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -1076,26 +1076,26 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
" Used *m_usedClass;\n" " Used *m_usedClass;\n"
"};\n" "};\n"
"\\endcode\n" "\\endcode\n"
"Si l'etiqueta \\c MAX_DOT_GRAPH_HEIGHT està igualada a 24a0 al fitxer de configuració, resultarà el gràfic següent:" "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><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
"<p>\n" "<p>\n"
"Les caixes del gràfic superior tenen aquesta interpretació:\n" "Les caixes del gràfic superior tenen aquesta interpretació:\n"
"<ul>\n" "<ul>\n"
"<li>Una caixa negra plena represent l'estructura o classe per la qual el gràfic 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 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 verda representa una estructura o classe indocumentada.\n"
"<li>Una caixa de vora vermalla representa una estructura o classe documentada de la qual " "<li>Una caixa de vora vermalla representa una estructura o classe documentada de la qual "
"no es mostren totes les relacions d'herència/inclusió. Un gràfic és truncat si no s'ajusta als límits.\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" "</ul>\n"
"Les sagetes tenen aquest significat:\n" "Les sagetes tenen aquest significat:\n"
"<ul>\n" "<ul>\n"
"<li>Una sageta blau fosc remarca una relació d'herència de tipus pública entre dues classes.\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 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 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." "<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" " 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." "<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" " La sageta s'etiqueta amb els paràmetres template de la instància.\n"
"</ul>\n"; "</ul>\n";
} }
/*! text for the link to the legend page */ /*! text for the link to the legend page */
...@@ -1126,7 +1126,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -1126,7 +1126,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! Used as a section header for KDE-2 IDL methods */ /*! Used as a section header for KDE-2 IDL methods */
virtual QCString trDCOPMethods() virtual QCString trDCOPMethods()
{ {
return "Mètodes DCOP"; return "Mètodes DCOP";
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
...@@ -1141,7 +1141,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -1141,7 +1141,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! Used as a section header for IDL property documentation */ /*! Used as a section header for IDL property documentation */
virtual QCString trPropertyDocumentation() virtual QCString trPropertyDocumentation()
{ {
return "Documentació de les Propietats"; return "Documentació de les Propietats";
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
...@@ -1151,7 +1151,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -1151,7 +1151,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! Used for Java interfaces in the summary section of Java packages */ /*! Used for Java interfaces in the summary section of Java packages */
virtual QCString trInterfaces() virtual QCString trInterfaces()
{ {
return "Interfícies"; return "Interfícies";
} }
/*! Used for Java classes in the summary section of Java packages */ /*! Used for Java classes in the summary section of Java packages */
virtual QCString trClasses() virtual QCString trClasses()
...@@ -1178,7 +1178,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -1178,7 +1178,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! The description of the package index page */ /*! The description of the package index page */
virtual QCString trPackageListDescription() 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 */ /*! The link name in the Quick links header for each page */
virtual QCString trPackages() virtual QCString trPackages()
...@@ -1188,7 +1188,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -1188,7 +1188,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! Used as a chapter title for Latex & RTF output */ /*! Used as a chapter title for Latex & RTF output */
virtual QCString trPackageDocumentation() virtual QCString trPackageDocumentation()
{ {
return "Documentació dels Paquets"; return "Documentació dels Paquets";
} }
/*! Text shown before a multi-line define */ /*! Text shown before a multi-line define */
virtual QCString trDefineValue() virtual QCString trDefineValue()
...@@ -1257,7 +1257,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -1257,7 +1257,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
/*! Used as header RTF general index */ /*! Used as header RTF general index */
virtual QCString trRTFGeneralIndex() virtual QCString trRTFGeneralIndex()
{ {
return "Índex"; return "Índex";
} }
/*! This is used for translation of the word that will possibly /*! This is used for translation of the word that will possibly
...@@ -1277,7 +1277,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -1277,7 +1277,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
*/ */
virtual QCString trFile(bool first_capital, bool singular) virtual QCString trFile(bool first_capital, bool singular)
{ {
QCString result((first_capital ? "Arxiu" : "arxiu")); QCString result((first_capital ? "Fitxer" : "fitxer"));
if (!singular) result+="s"; if (!singular) result+="s";
return result; return result;
} }
...@@ -1310,7 +1310,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -1310,7 +1310,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
*/ */
virtual QCString trPage(bool first_capital, bool singular) virtual QCString trPage(bool first_capital, bool singular)
{ {
QCString result((first_capital ? "Pàgin" : "pàgin")); QCString result((first_capital ? "Pàgin" : "pàgin"));
if (!singular) result+="es"; else result+="a"; if (!singular) result+="es"; else result+="a";
return result; return result;
} }
...@@ -1369,7 +1369,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -1369,7 +1369,7 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
*/ */
virtual QCString trReferences() virtual QCString trReferences()
{ {
return "Referències"; return "Referències";
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
...@@ -1403,6 +1403,199 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17 ...@@ -1403,6 +1403,199 @@ class TranslatorCatalan : public TranslatorAdapter_1_2_17
{ {
return "Taula de Continguts"; 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 #endif
src/translator_de.h
View file @ 4fa6a604
...@@ -96,13 +96,16 @@ ...@@ -96,13 +96,16 @@
// - added a dash after (file, ...) names and in front of description // - added a dash after (file, ...) names and in front of description
// - changed "Eigenschaften" to "Propertys" (yeah, not ..."ies") // - 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: // Todo:
// - see FIXME // - see FIXME
#ifndef TRANSLATOR_DE_H #ifndef TRANSLATOR_DE_H
#define TRANSLATOR_DE_H #define TRANSLATOR_DE_H
class TranslatorGerman : public TranslatorAdapter_1_4_1 class TranslatorGerman : public Translator
{ {
public: public:
...@@ -1645,7 +1648,7 @@ class TranslatorGerman : public TranslatorAdapter_1_4_1 ...@@ -1645,7 +1648,7 @@ class TranslatorGerman : public TranslatorAdapter_1_4_1
{ return "Verzeichnisdokumentation"; } { return "Verzeichnisdokumentation"; }
/*! This is used as the title of the directory index and also in the /*! 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() virtual QCString trDirectories()
{ return "Verzeichnisse"; } { return "Verzeichnisse"; }
...@@ -1674,6 +1677,20 @@ class TranslatorGerman : public TranslatorAdapter_1_4_1 ...@@ -1674,6 +1677,20 @@ class TranslatorGerman : public TranslatorAdapter_1_4_1
return result; 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 unterstützt.";
}
}; };
#endif #endif
src/translator_en.h
View file @ 4fa6a604
...@@ -1573,7 +1573,7 @@ class TranslatorEnglish : public Translator ...@@ -1573,7 +1573,7 @@ class TranslatorEnglish : public Translator
{ return "Directory Documentation"; } { return "Directory Documentation"; }
/*! This is used as the title of the directory index and also in the /*! 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() virtual QCString trDirectories()
{ return "Directories"; } { return "Directories"; }
......
src/translator_hr.h
View file @ 4fa6a604
...@@ -62,11 +62,14 @@ ...@@ -62,11 +62,14 @@
// 2005/02/28 // 2005/02/28
// - Removed obsolete (unused) methods // - Removed obsolete (unused) methods
// //
// 2005/03/21
// - Added strings for 1.4.1
//
#ifndef TRANSLATOR_HR_H #ifndef TRANSLATOR_HR_H
#define TRANSLATOR_HR_H #define TRANSLATOR_HR_H
class TranslatorCroatian : public TranslatorAdapter_1_4_1 class TranslatorCroatian : public Translator
{ {
private: private:
/*! to avoid macro redefinition from translator_cz.h */ /*! to avoid macro redefinition from translator_cz.h */
...@@ -1237,6 +1240,20 @@ class TranslatorCroatian : public TranslatorAdapter_1_4_1 ...@@ -1237,6 +1240,20 @@ class TranslatorCroatian : public TranslatorAdapter_1_4_1
if (!singular) result+="i"; if (!singular) result+="i";
return result; 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 #endif
......
src/translator_it.h
View file @ 4fa6a604
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
* *
* Revision history * 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/09: translated new items used since version 1.3.9
* 2004/06: translated new items used since version 1.3.8 * 2004/06: translated new items used since version 1.3.8
* 2003/11: translated new items used since version 1.3.3 * 2003/11: translated new items used since version 1.3.3
...@@ -28,7 +30,7 @@ ...@@ -28,7 +30,7 @@
* 2002/08: translated new items used since version 1.2.17 * 2002/08: translated new items used since version 1.2.17
* 2002/07: translated new items used since version 1.2.16 * 2002/07: translated new items used since version 1.2.16
* 2002/06: modified trRelatedPagesDescription() method * 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 * 2002/01: translated new items used since version 1.2.13
* updated e-mail address * updated e-mail address
* 2001/11: corrected the translation fixing the issues reported by the translator.pl script * 2001/11: corrected the translation fixing the issues reported by the translator.pl script
...@@ -72,7 +74,7 @@ ...@@ -72,7 +74,7 @@
#ifndef TRANSLATOR_IT_H #ifndef TRANSLATOR_IT_H
#define TRANSLATOR_IT_H #define TRANSLATOR_IT_H
class TranslatorItalian : public TranslatorAdapter_1_4_1 class TranslatorItalian : public Translator
{ {
public: public:
...@@ -212,10 +214,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 ...@@ -212,10 +214,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
QCString trFileList() QCString trFileList()
{ return "Lista dei file"; } { 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. */ /*! This is put above each page as a link to all members of compounds. */
QCString trCompoundMembers() QCString trCompoundMembers()
{ {
...@@ -333,10 +331,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 ...@@ -333,10 +331,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
return result; 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 */ /*! This is an introduction to the page with the list of all examples */
QCString trExamplesDescription() QCString trExamplesDescription()
{ return "Questa è la lista di tutti gli esempi:"; } { return "Questa è la lista di tutti gli esempi:"; }
...@@ -349,15 +343,8 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 ...@@ -349,15 +343,8 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
QCString trModulesDescription() QCString trModulesDescription()
{ return "Questa è la lista di tutti i moduli:"; } { 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) // index titles (the project name is prepended for these)
/*! This is used in HTML as the title of index.html. */ /*! This is used in HTML as the title of index.html. */
QCString trDocumentation() QCString trDocumentation()
{ return "Documentazione"; } { return "Documentazione"; }
...@@ -495,12 +482,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 ...@@ -495,12 +482,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
QCString trEnumerationTypeDocumentation() QCString trEnumerationTypeDocumentation()
{ return "Documentazione dei tipi enumerati"; } { 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 /*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for functions * of documentation blocks for functions
*/ */
...@@ -555,18 +536,10 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 ...@@ -555,18 +536,10 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
QCString trForInternalUseOnly() QCString trForInternalUseOnly()
{ return "Solo per uso interno."; } { 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. */ /*! this text is generated when the \\warning command is used. */
QCString trWarning() QCString trWarning()
{ return "Avvertimento"; } { 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. */ /*! this text is generated when the \\version command is used. */
QCString trVersion() QCString trVersion()
{ return "Versione"; } { return "Versione"; }
...@@ -846,10 +819,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 ...@@ -846,10 +819,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
// new since 0.49-991003 // new since 0.49-991003
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
QCString trSources()
{
return "Sorgenti";
}
QCString trDefinedAtLineInSourceFile() QCString trDefinedAtLineInSourceFile()
{ {
return "Definizione alla linea @0 del file @1."; return "Definizione alla linea @0 del file @1.";
...@@ -1142,11 +1111,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 ...@@ -1142,11 +1111,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
// new since 1.2.4 // 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 */ /*! Used for Java classes in the summary section of Java packages */
virtual QCString trClasses() virtual QCString trClasses()
{ {
...@@ -1179,11 +1143,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 ...@@ -1179,11 +1143,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
{ {
return "Package"; 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 */ /*! Text shown before a multi-line define */
virtual QCString trDefineValue() virtual QCString trDefineValue()
{ {
...@@ -1291,17 +1250,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 ...@@ -1291,17 +1250,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
return result; 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 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 /*! This is used for translation of the word that will possibly
* be followed by a single name or by a list of names * be followed by a single name or by a list of names
* of the category. * of the category.
...@@ -1562,6 +1510,20 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1 ...@@ -1562,6 +1510,20 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
return result; 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 #endif
src/translator_kr.h
View file @ 4fa6a604
...@@ -51,24 +51,43 @@ ...@@ -51,24 +51,43 @@
// //
// Update: // Update:
// //
// 2004.12.22 (SooYoung Jung: jung5000@gmail.com) // 2004.12.22 (SooYoung Jung: jung5000 at gmail.com)
// - LaTex and RTF were not generated correctly. // - LaTex and RTF were not generated correctly.
// Corrected trRTFansicp and trRTFCharSet. // Corrected trRTFansicp and trRTFCharSet.
// It was wrong. // It was wrong.
// - Adapting 1.3.9 and added "new since 1.3.9" // - 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 class TranslatorKorean : public TranslatorAdapter_1_4_1
{ {
private: private:
/*! The decode() can change euc into sjis */ // guess, unnecessary for Korean language
inline QCString decode(const QCString & sInput) inline QCString decode(const QCString & sInput)
{ {
if (Config_getBool("USE_WINDOWS_ENCODING")) if (Config_getBool("USE_WINDOWS_ENCODING"))
{ {
return JapaneseEucToSjis(sInput); return sInput;
} }
else else
{ {
...@@ -182,7 +201,7 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 ...@@ -182,7 +201,7 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1
virtual QCString trGeneratedAutomatically(const char *s) virtual QCString trGeneratedAutomatically(const char *s)
{ QCString result=""; { QCString result="";
if (s) result+=(QCString)s+"에 "; if (s) result+=(QCString)s+"에 ";
result += "source 코드로 부터 Doxygen에 의해 자동으로 생성"; result += "소스 코드로 부터 Doxygen에 의해 자동으로 생성";
return result; return result;
} }
...@@ -229,8 +248,8 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 ...@@ -229,8 +248,8 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1
{ return "파일 목록"; } //"파일 목록", "파일 리스트" { return "파일 목록"; } //"파일 목록", "파일 리스트"
/*! This is put above each page as a link to the list of all verbatim headers */ /*! This is put above each page as a link to the list of all verbatim headers */
virtual QCString trHeaderFiles() // virtual QCString trHeaderFiles()
{ return "헤더 파일"; } // { return "헤더 파일"; }
/*! This is put above each page as a link to all members of compounds. */ /*! This is put above each page as a link to all members of compounds. */
virtual QCString trCompoundMembers() virtual QCString trCompoundMembers()
...@@ -337,8 +356,8 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 ...@@ -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. */ /*! This is an introduction to the page with the list of all header files. */
virtual QCString trHeaderFilesDescription() // virtual QCString trHeaderFilesDescription()
{ return "다음은 API를 구성하는 헤더 파일입니다."; } // { return "다음은 API를 구성하는 헤더 파일입니다."; }
/*! This is an introduction to the page with the list of all examples */ /*! This is an introduction to the page with the list of all examples */
virtual QCString trExamplesDescription() virtual QCString trExamplesDescription()
...@@ -355,8 +374,8 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 ...@@ -355,8 +374,8 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1
/*! This sentences is used in the annotated class/file lists if no brief /*! This sentences is used in the annotated class/file lists if no brief
* description is given. * description is given.
*/ */
virtual QCString trNoDescriptionAvailable() // virtual QCString trNoDescriptionAvailable()
{ return "유용한 설명이 없습니다."; } // { return "유용한 설명이 없습니다."; }
// index titles (the project name is prepended for these) // index titles (the project name is prepended for these)
...@@ -492,8 +511,8 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 ...@@ -492,8 +511,8 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1
/*! This is used in the documentation of a file/namespace before the list /*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for enumeration values * of documentation blocks for enumeration values
*/ */
virtual QCString trEnumerationValueDocumentation() // virtual QCString trEnumerationValueDocumentation()
{ return "열거형 값 문서화"; } // { return "열거형 값 문서화"; }
/*! This is used in the documentation of a file/namespace before the list /*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for functions * of documentation blocks for functions
...@@ -514,11 +533,11 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 ...@@ -514,11 +533,11 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1
{ {
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{ {
return "Data Structures"; return "데이터 구조";
} }
else else
{ {
return "Classes"; return "클래스";
} }
} }
...@@ -550,16 +569,16 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 ...@@ -550,16 +569,16 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1
{ return "내부 사용만을 위해"; } { return "내부 사용만을 위해"; }
/*! this text is generated when the \\reimp command is used. */ /*! this text is generated when the \\reimp command is used. */
virtual QCString trReimplementedForInternalReasons() // virtual QCString trReimplementedForInternalReasons()
{ return "내부적 이유로 인해 재구현된: API가 영향을 받지않았다."; } // { return "내부적 이유로 인해 재구현된: API가 영향을 받지않았다."; }
/*! this text is generated when the \\warning command is used. */ /*! this text is generated when the \\warning command is used. */
virtual QCString trWarning() virtual QCString trWarning()
{ return "경고"; } { return "경고"; }
/*! this text is generated when the \\bug command is used. */ /*! this text is generated when the \\bug command is used. */
virtual QCString trBugsAndLimitations() // virtual QCString trBugsAndLimitations()
{ return "버그와 한계"; } // { return "버그와 한계"; }
/*! this text is generated when the \\version command is used. */ /*! this text is generated when the \\version command is used. */
virtual QCString trVersion() virtual QCString trVersion()
...@@ -639,8 +658,8 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 ...@@ -639,8 +658,8 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1
case ClassDef::Struct: result+=" 구조체"; break; case ClassDef::Struct: result+=" 구조체"; break;
case ClassDef::Union: result+=" 공용체"; break; case ClassDef::Union: result+=" 공용체"; break;
case ClassDef::Interface: result+=" 인터페이스"; break; case ClassDef::Interface: result+=" 인터페이스"; break;
case ClassDef::Protocol: result+=" protocol"; break; // translate me! case ClassDef::Protocol: result+=" 프로토콜"; break;
case ClassDef::Category: result+=" category"; break; // translate me! case ClassDef::Category: result+=" 카테고리"; break;
case ClassDef::Exception: result+=" 예외"; break; case ClassDef::Exception: result+=" 예외"; break;
} }
if (isTemplate) result+=" 템플릿"; if (isTemplate) result+=" 템플릿";
...@@ -838,10 +857,10 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 ...@@ -838,10 +857,10 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1
// new since 0.49-991003 // new since 0.49-991003
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
virtual QCString trSources() // virtual QCString trSources()
{ // {
return "출처"; // return "출처";
} // }
virtual QCString trDefinedAtLineInSourceFile() virtual QCString trDefinedAtLineInSourceFile()
{ {
return "@1 파일의 @0 번째 라인에서 정의"; return "@1 파일의 @0 번째 라인에서 정의";
...@@ -1016,13 +1035,12 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 ...@@ -1016,13 +1035,12 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1
} }
virtual QCString trInclByDepGraph() virtual QCString trInclByDepGraph()
{ {
// TODO: Need to be translated. -ryk11/22/01. return " 이 그래프는 이 파일을 직접 또는 간접적으로"
return "This graph shows which files directly or " "포함(include)함을 나타낸다:";
"indirectly include this file:";
} }
virtual QCString trSince() 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 ...@@ -1155,12 +1173,12 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1
/*! Used as a section header for IDL properties */ /*! Used as a section header for IDL properties */
virtual QCString trProperties() virtual QCString trProperties()
{ {
return "properties"; // TODO: Need to be translated. -ryk11/22/01. return "속성";
} }
/*! Used as a section header for IDL property documentation */ /*! Used as a section header for IDL property documentation */
virtual QCString trPropertyDocumentation() 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 ...@@ -1168,52 +1186,51 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
/*! Used for Java interfaces in the summary section of Java packages */ /*! Used for Java interfaces in the summary section of Java packages */
virtual QCString trInterfaces() // virtual QCString trInterfaces()
{ // {
return "인터페이스"; // TODO: Need to be translated. -ryk11/22/01. // return "인터페이스";
} // }
/*! Used for Java classes in the summary section of Java packages */ /*! Used for Java classes in the summary section of Java packages */
virtual QCString trClasses() virtual QCString trClasses()
{ {
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{ {
return "데이터 구조"; // TODO: Need to be translated. -ryk11/22/01. return "데이터 구조";
} }
else else
{ {
return "클래스"; // TODO: Need to be translated. -ryk11/22/01. return "클래스";
} }
} }
/*! Used as the title of a Java package */ /*! Used as the title of a Java package */
virtual QCString trPackage(const char *name) 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 */ /*! Title of the package index page */
virtual QCString trPackageList() virtual QCString trPackageList()
{ {
return "패키지 목록"; // TODO: Need to be translated. -ryk11/22/01. return "패키지 목록";
} }
/*! The description of the package index page */ /*! The description of the package index page */
virtual QCString trPackageListDescription() virtual QCString trPackageListDescription()
{ {
//Here are the packages with brief descriptions (if available):"; // TODO: Need to be translated. -ryk11/22/01.
return "다음은 간략한 설명을 가진 패키지이다."; return "다음은 간략한 설명을 가진 패키지이다.";
} }
/*! The link name in the Quick links header for each page */ /*! The link name in the Quick links header for each page */
virtual QCString trPackages() virtual QCString trPackages()
{ {
return "패키지"; // TODO: Need to be translated. -ryk11/22/01. return "패키지";
} }
/*! Used as a chapter title for Latex & RTF output */ /*! Used as a chapter title for Latex & RTF output */
virtual QCString trPackageDocumentation() // virtual QCString trPackageDocumentation()
{ // {
return "패키지 문서화"; // TODO: Need to be translated. -ryk11/22/01. // return "패키지 문서화";
} // }
/*! Text shown before a multi-line define */ /*! Text shown before a multi-line define */
virtual QCString trDefineValue() virtual QCString trDefineValue()
{ {
return "값:"; // TODO: Need to be translated. -ryk11/22/01. return "값:";
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
...@@ -1223,12 +1240,12 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 ...@@ -1223,12 +1240,12 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1
/*! Used as a marker that is put before a \\bug item */ /*! Used as a marker that is put before a \\bug item */
virtual QCString trBug() virtual QCString trBug()
{ {
return "버그"; // TODO: Need to be translated. -ryk11/22/01. return "버그";
} }
/*! Used as the header of the bug list */ /*! Used as the header of the bug list */
virtual QCString trBugList() virtual QCString trBugList()
{ {
return "버그 목록"; // TODO: Need to be translated. -ryk11/22/01. return "버그 목록";
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
...@@ -1350,12 +1367,12 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1 ...@@ -1350,12 +1367,12 @@ class TranslatorKorean : public TranslatorAdapter_1_4_1
* be followed by a single name or by a list of names * be followed by a single name or by a list of names
* of the category. * of the category.
*/ */
virtual QCString trField(bool first_capital, bool singular) // virtual QCString trField(bool first_capital, bool singular)
{ // {
QCString result((first_capital ? "필드" : "필드")); // QCString result((first_capital ? "필드" : "필드"));
if (!singular) result+="들"; // if (!singular) result+="들";
return result; // TODO: Need to be translated. -ryk11/22/01. // return result; // TODO: Need to be translated. -ryk11/22/01.
} // }
/*! This is used for translation of the word that will possibly /*! This is used for translation of the word that will possibly
* be followed by a single name or by a list of names * be followed by a single name or by a list of names
......
src/util.cpp
View file @ 4fa6a604
...@@ -1388,7 +1388,7 @@ void linkifyText(const TextGeneratorIntf &out,Definition *scope, ...@@ -1388,7 +1388,7 @@ void linkifyText(const TextGeneratorIntf &out,Definition *scope,
bool keepSpaces) bool keepSpaces)
{ {
//printf("`%s'\n",text); //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; QCString txtStr=text;
int strLen = txtStr.length(); int strLen = txtStr.length();
//printf("linkifyText scope=%s fileScope=%s strtxt=%s strlen=%d\n", //printf("linkifyText scope=%s fileScope=%s strtxt=%s strlen=%d\n",
...@@ -1718,7 +1718,7 @@ QCString getFileFilter(const char* name) ...@@ -1718,7 +1718,7 @@ QCString getFileFilter(const char* name)
// compare the file name to the filter pattern list // compare the file name to the filter pattern list
QStrListIterator sli(filterList); QStrListIterator sli(filterList);
char* filterStr; char* filterStr;
for(sli.toFirst(); (filterStr = sli.current()); ++sli) for (sli.toFirst(); (filterStr = sli.current()); ++sli)
{ {
QCString fs = filterStr; QCString fs = filterStr;
int i_equals=fs.find('='); int i_equals=fs.find('=');
...@@ -4256,7 +4256,7 @@ QCString convertToHtml(const char *s) ...@@ -4256,7 +4256,7 @@ QCString convertToHtml(const char *s)
/*! Returns the standard string that is generated when the \\overload /*! Returns the standard string that is generated when the \\overload
* command is used. * command is used.
*/ */
const char *getOverloadDocs() QCString getOverloadDocs()
{ {
return theTranslator->trOverloadText(); return theTranslator->trOverloadText();
//"This is an overloaded member function, " //"This is an overloaded member function, "
......
src/util.h
View file @ 4fa6a604
...@@ -180,7 +180,7 @@ QCString stripScope(const char *name); ...@@ -180,7 +180,7 @@ QCString stripScope(const char *name);
int iSystem(const char *command,const char *args,bool isBatchFile=FALSE); int iSystem(const char *command,const char *args,bool isBatchFile=FALSE);
QCString convertToHtml(const char *s); QCString convertToHtml(const char *s);
QCString convertToXML(const char *s); QCString convertToXML(const char *s);
const char * getOverloadDocs(); QCString getOverloadDocs();
void addMembersToMemberGroup(MemberList *ml, void addMembersToMemberGroup(MemberList *ml,
MemberGroupSDict *memberGroupSDict, MemberGroupSDict *memberGroupSDict,
Definition *context); Definition *context);
......
src/xmldocvisitor.cpp
View file @ 4fa6a604
...@@ -767,9 +767,11 @@ void XmlDocVisitor::visitPre(DocParamList *pl) ...@@ -767,9 +767,11 @@ void XmlDocVisitor::visitPre(DocParamList *pl)
if (m_hide) return; if (m_hide) return;
m_t << "<parameteritem>" << endl; m_t << "<parameteritem>" << endl;
m_t << "<parameternamelist>" << endl; m_t << "<parameternamelist>" << endl;
QStrListIterator li(pl->parameters()); //QStrListIterator li(pl->parameters());
const char *s; //const char *s;
for (li.toFirst();(s=li.current());++li) QListIterator<DocNode> li(pl->parameters());
DocNode *param;
for (li.toFirst();(param=li.current());++li)
{ {
m_t << "<parametername"; m_t << "<parametername";
if (pl->direction()!=DocParamSect::Unspecified) if (pl->direction()!=DocParamSect::Unspecified)
...@@ -790,7 +792,14 @@ void XmlDocVisitor::visitPre(DocParamList *pl) ...@@ -790,7 +792,14 @@ void XmlDocVisitor::visitPre(DocParamList *pl)
m_t << "\""; m_t << "\"";
} }
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 << "</parametername>" << endl;
} }
m_t << "</parameternamelist>" << endl; m_t << "</parameternamelist>" << endl;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment