Skip to content

D
doxverilog
Commit c8be4837 authored by dimitri's avatar dimitri
Browse files
Options

Release-1.4.2

parent 2fcc16df
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 905 additions and 565 deletions
INSTALL
View file @ c8be4837
DOXYGEN Version 1.4.1-20050315
DOXYGEN Version 1.4.2
Please read the installation section of the manual
(http://www.doxygen.org/install.html) for instructions.
--------
Dimitri van Heesch (15 March 2005)
Dimitri van Heesch (28 March 2005)
README
View file @ c8be4837
DOXYGEN Version 1.4.1_20050315
DOXYGEN Version 1.4.2
Please read INSTALL for compilation instructions.
......@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives.
Enjoy,
Dimitri van Heesch (dimitri@stack.nl) (15 March 2005)
Dimitri van Heesch (dimitri@stack.nl) (28 March 2005)
VERSION
View file @ c8be4837
1.4.1-20050315
1.4.2
doc/index.doc
View file @ c8be4837
......@@ -27,7 +27,7 @@ Version: $(VERSION)
<h2>Introduction</h2>
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:
<ol>
......
doc/language.doc
View file @ c8be4837
......@@ -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
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):
Afrikaans, Brazilian Portuguese, Catalan, Chinese, Chinese
Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French,
......@@ -60,13 +60,13 @@ when the translator was updated.
<td>Brazilian Portuguese</td>
<td>Fabio "FJTC" Jun Takada Chino</td>
<td>jun-chino at uol dot com dot br</td>
<td>1.4.1</td>
<td>up-to-date</td>
</tr>
<tr bgcolor="#ffffff">
<td>Catalan</td>
<td>Albert Mora</td>
<td>amora at iua dot upf dot es</td>
<td>1.2.17</td>
<td>Maximiliano Pin<br>Albert Mora</td>
<td>mcpin at emtesistemas dot com<br>amora at iua dot upf dot es</td>
<td>1.4.1</td>
</tr>
<tr bgcolor="#ffffff">
<td>Chinese</td>
......@@ -84,7 +84,7 @@ when the translator was updated.
<td>Croatian</td>
<td>Boris Bralo</td>
<td>boris.bralo at zg dot htnet dot hr</td>
<td>1.4.1</td>
<td>up-to-date</td>
</tr>
<tr bgcolor="#ffffff">
<td>Czech</td>
......@@ -126,7 +126,7 @@ when the translator was updated.
<td>German</td>
<td>Jens Seidel</td>
<td>jensseidel at users dot sf dot net</td>
<td>1.4.1</td>
<td>up-to-date</td>
</tr>
<tr bgcolor="#ffffff">
<td>Greek</td>
......@@ -144,7 +144,7 @@ when the translator was updated.
<td>Italian</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>1.4.1</td>
<td>up-to-date</td>
</tr>
<tr bgcolor="#ffffff">
<td>Japanese</td>
......@@ -162,7 +162,7 @@ when the translator was updated.
<td>Korean</td>
<td>SooYoung Jung<br>Richard Kim</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 bgcolor="#ffffff">
<td>KoreanEn</td>
......@@ -259,9 +259,10 @@ when the translator was updated.
\hline
Afrikaans & Johan Prinsloo & {\tt\tiny johan@zippysnoek.com} & 1.3.9 \\
\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
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
Chinese & Li Daobing & {\tt\tiny lidaobing@gmail.com} & 1.4.1 \\
~ & Wei Liu & {\tt\tiny liuwei@asiainfo.com} & ~ \\
......@@ -269,7 +270,7 @@ when the translator was updated.
Chinese Traditional & Daniel YC Lin & {\tt\tiny daniel@twpda.com} & 1.3.8 \\
~ & Gary Lee & {\tt\tiny garylee@ecosine.com.tw} & ~ \\
\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
Czech & Petr P\v{r}ikryl & {\tt\tiny prikrylp@skil.cz} & up-to-date \\
\hline
......@@ -283,14 +284,14 @@ when the translator was updated.
\hline
French & Xavier Outhier & {\tt\tiny xouthier@yahoo.fr} & 1.4.1 \\
\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
Greek & Harry Kalogirou & {\tt\tiny harkal@rainbow.cs.unipi.gr} & 1.2.11 \\
\hline
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} & ~ \\
\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} & ~ \\
\hline
Japanese & Ryunosuke Satoh & {\tt\tiny sun594@hotmail.com} & 1.3.9 \\
......@@ -299,7 +300,7 @@ when the translator was updated.
\hline
JapaneseEn & see the Japanese language & {\tt\tiny ~} & English based \\
\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} & ~ \\
\hline
KoreanEn & see the Korean language & {\tt\tiny ~} & English based \\
......
doc/maintainers.txt
View file @ c8be4837
......@@ -16,6 +16,7 @@ TranslatorBrazilian
Fabio "FJTC" Jun Takada Chino: jun-chino@uol.com.br
TranslatorCatalan
Maximiliano Pin: mcpin@emtesistemas.com
Albert Mora: amora@iua.upf.es
TranslatorChinese
......
doc/translator_report.txt
View file @ c8be4837
(1.4.1-20050314)
(1.4.1-20050315)
Doxygen supports the following 30 languages (sorted alphabetically):
......@@ -8,7 +8,7 @@ German, Greek, Hungarian, Italian, Japanese (+En), Korean (+En),
Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, Serbian,
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.
----------------------------------------------------------------------
......@@ -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
still may be some details listed even for them:
TranslatorBrazilian -- Remove the obsolete methods (never used).
TranslatorCroatian
TranslatorCzech
TranslatorDutch -- Remove the obsolete methods (never used).
TranslatorEnglish -- Remove the obsolete methods (never used).
TranslatorGerman -- Remove the obsolete methods (never used).
TranslatorItalian
TranslatorRussian
TranslatorSwedish
......@@ -33,16 +37,11 @@ must be implemented to become up-to-date:
TranslatorSerbian 1.4.1 1 method to implement
TranslatorRomanian 1.4.1 1 method to implement
TranslatorPolish 1.4.1 1 method to implement
TranslatorKorean 1.4.01 1 method to implement
Note: Change the base class to TranslatorAdapter_1_4_1.
TranslatorItalian 1.4.1 1 method to implement
TranslatorKorean 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
TranslatorCroatian 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
TranslatorJapanese 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:
TranslatorChinesetraditional 1.3.8 8 methods to implement
TranslatorPortuguese 1.3.3 12 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
TranslatorGreek 1.2.11 26 methods to implement
TranslatorFinnish obsolete 95 methods to implement
......@@ -100,14 +98,10 @@ TranslatorAfrikaans (TranslatorAdapter_1_3_9) 7 methods to implement
virtual QCString trNoDescriptionAvailable()
TranslatorBrazilian (TranslatorAdapter_1_4_1) 1 method to implement
TranslatorBrazilian (Translator)
-------------------
Implements 191 of the required methods.
Missing methods (should be implemented):
virtual QCString trOverloadText()
Implements 192 of the required methods.
Obsolete methods (should be removed, never used):
......@@ -123,35 +117,14 @@ TranslatorBrazilian (TranslatorAdapter_1_4_1) 1 method to implement
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):
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):
......@@ -207,16 +180,6 @@ TranslatorChinesetraditional (TranslatorAdapter_1_3_8) 8 methods to implement
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
----------------
......@@ -423,14 +386,10 @@ TranslatorFrench (TranslatorAdapter_1_4_1) 1 method to implement
virtual QCString trNoDescriptionAvailable()
TranslatorGerman (TranslatorAdapter_1_4_1) 1 method to implement
TranslatorGerman (Translator)
----------------
Implements 191 of the required methods.
Missing methods (should be implemented):
virtual QCString trOverloadText()
Implements 192 of the required methods.
Obsolete methods (should be removed, never used):
......@@ -517,29 +476,6 @@ TranslatorHungarian (TranslatorAdapter_1_4_1) 1 method to implement
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
------------------
......@@ -583,7 +519,7 @@ TranslatorJapaneseEn (TranslatorEnglish) 187 methods to implement
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.
......@@ -592,19 +528,6 @@ TranslatorKorean (TranslatorAdapter_1_3_9) 1 method to implement
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
------------------
......
packages/rpm/doxygen.spec
View file @ c8be4837
Summary: A documentation system for C/C++.
Name: doxygen
Version: 1.4.1_20050315
Version: 1.4.2
Release: 1
Epoch: 1
Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
......
src/code.l
View file @ c8be4837
......@@ -1994,6 +1994,11 @@ OPERATOR {ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}
<Body>{KEYWORD}/([^a-z_A-Z0-9]) {
startFontClass("keyword");
codifyLines(yytext);
if (QCString(yytext)=="typedef")
{
addType();
g_name+=yytext;
}
endFontClass();
}
<Body>{KEYWORD}/{B}* {
......
src/commentscan.l
View file @ c8be4837
......@@ -43,6 +43,7 @@
#include "membergroup.h"
#include "reflist.h"
#include "code.h"
#include "debug.h"
// forward declarations
static void handleBrief(const QCString &);
......@@ -602,9 +603,19 @@ static inline void setOutput(OutputContext ctx)
switch(inContext)
{
case OutputDoc:
if (current->docFile.isEmpty())
{
current->docFile = yyFileName;
current->docLine = yyLineNr;
}
pOutputString = &current->doc;
break;
case OutputBrief:
if (current->briefFile.isEmpty())
{
current->briefFile = yyFileName;
current->briefLine = yyLineNr;
}
pOutputString = &current->brief;
break;
case OutputXRef:
......@@ -667,8 +678,7 @@ OL [oO][lL]
DL [dD][lL]
IMG [iI][mM][gG]
HR [hH][rR]
CODE [cC][oO][dD][eE]
DETAILEDHTML {PRE}|{UL}|{TABLE}|{OL}|{DL}|{P}|[Hh][1-6]|{IMG}|{HR}|{CODE}
DETAILEDHTML {PRE}|{UL}|{TABLE}|{OL}|{DL}|{P}|[Hh][1-6]|{IMG}|{HR}
BN [ \t\n\r]
BL [ \t\r]*"\n"
B [ \t]
......@@ -1421,7 +1431,7 @@ SCOPENAME "$"?(({ID}?{BN}*"::"{BN}*)*)((~{BN}*)?{ID})
BEGIN( Comment );
}
}
<SkipGuardedSection>{CMD}"else"/{NW}] {
<SkipGuardedSection>{CMD}"else"/{NW} {
if (guards.isEmpty())
{
warn(yyFileName,yyLineNr,
......@@ -2011,18 +2021,16 @@ bool parseCommentBlock(/* in,out */ Entry *curEntry,
{
//fprintf(stderr,"parseCommentBlock() isBrief=%d isJavaDocStyle=%d lineNr=%d\n",
// isBrief,isJavaDocStyle,lineNr);
initParser();
guards.setAutoDelete(TRUE);
guards.clear();
//current_root = rootEntry;
current = curEntry;
//previous = prevEntry;
inputString = comment;
if (inputString==0) return FALSE; // avoid empty strings
inputPosition = 0;
yyLineNr = lineNr;
yyFileName = fileName;
//inBody = foundInBody;
protection = prot;
needNewEntry = FALSE;
xrefKind = XRef_None;
......@@ -2040,11 +2048,20 @@ bool parseCommentBlock(/* in,out */ Entry *curEntry,
warn(yyFileName,yyLineNr,"Documentation block ended in the middle of a conditional section!");
}
// strip any leading/trailing whitespace
current->doc=current->doc.stripWhiteSpace();
if (current->section==Entry::FILEDOC_SEC && current->doc.isEmpty())
{
// to allow a comment block with just a @file command.
current->doc="\n\n";
}
Debug::print(Debug::CommentScan,0,"CommentScanner\n%s:%d\n"
"input=[%s]\nbrief=[%s]\ndocs=[%s]\n------------\n",
fileName.data(),lineNr,comment.data(),
current->brief.data(),current->doc.data()
);
checkFormula();
prot = protection;
......
src/compound.xsd
View file @ c8be4837
......@@ -548,12 +548,11 @@
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="docParamName">
<xsd:simpleContent>
<xsd:extension base="xsd:string">
<xsd:attribute name="direction" type="DoxParamDir" use="optional" />
</xsd:extension>
</xsd:simpleContent>
<xsd:complexType name="docParamName" mixed="true">
<xsd:sequence>
<xsd:element name="ref" type="refTextType" minOccurs="0" maxOccurs="1" />
</xsd:sequence>
<xsd:attribute name="direction" type="DoxParamDir" use="optional" />
</xsd:complexType>
<xsd:complexType name="docXRefSectType">
......
src/compound_xsd.h
View file @ c8be4837
......@@ -548,12 +548,11 @@
" </xsd:sequence>\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"docParamName\">\n"
" <xsd:simpleContent>\n"
" <xsd:extension base=\"xsd:string\">\n"
" <xsd:attribute name=\"direction\" type=\"DoxParamDir\" use=\"optional\" />\n"
" </xsd:extension>\n"
" </xsd:simpleContent>\n"
" <xsd:complexType name=\"docParamName\" mixed=\"true\">\n"
" <xsd:sequence>\n"
" <xsd:element name=\"ref\" type=\"refTextType\" minOccurs=\"0\" maxOccurs=\"1\" />\n"
" </xsd:sequence>\n"
" <xsd:attribute name=\"direction\" type=\"DoxParamDir\" use=\"optional\" />\n"
" </xsd:complexType>\n"
"\n"
" <xsd:complexType name=\"docXRefSectType\">\n"
......
src/debug.cpp
View file @ c8be4837
......@@ -18,9 +18,61 @@
#include <stdarg.h>
#include <stdio.h>
#include <qdict.h>
#include "qtbc.h"
#include "debug.h"
//------------------------------------------------------------------------
struct LabelMap
{
const char *name;
Debug::DebugMask event;
};
static LabelMap s_labels[] =
{
{ "findmembers", Debug::FindMembers },
{ "functions", Debug::Functions },
{ "variables", Debug::Variables },
{ "preprocessor", Debug::Preprocessor },
{ "classes", Debug::Classes },
{ "commentcnv", Debug::CommentCnv },
{ "commentscan", Debug::CommentScan },
{ "validate", Debug::Validate },
{ "printtree", Debug::PrintTree },
{ "time", Debug::Time },
{ "extcmd", Debug::ExtCmd },
{ 0, (Debug::DebugMask)0 }
};
class LabelMapper
{
public:
LabelMapper() : m_map(17)
{
m_map.setAutoDelete(TRUE);
LabelMap *p = s_labels;
while (p->name)
{
m_map.insert(p->name,new Debug::DebugMask(p->event));
p++;
}
}
Debug::DebugMask *find(const char *s) const
{
if (s==0) return 0;
return m_map.find(s);
}
private:
QDict<Debug::DebugMask> m_map;
};
static LabelMapper g_labelMapper;
//------------------------------------------------------------------------
Debug::DebugMask Debug::curMask = Debug::Quiet;
int Debug::curPrio = 0;
......@@ -38,29 +90,8 @@ void Debug::print(DebugMask mask,int prio,const char *fmt,...)
static int labelToEnumValue(const char *l)
{
QCString label=l;
label=label.lower();
if (label=="findmembers")
return Debug::FindMembers;
else if (label=="functions")
return Debug::Functions;
else if (label=="variables")
return Debug::Variables;
else if (label=="preprocessor")
return Debug::Preprocessor;
else if (label=="classes")
return Debug::Classes;
else if (label=="commentcnv")
return Debug::CommentCnv;
else if (label=="validate")
return Debug::Validate;
else if (label=="printtree")
return Debug::PrintTree;
else if (label=="time")
return Debug::Time;
else if (label=="extcmd")
return Debug::ExtCmd;
else
return 0;
Debug::DebugMask *event = g_labelMapper.find(label.lower());
if (event) return *event; else return 0;
}
void Debug::setFlag(const char *lab)
......@@ -82,3 +113,4 @@ bool Debug::isFlagSet(DebugMask mask)
{
return (curMask & mask)!=0;
}
src/debug.h
View file @ c8be4837
......@@ -29,10 +29,11 @@ class Debug
Preprocessor = 0x00000008,
Classes = 0x00000010,
CommentCnv = 0x00000020,
Validate = 0x00000040,
PrintTree = 0x00000080,
Time = 0x00000100,
ExtCmd = 0x00000200
CommentScan = 0x00000040,
Validate = 0x00000080,
PrintTree = 0x00000100,
Time = 0x00000200,
ExtCmd = 0x00000400
};
static void print(DebugMask mask,int prio,const char *fmt,...);
static void setFlag(const char *label);
......
src/declinfo.h
View file @ c8be4837
......@@ -22,6 +22,7 @@
#include <stdio.h>
extern void parseFuncDecl(const QCString &decl,
bool objC,
QCString &clName,
QCString &type,
QCString &name,
......
src/declinfo.l
View file @ c8be4837
......@@ -48,6 +48,7 @@ static int sharpCount;
static bool classTempListFound;
static bool funcTempListFound;
static QCString exceptionString;
static bool insideObjC;
static void addType()
{
......@@ -117,6 +118,16 @@ ID ([a-z_A-Z][a-z_A-Z0-9]*)|(@[0-9]+)
name += yytext;
BEGIN(Operator);
}
<Start>{ID}{B}*"("{B}*{ID}{B}*")" { // Objective-C class categories
if (!insideObjC)
{
REJECT;
}
else
{
name += yytext;
}
}
<Start>(~{B}*)?{ID}/({B}*"["{B}*"]")* { // the []'s are for Java,
// the / was add to deal with multi-
// dimensional C++ arrays like A[][15]
......@@ -213,7 +224,7 @@ ID ([a-z_A-Z][a-z_A-Z0-9]*)|(@[0-9]+)
/*@ ----------------------------------------------------------------------------
*/
void parseFuncDecl(const QCString &decl,QCString &cl,QCString &t,
void parseFuncDecl(const QCString &decl,bool objC,QCString &cl,QCString &t,
QCString &n,QCString &a,QCString &ftl,QCString &exc)
{
inputString = decl;
......@@ -222,6 +233,7 @@ void parseFuncDecl(const QCString &decl,QCString &cl,QCString &t,
inputPosition = 0;
classTempListFound = FALSE;
funcTempListFound = FALSE;
insideObjC = objC;
scope.resize(0);
className.resize(0);
classTempList.resize(0);
......
src/definition.cpp
View file @ c8be4837
......@@ -217,10 +217,10 @@ void Definition::setDocumentation(const char *d,const char *docFile,int docLine,
void Definition::setBriefDescription(const char *b,const char *briefFile,int briefLine)
{
if (b==0) return;
//printf("Definition::setBriefDescription(%s,%s,%d)\n",b,briefFile,briefLine);
//fprintf(stderr,"Definition::setBriefDescription(%s,%s,%d)\n",b,briefFile,briefLine);
m_brief=QCString(b).stripWhiteSpace();
int bl=m_brief.length();
if (bl>0) // add puntuation if needed
if (bl>0) // add punctuation if needed
{
switch(m_brief.at(bl-1))
{
......
src/docparser.cpp
View file @ c8be4837
......@@ -41,9 +41,16 @@
#include "searchindex.h"
#include "language.h"
// debug off
#define DBG(x) do {} while(0)
// debug to stdout
//#define DBG(x) printf x
// debug to stderr
//#define myprintf(x...) fprintf(stderr,x)
//#define DBG(x) myprintf x
#define INTERNAL_ASSERT(x) do {} while(0)
//#define INTERNAL_ASSERT(x) if (!(x)) DBG(("INTERNAL_ASSERT(%s) failed retval=0x%x: file=%s line=%d\n",#x,retval,__FILE__,__LINE__));
......@@ -3347,7 +3354,8 @@ int DocParamList::parse(const QString &cmdName)
g_hasReturnCommand=TRUE;
checkArgumentName(g_token->name,FALSE);
}
m_params.append(g_token->name);
//m_params.append(g_token->name);
handleLinkedWord(this,m_params);
tok=doctokenizerYYlex();
}
doctokenizerYYsetStatePara();
......
src/docparser.h
View file @ c8be4837
......@@ -206,7 +206,7 @@ class DocLinkedWord : public DocNode
const QString &ref,const QString &file,
const QString &anchor);
QString word() const { return m_word; }
Kind kind() const { return Kind_Word; }
Kind kind() const { return Kind_LinkedWord; }
DocNode *parent() const { return m_parent; }
QString file() const { return m_file; }
QString relPath() const { return m_relPath; }
......@@ -993,7 +993,8 @@ class DocParamList : public DocNode
virtual ~DocParamList() { delete m_paragraph; }
Kind kind() const { return Kind_ParamList; }
DocNode *parent() const { return m_parent; }
const QStrList &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::Direction direction() const { return m_dir; }
void markFirst(bool b=TRUE) { m_isFirst=b; }
......@@ -1011,7 +1012,8 @@ class DocParamList : public DocNode
private:
DocNode * m_parent;
DocPara * m_paragraph;
QStrList m_params;
//QStrList m_params;
QList<DocNode> m_params;
DocParamSect::Type m_type;
DocParamSect::Direction m_dir;
bool m_isFirst;
......
src/doxygen.cpp
View file @ c8be4837
......@@ -1909,7 +1909,7 @@ static void buildVarList(Entry *root)
}
}
QCString scope,name=root->name.copy();
QCString scope,name=removeRedundantWhiteSpace(root->name);
// find the scope of this variable
Entry *p = root->parent;
......@@ -1939,7 +1939,7 @@ static void buildVarList(Entry *root)
addVariableToClass(root, // entry
cd, // class to add member to
MemberDef::Friend, // type of member
root->name, // name of the member
name, // name of the member
FALSE, // from Anonymous scope
0, // anonymous member
Public, // protection
......@@ -1986,11 +1986,12 @@ static void buildVarList(Entry *root)
if (!scope.isEmpty() && !name.isEmpty() && (cd=getClass(scope)))
{
// TODO: clean up this mess!
MemberDef *md=0;
#if 0
// if cd is an annonymous scope we insert the member
// into a non-annonymous scope as well.
// into a non-annonymous scope as well. This is needed to
// be able to refer to it using \var or \fn
//int indentDepth=0;
int si=scope.find('@');
//int anonyScopes = 0;
......@@ -2019,14 +2020,16 @@ static void buildVarList(Entry *root)
);
added=TRUE;
}
else // annonymous scope inside namespace or file => put variable in the global scope
else // anonymous scope inside namespace or file => put variable in the global scope
{
md=addVariableToFile(root,mtype,pScope,name,TRUE,0);
if (mtype==MemberDef::Variable)
{
md=addVariableToFile(root,mtype,pScope,name,TRUE,0);
}
added=TRUE;
}
}
}
#endif
//printf("name=`%s' scope=%s scope.right=%s indentDepth=%d anonyScopes=%d\n",
// name.data(),scope.data(),
// scope.right(scope.length()-si).data(),
......@@ -2266,7 +2269,8 @@ static void buildFunctionList(Entry *root)
int te=rname.find('>');
if (ts==-1 || te==-1)
{
isMember=TRUE;
NamespaceDef *nd = Doxygen::namespaceSDict.find(rname.left(memIndex));
isMember=nd==0;
}
else
{
......@@ -2289,11 +2293,12 @@ static void buildFunctionList(Entry *root)
addMethodToClass(root,cd,rname,isFriend);
}
else if (root->parent &&
!((root->parent->section & Entry::COMPOUND_MASK) || root->parent->section==Entry::OBJCIMPL_SEC) &&
!((root->parent->section & Entry::COMPOUND_MASK)
|| root->parent->section==Entry::OBJCIMPL_SEC
) &&
!isMember &&
(root->relates.isEmpty() || root->relatesDup) &&
root->type.left(7)!="extern " &&
root->type.left(8)!="typedef "
root->type.left(7)!="extern " && root->type.left(8)!="typedef "
)
// no member => unrelated function
{
......@@ -4341,10 +4346,10 @@ static void findMember(Entry *root,
Debug::print(Debug::FindMembers,0,
"findMember(root=%p,funcDecl=`%s',related=`%s',overload=%d,"
"isFunc=%d mGrpId=%d tArgList=%p (#=%d) "
"memSpec=%d\n",
"memSpec=%d isObjC=%d\n",
root,funcDecl.data(),root->relates.data(),overloaded,isFunc,root->mGrpId,
root->tArgLists,root->tArgLists ? root->tArgLists->count() : 0,
root->memSpec
root->memSpec,root->objc
);
QCString scopeName;
......@@ -4427,7 +4432,7 @@ static void findMember(Entry *root,
else
{
// extract information from the declarations
parseFuncDecl(funcDecl,scopeName,funcType,funcName,
parseFuncDecl(funcDecl,root->objc,scopeName,funcType,funcName,
funcArgs,funcTempList,exceptions
);
}
......@@ -4648,6 +4653,11 @@ static void findMember(Entry *root,
if (!namespaceName.isEmpty()) nd=getResolvedNamespace(namespaceName);
ClassDef *tcd=findClassDefinition(fd,nd,scopeName);
if (tcd==0 && stripAnonymousNamespaceScope(cd->name())==scopeName)
{
// don't be fooled by anonymous scopes
tcd=cd;
}
//printf("Looking for %s inside nd=%s result=%p\n",
// scopeName.data(),nd?nd->name().data():"<none>",tcd);
......@@ -5179,6 +5189,16 @@ static void findMember(Entry *root,
Doxygen::memberNameSDict.append(funcName,mn);
}
}
if (root->relatesDup)
{
if (!findGlobalMember(root,namespaceName,funcName,funcTempList,funcArgs,funcDecl))
{
warn(root->fileName,root->startLine,
"Warning: Cannot determine file/namespace for relatedalso function\n%s",
fullFuncDecl.data()
);
}
}
}
else
{
......@@ -6124,7 +6144,7 @@ static void generateClassDocs()
writeHierarchicalIndex(*outputList);
msg("Generating member index...\n");
writeMemberIndex(*outputList);
writeClassMemberIndex(*outputList);
if (Doxygen::exampleSDict->count()>0)
{
......@@ -7196,9 +7216,12 @@ static bool patternMatch(QFileInfo *fi,QStrList *patList)
bool found=FALSE;
if (patList)
{
char *pattern=patList->first();
while (pattern && !found)
QCString pattern=patList->first();
while (!pattern.isEmpty() && !found)
{
int i=pattern.find('=');
if (i!=-1) pattern=pattern.left(i); // strip of the extension specific filter name
//printf("Matching `%s' against pattern `%s'\n",fi->fileName().data(),pattern);
#if defined(_WIN32) // windows
QRegExp re(pattern,FALSE,TRUE); // case insensitive match
......
src/formula.cpp
View file @ c8be4837
......@@ -103,7 +103,9 @@ void FormulaList::generateBitmaps(const char *path)
{
//printf("Running latex...\n");
//system("latex _formulas.tex </dev/null >/dev/null");
if (iSystem("latex","_formulas.tex")!=0)
QCString latexCmd = Config_getString("LATEX_CMD_NAME");
if (latexCmd.isEmpty()) latexCmd="latex";
if (iSystem(latexCmd,"_formulas.tex")!=0)
{
err("Problems running latex. Check your installation or look for typos in _formulas.tex!\n");
formulaError=TRUE;
......
src/htmldocvisitor.cpp
View file @ c8be4837
......@@ -903,13 +903,22 @@ void HtmlDocVisitor::visitPre(DocParamList *pl)
m_t << "]</tt>&nbsp;";
}
m_t << "</td><td valign=\"top\"><em>";
QStrListIterator li(pl->parameters());
const char *s;
//QStrListIterator li(pl->parameters());
//const char *s;
QListIterator<DocNode> li(pl->parameters());
DocNode *param;
bool first=TRUE;
for (li.toFirst();(s=li.current());++li)
for (li.toFirst();(param=li.current());++li)
{
if (!first) m_t << ","; else first=FALSE;
filter(s);
if (param->kind()==DocNode::Kind_Word)
{
visit((DocWord*)param);
}
else if (param->kind()==DocNode::Kind_LinkedWord)
{
visit((DocLinkedWord*)param);
}
}
m_t << "</em>&nbsp;</td><td>";
}
......
src/htmlgen.cpp
View file @ c8be4837
......@@ -57,7 +57,7 @@ static const char *defaultStyleSheet =
" font-size: 120%;\n"
"}\n"
"H3 {\n"
" font-size: 110%;\n"
" font-size: 100%;\n"
"}\n"
"CAPTION { font-weight: bold }\n"
"DIV.qindex {\n"
......@@ -126,7 +126,7 @@ static const char *defaultStyleSheet =
"DL.el { margin-left: -1cm }\n"
".fragment {\n"
" font-family: Fixed, monospace;\n"
" font-size: 90%;\n"
" font-size: 95%;\n"
"}\n"
"PRE.fragment {\n"
" border: 1px solid #CCCCCC;\n"
......
src/htmlhelp.cpp
View file @ c8be4837
......@@ -37,6 +37,7 @@ struct IndexField
QCString url;
QCString anchor;
bool link;
bool reversed;
};
class IndexFieldList : public QList<IndexField>
......@@ -72,7 +73,8 @@ class HtmlHelpIndex
HtmlHelpIndex();
~HtmlHelpIndex();
void addItem(const char *first,const char *second,
const char *url, const char *anchor,bool hasLink);
const char *url, const char *anchor,
bool hasLink,bool reversed);
void writeFields(QTextStream &t);
private:
IndexFieldList *list;
......@@ -104,9 +106,12 @@ HtmlHelpIndex::~HtmlHelpIndex()
* \param anchor the anchor of the documentation within the page.
* \param hasLink if true, the url (without anchor) can be used in the
* level1 item, when writing the header of a list of level2 items.
* \param reversed TRUE if level1 is the member name and level2 the compound
* name.
*/
void HtmlHelpIndex::addItem(const char *level1,const char *level2,
const char *url,const char *anchor,bool hasLink)
const char *url,const char *anchor,bool hasLink,
bool reversed)
{
QCString key = level1;
if (level2) key+= (QCString)"?" + level2;
......@@ -115,10 +120,11 @@ void HtmlHelpIndex::addItem(const char *level1,const char *level2,
//printf(">>>>>>>>> HtmlHelpIndex::addItem(%s,%s,%s,%s)\n",
// level1,level2,url,anchor);
IndexField *f = new IndexField;
f->name = key;
f->url = url;
f->anchor = anchor;
f->link = hasLink;
f->name = key;
f->url = url;
f->anchor = anchor;
f->link = hasLink;
f->reversed = reversed;
list->inSort(f);
dict->insert(key,f);
}
......@@ -199,7 +205,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t)
{
t << " <LI><OBJECT type=\"text/sitemap\">";
t << "<param name=\"Local\" value=\"" << f->url << Doxygen::htmlFileExtension;
if (!f->anchor.isEmpty()) t << "#" << f->anchor;
if (!f->anchor.isEmpty() && f->reversed) t << "#" << f->anchor;
t << "\">";
t << "<param name=\"Name\" value=\"" << level1 << "\">"
"</OBJECT>\n";
......@@ -210,7 +216,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t)
{
t << " <LI><OBJECT type=\"text/sitemap\">";
t << "<param name=\"Local\" value=\"" << f->url << Doxygen::htmlFileExtension;
if (!f->anchor.isEmpty()) t << "#" << f->anchor;
if (!f->anchor.isEmpty() && f->reversed) t << "#" << f->anchor;
t << "\">";
t << "<param name=\"Name\" value=\"" << level1 << "\">"
"</OBJECT>\n";
......@@ -245,6 +251,7 @@ void HtmlHelpIndex::writeFields(QTextStream &t)
}
lastLevel1 = level1.copy();
}
if (level2Started) t << " </UL>" << endl;
}
//----------------------------------------------------------------------------
......@@ -551,7 +558,7 @@ void HtmlHelp::addContentsItem(bool isDir,
void HtmlHelp::addIndexItem(const char *level1, const char *level2,
const char *ref, const char *anchor)
{
index->addItem(level1,level2,ref,anchor,TRUE);
index->addItem(level2,level1,ref,anchor,TRUE);
index->addItem(level1,level2,ref,anchor,TRUE,FALSE);
index->addItem(level2,level1,ref,anchor,TRUE,TRUE);
}
src/index.cpp
View file @ c8be4837
......@@ -92,7 +92,6 @@ void countDataStructures()
static void startIndexHierarchy(OutputList &ol,int level)
{
// UGLY HACK!
ol.pushGeneratorState();
ol.disable(OutputGenerator::Man);
ol.disable(OutputGenerator::Html);
......@@ -106,7 +105,6 @@ static void startIndexHierarchy(OutputList &ol,int level)
static void endIndexHierarchy(OutputList &ol,int level)
{
// UGLY HACK!
ol.pushGeneratorState();
ol.disable(OutputGenerator::Man);
ol.disable(OutputGenerator::Html);
......@@ -1695,7 +1693,7 @@ void writeQuickMemberIndex(OutputList &ol,bool *charUsed,int page,
//----------------------------------------------------------------------------
static void writeMemberIndexFiltered(OutputList &ol, ClassMemberHighlight hl)
static void writeClassMemberIndexFiltered(OutputList &ol, ClassMemberHighlight hl)
{
if (documentedClassMembers[hl]==0) return;
......@@ -1791,31 +1789,34 @@ static void writeMemberIndexFiltered(OutputList &ol, ClassMemberHighlight hl)
ol.popGeneratorState();
}
void writeMemberIndex(OutputList &ol)
void writeClassMemberIndex(OutputList &ol)
{
writeMemberIndexFiltered(ol,CMHL_All);
writeMemberIndexFiltered(ol,CMHL_Functions);
writeMemberIndexFiltered(ol,CMHL_Variables);
writeMemberIndexFiltered(ol,CMHL_Typedefs);
writeMemberIndexFiltered(ol,CMHL_Enums);
writeMemberIndexFiltered(ol,CMHL_EnumValues);
writeMemberIndexFiltered(ol,CMHL_Properties);
writeMemberIndexFiltered(ol,CMHL_Events);
writeMemberIndexFiltered(ol,CMHL_Related);
QCString title = theTranslator->trCompoundMembers();
bool &generateHtml = Config_getBool("GENERATE_HTML") ;
bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
if (hasHtmlHelp)
{
HtmlHelp *htmlHelp = HtmlHelp::getInstance();
htmlHelp->addContentsItem(FALSE,title,"functions");
}
if (hasFtvHelp)
{
FTVHelp *ftvHelp = FTVHelp::getInstance();
ftvHelp->addContentsItem(FALSE,0,"functions",0,title);
writeClassMemberIndexFiltered(ol,CMHL_All);
writeClassMemberIndexFiltered(ol,CMHL_Functions);
writeClassMemberIndexFiltered(ol,CMHL_Variables);
writeClassMemberIndexFiltered(ol,CMHL_Typedefs);
writeClassMemberIndexFiltered(ol,CMHL_Enums);
writeClassMemberIndexFiltered(ol,CMHL_EnumValues);
writeClassMemberIndexFiltered(ol,CMHL_Properties);
writeClassMemberIndexFiltered(ol,CMHL_Events);
writeClassMemberIndexFiltered(ol,CMHL_Related);
if (documentedClassMembers[CMHL_All]>0)
{
QCString title = theTranslator->trCompoundMembers();
bool &generateHtml = Config_getBool("GENERATE_HTML") ;
bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
if (hasHtmlHelp)
{
HtmlHelp *htmlHelp = HtmlHelp::getInstance();
htmlHelp->addContentsItem(FALSE,title,"functions");
}
if (hasFtvHelp)
{
FTVHelp *ftvHelp = FTVHelp::getInstance();
ftvHelp->addContentsItem(FALSE,0,"functions",0,title);
}
}
}
......@@ -2193,19 +2194,22 @@ void writeFileMemberIndex(OutputList &ol)
writeFileMemberIndexFiltered(ol,FMHL_EnumValues);
writeFileMemberIndexFiltered(ol,FMHL_Defines);
QCString title = theTranslator->trFileMembers();
bool &generateHtml = Config_getBool("GENERATE_HTML") ;
bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
if (hasHtmlHelp)
if (documentedFileMembers[FMHL_All]>0)
{
HtmlHelp *htmlHelp = HtmlHelp::getInstance();
htmlHelp->addContentsItem(FALSE,title,"globals");
}
if (hasFtvHelp)
{
FTVHelp *ftvHelp = FTVHelp::getInstance();
ftvHelp->addContentsItem(FALSE,0,"globals",0,title);
QCString title = theTranslator->trFileMembers();
bool &generateHtml = Config_getBool("GENERATE_HTML") ;
bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
if (hasHtmlHelp)
{
HtmlHelp *htmlHelp = HtmlHelp::getInstance();
htmlHelp->addContentsItem(FALSE,title,"globals");
}
if (hasFtvHelp)
{
FTVHelp *ftvHelp = FTVHelp::getInstance();
ftvHelp->addContentsItem(FALSE,0,"globals",0,title);
}
}
}
......@@ -2309,19 +2313,22 @@ void writeNamespaceMemberIndex(OutputList &ol)
writeNamespaceMemberIndexFiltered(ol,NMHL_Enums);
writeNamespaceMemberIndexFiltered(ol,NMHL_EnumValues);
QCString title = theTranslator->trNamespaceMembers();
bool &generateHtml = Config_getBool("GENERATE_HTML") ;
bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
if (hasHtmlHelp)
{
HtmlHelp *htmlHelp = HtmlHelp::getInstance();
htmlHelp->addContentsItem(FALSE,title,"namespacemembers");
}
if (hasFtvHelp)
if (documentedNamespaceMembers[NMHL_All]>0)
{
FTVHelp *ftvHelp = FTVHelp::getInstance();
ftvHelp->addContentsItem(FALSE,0,"namespacemembers",0,title);
QCString title = theTranslator->trNamespaceMembers();
bool &generateHtml = Config_getBool("GENERATE_HTML") ;
bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
if (hasHtmlHelp)
{
HtmlHelp *htmlHelp = HtmlHelp::getInstance();
htmlHelp->addContentsItem(FALSE,title,"namespacemembers");
}
if (hasFtvHelp)
{
FTVHelp *ftvHelp = FTVHelp::getInstance();
ftvHelp->addContentsItem(FALSE,0,"namespacemembers",0,title);
}
}
}
......
src/index.h
View file @ c8be4837
......@@ -49,24 +49,28 @@ void writeIndex(OutputList &ol);
void writeHierarchicalIndex(OutputList &ol);
void writeAlphabeticalIndex(OutputList &ol);
void writeClassHierarchy(OutputList &ol);
void writeFileIndex(OutputList &ol);
void writeSourceIndex(OutputList &ol);
void writeAnnotatedIndex(OutputList &ol);
void writeAnnotatedClassList(OutputList &ol);
void writeMemberIndex(OutputList &ol);
void writeMemberList(OutputList &ol,bool useSections);
void writeSourceIndex(OutputList &ol);
void writeHeaderIndex(OutputList &ol);
void writeHeaderFileList(OutputList &ol);
void writeExampleIndex(OutputList &ol);
void writePageIndex(OutputList &ol);
void writeFileMemberIndex(OutputList &ol);
void writeFileIndex(OutputList &ol);
void writeNamespaceIndex(OutputList &ol);
void writeGroupIndex(OutputList &ol);
void writeDirIndex(OutputList &ol);
void writeNamespaceIndex(OutputList &ol);
void writePackageIndex(OutputList &ol);
void writeClassMemberIndex(OutputList &ol);
void writeFileMemberIndex(OutputList &ol);
void writeNamespaceMemberIndex(OutputList &ol);
void writeGraphicalClassHierarchy(OutputList &ol);
void writeGraphInfo(OutputList &ol);
void writePackageIndex(OutputList &ol);
void countDataStructures();
......
src/latexdocvisitor.cpp
View file @ c8be4837
......@@ -909,14 +909,23 @@ void LatexDocVisitor::visitPre(DocParamList *pl)
m_t << "} ";
}
m_t << "{\\em ";
QStrListIterator li(pl->parameters());
const char *s;
//QStrListIterator li(pl->parameters());
//const char *s;
QListIterator<DocNode> li(pl->parameters());
DocNode *param;
bool first=TRUE;
for (li.toFirst();(s=li.current());++li)
for (li.toFirst();(param=li.current());++li)
{
if (!first) m_t << ","; else first=FALSE;
m_insideItem=TRUE;
filter(s);
if (param->kind()==DocNode::Kind_Word)
{
visit((DocWord*)param);
}
else if (param->kind()==DocNode::Kind_LinkedWord)
{
visit((DocLinkedWord*)param);
}
m_insideItem=FALSE;
}
m_t << "}]";
......
src/mandocvisitor.cpp
View file @ c8be4837
......@@ -804,13 +804,22 @@ void ManDocVisitor::visitPre(DocParamList *pl)
{
if (m_hide) return;
m_t << "\\fI";
QStrListIterator li(pl->parameters());
const char *s;
//QStrListIterator li(pl->parameters());
//const char *s;
QListIterator<DocNode> li(pl->parameters());
DocNode *param;
bool first=TRUE;
for (li.toFirst();(s=li.current());++li)
for (li.toFirst();(param=li.current());++li)
{
if (!first) m_t << ","; else first=FALSE;
m_t << s;
if (param->kind()==DocNode::Kind_Word)
{
visit((DocWord*)param);
}
else if (param->kind()==DocNode::Kind_LinkedWord)
{
visit((DocLinkedWord*)param);
}
}
m_t << "\\fP ";
}
......
src/pagedef.cpp
View file @ c8be4837
......@@ -59,7 +59,7 @@ void PageDef::writeDocumentation(OutputList &ol)
startFile(ol,pageName,pageName,title());
if (getOuterScope()!=Doxygen::globalScope)
if (getOuterScope()!=Doxygen::globalScope && !Config_getBool("DISABLE_INDEX"))
{
getOuterScope()->writeNavigationPath(ol);
}
......
src/perlmodgen.cpp
View file @ c8be4837
......@@ -1165,10 +1165,21 @@ void PerlModDocVisitor::visitPre(DocParamList *pl)
leaveText();
m_output.openHash()
.openList("parameters");
QStrListIterator li(pl->parameters());
const char *s;
for (li.toFirst();(s=li.current());++li)
//QStrListIterator li(pl->parameters());
//const char *s;
QListIterator<DocNode> li(pl->parameters());
DocNode *param;
for (li.toFirst();(param=li.current());++li)
{
QCString s;
if (param->kind()==DocNode::Kind_Word)
{
s = ((DocWord*)param)->word();
}
else if (param->kind()==DocNode::Kind_LinkedWord)
{
s = ((DocLinkedWord*)param)->word();
}
m_output.openHash()
.addFieldQuotedString("name", s)
.closeHash();
......
src/printdocvisitor.h
View file @ c8be4837
......@@ -547,12 +547,23 @@ class PrintDocVisitor : public DocVisitor
void visitPre(DocParamList *pl)
{
indent_pre();
QStrListIterator sli(pl->parameters());
const char *s;
//QStrListIterator sli(pl->parameters());
QListIterator<DocNode> sli(pl->parameters());
//const char *s;
DocNode *param;
printf("<parameters>");
for (sli.toFirst();(s=sli.current());++sli)
for (sli.toFirst();(param=sli.current());++sli)
{
printf("<param>%s</param>",s);
printf("<param>");
if (param->kind()==DocNode::Kind_Word)
{
visit((DocWord*)param);
}
else if (param->kind()==DocNode::Kind_LinkedWord)
{
visit((DocLinkedWord*)param);
}
printf("</param>");
}
printf("\n");
}
......
src/rtfdocvisitor.cpp
View file @ c8be4837
......@@ -1150,13 +1150,22 @@ void RTFDocVisitor::visitPre(DocParamList *pl)
if (m_hide) return;
DBG_RTF("{\\comment RTFDocVisitor::visitPre(DocParamList)}\n");
m_t << "{\\i ";
QStrListIterator li(pl->parameters());
const char *s;
//QStrListIterator li(pl->parameters());
//const char *s;
QListIterator<DocNode> li(pl->parameters());
DocNode *param;
bool first=TRUE;
for (li.toFirst();(s=li.current());++li)
for (li.toFirst();(param=li.current());++li)
{
if (!first) m_t << ","; else first=FALSE;
filter(s);
if (param->kind()==DocNode::Kind_Word)
{
visit((DocWord*)param);
}
else if (param->kind()==DocNode::Kind_LinkedWord)
{
visit((DocLinkedWord*)param);
}
}
m_t << "} ";
m_lastIsPara=TRUE;
......
src/scanner.l
View file @ c8be4837
......@@ -213,6 +213,7 @@ static void initParser()
lastDefGroup.groupname.resize(0);
insideFormula = FALSE;
insideCode=FALSE;
previous = 0;
}
static void initEntry()
......@@ -225,6 +226,7 @@ static void initEntry()
current->mGrpId = memberGroupId;
current->relates = memberGroupRelates.copy();
current->inside = memberGroupInside.copy();
current->objc = insideObjC;
if (!autoGroupStack.isEmpty())
{
//printf("Appending group %s\n",autoGroupStack.top()->groupname.data());
......@@ -1133,6 +1135,7 @@ IDLATTR ("["[^\]]*"]"){BN}*
current->bodyLine = yyLineNr;
current->section = Entry::FUNCTION_SEC;
current->protection = protection = Public ;
current->objc = TRUE;
current->virt = Virtual;
current->stat=yytext[0]=='+';
current->mtype = mtype = Method;
......@@ -2141,7 +2144,10 @@ IDLATTR ("["[^\]]*"]"){BN}*
<FindMembers,FindFields>("//"([!/]?){B}*{CMD}"{")|("/*"([!*]?){B}*{CMD}"{") {
#ifdef COMMENTSCAN
Entry *tmp = current;
current = previous;
if (previous)
{
current = previous;
}
handleGroupStartCommand(current->name);
current = tmp;
initEntry();
......@@ -2749,7 +2755,7 @@ IDLATTR ("["[^\]]*"]"){BN}*
unput(';');
BEGIN( MemberSpec ) ;
}
<MemberSpec>([*&]*{BN}*)*{ID}("["[a-z_A-Z0-9]*"]")* { // the [] part could be improved.
<MemberSpec>([*&]*{BN}*)*{ID}("["[^\]\n]*"]")* { // the [] part could be improved.
lineCount();
int i=0,l=yyleng,j;
while (i<l && (!isId(yytext[i]))) i++;
......@@ -6405,7 +6411,7 @@ static void parseCompounds(Entry *rt)
setContext();
yyLineNr = ce->startLine ;
insideObjC = ce->objc;
//printf("---> Inner block starts at line %d\n",yyLineNr);
//printf("---> Inner block starts at line %d objC=%d\n",yyLineNr,insideObjC);
//current->reset();
if (current) delete current;
current = new Entry;
......@@ -6621,6 +6627,7 @@ void handleGroupStartCommand(const char *header)
void handleGroupEndCommand()
{
endGroup();
previous=0;
}
......
src/translator_br.h
View file @ c8be4837
......@@ -12,9 +12,11 @@
*
* Brazilian Portuguese version by
* Fabio "FJTC" Jun Takada Chino <jun-chino at uol.com.br>
* Version: 1.3.8 (2004/06/30)
* Version: 1.4.1 (2005/03/20)
*
* History:
* 1.4.1
* - Method trOverloadText() added.
* 1.3.9
* - Updated to Doxygen 1.3.9
* 1.3.8
......@@ -34,7 +36,7 @@
#ifndef TRANSLATOR_BR_H
#define TRANSLATOR_BR_H
class TranslatorBrazilian : public TranslatorAdapter_1_4_1
class TranslatorBrazilian : public Translator
{
public:
......@@ -1597,5 +1599,19 @@ class TranslatorBrazilian : public TranslatorAdapter_1_4_1
if (!singular) result+="s";
return result;
}
//////////////////////////////////////////////////////////////////////////
// new since 1.4.1
//////////////////////////////////////////////////////////////////////////
/*! This text is added to the documentation when the \\overload command
* is used for a overloaded function.
*/
virtual QCString trOverloadText()
{
return "Este é um método provido por conveniência. "
"Ele difere do método acima apenas na lista de "
"argumentos que devem ser utilizados.";
}
};
#endif
src/translator_ca.h
View file @ c8be4837
This diff is collapsed.
src/translator_de.h
View file @ c8be4837
......@@ -96,13 +96,16 @@
// - added a dash after (file, ...) names and in front of description
// - changed "Eigenschaften" to "Propertys" (yeah, not ..."ies")
//
// 2005/03/20 Jens Seidel (jensseidel@users.sourceforge.net)
// - Updated for "new since 1.4.1" version
//
// Todo:
// - see FIXME
#ifndef TRANSLATOR_DE_H
#define TRANSLATOR_DE_H
class TranslatorGerman : public TranslatorAdapter_1_4_1
class TranslatorGerman : public Translator
{
public:
......@@ -1645,7 +1648,7 @@ class TranslatorGerman : public TranslatorAdapter_1_4_1
{ return "Verzeichnisdokumentation"; }
/*! This is used as the title of the directory index and also in the
* Quick links of a HTML page, to link to the directory hierarchy.
* Quick links of an HTML page, to link to the directory hierarchy.
*/
virtual QCString trDirectories()
{ return "Verzeichnisse"; }
......@@ -1674,6 +1677,20 @@ class TranslatorGerman : public TranslatorAdapter_1_4_1
return result;
}
//////////////////////////////////////////////////////////////////////////
// new since 1.4.1
//////////////////////////////////////////////////////////////////////////
/*! This text is added to the documentation when the \\overload command
* is used for a overloaded function.
*/
virtual QCString trOverloadText()
{
return "Dies ist eine überladene Methode, die der Bequemlichkeit "
"wegen bereitgestellt wird. Sie unterscheidet sich von der "
"obigen Funktion nur in den Argumenten die sie unterstützt.";
}
};
#endif
src/translator_en.h
View file @ c8be4837
......@@ -1573,7 +1573,7 @@ class TranslatorEnglish : public Translator
{ return "Directory Documentation"; }
/*! This is used as the title of the directory index and also in the
* Quick links of a HTML page, to link to the directory hierarchy.
* Quick links of an HTML page, to link to the directory hierarchy.
*/
virtual QCString trDirectories()
{ return "Directories"; }
......
src/translator_hr.h
View file @ c8be4837
......@@ -62,11 +62,14 @@
// 2005/02/28
// - Removed obsolete (unused) methods
//
// 2005/03/21
// - Added strings for 1.4.1
//
#ifndef TRANSLATOR_HR_H
#define TRANSLATOR_HR_H
class TranslatorCroatian : public TranslatorAdapter_1_4_1
class TranslatorCroatian : public Translator
{
private:
/*! to avoid macro redefinition from translator_cz.h */
......@@ -1237,6 +1240,20 @@ class TranslatorCroatian : public TranslatorAdapter_1_4_1
if (!singular) result+="i";
return result;
}
//////////////////////////////////////////////////////////////////////////
// new since 1.4.1
//////////////////////////////////////////////////////////////////////////
/*! This text is added to the documentation when the \\overload command
* is used for a overloaded function.
*/
virtual QCString trOverloadText()
{
return decode("Ovo je preoptereena funkcija (overload). "
"Razlikuje se od navedene metode "
"samo po vrsti argumenata koje prihvata.");
}
};
#endif
......
src/translator_it.h
View file @ c8be4837
......@@ -19,6 +19,8 @@
*
* Revision history
*
* 2005/03: translated new items used since version 1.4.1
* removed unused methods listed in Petr Prikryl February 28 translator report
* 2004/09: translated new items used since version 1.3.9
* 2004/06: translated new items used since version 1.3.8
* 2003/11: translated new items used since version 1.3.3
......@@ -28,7 +30,7 @@
* 2002/08: translated new items used since version 1.2.17
* 2002/07: translated new items used since version 1.2.16
* 2002/06: modified trRelatedPagesDescription() method
* correct typo in trInclByDepGraph() method
* corrected typo in trInclByDepGraph() method
* 2002/01: translated new items used since version 1.2.13
* updated e-mail address
* 2001/11: corrected the translation fixing the issues reported by the translator.pl script
......@@ -72,7 +74,7 @@
#ifndef TRANSLATOR_IT_H
#define TRANSLATOR_IT_H
class TranslatorItalian : public TranslatorAdapter_1_4_1
class TranslatorItalian : public Translator
{
public:
......@@ -212,10 +214,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
QCString trFileList()
{ return "Lista dei file"; }
/*! This is put above each page as a link to the list of all verbatim headers */
QCString trHeaderFiles()
{ return "Lista dei file header"; }
/*! This is put above each page as a link to all members of compounds. */
QCString trCompoundMembers()
{
......@@ -333,10 +331,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
return result;
}
/*! This is an introduction to the page with the list of all header files. */
QCString trHeaderFilesDescription()
{ return "Questi sono gli header file che compongono l'API:"; }
/*! This is an introduction to the page with the list of all examples */
QCString trExamplesDescription()
{ return "Questa è la lista di tutti gli esempi:"; }
......@@ -349,15 +343,8 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
QCString trModulesDescription()
{ return "Questa è la lista di tutti i moduli:"; }
/*! This sentences is used in the annotated class/file lists if no brief
* description is given.
*/
QCString trNoDescriptionAvailable()
{ return "Descrizione non disponibile"; }
// index titles (the project name is prepended for these)
/*! This is used in HTML as the title of index.html. */
QCString trDocumentation()
{ return "Documentazione"; }
......@@ -495,12 +482,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
QCString trEnumerationTypeDocumentation()
{ return "Documentazione dei tipi enumerati"; }
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for enumeration values
*/
QCString trEnumerationValueDocumentation()
{ return "Documentazione dei valori dei tipi enumerati"; }
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for functions
*/
......@@ -555,18 +536,10 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
QCString trForInternalUseOnly()
{ return "Solo per uso interno."; }
/*! this text is generated when the \\reimp command is used. */
QCString trReimplementedForInternalReasons()
{ return "Reimplementato per motivi interni; l'API non è stata modificata.";}
/*! this text is generated when the \\warning command is used. */
QCString trWarning()
{ return "Avvertimento"; }
/*! this text is generated when the \\bug command is used. */
QCString trBugsAndLimitations()
{ return "Bug e limitazioni"; }
/*! this text is generated when the \\version command is used. */
QCString trVersion()
{ return "Versione"; }
......@@ -846,10 +819,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
// new since 0.49-991003
//////////////////////////////////////////////////////////////////////////
QCString trSources()
{
return "Sorgenti";
}
QCString trDefinedAtLineInSourceFile()
{
return "Definizione alla linea @0 del file @1.";
......@@ -1142,11 +1111,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
// new since 1.2.4
//////////////////////////////////////////////////////////////////////////
/*! Used for Java interfaces in the summary section of Java packages */
virtual QCString trInterfaces()
{
return "Interfacce";
}
/*! Used for Java classes in the summary section of Java packages */
virtual QCString trClasses()
{
......@@ -1179,11 +1143,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
{
return "Package";
}
/*! Used as a chapter title for Latex & RTF output */
virtual QCString trPackageDocumentation()
{
return "Documentazione dei package";
}
/*! Text shown before a multi-line define */
virtual QCString trDefineValue()
{
......@@ -1291,17 +1250,6 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
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
* be followed by a single name or by a list of names
* of the category.
......@@ -1562,6 +1510,20 @@ class TranslatorItalian : public TranslatorAdapter_1_4_1
return result;
}
//////////////////////////////////////////////////////////////////////////
// new since 1.4.1
//////////////////////////////////////////////////////////////////////////
/*! This text is added to the documentation when the \\overload command
* is used for a overloaded function.
*/
virtual QCString trOverloadText()
{
return "Questa è una funzione membro sovraccaricata (overloaded), "
"fornita per comodità. Differisce dalla funzione di cui sopra"
"unicamente per gli argomenti passati.";
}
};
#endif
src/translator_kr.h
View file @ c8be4837
This diff is collapsed.
src/util.cpp
View file @ c8be4837
......@@ -1388,7 +1388,7 @@ void linkifyText(const TextGeneratorIntf &out,Definition *scope,
bool keepSpaces)
{
//printf("`%s'\n",text);
static QRegExp regExp("[a-z_A-Z][a-z_A-Z0-9.:]*");
static QRegExp regExp("[a-z_A-Z][~a-z_A-Z0-9.:]*");
QCString txtStr=text;
int strLen = txtStr.length();
//printf("linkifyText scope=%s fileScope=%s strtxt=%s strlen=%d\n",
......@@ -1718,7 +1718,7 @@ QCString getFileFilter(const char* name)
// compare the file name to the filter pattern list
QStrListIterator sli(filterList);
char* filterStr;
for(sli.toFirst(); (filterStr = sli.current()); ++sli)
for (sli.toFirst(); (filterStr = sli.current()); ++sli)
{
QCString fs = filterStr;
int i_equals=fs.find('=');
......@@ -4256,7 +4256,7 @@ QCString convertToHtml(const char *s)
/*! Returns the standard string that is generated when the \\overload
* command is used.
*/
const char *getOverloadDocs()
QCString getOverloadDocs()
{
return theTranslator->trOverloadText();
//"This is an overloaded member function, "
......
src/util.h
View file @ c8be4837
......@@ -180,7 +180,7 @@ QCString stripScope(const char *name);
int iSystem(const char *command,const char *args,bool isBatchFile=FALSE);
QCString convertToHtml(const char *s);
QCString convertToXML(const char *s);
const char * getOverloadDocs();
QCString getOverloadDocs();
void addMembersToMemberGroup(MemberList *ml,
MemberGroupSDict *memberGroupSDict,
Definition *context);
......
src/xmldocvisitor.cpp
View file @ c8be4837
......@@ -767,9 +767,11 @@ void XmlDocVisitor::visitPre(DocParamList *pl)
if (m_hide) return;
m_t << "<parameteritem>" << endl;
m_t << "<parameternamelist>" << endl;
QStrListIterator li(pl->parameters());
const char *s;
for (li.toFirst();(s=li.current());++li)
//QStrListIterator li(pl->parameters());
//const char *s;
QListIterator<DocNode> li(pl->parameters());
DocNode *param;
for (li.toFirst();(param=li.current());++li)
{
m_t << "<parametername";
if (pl->direction()!=DocParamSect::Unspecified)
......@@ -790,7 +792,14 @@ void XmlDocVisitor::visitPre(DocParamList *pl)
m_t << "\"";
}
m_t << ">";
filter(s);
if (param->kind()==DocNode::Kind_Word)
{
visit((DocWord*)param);
}
else if (param->kind()==DocNode::Kind_LinkedWord)
{
visit((DocLinkedWord*)param);
}
m_t << "</parametername>" << endl;
}
m_t << "</parameternamelist>" << endl;
......
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