Commit 80108293 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Release-1.3.2

parent dae59054
...@@ -72,6 +72,7 @@ EXCLUDE = src/code.cpp \ ...@@ -72,6 +72,7 @@ EXCLUDE = src/code.cpp \
src/suffixtree.h \ src/suffixtree.h \
src/searchindex.cpp \ src/searchindex.cpp \
src/searchindex.h \ src/searchindex.h \
src/commentcnv.cpp
EXCLUDE_PATTERNS = EXCLUDE_PATTERNS =
EXAMPLE_PATH = EXAMPLE_PATH =
EXAMPLE_PATTERNS = EXAMPLE_PATTERNS =
......
DOXYGEN Version 1.3.1-20030609 DOXYGEN Version 1.3.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 (09 June 2003) Dimitri van Heesch (15 June 2003)
DOXYGEN Version 1.3.1_20030609 DOXYGEN Version 1.3.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) (09 June 2003) Dimitri van Heesch (dimitri@stack.nl) (15 June 2003)
1.3.1-20030609 1.3.2
...@@ -1411,9 +1411,9 @@ TAGFILES = file1=loc1 "file2 = loc2" ... </pre> ...@@ -1411,9 +1411,9 @@ TAGFILES = file1=loc1 "file2 = loc2" ... </pre>
If the \c CLASS_DIAGRAMS tag is set to \c YES (the default) doxygen will If the \c CLASS_DIAGRAMS tag is set to \c YES (the default) doxygen will
generate a class diagram (in HTML and \f$\mbox{\LaTeX}\f$) for classes with base or generate a class diagram (in HTML and \f$\mbox{\LaTeX}\f$) for classes with base or
super classes. Setting the tag to \c NO turns the diagrams off. super classes. Setting the tag to \c NO turns the diagrams off.
Note that this option is superseded by the HAVE_DOT option below. Note that this option is superceded by the HAVE_DOT option below.
This is only a fallback. It is recommended to install and use dot, This is only a fallback. It is recommended to install and use dot,
since it yield more powerful graphs. since it yields more powerful graphs.
\anchor cfg_have_dot \anchor cfg_have_dot
<dt>\c HAVE_DOT <dd> <dt>\c HAVE_DOT <dd>
......
...@@ -41,7 +41,7 @@ reasons to not include all sources for these with every run of doxygen: ...@@ -41,7 +41,7 @@ reasons to not include all sources for these with every run of doxygen:
copy of it with your project's documentation. When the author forbids copy of it with your project's documentation. When the author forbids
redistribution, this is necessary. If the author requires compliance redistribution, this is necessary. If the author requires compliance
with some license condition as a precondition of redistribution, and with some license condition as a precondition of redistribution, and
you do now want to be bound by those conditions, referring to their you do not want to be bound by those conditions, referring to their
copy of their documentation is preferable to including a copy. copy of their documentation is preferable to including a copy.
</dl> </dl>
...@@ -126,8 +126,8 @@ if you want to create a tag file for the Qt documentation. ...@@ -126,8 +126,8 @@ if you want to create a tag file for the Qt documentation.
The tool \c doxytag depends on the particular structure The tool \c doxytag depends on the particular structure
of the generated output and on some special markers that are generated by of the generated output and on some special markers that are generated by
doxygen. Since this type of extraction is brittle and error prone I doxygen. Since this type of extraction is brittle and error-prone I
suggest you to only use this approach if there is no alternative. The suggest you only use this approach if there is no alternative. The
doxytag tool may even become obsolete in the future. doxytag tool may even become obsolete in the future.
\htmlonly \htmlonly
......
...@@ -195,15 +195,15 @@ remove the % and keep the word unlinked. ...@@ -195,15 +195,15 @@ remove the % and keep the word unlinked.
No, not as such; doxygen needs to understand the structure of what it reads. No, not as such; doxygen needs to understand the structure of what it reads.
If you don't mind spending some time on it, there are several options: If you don't mind spending some time on it, there are several options:
- If the grammer of X is close to C or C++, then it is probably not too hard to - If the grammar of X is close to C or C++, then it is probably not too hard to
tweak src/scanner.l a bit so the language is supported. This is done tweak src/scanner.l a bit so the language is supported. This is done
for all other languages directly supported by doxygen for all other languages directly supported by doxygen
(i.e. Java, IDL, C#, PHP). (i.e. Java, IDL, C#, PHP).
- If the grammer of X is somewhat different than you can write an input - If the grammar of X is somewhat different than you can write an input
filter that translates X into something similar enough to C/C++ for filter that translates X into something similar enough to C/C++ for
doxygen to understand (this approach is taken for VB, Object Pascal, and doxygen to understand (this approach is taken for VB, Object Pascal, and
Javascript, see http://www.stack.nl/~dimitri/doxygen/download.html#helpers). Javascript, see http://www.stack.nl/~dimitri/doxygen/download.html#helpers).
- If the grammer is completely different one could write a parser for X and - If the grammar is completely different one could write a parser for X and
write a backend that produces a similar syntax tree as is done by write a backend that produces a similar syntax tree as is done by
src/scanner.l (and also by src/tagreader.cpp while reading tag files). src/scanner.l (and also by src/tagreader.cpp while reading tag files).
...@@ -218,8 +218,8 @@ where this might happen is if you have lines in your code with more than ...@@ -218,8 +218,8 @@ where this might happen is if you have lines in your code with more than
16K characters. 16K characters.
If you have run into such a case and want me to fix it, you If you have run into such a case and want me to fix it, you
should send me a code fragment that triggers the message. The workaround should send me a code fragment that triggers the message. To work around
the problem put some line-breaks into your file, split it up into smaller the problem, put some line-breaks into your file, split it up into smaller
parts, or exclude it from the input using EXCLUDE. parts, or exclude it from the input using EXCLUDE.
<li><b>When running make in the latex dir I get "TeX capacity exceeded". Now what?</b> <li><b>When running make in the latex dir I get "TeX capacity exceeded". Now what?</b>
......
...@@ -25,7 +25,7 @@ Doxygen has built-in support for multiple languages. This means ...@@ -25,7 +25,7 @@ Doxygen has built-in support for multiple languages. This means
that the text fragments that doxygen generates can be produced in that the text fragments that doxygen generates can be produced in
languages other than English (the default) at configuration time. languages other than English (the default) at configuration time.
Currently (version 1.3-20030430), 28 languages Currently (version 1.3.1-20030609), 28 languages
are supported (sorted alphabetically): are supported (sorted alphabetically):
Brazilian Portuguese, Catalan, Chinese, Chinese Traditional, Croatian, Brazilian Portuguese, Catalan, Chinese, Chinese Traditional, Croatian,
Czech, Danish, Dutch, English, Finnish, Czech, Danish, Dutch, English, Finnish,
...@@ -55,7 +55,7 @@ when the translator was updated. ...@@ -55,7 +55,7 @@ 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>chino@NOSPAM.icmc.sc.usp.br</TD> <TD>chino@NOSPAM.icmc.sc.usp.br</TD>
<TD>up-to-date</TD> <TD>1.3.1</TD>
</TR> </TR>
<TR BGCOLOR="#ffffff"> <TR BGCOLOR="#ffffff">
<TD>Catalan</TD> <TD>Catalan</TD>
...@@ -79,7 +79,7 @@ when the translator was updated. ...@@ -79,7 +79,7 @@ when the translator was updated.
<TD>Croatian</TD> <TD>Croatian</TD>
<TD>Boris Bralo</TD> <TD>Boris Bralo</TD>
<TD>boris.bralo@NOSPAM.zg.tel.hr</TD> <TD>boris.bralo@NOSPAM.zg.tel.hr</TD>
<TD>up-to-date</TD> <TD>1.3.1</TD>
</TR> </TR>
<TR BGCOLOR="#ffffff"> <TR BGCOLOR="#ffffff">
<TD>Czech</TD> <TD>Czech</TD>
...@@ -115,13 +115,13 @@ when the translator was updated. ...@@ -115,13 +115,13 @@ when the translator was updated.
<TD>French</TD> <TD>French</TD>
<TD>Xavier Outhier</TD> <TD>Xavier Outhier</TD>
<TD>xouthier@NOSPAM.yahoo.fr</TD> <TD>xouthier@NOSPAM.yahoo.fr</TD>
<TD>up-to-date</TD> <TD>1.3.1</TD>
</TR> </TR>
<TR BGCOLOR="#ffffff"> <TR BGCOLOR="#ffffff">
<TD>German</TD> <TD>German</TD>
<TD>Jens Seidel</TD> <TD>Jens Seidel</TD>
<TD>jensseidel@NOSPAM.users.sf.net</TD> <TD>jensseidel@NOSPAM.users.sf.net</TD>
<TD>up-to-date</TD> <TD>1.3.1</TD>
</TR> </TR>
<TR BGCOLOR="#ffffff"> <TR BGCOLOR="#ffffff">
<TD>Greek</TD> <TD>Greek</TD>
...@@ -169,7 +169,7 @@ when the translator was updated. ...@@ -169,7 +169,7 @@ when the translator was updated.
<TD>Portuguese</TD> <TD>Portuguese</TD>
<TD>Rui Godinho Lopes</TD> <TD>Rui Godinho Lopes</TD>
<TD>ruiglopes@NOSPAM.yahoo.com</TD> <TD>ruiglopes@NOSPAM.yahoo.com</TD>
<TD>1.2.18</TD> <TD>1.3.1</TD>
</TR> </TR>
<TR BGCOLOR="#ffffff"> <TR BGCOLOR="#ffffff">
<TD>Romanian</TD> <TD>Romanian</TD>
...@@ -230,7 +230,7 @@ when the translator was updated. ...@@ -230,7 +230,7 @@ when the translator was updated.
{\bf Language} & {\bf Maintainer} & {\bf Contact address} & {\bf Status} \\ {\bf Language} & {\bf Maintainer} & {\bf Contact address} & {\bf Status} \\
\hline \hline
\hline \hline
Brazilian Portuguese & Fabio "FJTC" Jun Takada Chino & {\tt chino@icmc.sc.usp.br} & up-to-date \\ Brazilian Portuguese & Fabio "FJTC" Jun Takada Chino & {\tt chino@icmc.sc.usp.br} & 1.3.1 \\
\hline \hline
Catalan & Albert Mora & {\tt amora@iua.upf.es} & 1.2.17 \\ Catalan & Albert Mora & {\tt amora@iua.upf.es} & 1.2.17 \\
\hline \hline
...@@ -239,7 +239,7 @@ when the translator was updated. ...@@ -239,7 +239,7 @@ when the translator was updated.
\hline \hline
Chinese Traditional & Gary Lee & {\tt garylee@ecosine.com.tw} & 1.2.16 \\ Chinese Traditional & Gary Lee & {\tt garylee@ecosine.com.tw} & 1.2.16 \\
\hline \hline
Croatian & Boris Bralo & {\tt boris.bralo@zg.tel.hr} & up-to-date \\ Croatian & Boris Bralo & {\tt boris.bralo@zg.tel.hr} & 1.3.1 \\
\hline \hline
Czech & Petr P\v{r}ikryl & {\tt prikrylp@skil.cz} & up-to-date \\ Czech & Petr P\v{r}ikryl & {\tt prikrylp@skil.cz} & up-to-date \\
\hline \hline
...@@ -251,9 +251,9 @@ when the translator was updated. ...@@ -251,9 +251,9 @@ when the translator was updated.
\hline \hline
Finnish & Olli Korhonen & {\tt Olli.Korhonen@ccc.fi} & obsolete \\ Finnish & Olli Korhonen & {\tt Olli.Korhonen@ccc.fi} & obsolete \\
\hline \hline
French & Xavier Outhier & {\tt xouthier@yahoo.fr} & up-to-date \\ French & Xavier Outhier & {\tt xouthier@yahoo.fr} & 1.3.1 \\
\hline \hline
German & Jens Seidel & {\tt jensseidel@users.sf.net} & up-to-date \\ German & Jens Seidel & {\tt jensseidel@users.sf.net} & 1.3.1 \\
\hline \hline
Greek & Harry Kalogirou & {\tt harkal@rainbow.cs.unipi.gr} & 1.2.11 \\ Greek & Harry Kalogirou & {\tt harkal@rainbow.cs.unipi.gr} & 1.2.11 \\
\hline \hline
...@@ -272,7 +272,7 @@ when the translator was updated. ...@@ -272,7 +272,7 @@ when the translator was updated.
Polish & Piotr Kaminski & {\tt Piotr.Kaminski@ctm.gdynia.pl} & strange \\ Polish & Piotr Kaminski & {\tt Piotr.Kaminski@ctm.gdynia.pl} & strange \\
& Grzegorz Kowal & {\tt g\_kowal@poczta.onet.pl} & \\ & Grzegorz Kowal & {\tt g\_kowal@poczta.onet.pl} & \\
\hline \hline
Portuguese & Rui Godinho Lopes & {\tt ruiglopes@yahoo.com} & 1.2.18 \\ Portuguese & Rui Godinho Lopes & {\tt ruiglopes@yahoo.com} & 1.3.1 \\
\hline \hline
Romanian & Alexandru Iosup & {\tt aiosup@yahoo.com} & 1.2.16 \\ Romanian & Alexandru Iosup & {\tt aiosup@yahoo.com} & 1.2.16 \\
\hline \hline
......
Summary: A documentation system for C/C++. Summary: A documentation system for C/C++.
Name: doxygen Name: doxygen
Version: 1.3.1_20030609 Version: 1.3.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
......
...@@ -41,8 +41,9 @@ ...@@ -41,8 +41,9 @@
//#define DBG_CTX(x) fprintf x //#define DBG_CTX(x) fprintf x
#define DBG_CTX(x) do { } while(0) #define DBG_CTX(x) do { } while(0)
#define SCOPEBLOCK (int *)4 #define CLASSBLOCK (int *)4
#define INNERBLOCK (int *)8 #define SCOPEBLOCK (int *)8
#define INNERBLOCK (int *)12
/* ----------------------------------------------------------------- /* -----------------------------------------------------------------
* statics * statics
...@@ -525,7 +526,7 @@ static ClassDef *stripClassName(const char *s) ...@@ -525,7 +526,7 @@ static ClassDef *stripClassName(const char *s)
static MemberDef *setCallContextForVar(const QCString &name) static MemberDef *setCallContextForVar(const QCString &name)
{ {
if (name.isEmpty()) return 0; if (name.isEmpty()) return 0;
//printf("setCallContextForVar(%s)\n",name.data()); //printf("setCallContextForVar(%s) g_classScope=%s\n",name.data(),g_classScope.data());
int scopeEnd = name.findRev("::"); int scopeEnd = name.findRev("::");
if (scopeEnd!=-1) // name with explicit scope if (scopeEnd!=-1) // name with explicit scope
...@@ -550,6 +551,7 @@ static MemberDef *setCallContextForVar(const QCString &name) ...@@ -550,6 +551,7 @@ static MemberDef *setCallContextForVar(const QCString &name)
ClassDef *mcd = g_theVarContext.findVariable(name); ClassDef *mcd = g_theVarContext.findVariable(name);
if (mcd) // local variable if (mcd) // local variable
{ {
//printf("local variable\n");
if (mcd!=VariableContext::dummyContext) if (mcd!=VariableContext::dummyContext)
{ {
//printf("local var `%s' mcd=%s\n",name.data(),mcd->name().data()); //printf("local var `%s' mcd=%s\n",name.data(),mcd->name().data());
...@@ -565,7 +567,11 @@ static MemberDef *setCallContextForVar(const QCString &name) ...@@ -565,7 +567,11 @@ static MemberDef *setCallContextForVar(const QCString &name)
MemberDef *md=mcd->getMemberByName(name); MemberDef *md=mcd->getMemberByName(name);
if (md) if (md)
{ {
g_theCallContext.setClass(stripClassName(md->typeString())); if (g_scopeStack.top()!=CLASSBLOCK)
{
//printf("class member `%s' mcd=%s\n",name.data(),mcd->name().data());
g_theCallContext.setClass(stripClassName(md->typeString()));
}
return md; return md;
} }
} }
...@@ -1146,7 +1152,8 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned" ...@@ -1146,7 +1152,8 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
<Body,MemberCall,MemberCall2>"}" { <Body,MemberCall,MemberCall2>"}" {
g_theVarContext.popScope(); g_theVarContext.popScope();
if (g_scopeStack.pop()==SCOPEBLOCK) int *scope = g_scopeStack.pop();
if (scope==SCOPEBLOCK || scope==CLASSBLOCK)
{ {
popScope(); popScope();
} }
...@@ -1221,7 +1228,7 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned" ...@@ -1221,7 +1228,7 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
if (g_insideBody) g_bodyCurlyCount++; if (g_insideBody) g_bodyCurlyCount++;
if (!g_curClassName.isEmpty()) // valid class name if (!g_curClassName.isEmpty()) // valid class name
{ {
g_scopeStack.push(SCOPEBLOCK); g_scopeStack.push(CLASSBLOCK);
pushScope(g_curClassName); pushScope(g_curClassName);
//printf("***** g_curClassName=%s\n",g_curClassName.data()); //printf("***** g_curClassName=%s\n",g_curClassName.data());
if (getResolvedClass(g_currentDefinition,g_curClassName)==0) if (getResolvedClass(g_currentDefinition,g_curClassName)==0)
...@@ -1509,7 +1516,10 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned" ...@@ -1509,7 +1516,10 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
g_saveType = g_type.copy(); g_saveType = g_type.copy();
if (!g_type.isEmpty()) if (!g_type.isEmpty())
{ {
g_theVarContext.addVariable(g_type,g_name); if (g_scopeStack.top()!=CLASSBLOCK)
{
g_theVarContext.addVariable(g_type,g_name);
}
g_name.resize(0); g_name.resize(0);
} }
if (*yytext==';') if (*yytext==';')
...@@ -1903,6 +1913,7 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned" ...@@ -1903,6 +1913,7 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
} }
} }
<*>"//"[!/][^\n]*\n { // strip special one-line comment <*>"//"[!/][^\n]*\n { // strip special one-line comment
if (YY_START==SkipComment) REJECT;
if (Config_getBool("STRIP_CODE_COMMENTS")) if (Config_getBool("STRIP_CODE_COMMENTS"))
{ {
char c[2]; c[0]='\n'; c[1]=0; char c[2]; c[0]='\n'; c[1]=0;
......
...@@ -2433,8 +2433,8 @@ void Config::create() ...@@ -2433,8 +2433,8 @@ void Config::create()
"If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will \n" "If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will \n"
"generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or \n" "generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or \n"
"super classes. Setting the tag to NO turns the diagrams off. Note that this \n" "super classes. Setting the tag to NO turns the diagrams off. Note that this \n"
"option is superseded by the HAVE_DOT option below. This is only a fallback. It is \n" "option is superceded by the HAVE_DOT option below. This is only a fallback. It is \n"
"recommended to install and use dot, since it yield more powerful graphs. \n", "recommended to install and use dot, since it yields more powerful graphs. \n",
TRUE TRUE
); );
cb = addBool( cb = addBool(
......
...@@ -3435,6 +3435,13 @@ void DocPara::handleSection(const QString &cmdName) ...@@ -3435,6 +3435,13 @@ void DocPara::handleSection(const QString &cmdName)
doctokenizerYYsetStatePara(); doctokenizerYYsetStatePara();
} }
int DocPara::handleHtmlHeader(const HtmlAttribList &tagHtmlAttribs,int level)
{
DocHtmlHeader *header = new DocHtmlHeader(this,tagHtmlAttribs,level);
m_children.append(header);
int retval = header->parse();
return (retval==RetVal_OK) ? TK_NEWPARA : retval;
}
int DocPara::handleCommand(const QString &cmdName) int DocPara::handleCommand(const QString &cmdName)
{ {
...@@ -3930,46 +3937,22 @@ int DocPara::handleHtmlStartTag(const QString &tagName,const HtmlAttribList &tag ...@@ -3930,46 +3937,22 @@ int DocPara::handleHtmlStartTag(const QString &tagName,const HtmlAttribList &tag
} }
break; break;
case HTML_H1: case HTML_H1:
{ retval=handleHtmlHeader(tagHtmlAttribs,1);
DocHtmlHeader *header = new DocHtmlHeader(this,tagHtmlAttribs,1);
m_children.append(header);
retval = header->parse();
}
break; break;
case HTML_H2: case HTML_H2:
{ retval=handleHtmlHeader(tagHtmlAttribs,2);
DocHtmlHeader *header = new DocHtmlHeader(this,tagHtmlAttribs,2);
m_children.append(header);
retval = header->parse();
}
break; break;
case HTML_H3: case HTML_H3:
{ retval=handleHtmlHeader(tagHtmlAttribs,3);
DocHtmlHeader *header = new DocHtmlHeader(this,tagHtmlAttribs,3);
m_children.append(header);
retval = header->parse();
}
break; break;
case HTML_H4: case HTML_H4:
{ retval=handleHtmlHeader(tagHtmlAttribs,4);
DocHtmlHeader *header = new DocHtmlHeader(this,tagHtmlAttribs,4);
m_children.append(header);
retval = header->parse();
}
break; break;
case HTML_H5: case HTML_H5:
{ retval=handleHtmlHeader(tagHtmlAttribs,5);
DocHtmlHeader *header = new DocHtmlHeader(this,tagHtmlAttribs,5);
m_children.append(header);
retval = header->parse();
}
break; break;
case HTML_H6: case HTML_H6:
{ retval=handleHtmlHeader(tagHtmlAttribs,6);
DocHtmlHeader *header = new DocHtmlHeader(this,tagHtmlAttribs,6);
m_children.append(header);
retval = header->parse();
}
break; break;
case HTML_IMG: case HTML_IMG:
{ {
......
...@@ -940,6 +940,7 @@ class DocPara : public CompAccept<DocPara>, public DocNode ...@@ -940,6 +940,7 @@ class DocPara : public CompAccept<DocPara>, public DocNode
void handleLink(const QString &cmdName,bool isJavaLink); void handleLink(const QString &cmdName,bool isJavaLink);
void handleRef(const QString &cmdName); void handleRef(const QString &cmdName);
void handleSection(const QString &cmdName); void handleSection(const QString &cmdName);
int handleHtmlHeader(const HtmlAttribList &tagHtmlAttribs,int level);
int handleLanguageSwitch(); int handleLanguageSwitch();
private: private:
......
...@@ -48,20 +48,20 @@ static const char *defaultStyleSheet = ...@@ -48,20 +48,20 @@ static const char *defaultStyleSheet =
"}\n" "}\n"
"CAPTION { font-weight: bold }\n" "CAPTION { font-weight: bold }\n"
"DIV.qindex { width: 100%;\n" "DIV.qindex { width: 100%;\n"
" background-color: #ddddee;\n" " background-color: #eeeeff;\n"
" border: 4px solid #ddddee;\n" " border: 4px solid #eeeeff;\n"
" text-align: center;\n" " text-align: center;\n"
" margin-bottom: 2px\n" " margin-bottom: 2px\n"
"}\n" "}\n"
"A.qindex { text-decoration: none; font-weight: bold; }\n" "A.qindex { text-decoration: none; font-weight: bold; }\n"
"A.qindex:hover { text-decoration: none; background-color: #ccccee }\n" "A.qindex:hover { text-decoration: none; background-color: #ddddff }\n"
"A.qindexHL { text-decoration: none; font-weight: bold;\n" "A.qindexHL { text-decoration: none; font-weight: bold;\n"
" background-color: #6666cc;\n" " background-color: #6666cc;\n"
" color: #ffffff\n" " color: #ffffff\n"
" }\n" " }\n"
"A.qindexHL:hover { text-decoration: none; background-color: #6666cc }\n" "A.qindexHL:hover { text-decoration: none; background-color: #6666cc }\n"
"A.qindexRef { text-decoration: none; font-weight: bold; }\n" "A.qindexRef { text-decoration: none; font-weight: bold; }\n"
"A.qindexRef:hover { text-decoration: none; background-color: #ccccee }\n" "A.qindexRef:hover { text-decoration: none; background-color: #ddddff }\n"
"A.qindexRefHL { text-decoration: none; font-weight: bold;\n" "A.qindexRefHL { text-decoration: none; font-weight: bold;\n"
" background-color: #6666cc;\n" " background-color: #6666cc;\n"
" color: #ffffff\n" " color: #ffffff\n"
......
...@@ -358,7 +358,7 @@ void writeQuickLinks(OutputList &ol,bool compact,HighlightedItem hli,bool ext=FA ...@@ -358,7 +358,7 @@ void writeQuickLinks(OutputList &ol,bool compact,HighlightedItem hli,bool ext=FA
ol.parseText(fixSpaces(theTranslator->trNamespaceMembers())); ol.parseText(fixSpaces(theTranslator->trNamespaceMembers()));
endQuickIndexItem(ol); endQuickIndexItem(ol);
} }
if (documentedClassMembers>0) if (documentedClassMembers[CMHL_All]>0)
{ {
if (!compact) ol.writeListItem(); if (!compact) ol.writeListItem();
startQuickIndexItem(ol,extLink,"functions"+Doxygen::htmlFileExtension, startQuickIndexItem(ol,extLink,"functions"+Doxygen::htmlFileExtension,
...@@ -1900,29 +1900,31 @@ static void writeMemberIndexFiltered(OutputList &ol, ...@@ -1900,29 +1900,31 @@ static void writeMemberIndexFiltered(OutputList &ol,
ol.writeString(fixSpaces(theTranslator->trRelatedFunctions())); ol.writeString(fixSpaces(theTranslator->trRelatedFunctions()));
endQuickIndexItem(ol); endQuickIndexItem(ol);
} }
ol.writeString("</div><p>\n"); ol.writeString("</div>\n");
bool quickIndex = documentedClassMembers[hl]>maxItemsBeforeQuickIndex; bool quickIndex = documentedClassMembers[hl]>maxItemsBeforeQuickIndex;
if (quickIndex) if (quickIndex)
{ {
writeQuickMemberIndex(ol,g_memberIndexLetterUsed[hl]); writeQuickMemberIndex(ol,g_memberIndexLetterUsed[hl]);
} }
bool &generateHtml = Config_getBool("GENERATE_HTML") ; ol.newParagraph();
bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP"); if (hl==CMHL_All)
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
if (hasHtmlHelp)
{
HtmlHelp *htmlHelp = HtmlHelp::getInstance();
htmlHelp->addContentsItem(FALSE,htmlHelpTitle,"functions");
}
if (hasFtvHelp)
{ {
FTVHelp *ftvHelp = FTVHelp::getInstance(); bool &generateHtml = Config_getBool("GENERATE_HTML") ;
ftvHelp->addContentsItem(FALSE,0,"functions",0,ftvHelpTitle); bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
if (hasHtmlHelp)
{
HtmlHelp *htmlHelp = HtmlHelp::getInstance();
htmlHelp->addContentsItem(FALSE,htmlHelpTitle,"functions");
}
if (hasFtvHelp)
{
FTVHelp *ftvHelp = FTVHelp::getInstance();
ftvHelp->addContentsItem(FALSE,0,"functions",0,ftvHelpTitle);
}
ol.parseText(theTranslator->trCompoundMembersDescription(Config_getBool("EXTRACT_ALL")));
} }
if (hl==CMHL_All) ol.parseText(theTranslator->trCompoundMembersDescription(Config_getBool("EXTRACT_ALL")));
writeMemberList(ol,quickIndex,hl); writeMemberList(ol,quickIndex,hl);
endFile(ol); endFile(ol);
ol.popGeneratorState(); ol.popGeneratorState();
...@@ -2262,7 +2264,7 @@ static void writeFileMemberIndexFiltered(OutputList &ol, ...@@ -2262,7 +2264,7 @@ static void writeFileMemberIndexFiltered(OutputList &ol,
ol.writeString(fixSpaces(theTranslator->trDefines())); ol.writeString(fixSpaces(theTranslator->trDefines()));
endQuickIndexItem(ol); endQuickIndexItem(ol);
} }
ol.writeString("</div><p>\n"); ol.writeString("</div>\n");
bool quickIndex = documentedFileMembers[hl]>maxItemsBeforeQuickIndex; bool quickIndex = documentedFileMembers[hl]>maxItemsBeforeQuickIndex;
...@@ -2270,20 +2272,24 @@ static void writeFileMemberIndexFiltered(OutputList &ol, ...@@ -2270,20 +2272,24 @@ static void writeFileMemberIndexFiltered(OutputList &ol,
{ {
writeQuickMemberIndex(ol,g_fileIndexLetterUsed[hl]); writeQuickMemberIndex(ol,g_fileIndexLetterUsed[hl]);
} }
bool &generateHtml = Config_getBool("GENERATE_HTML") ; ol.newParagraph();
bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP"); if (hl==FMHL_All)
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
if (hasHtmlHelp)
{
HtmlHelp *htmlHelp = HtmlHelp::getInstance();
htmlHelp->addContentsItem(FALSE,htmlHelpTitle,"globals");
}
if (hasFtvHelp)
{ {
FTVHelp *ftvHelp = FTVHelp::getInstance(); bool &generateHtml = Config_getBool("GENERATE_HTML") ;
ftvHelp->addContentsItem(FALSE,0,"globals",0,ftvHelpTitle); bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
if (hasHtmlHelp)
{
HtmlHelp *htmlHelp = HtmlHelp::getInstance();
htmlHelp->addContentsItem(FALSE,htmlHelpTitle,"globals");
}
if (hasFtvHelp)
{
FTVHelp *ftvHelp = FTVHelp::getInstance();
ftvHelp->addContentsItem(FALSE,0,"globals",0,ftvHelpTitle);
}
ol.parseText(theTranslator->trFileMembersDescription(Config_getBool("EXTRACT_ALL")));
} }
if (hl==FMHL_All) ol.parseText(theTranslator->trFileMembersDescription(Config_getBool("EXTRACT_ALL")));
writeFileMemberList(ol,quickIndex,hl); writeFileMemberList(ol,quickIndex,hl);
endFile(ol); endFile(ol);
ol.popGeneratorState(); ol.popGeneratorState();
...@@ -2363,27 +2369,31 @@ static void writeNamespaceMemberIndexFiltered(OutputList &ol, ...@@ -2363,27 +2369,31 @@ static void writeNamespaceMemberIndexFiltered(OutputList &ol,
ol.writeString(fixSpaces(theTranslator->trEnumerationValues())); ol.writeString(fixSpaces(theTranslator->trEnumerationValues()));
endQuickIndexItem(ol); endQuickIndexItem(ol);
} }
ol.writeString("</div><p>\n"); ol.writeString("</div>\n");
bool quickIndex = documentedNamespaceMembers[hl]>maxItemsBeforeQuickIndex; bool quickIndex = documentedNamespaceMembers[hl]>maxItemsBeforeQuickIndex;
if (quickIndex) if (quickIndex)
{ {
writeQuickMemberIndex(ol,g_namespaceIndexLetterUsed[hl]); writeQuickMemberIndex(ol,g_namespaceIndexLetterUsed[hl]);
} }
bool &generateHtml = Config_getBool("GENERATE_HTML") ; ol.newParagraph();
bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP"); if (hl==NMHL_All)
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
if (hasHtmlHelp)
{
HtmlHelp *htmlHelp = HtmlHelp::getInstance();
htmlHelp->addContentsItem(FALSE,htmlHelpTitle,"namespacemembers");
}
if (hasFtvHelp)
{ {
FTVHelp *ftvHelp = FTVHelp::getInstance(); bool &generateHtml = Config_getBool("GENERATE_HTML") ;
ftvHelp->addContentsItem(FALSE,0,"namespacemembers",0,ftvHelpTitle); bool hasHtmlHelp = generateHtml && Config_getBool("GENERATE_HTMLHELP");
bool hasFtvHelp = generateHtml && Config_getBool("GENERATE_TREEVIEW");
if (hasHtmlHelp)
{
HtmlHelp *htmlHelp = HtmlHelp::getInstance();
htmlHelp->addContentsItem(FALSE,htmlHelpTitle,"namespacemembers");
}
if (hasFtvHelp)
{
FTVHelp *ftvHelp = FTVHelp::getInstance();
ftvHelp->addContentsItem(FALSE,0,"namespacemembers",0,ftvHelpTitle);
}
ol.parseText(theTranslator->trNamespaceMemberDescription(Config_getBool("EXTRACT_ALL")));
} }
if (hl==NMHL_All) ol.parseText(theTranslator->trNamespaceMemberDescription(Config_getBool("EXTRACT_ALL")));
writeNamespaceMemberList(ol,quickIndex,hl); writeNamespaceMemberList(ol,quickIndex,hl);
endFile(ol); endFile(ol);
ol.popGeneratorState(); ol.popGeneratorState();
......
...@@ -3367,14 +3367,14 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;] ...@@ -3367,14 +3367,14 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
current->groupDocType = Entry::GROUPDOC_NORMAL; current->groupDocType = Entry::GROUPDOC_NORMAL;
BEGIN( GroupDocArg1 ); BEGIN( GroupDocArg1 );
} }
<Doc,JavaDoc>{B}*{CMD}"addtogroup"{B}+ { <Doc,PageDoc,ExampleDoc,JavaDoc>{B}*{CMD}"addtogroup"{B}+ {
current->section = Entry::GROUPDOC_SEC; current->section = Entry::GROUPDOC_SEC;
current->fileName = yyFileName; current->fileName = yyFileName;
current->startLine = yyLineNr; current->startLine = yyLineNr;
current->groupDocType = Entry::GROUPDOC_ADD; current->groupDocType = Entry::GROUPDOC_ADD;
BEGIN( GroupDocArg1 ); BEGIN( GroupDocArg1 );
} }
<Doc,JavaDoc>{B}*{CMD}"weakgroup"{B}+ { <Doc,PageDoc,ExampleDoc,JavaDoc>{B}*{CMD}"weakgroup"{B}+ {
current->section = Entry::GROUPDOC_SEC; current->section = Entry::GROUPDOC_SEC;
current->fileName = yyFileName; current->fileName = yyFileName;
current->startLine = yyLineNr; current->startLine = yyLineNr;
......
...@@ -20,18 +20,9 @@ ...@@ -20,18 +20,9 @@
// The first translation from English to Czech was started by // The first translation from English to Czech was started by
// Vlastimil Havran. He wrote: // Vlastimil Havran (1999--2000). The prototype version of Czech strings
// // with diacritics was implemented by Petr Prikryl (prikrylp@skil.cz),
// "In the cases where are more translations possible I hope // 2000/06/20. Vlastimil agreed that Petr be the new maintainer.
// that I have selected the most reasonable text. If not, please,
// mail the comments and text proposals to
//
// havran@fel.cvut.cz, 1999/04/11"
//
// The prototype version of Czech strings with diacritics was
// implemented by Petr Prikryl (prikrylp@skil.cz), 2000/06/20. As
// Vlastimil was quite busy at the time, he agreed that Petr be the
// maintainer for a while (from 2000/06/20).
// //
// Updates: // Updates:
// -------- // --------
...@@ -144,12 +135,10 @@ ...@@ -144,12 +135,10 @@
// 2002/07/29 // 2002/07/29
// - The new trDeprecatedList() implemented. // - The new trDeprecatedList() implemented.
// //
// 2002/10/15 // 2002/10/15 - The new trEvents() and trEventDocumentation() implemented.
// - The new trEvents() and trEventDocumentation() implemented. // 2003/04/28 - Five new methods "since 1.3" implemented.
// // 2003/06/10 - Two new methods "since 1.3.1" implemented.
// 2003/04/28
// - The five new methods "since 1.3" implemented.
//
// Todo // Todo
// ---- // ----
// - The trReimplementedFromList() should pass the kind of the // - The trReimplementedFromList() should pass the kind of the
...@@ -168,7 +157,7 @@ ...@@ -168,7 +157,7 @@
// Windows version. The version which does not call the function is // Windows version. The version which does not call the function is
// probably slightly faster. // probably slightly faster.
class TranslatorCzech : public TranslatorAdapter_1_3_1 class TranslatorCzech : public Translator
{ {
private: private:
/*! The decode() inline assumes the source written in the /*! The decode() inline assumes the source written in the
...@@ -1602,6 +1591,23 @@ class TranslatorCzech : public TranslatorAdapter_1_3_1 ...@@ -1602,6 +1591,23 @@ class TranslatorCzech : public TranslatorAdapter_1_3_1
return decode("Statické atributy balíku"); return decode("Statické atributy balíku");
} }
//////////////////////////////////////////////////////////////////////////
// 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 decode("Vše");
}
/*! Put in front of the call graph for a function. */
virtual QCString trCallGraph()
{
return decode("Graf volání této funkce:");
}
}; };
#endif // TRANSLATOR_CZ_H #endif // TRANSLATOR_CZ_H
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
* The translation into French was provided by * The translation into French was provided by
* Christophe Bordeux (bordeux@lig.di.epfl.ch) * Christophe Bordeux (bordeux@lig.di.epfl.ch)
* and after version 1.2.0 by Xavier Outhier (xouthier@yahoo.fr) * and after version 1.2.0 by Xavier Outhier (xouthier@yahoo.fr)
* member of the non for profit association D2SET (http://www.d2set.org, * member of the non for profit association D2SET (http://d2set.free.fr)
* d2set@d2set.org).
*/ */
/****************************************************************************** /******************************************************************************
...@@ -45,11 +44,17 @@ ...@@ -45,11 +44,17 @@
* -------------+------------------------------------------------------------ * -------------+------------------------------------------------------------
* 2003-03-29 | Update for new since 1.3 * 2003-03-29 | Update for new since 1.3
* -------------+------------------------------------------------------------ * -------------+------------------------------------------------------------
* 2003-03-29 | Changed fonction into méthode.
* -------------+------------------------------------------------------------
* 2003-06-06 | Fixed code page problem appeared between 1.42 and 1.43 in CVS
* -------------+------------------------------------------------------------
* 2003-06-10 | Update for new since 1.3.1
* -------------+------------------------------------------------------------
*/ */
#ifndef TRANSLATOR_FR_H #ifndef TRANSLATOR_FR_H
#define TRANSLATOR_FR_H #define TRANSLATOR_FR_H
class TranslatorFrench : public TranslatorAdapter_1_3_1 class TranslatorFrench : public Translator
{ {
public: public:
QCString idLanguage() QCString idLanguage()
...@@ -1320,14 +1325,14 @@ class TranslatorFrench : public TranslatorAdapter_1_3_1 ...@@ -1320,14 +1325,14 @@ class TranslatorFrench : public TranslatorAdapter_1_3_1
*/ */
virtual QCString trPackageMembers() virtual QCString trPackageMembers()
{ {
return "Fonctions de paquetage"; return "Méthodes de paquetage";
} }
/*! Used as a heading for a list of static Java class functions with /*! Used as a heading for a list of static Java class functions with
* package scope. * package scope.
*/ */
virtual QCString trStaticPackageMembers() virtual QCString trStaticPackageMembers()
{ {
return "Fonctions statiques de paquetage"; return "Méthodes statiques de paquetage";
} }
/*! Used as a heading for a list of Java class variables with package /*! Used as a heading for a list of Java class variables with package
* scope. * scope.
...@@ -1343,7 +1348,23 @@ class TranslatorFrench : public TranslatorAdapter_1_3_1 ...@@ -1343,7 +1348,23 @@ class TranslatorFrench : public TranslatorAdapter_1_3_1
{ {
return "Attributs statiques de paquetage"; return "Attributs statiques de paquetage";
} }
//////////////////////////////////////////////////////////////////////////
// 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 "Tout";
}
/*! Put in front of the call graph for a function. */
virtual QCString trCallGraph()
{
return "Voici le graphique d'appel pour cette fonction:";
}
}; };
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* *
* Revision history * Revision history
* *
* 2003/06: translated new items used since version 1.3.1
* 2003/04: translated new items used since version 1.3 * 2003/04: translated new items used since version 1.3
* 2002/11: translated new items used since version 1.2.18 * 2002/11: translated new items used since version 1.2.18
* 2002/08: translated new items used since version 1.2.17 * 2002/08: translated new items used since version 1.2.17
...@@ -68,7 +69,7 @@ ...@@ -68,7 +69,7 @@
#ifndef TRANSLATOR_IT_H #ifndef TRANSLATOR_IT_H
#define TRANSLATOR_IT_H #define TRANSLATOR_IT_H
class TranslatorItalian : public TranslatorAdapter_1_3_1 class TranslatorItalian : public Translator
{ {
public: public:
...@@ -1430,6 +1431,23 @@ class TranslatorItalian : public TranslatorAdapter_1_3_1 ...@@ -1430,6 +1431,23 @@ class TranslatorItalian : public TranslatorAdapter_1_3_1
return "Attributi statici con visibilità di package"; return "Attributi statici con visibilità di package";
} }
//////////////////////////////////////////////////////////////////////////
// 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 "Tutto";
}
/*! Put in front of the call graph for a function. */
virtual QCString trCallGraph()
{
return "Questo è il grafo delle chiamate per questa funzione:";
}
}; };
#endif #endif
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
* *
* VERSION HISTORY * VERSION HISTORY
* --------------- * ---------------
* 007 09 june 2003
* ! Updated for doxygen v1.3.1
* 006 30 july 2002 * 006 30 july 2002
* ! Updated for doxygen v1.2.17 * ! Updated for doxygen v1.2.17
* 005 10 july 2002 * 005 10 july 2002
...@@ -38,7 +40,7 @@ ...@@ -38,7 +40,7 @@
#ifndef TRANSLATOR_PT_H #ifndef TRANSLATOR_PT_H
#define TRANSLATOR_PT_H #define TRANSLATOR_PT_H
class TranslatorPortuguese : public TranslatorAdapter_1_2_18 class TranslatorPortuguese : public TranslatorAdapter_1_3_1
{ {
public: public:
...@@ -127,7 +129,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_2_18 ...@@ -127,7 +129,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_2_18
/*! 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 */
QCString trThisIsTheListOfAllMembers() QCString trThisIsTheListOfAllMembers()
{ return "Esta é a lista completa dos membros de "; } { return "Lista completa de todos os membros de "; }
/*! this is the remainder of the sentence after the class name */ /*! this is the remainder of the sentence after the class name */
QCString trIncludingInheritedMembers() QCString trIncludingInheritedMembers()
...@@ -268,7 +270,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_2_18 ...@@ -268,7 +270,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_2_18
{ {
result+=" documentadas"; result+=" documentadas";
} }
result+=" com links para "; result+=" com referência para ";
if (!extractAll) if (!extractAll)
{ {
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
...@@ -297,20 +299,20 @@ class TranslatorPortuguese : public TranslatorAdapter_1_2_18 ...@@ -297,20 +299,20 @@ class TranslatorPortuguese : public TranslatorAdapter_1_2_18
/*! This is an introduction to the page with all file members. */ /*! This is an introduction to the page with all file members. */
QCString trFileMembersDescription(bool extractAll) QCString trFileMembersDescription(bool extractAll)
{ {
QCString result="Lista de todas as "; QCString result="Lista de ";
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C")) if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{ {
result+="funções, variáveis, definições, enumerações e definições de tipo "; result+="todas as funções, variáveis, definições, enumerações e definições de tipo ";
if (!extractAll) result+="documentadas "; if (!extractAll) result+="documentadas ";
} }
else else
{ {
result+="ficheiros membro"; result+="todos os ficheiros membro ";
if (!extractAll) result+="documentados "; if (!extractAll) result+="documentados ";
} }
result+="com links para "; result+="com referência para ";
if (extractAll) if (extractAll)
result+="os ficheiro a que pertecem:"; result+="o ficheiro a que pertecem:";
else else
result+="a respectiva documentação:"; result+="a respectiva documentação:";
return result; return result;
...@@ -416,7 +418,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_2_18 ...@@ -416,7 +418,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_2_18
* list of defines * list of defines
*/ */
QCString trDefines() QCString trDefines()
{ return "Definição de macros"; } { return "Macros"; }
/*! 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 function prototypes * list of function prototypes
...@@ -740,7 +742,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_2_18 ...@@ -740,7 +742,7 @@ class TranslatorPortuguese : public TranslatorAdapter_1_2_18
QCString result="Lista "; QCString result="Lista ";
if (extractAll) result+="de todos os "; if (extractAll) result+="de todos os ";
else result+="de toda a documentação dos "; else result+="de toda a documentação dos ";
result+="membros do namespace com links para "; result+="membros do namespace com referência para ";
if (extractAll) if (extractAll)
result+="a documentação de cada membro:"; result+="a documentação de cada membro:";
else else
...@@ -1396,6 +1398,79 @@ class TranslatorPortuguese : public TranslatorAdapter_1_2_18 ...@@ -1396,6 +1398,79 @@ class TranslatorPortuguese : public TranslatorAdapter_1_2_18
return "Lista de Deprecados"; return "Lista de Deprecados";
} }
//////////////////////////////////////////////////////////////////////////
// new since 1.2.18
//////////////////////////////////////////////////////////////////////////
/*! Used as a header for declaration section of the events found in
* a C# program
*/
virtual QCString trEvents()
{
return "Eventos";
}
/*! Header used for the documentation section of a class' events. */
virtual QCString trEventDocumentation()
{
return "Documentação dos eventos";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.3
//////////////////////////////////////////////////////////////////////////
/*! Used as a heading for a list of Java class types with package scope.
*/
virtual QCString trPackageTypes()
{
return "Tipos do Pacote";
}
/*! Used as a heading for a list of Java class functions with package
* scope.
*/
virtual QCString trPackageMembers()
{
return "Funções do Pacote";
}
/*! Used as a heading for a list of static Java class functions with
* package scope.
*/
virtual QCString trStaticPackageMembers()
{
return "Funções Estáticas do Pacote";
}
/*! Used as a heading for a list of Java class variables with package
* scope.
*/
virtual QCString trPackageAttribs()
{
return "Atributos do Pacote";
}
/*! Used as a heading for a list of static Java class variables with
* package scope.
*/
virtual QCString trStaticPackageAttribs()
{
return "Atributos Estáticos do Pacote";
}
//////////////////////////////////////////////////////////////////////////
// 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 "Tudo";
}
/*! Put in front of the call graph for a function. */
virtual QCString trCallGraph()
{
return "Grafo de chamadas desta função:";
}
}; };
#endif #endif
...@@ -757,7 +757,7 @@ bool leftScopeMatch(const QCString &scope, const QCString &name) ...@@ -757,7 +757,7 @@ bool leftScopeMatch(const QCString &scope, const QCString &name)
void linkifyText(const TextGeneratorIntf &out,Definition *scope,const char * /*name*/,const char *text,bool autoBreak,bool external) void linkifyText(const TextGeneratorIntf &out,Definition *scope,const char * /*name*/,const char *text,bool autoBreak,bool external)
{ {
//printf("scope=`%s' name=`%s' Text: `%s'\n",scName,name,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;
QCString scopeName; QCString scopeName;
...@@ -774,6 +774,13 @@ void linkifyText(const TextGeneratorIntf &out,Definition *scope,const char * /*n ...@@ -774,6 +774,13 @@ void linkifyText(const TextGeneratorIntf &out,Definition *scope,const char * /*n
{ {
// add non-word part to the result // add non-word part to the result
floatingIndex+=newIndex-skipIndex; floatingIndex+=newIndex-skipIndex;
bool insideString=FALSE;
int i;
for (i=index;i<newIndex;i++)
{
if (txtStr.at(i)=='"') insideString=!insideString;
}
if (strLen>30 && floatingIndex>25 && autoBreak) // try to insert a split point if (strLen>30 && floatingIndex>25 && autoBreak) // try to insert a split point
{ {
QCString splitText = txtStr.mid(skipIndex,newIndex-skipIndex); QCString splitText = txtStr.mid(skipIndex,newIndex-skipIndex);
...@@ -800,41 +807,35 @@ void linkifyText(const TextGeneratorIntf &out,Definition *scope,const char * /*n ...@@ -800,41 +807,35 @@ void linkifyText(const TextGeneratorIntf &out,Definition *scope,const char * /*n
} }
// get word from string // get word from string
QCString word=txtStr.mid(newIndex,matchLen); QCString word=txtStr.mid(newIndex,matchLen);
ClassDef *cd=0; bool found=FALSE;
FileDef *fd=0; if (!insideString)
MemberDef *md=0;
NamespaceDef *nd=0;
GroupDef *gd=0;
//QCString searchName=name;
//printf("word=`%s' scope=`%s'\n",
// word.data(),scope ? scope->name().data() : "<none>"
// );
Definition *curScope = scope;
// check if `word' is a documented class name
if (
1
/* !rightScopeMatch(word,searchName) &&
!rightScopeMatch(scopeName,word) */
)
{ {
ClassDef *cd=0;
FileDef *fd=0;
MemberDef *md=0;
NamespaceDef *nd=0;
GroupDef *gd=0;
//QCString searchName=name;
//printf("word=`%s' scope=`%s'\n",
// word.data(),scope ? scope->name().data() : "<none>"
// );
Definition *curScope = scope;
// check if `word' is a documented class name
//printf("Searching...\n"); //printf("Searching...\n");
//int scopeOffset=scopeName.length(); //int scopeOffset=scopeName.length();
bool found=FALSE;
do // for each scope (starting with full scope and going to empty scope) do // for each scope (starting with full scope and going to empty scope)
{ {
QCString fullName = word; QCString fullName = word;
QCString prefix; QCString prefix;
replaceNamespaceAliases(fullName,fullName.length()); replaceNamespaceAliases(fullName,fullName.length());
//if (scopeOffset>0) //if (scopeOffset>0)
if (curScope) if (curScope && curScope!=Doxygen::globalScope)
{ {
//prefix = scopeName.left(scopeOffset);
prefix = curScope->name(); prefix = curScope->name();
replaceNamespaceAliases(prefix,prefix.length()); replaceNamespaceAliases(prefix,prefix.length());
fullName.prepend(prefix+"::"); fullName.prepend(prefix+"::");
} }
//printf("Trying class %s\n",fullName.data());
bool isTypeDef=FALSE; bool isTypeDef=FALSE;
if ((cd=getResolvedClass(scope,fullName,&isTypeDef))) if ((cd=getResolvedClass(scope,fullName,&isTypeDef)))
...@@ -842,7 +843,6 @@ void linkifyText(const TextGeneratorIntf &out,Definition *scope,const char * /*n ...@@ -842,7 +843,6 @@ void linkifyText(const TextGeneratorIntf &out,Definition *scope,const char * /*n
// add link to the result // add link to the result
if (external ? cd->isLinkable() : cd->isLinkableInProject()) if (external ? cd->isLinkable() : cd->isLinkableInProject())
{ {
//ol.writeObjectLink(cd->getReference(),cd->getOutputFileBase(),0,word);
out.writeLink(cd->getReference(),cd->getOutputFileBase(),0,word); out.writeLink(cd->getReference(),cd->getOutputFileBase(),0,word);
found=TRUE; found=TRUE;
} }
...@@ -851,24 +851,16 @@ void linkifyText(const TextGeneratorIntf &out,Definition *scope,const char * /*n ...@@ -851,24 +851,16 @@ void linkifyText(const TextGeneratorIntf &out,Definition *scope,const char * /*n
{ {
goto endloop; goto endloop;
} }
//if (scopeOffset==0)
//{
// scopeOffset=-1;
//}
//else if ((scopeOffset=scopeName.findRev("::",scopeOffset-1))==-1)
//{
// scopeOffset=0;
//}
if (curScope) curScope = curScope->getOuterScope(); if (curScope) curScope = curScope->getOuterScope();
} //while (!found && scopeOffset>=0); } //while (!found && scopeOffset>=0);
while (!found && curScope); while (!found && curScope);
endloop: endloop:
if (scope && if (scope &&
(scope->definitionType()==Definition::TypeClass || (scope->definitionType()==Definition::TypeClass ||
scope->definitionType()==Definition::TypeNamespace scope->definitionType()==Definition::TypeNamespace
) )
) )
{ {
scopeName=scope->name(); scopeName=scope->name();
...@@ -890,18 +882,13 @@ endloop: ...@@ -890,18 +882,13 @@ endloop:
//ol.writeObjectLink(d->getReference(),d->getOutputFileBase(), //ol.writeObjectLink(d->getReference(),d->getOutputFileBase(),
// md->anchor(),word); // md->anchor(),word);
out.writeLink(d->getReference(),d->getOutputFileBase(), out.writeLink(d->getReference(),d->getOutputFileBase(),
md->anchor(),word); md->anchor(),word);
found=TRUE; found=TRUE;
} }
} }
if (!found) // add word to the result
{
//ol.docify(word);
out.writeString(word);
}
} }
else
if (!found) // add word to the result
{ {
//ol.docify(word); //ol.docify(word);
out.writeString(word); out.writeString(word);
......
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