Skip to content

D
doxverilog
Commit 78a0accf authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files
Options

Release-1.5.7.1-20081103

parent b37fae19
Hide whitespace changes
Inline Side-by-side
Showing with 4490 additions and 2232 deletions
INSTALL
View file @ 78a0accf
DOXYGEN Version 1.5.7.1-20081012 DOXYGEN Version 1.5.7.1-20081103
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 (12 October 2008) Dimitri van Heesch (03 November 2008)
README
View file @ 78a0accf
DOXYGEN Version 1.5.7.1_20081012 DOXYGEN Version 1.5.7.1_20081103
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) (12 October 2008) Dimitri van Heesch (dimitri@stack.nl) (03 November 2008)
configure
View file @ 78a0accf
...@@ -20,7 +20,7 @@ doxygen_version_minor=5 ...@@ -20,7 +20,7 @@ doxygen_version_minor=5
doxygen_version_revision=7.1 doxygen_version_revision=7.1
#NOTE: Setting version_mmn to "NO" will omit mmn info from the package. #NOTE: Setting version_mmn to "NO" will omit mmn info from the package.
doxygen_version_mmn=20081012 doxygen_version_mmn=20081103
bin_dirs=`echo $PATH | sed -e "s/:/ /g"` bin_dirs=`echo $PATH | sed -e "s/:/ /g"`
...@@ -38,7 +38,7 @@ f_app=NO ...@@ -38,7 +38,7 @@ f_app=NO
f_thread=NO f_thread=NO
f_flex=NO f_flex=NO
f_bison=NO f_bison=NO
f_langs=nl,se,cz,fr,id,it,de,jp,je,es,fi,ru,hr,pl,pt,hu,kr,ke,ro,si,cn,no,br,dk,sk,ua,gr,tw,sr,ca,lt,za,ar,fa f_langs=nl,se,cz,fr,id,it,de,jp,je,es,fi,ru,hr,pl,pt,hu,kr,ke,ro,si,cn,no,br,dk,sk,ua,gr,tw,sr,ca,lt,za,ar,fa,vi
while test -n "$1"; do while test -n "$1"; do
case $1 in case $1 in
...@@ -669,7 +669,7 @@ fi ...@@ -669,7 +669,7 @@ fi
echo -n " Generating src/lang_cfg.h..." echo -n " Generating src/lang_cfg.h..."
echo $f_langs | $f_perl -e '@l=split(/,/,<STDIN>); echo $f_langs | $f_perl -e '@l=split(/,/,<STDIN>);
chomp @l; chomp @l;
@allowed=(split(/,/,"NL,SE,CZ,FR,ID,IT,DE,JP,JE,ES,FI,RU,HR,PL,PT,HU,KR,KE,RO,SI,CN,NO,MK,BR,DK,SK,UA,GR,TW,SR,CA,LT,ZA,AR,FA,SC")); @allowed=(split(/,/,"NL,SE,CZ,FR,ID,IT,DE,JP,JE,ES,FI,RU,HR,PL,PT,HU,KR,KE,RO,SI,CN,NO,MK,BR,DK,SK,UA,GR,TW,SR,CA,LT,ZA,AR,FA,SC,VI"));
foreach my $elem (@l){ foreach my $elem (@l){
$elem =~ tr/a-z/A-Z/; $elem =~ tr/a-z/A-Z/;
$r=0; $r=0;
......
doc/config.doc
View file @ 78a0accf
...@@ -101,6 +101,7 @@ followed by the descriptions of the tags grouped by category. ...@@ -101,6 +101,7 @@ followed by the descriptions of the tags grouped by category.
\refitem cfg_exclude_symlinks EXCLUDE_SYMLINKS \refitem cfg_exclude_symlinks EXCLUDE_SYMLINKS
\refitem cfg_expand_as_defined EXPAND_AS_DEFINED \refitem cfg_expand_as_defined EXPAND_AS_DEFINED
\refitem cfg_expand_only_predef EXPAND_ONLY_PREDEF \refitem cfg_expand_only_predef EXPAND_ONLY_PREDEF
\refitem cfg_extension_mapping EXTENSION_MAPPING
\refitem cfg_external_groups EXTERNAL_GROUPS \refitem cfg_external_groups EXTERNAL_GROUPS
\refitem cfg_extra_packages EXTRA_PACKAGES \refitem cfg_extra_packages EXTRA_PACKAGES
\refitem cfg_extract_all EXTRACT_ALL \refitem cfg_extract_all EXTRACT_ALL
...@@ -195,7 +196,7 @@ followed by the descriptions of the tags grouped by category. ...@@ -195,7 +196,7 @@ followed by the descriptions of the tags grouped by category.
\refitem cfg_project_number PROJECT_NUMBER \refitem cfg_project_number PROJECT_NUMBER
\refitem cfg_qhp_namespace QHP_NAMESPACE \refitem cfg_qhp_namespace QHP_NAMESPACE
\refitem cfg_qhp_virtual_folder QHP_VIRTUAL_FOLDER \refitem cfg_qhp_virtual_folder QHP_VIRTUAL_FOLDER
\refitem cfg_qhp_custom_filter_name QHP_CUSTOM_FILTER_NAME \refitem cfg_qhp_cust_filter_name QHP_CUST_FILTER_NAME
\refitem cfg_qhp_cust_filter_attrs QHP_CUST_FILTER_ATTRS \refitem cfg_qhp_cust_filter_attrs QHP_CUST_FILTER_ATTRS
\refitem cfg_qhp_sect_filter_attrs QHP_SECT_FILTER_ATTRS \refitem cfg_qhp_sect_filter_attrs QHP_SECT_FILTER_ATTRS
\refitem cfg_qhg_location QHG_LOCATION \refitem cfg_qhg_location QHG_LOCATION
...@@ -550,14 +551,26 @@ followed by the descriptions of the tags grouped by category. ...@@ -550,14 +551,26 @@ followed by the descriptions of the tags grouped by category.
\anchor cfg_optimize_for_fortran \anchor cfg_optimize_for_fortran
<dt>\c OPTIMIZE_FOR_FORTRAN <dd> <dt>\c OPTIMIZE_FOR_FORTRAN <dd>
\addindex OPTIMIZE_FOR_FORTRAN \addindex OPTIMIZE_FOR_FORTRAN
Set the \c OPTIMIZE_FOR_FORTRAN tag to \c YES if your project consists of Fortran Set the \c OPTIMIZE_FOR_FORTRAN tag to \c YES if your project consists of Fortran
sources. Doxygen will then generate output that is tailored for Fortran. sources. Doxygen will then generate output that is tailored for Fortran.
\anchor cfg_optimize_output_vhdl \anchor cfg_optimize_output_vhdl
<dt>\c OPTIMIZE_OUTPUT_VHDL <dd> <dt>\c OPTIMIZE_OUTPUT_VHDL <dd>
\addindex OPTIMIZE_OUTPUT_VHDL \addindex OPTIMIZE_OUTPUT_VHDL
Set the \c OPTIMIZE_OUTPUT_VHDL tag to \c YES if your project consists of VHDL Set the \c OPTIMIZE_OUTPUT_VHDL tag to \c YES if your project consists of VHDL
sources. Doxygen will then generate output that is tailored for VHDL. sources. Doxygen will then generate output that is tailored for VHDL.
\anchor cfg_extension_mapping
<dt>\c EXTENSION_MAPPING <dd>
\addindex EXTENSION_MAPPING
Doxygen selects the parser to use depending on the extension of the files it parses.
With this tag you can assign which parser to use for a given extension.
Doxygen has a built-in mapping, but you can override or extend it using this tag.
The format is ext=language, where ext is a file extension, and language is one of
the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
.inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
use: inc=Fortran f=C
\anchor cfg_subgrouping \anchor cfg_subgrouping
<dt>\c SUBGROUPING <dd> <dt>\c SUBGROUPING <dd>
...@@ -1387,10 +1400,10 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn" ...@@ -1387,10 +1400,10 @@ FILE_VERSION_INFO = "cleartool desc -fmt \%Vn"
generating Qt Help Project output. For more information please see generating Qt Help Project output. For more information please see
<a href="http://doc.trolltech.com/qthelpproject.html#virtual-folders">Qt Help Project / Virtual Folders</a>. <a href="http://doc.trolltech.com/qthelpproject.html#virtual-folders">Qt Help Project / Virtual Folders</a>.
\anchor cfg_qhp_custom_filter_name \anchor cfg_qhp_cust_filter_name
<dt>\c QHP_CUSTOM_FILTER_NAME <dd> <dt>\c QHP_CUST_FILTER_NAME <dd>
\addindex QHP_CUSTOM_FILTER_NAME \addindex QHP_CUST_FILTER_NAME
If QHP_CUSTOM_FILTER_NAME is set, it specifies the name of a custom filter to add. For more information please see If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. For more information please see
<a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>. <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
\anchor cfg_qhp_cust_filter_attrs \anchor cfg_qhp_cust_filter_attrs
......
doc/language.doc
View file @ 78a0accf
...@@ -23,14 +23,14 @@ text fragments, generated by doxygen, can be produced in languages other ...@@ -23,14 +23,14 @@ text fragments, generated by doxygen, can be produced in languages other
than English (the default). The output language is chosen through the than English (the default). The output language is chosen through the
configuration file (with default name and known as Doxyfile). configuration file (with default name and known as Doxyfile).
Currently (version 1.5.6), 35 languages Currently (version 1.5.7.1), 36 languages
are supported (sorted alphabetically): are supported (sorted alphabetically):
Afrikaans, Arabic, Brazilian Portuguese, Catalan, Chinese, Chinese Afrikaans, Arabic, Brazilian Portuguese, Catalan, Chinese, Chinese
Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French, Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French,
German, Greek, Hungarian, Indonesian, Italian, Japanese (+En), Korean German, Greek, Hungarian, Indonesian, Italian, Japanese (+En), Korean
(+En), Lithuanian, Macedonian, Norwegian, Persian, Polish, Portuguese, (+En), Lithuanian, Macedonian, Norwegian, Persian, Polish, Portuguese,
Romanian, Russian, Serbian, SerbianCyrilic, Slovak, Slovene, Spanish, Romanian, Russian, Serbian, SerbianCyrilic, Slovak, Slovene, Spanish,
Swedish, and Ukrainian.. Swedish, Ukrainian, and Vietnamese..
The table of information related to the supported languages follows. The table of information related to the supported languages follows.
It is sorted by language alphabetically. The <b>Status</b> column It is sorted by language alphabetically. The <b>Status</b> column
...@@ -273,6 +273,12 @@ when the translator was updated. ...@@ -273,6 +273,12 @@ when the translator was updated.
<td>olexij.tkatchenko at parcs dot de</td> <td>olexij.tkatchenko at parcs dot de</td>
<td>1.4.1</td> <td>1.4.1</td>
</tr> </tr>
<tr bgcolor="#ffffff">
<td>Vietnamese</td>
<td>Dang Minh Tuan</td>
<td>tuanvietkey at gmail dot com</td>
<td>up-to-date</td>
</tr>
<!-- table content end --> <!-- table content end -->
</table> </table>
</td> </td>
...@@ -376,6 +382,8 @@ when the translator was updated. ...@@ -376,6 +382,8 @@ when the translator was updated.
\hline \hline
Ukrainian & Olexij Tkatchenko & {\tt\tiny olexij.tkatchenko@parcs.de} & 1.4.1 \\ Ukrainian & Olexij Tkatchenko & {\tt\tiny olexij.tkatchenko@parcs.de} & 1.4.1 \\
\hline \hline
Vietnamese & Dang Minh Tuan & {\tt\tiny tuanvietkey@gmail.com} & up-to-date \\
\hline
\end{tabular} \end{tabular}
\endlatexonly \endlatexonly
......
doc/maintainers.txt
View file @ 78a0accf
...@@ -128,3 +128,5 @@ Mikael Hallin: mikaelhallin@yahoo.se ...@@ -128,3 +128,5 @@ Mikael Hallin: mikaelhallin@yahoo.se
TranslatorUkrainian TranslatorUkrainian
Olexij Tkatchenko: olexij.tkatchenko@parcs.de Olexij Tkatchenko: olexij.tkatchenko@parcs.de
TranslatorVietnamese
Dang Minh Tuan: tuanvietkey@gmail.com
doc/translator_report.txt
View file @ 78a0accf
(1.5.6) (1.5.7.1)
Doxygen supports the following 35 languages (sorted alphabetically): Doxygen supports the following 36 languages (sorted alphabetically):
Afrikaans, Arabic, Brazilian Portuguese, Catalan, Chinese, Chinese Afrikaans, Arabic, Brazilian Portuguese, Catalan, Chinese, Chinese
Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French, Traditional, Croatian, Czech, Danish, Dutch, English, Finnish, French,
German, Greek, Hungarian, Indonesian, Italian, Japanese (+En), Korean German, Greek, Hungarian, Indonesian, Italian, Japanese (+En), Korean
(+En), Lithuanian, Macedonian, Norwegian, Persian, Polish, Portuguese, (+En), Lithuanian, Macedonian, Norwegian, Persian, Polish, Portuguese,
Romanian, Russian, Serbian, SerbianCyrilic, Slovak, Slovene, Spanish, Romanian, Russian, Serbian, SerbianCyrilic, Slovak, Slovene, Spanish,
Swedish, and Ukrainian. Swedish, Ukrainian, and Vietnamese.
Of them, 18 translators are up-to-date, 17 translators are based on Of them, 19 translators are up-to-date, 17 translators are based on
some adapter class, and 2 are English based. some adapter class, and 2 are English based.
---------------------------------------------------------------------- ----------------------------------------------------------------------
...@@ -36,6 +36,7 @@ still may be some details listed even for them: ...@@ -36,6 +36,7 @@ still may be some details listed even for them:
TranslatorSerbianCyrilic TranslatorSerbianCyrilic
TranslatorSerbian TranslatorSerbian
TranslatorSpanish -- Change the base class to Translator. TranslatorSpanish -- Change the base class to Translator.
TranslatorVietnamese
---------------------------------------------------------------------- ----------------------------------------------------------------------
The following translator classes need some maintenance (the most The following translator classes need some maintenance (the most
......
src/config.h
View file @ 78a0accf
/******************************************************************************
*
*
*
*
* Copyright (C) 1997-2008 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
* granted. No representations are made about the suitability of this software
* for any purpose. It is provided "as is" without express or implied warranty.
* See the GNU General Public License for more details.
*
* Documents produced by Doxygen are derivative works derived from the
* input used in their production; they are not affected by this license.
*
*/
#ifndef CONFIG_H #ifndef CONFIG_H
#define CONFIG_H #define CONFIG_H
...@@ -56,6 +74,7 @@ class ConfigOption ...@@ -56,6 +74,7 @@ class ConfigOption
virtual void writeTemplate(QTextStream &t,bool sl,bool upd) = 0; virtual void writeTemplate(QTextStream &t,bool sl,bool upd) = 0;
virtual void convertStrToVal() {} virtual void convertStrToVal() {}
virtual void substEnvVars() = 0; virtual void substEnvVars() = 0;
virtual void writeXML(QTextStream&) {}
virtual void init() {} virtual void init() {}
QCString convertToComment(const QCString &s); QCString convertToComment(const QCString &s);
...@@ -128,6 +147,7 @@ class ConfigList : public ConfigOption ...@@ -128,6 +147,7 @@ class ConfigList : public ConfigOption
t << "\n"; t << "\n";
} }
void substEnvVars(); void substEnvVars();
void writeXML(QTextStream&);
void init() { m_value.clear(); } void init() { m_value.clear(); }
private: private:
QStrList m_value; QStrList m_value;
...@@ -167,6 +187,7 @@ class ConfigEnum : public ConfigOption ...@@ -167,6 +187,7 @@ class ConfigEnum : public ConfigOption
writeStringValue(t,m_value); writeStringValue(t,m_value);
t << "\n"; t << "\n";
} }
void writeXML(QTextStream&);
void init() { m_value = m_defValue.copy(); } void init() { m_value = m_defValue.copy(); }
private: private:
...@@ -209,6 +230,7 @@ class ConfigString : public ConfigOption ...@@ -209,6 +230,7 @@ class ConfigString : public ConfigOption
t << "\n"; t << "\n";
} }
void substEnvVars(); void substEnvVars();
void writeXML(QTextStream&);
void init() { m_value = m_defValue.copy(); } void init() { m_value = m_defValue.copy(); }
private: private:
...@@ -258,6 +280,7 @@ class ConfigInt : public ConfigOption ...@@ -258,6 +280,7 @@ class ConfigInt : public ConfigOption
} }
t << "\n"; t << "\n";
} }
void writeXML(QTextStream&);
void init() { m_value = m_defValue; } void init() { m_value = m_defValue; }
private: private:
int m_value; int m_value;
...@@ -305,6 +328,7 @@ class ConfigBool : public ConfigOption ...@@ -305,6 +328,7 @@ class ConfigBool : public ConfigOption
} }
t << "\n"; t << "\n";
} }
void writeXML(QTextStream&);
void init() { m_value = m_defValue; } void init() { m_value = m_defValue; }
private: private:
bool m_value; bool m_value;
...@@ -321,6 +345,7 @@ class ConfigObsolete : public ConfigOption ...@@ -321,6 +345,7 @@ class ConfigObsolete : public ConfigOption
ConfigObsolete(OptionType t) : ConfigOption(t) {} ConfigObsolete(OptionType t) : ConfigOption(t) {}
void writeTemplate(QTextStream &,bool,bool) {} void writeTemplate(QTextStream &,bool,bool) {}
void substEnvVars() {} void substEnvVars() {}
void writeXML(QTextStream&);
}; };
...@@ -511,6 +536,9 @@ class Config ...@@ -511,6 +536,9 @@ class Config
*/ */
void writeTemplate(QTextStream &t,bool shortIndex,bool updateOnly); void writeTemplate(QTextStream &t,bool shortIndex,bool updateOnly);
/** Write XML representation of the config file */
void writeXML(QTextStream &t);
///////////////////////////// /////////////////////////////
// internal API // internal API
///////////////////////////// /////////////////////////////
......
src/config.l
View file @ 78a0accf
This source diff could not be displayed because it is too large. You can view the blob instead.
src/configoptions.cpp 0 → 100644
View file @ 78a0accf
This source diff could not be displayed because it is too large. You can view the blob instead.
src/configoptions.h 0 → 100644
View file @ 78a0accf
/******************************************************************************
*
*
*
*
* Copyright (C) 1997-2008 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
* granted. No representations are made about the suitability of this software
* for any purpose. It is provided "as is" without express or implied warranty.
* See the GNU General Public License for more details.
*
* Documents produced by Doxygen are derivative works derived from the
* input used in their production; they are not affected by this license.
*
*/
#ifndef CONFIGOPTIONS
#define CONFIGOPTIONS
class Config;
void addConfigOptions(Config *cfg);
#endif
src/docparser.cpp
View file @ 78a0accf
...@@ -258,6 +258,7 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type) ...@@ -258,6 +258,7 @@ static QCString findAndCopyImage(const char *fileName,DocImage::Type type)
outImage.writeBlock(buffer,inImage.size()); outImage.writeBlock(buffer,inImage.size());
outImage.flush(); outImage.flush();
delete buffer; delete buffer;
if (type==DocImage::Html) Doxygen::indexList.addImageFile(result);
} }
else else
{ {
...@@ -2762,7 +2763,7 @@ int DocInternal::parse(int level) ...@@ -2762,7 +2763,7 @@ int DocInternal::parse(int level)
) )
{ {
DocSection *s=new DocSection(this, DocSection *s=new DocSection(this,
QMIN(level+Doxygen::subpageNestingLevel,4),g_token->sectionId); QMIN(level+Doxygen::subpageNestingLevel,5),g_token->sectionId);
m_children.append(s); m_children.append(s);
retval = s->parse(); retval = s->parse();
} }
...@@ -5813,43 +5814,46 @@ int DocSection::parse() ...@@ -5813,43 +5814,46 @@ int DocSection::parse()
if (lastPar) lastPar->markLast(); if (lastPar) lastPar->markLast();
if (retval==RetVal_Subsection && m_level==1) //printf("m_level=%d <-> %d\n",m_level,Doxygen::subpageNestingLevel);
if (retval==RetVal_Subsection && m_level==Doxygen::subpageNestingLevel+1)
{ {
// then parse any number of nested sections // then parse any number of nested sections
while (retval==RetVal_Subsection) // more sections follow while (retval==RetVal_Subsection) // more sections follow
{ {
//SectionInfo *sec=Doxygen::sectionDict[g_token->sectionId]; //SectionInfo *sec=Doxygen::sectionDict[g_token->sectionId];
DocSection *s=new DocSection(this, DocSection *s=new DocSection(this,
QMIN(2+Doxygen::subpageNestingLevel,4),g_token->sectionId); QMIN(2+Doxygen::subpageNestingLevel,5),g_token->sectionId);
m_children.append(s); m_children.append(s);
retval = s->parse(); retval = s->parse();
} }
} }
else if (retval==RetVal_Subsubsection && m_level==2) else if (retval==RetVal_Subsubsection && m_level==Doxygen::subpageNestingLevel+2)
{ {
// then parse any number of nested sections // then parse any number of nested sections
while (retval==RetVal_Subsubsection) // more sections follow while (retval==RetVal_Subsubsection) // more sections follow
{ {
//SectionInfo *sec=Doxygen::sectionDict[g_token->sectionId]; //SectionInfo *sec=Doxygen::sectionDict[g_token->sectionId];
DocSection *s=new DocSection(this, DocSection *s=new DocSection(this,
QMIN(3+Doxygen::subpageNestingLevel,4),g_token->sectionId); QMIN(3+Doxygen::subpageNestingLevel,5),g_token->sectionId);
m_children.append(s); m_children.append(s);
retval = s->parse(); retval = s->parse();
} }
} }
else if (retval==RetVal_Paragraph && m_level==3) else if (retval==RetVal_Paragraph && m_level==QMIN(5,Doxygen::subpageNestingLevel+3))
{ {
// then parse any number of nested sections // then parse any number of nested sections
while (retval==RetVal_Paragraph) // more sections follow while (retval==RetVal_Paragraph) // more sections follow
{ {
//SectionInfo *sec=Doxygen::sectionDict[g_token->sectionId]; //SectionInfo *sec=Doxygen::sectionDict[g_token->sectionId];
DocSection *s=new DocSection(this,4,g_token->sectionId); DocSection *s=new DocSection(this,
QMIN(4+Doxygen::subpageNestingLevel,5),g_token->sectionId);
m_children.append(s); m_children.append(s);
retval = s->parse(); retval = s->parse();
} }
} }
else if ((m_level<=1 && retval==RetVal_Subsubsection) || else if ((m_level<=1+Doxygen::subpageNestingLevel && retval==RetVal_Subsubsection) ||
(m_level<=2 && retval==RetVal_Paragraph) (m_level<=2+Doxygen::subpageNestingLevel && retval==RetVal_Paragraph)
) )
{ {
int level; int level;
...@@ -6013,6 +6017,7 @@ void DocRoot::parse() ...@@ -6013,6 +6017,7 @@ void DocRoot::parse()
} while (retval!=0 && retval!=RetVal_Section && retval!=RetVal_Internal); } while (retval!=0 && retval!=RetVal_Section && retval!=RetVal_Internal);
if (lastPar) lastPar->markLast(); if (lastPar) lastPar->markLast();
//printf("DocRoot::parse() retval=%d %d\n",retval,RetVal_Section);
// then parse any number of level1 sections // then parse any number of level1 sections
while (retval==RetVal_Section) while (retval==RetVal_Section)
{ {
...@@ -6020,7 +6025,7 @@ void DocRoot::parse() ...@@ -6020,7 +6025,7 @@ void DocRoot::parse()
if (sec) if (sec)
{ {
DocSection *s=new DocSection(this, DocSection *s=new DocSection(this,
QMIN(1+Doxygen::subpageNestingLevel,4),g_token->sectionId); QMIN(1+Doxygen::subpageNestingLevel,5),g_token->sectionId);
m_children.append(s); m_children.append(s);
retval = s->parse(); retval = s->parse();
} }
......
src/docsets.cpp
View file @ 78a0accf
...@@ -280,8 +280,10 @@ void DocSets::addIndexItem(const char *, const char *, ...@@ -280,8 +280,10 @@ void DocSets::addIndexItem(const char *, const char *,
scope = cd->qualifiedName(); scope = cd->qualifiedName();
if (cd->isTemplate()) if (cd->isTemplate())
type="tmplt"; type="tmplt";
else if (cd->compoundType()==ClassDef::Interface) else if (cd->compoundType()==ClassDef::Protocol)
type="intf"; type="intf";
else if (cd->compoundType()==ClassDef::Interface)
type="cl";
else if (cd->compoundType()==ClassDef::Category) else if (cd->compoundType()==ClassDef::Category)
type="cat"; type="cat";
else else
...@@ -357,7 +359,9 @@ void DocSets::writeToken(QTextStream &t, ...@@ -357,7 +359,9 @@ void DocSets::writeToken(QTextStream &t,
{ {
t << " <Token>" << endl; t << " <Token>" << endl;
t << " <TokenIdentifier>" << endl; t << " <TokenIdentifier>" << endl;
t << " <Name>" << convertToXML(d->name()) << "</Name>" << endl; QString name = d->name();
if (name.right(2)=="-p") name=name.left(name.length()-2);
t << " <Name>" << convertToXML(name) << "</Name>" << endl;
t << " <APILanguage>" << lang << "</APILanguage>" << endl; t << " <APILanguage>" << lang << "</APILanguage>" << endl;
t << " <Type>" << type << "</Type>" << endl; t << " <Type>" << type << "</Type>" << endl;
t << " <Scope>" << convertToXML(scope) << "</Scope>" << endl; t << " <Scope>" << convertToXML(scope) << "</Scope>" << endl;
......
src/doctokenizer.h
View file @ 78a0accf
...@@ -47,18 +47,19 @@ enum Tokens ...@@ -47,18 +47,19 @@ enum Tokens
RetVal_Subsection = 0x10004, RetVal_Subsection = 0x10004,
RetVal_Subsubsection = 0x10005, RetVal_Subsubsection = 0x10005,
RetVal_Paragraph = 0x10006, RetVal_Paragraph = 0x10006,
RetVal_EndList = 0x10007, RetVal_SubParagraph = 0x10007,
RetVal_EndPre = 0x10008, RetVal_EndList = 0x10008,
RetVal_DescData = 0x10009, RetVal_EndPre = 0x10009,
RetVal_DescTitle = 0x1000A, RetVal_DescData = 0x1000A,
RetVal_EndDesc = 0x1000B, RetVal_DescTitle = 0x1000B,
RetVal_TableRow = 0x1000C, RetVal_EndDesc = 0x1000C,
RetVal_TableCell = 0x1000D, RetVal_TableRow = 0x1000D,
RetVal_TableHCell = 0x1000E, RetVal_TableCell = 0x1000E,
RetVal_EndTable = 0x1000F, RetVal_TableHCell = 0x1000F,
RetVal_Internal = 0x10010, RetVal_EndTable = 0x10010,
RetVal_SwitchLang = 0x10011, RetVal_Internal = 0x10011,
RetVal_CloseXml = 0x10012 RetVal_SwitchLang = 0x10012,
RetVal_CloseXml = 0x10013
}; };
struct TokenInfo struct TokenInfo
......
src/doxygen.cpp
View file @ 78a0accf
...@@ -158,6 +158,7 @@ QCString spaces; ...@@ -158,6 +158,7 @@ QCString spaces;
static bool g_successfulRun = FALSE; static bool g_successfulRun = FALSE;
static bool g_dumpSymbolMap = FALSE; static bool g_dumpSymbolMap = FALSE;
static bool g_dumpConfigAsXML = FALSE;
...@@ -8917,6 +8918,17 @@ static void dumpSymbolMap() ...@@ -8917,6 +8918,17 @@ static void dumpSymbolMap()
} }
} }
//----------------------------------------------------------------------------
void dumpConfigAsXML()
{
QFile f("config.xml");
if (f.open(IO_WriteOnly))
{
QTextStream t(&f);
Config::instance()->writeXML(t);
}
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// print the usage of doxygen // print the usage of doxygen
...@@ -8977,15 +8989,15 @@ void initDoxygen() ...@@ -8977,15 +8989,15 @@ void initDoxygen()
Doxygen::runningTime.start(); Doxygen::runningTime.start();
initPreprocessor(); initPreprocessor();
ParserInterface *defaultParser = new CLanguageScanner; Doxygen::parserManager = new ParserManager;
Doxygen::parserManager = new ParserManager(defaultParser); Doxygen::parserManager->registerParser("c", new CLanguageScanner, TRUE);
Doxygen::parserManager->registerParser(".py", new PythonLanguageScanner); Doxygen::parserManager->registerParser("python", new PythonLanguageScanner);
Doxygen::parserManager->registerParser(".f", new FortranLanguageScanner); Doxygen::parserManager->registerParser("fortran", new FortranLanguageScanner);
Doxygen::parserManager->registerParser(".f90", new FortranLanguageScanner); Doxygen::parserManager->registerParser("vhdl", new VHDLLanguageScanner);
Doxygen::parserManager->registerParser(".vhd", new VHDLLanguageScanner);
// register any additional parsers here... // register any additional parsers here...
initDefaultExtensionMapping();
initClassMemberIndices(); initClassMemberIndices();
initNamespaceMemberIndices(); initNamespaceMemberIndices();
initFileMemberIndices(); initFileMemberIndices();
...@@ -9245,6 +9257,9 @@ void readConfiguration(int argc, char **argv) ...@@ -9245,6 +9257,9 @@ void readConfiguration(int argc, char **argv)
case 'm': case 'm':
g_dumpSymbolMap = TRUE; g_dumpSymbolMap = TRUE;
break; break;
case 'x':
g_dumpConfigAsXML = TRUE;
break;
case '-': case '-':
if (strcmp(&argv[optind][2],"help")==0) if (strcmp(&argv[optind][2],"help")==0)
{ {
...@@ -9280,7 +9295,13 @@ void readConfiguration(int argc, char **argv) ...@@ -9280,7 +9295,13 @@ void readConfiguration(int argc, char **argv)
if (genConfig) if (genConfig)
{ {
checkConfiguration();
generateConfigFile(configName,shortList); generateConfigFile(configName,shortList);
if (g_dumpConfigAsXML)
{
dumpConfigAsXML();
exit(0);
}
cleanUpDoxygen(); cleanUpDoxygen();
exit(0); exit(0);
} }
...@@ -9460,6 +9481,37 @@ void parseInput() ...@@ -9460,6 +9481,37 @@ void parseInput()
{ {
atexit(exitDoxygen); atexit(exitDoxygen);
/**************************************************************************
* Add custom extension mappings
**************************************************************************/
QStrList &extMaps = Config_getList("EXTENSION_MAPPING");
char *mapping = extMaps.first();
while (mapping)
{
QCString mapStr = mapping;
int i;
if ((i=mapStr.find('='))!=-1)
{
QCString ext=mapStr.left(i).stripWhiteSpace().lower();
QCString language=mapStr.mid(i+1).stripWhiteSpace().lower();
if (!updateLanguageMapping(ext,language))
{
err("Failed to map file extension '%s' to unsupported language '%s'.\n"
"Check the EXTENSION_MAPPING setting in the config file.\n",
ext.data(),language.data());
}
else
{
msg("Adding custom extension mapping: .%s will be treated as language %s\n",
ext.data(),language.data());
}
}
mapping = extMaps.next();
}
/************************************************************************** /**************************************************************************
* Make sure the output directory exists * Make sure the output directory exists
**************************************************************************/ **************************************************************************/
...@@ -10031,8 +10083,8 @@ void generateOutput() ...@@ -10031,8 +10083,8 @@ void generateOutput()
//} //}
if (g_dumpSymbolMap) if (g_dumpSymbolMap)
{ {
dumpSymbolMap(); dumpSymbolMap();
exit(0); exit(0);
} }
initDocParser(); initDocParser();
......
src/doxygen.css
View file @ 78a0accf
...@@ -24,7 +24,7 @@ caption { ...@@ -24,7 +24,7 @@ caption {
font-weight: bold; font-weight: bold;
} }
div.qindex, div.navpath, div.navtab{ div.qindex, div.navtab{
background-color: #e8eef2; background-color: #e8eef2;
border: 1px solid #84b0c7; border: 1px solid #84b0c7;
text-align: center; text-align: center;
......
src/doxygen_css.h
View file @ 78a0accf
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
" font-weight: bold;\n" " font-weight: bold;\n"
"}\n" "}\n"
"\n" "\n"
"div.qindex, div.navpath, div.navtab{\n" "div.qindex, div.navtab{\n"
" background-color: #e8eef2;\n" " background-color: #e8eef2;\n"
" border: 1px solid #84b0c7;\n" " border: 1px solid #84b0c7;\n"
" text-align: center;\n" " text-align: center;\n"
......
src/entry.cpp
View file @ 78a0accf
...@@ -225,6 +225,7 @@ Entry::~Entry() ...@@ -225,6 +225,7 @@ Entry::~Entry()
delete argList; delete argList;
delete tArgLists; delete tArgLists;
delete tagInfo; delete tagInfo;
delete typeConstr;
delete sli; delete sli;
num--; num--;
} }
......
src/formula.cpp
View file @ 78a0accf
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
#include "message.h" #include "message.h"
#include "config.h" #include "config.h"
#include "portable.h" #include "portable.h"
#include "index.h"
#include "doxygen.h"
Formula::Formula(const char *text) Formula::Formula(const char *text)
{ {
...@@ -92,6 +94,7 @@ void FormulaList::generateBitmaps(const char *path) ...@@ -92,6 +94,7 @@ void FormulaList::generateBitmaps(const char *path)
t << formula->getFormulaText() << endl << "\\pagebreak\n\n"; t << formula->getFormulaText() << endl << "\\pagebreak\n\n";
pagesToGenerate.append(new int(page)); pagesToGenerate.append(new int(page));
} }
Doxygen::indexList.addImageFile(resultName);
page++; page++;
} }
t << "\\end{document}" << endl; t << "\\end{document}" << endl;
......
src/ftvhelp.cpp
View file @ 78a0accf
...@@ -473,7 +473,7 @@ void FTVHelp::generateLink(QTextStream &t,FTVNode *n) ...@@ -473,7 +473,7 @@ void FTVHelp::generateLink(QTextStream &t,FTVNode *n)
// n->ref.data(),n->file.data(),n->anchor.data()); // n->ref.data(),n->file.data(),n->anchor.data());
if (n->file.isEmpty()) // no link if (n->file.isEmpty()) // no link
{ {
t << "<b>" << n->name << "</b>"; t << "<b>" << convertToHtml(n->name) << "</b>";
} }
else // link into other frame else // link into other frame
{ {
...@@ -499,7 +499,7 @@ void FTVHelp::generateLink(QTextStream &t,FTVNode *n) ...@@ -499,7 +499,7 @@ void FTVHelp::generateLink(QTextStream &t,FTVNode *n)
t << "\" target=\"basefrm\">"; t << "\" target=\"basefrm\">";
else else
t << "\" target=\"_self\">"; t << "\" target=\"_self\">";
t << n->name; t << convertToHtml(n->name);
t << "</a>"; t << "</a>";
if (!n->ref.isEmpty()) if (!n->ref.isEmpty())
{ {
......
src/htmlgen.cpp
View file @ 78a0accf
...@@ -383,7 +383,7 @@ static const char tabs_css[] = ...@@ -383,7 +383,7 @@ static const char tabs_css[] =
" float : left;\n" " float : left;\n"
" background : url(\"tab_r.gif\") no-repeat right top;\n" " background : url(\"tab_r.gif\") no-repeat right top;\n"
" border-bottom : 1px solid #84B0C7;\n" " border-bottom : 1px solid #84B0C7;\n"
" font-size : 8px;\n" " font-size : 80%;\n"
" font-weight : bold;\n" " font-weight : bold;\n"
" text-decoration : none;\n" " text-decoration : none;\n"
"}\n" "}\n"
...@@ -417,7 +417,7 @@ static const char tabs_css[] = ...@@ -417,7 +417,7 @@ static const char tabs_css[] =
"\n" "\n"
"DIV.tabs TD\n" "DIV.tabs TD\n"
"{\n" "{\n"
" font-size : 8px;\n" " font-size : 80%;\n"
" font-weight : bold;\n" " font-weight : bold;\n"
" text-decoration : none;\n" " text-decoration : none;\n"
"}\n" "}\n"
...@@ -450,6 +450,9 @@ static const char tabs_css[] = ...@@ -450,6 +450,9 @@ static const char tabs_css[] =
" background : none;\n" " background : none;\n"
" border : none;\n" " border : none;\n"
" border-bottom : 1px solid #84B0C7;\n" " border-bottom : 1px solid #84B0C7;\n"
" text-align : center;\n"
" margin : 2px;\n"
" padding : 2px;\n"
"}\n" "}\n"
; ;
...@@ -573,6 +576,7 @@ static void writeDefaultHeaderFile(QTextStream &t, const char *title, ...@@ -573,6 +576,7 @@ static void writeDefaultHeaderFile(QTextStream &t, const char *title,
"<title>"; "<title>";
t << convertToHtml(title); t << convertToHtml(title);
t << "</title>\n"; t << "</title>\n";
t << "<link href=\"" << relPathStr << "tabs.css\" rel=\"stylesheet\" type=\"text/css\">\n";
t << "<link "; t << "<link ";
t << "href=\""; t << "href=\"";
if (Config_getString("HTML_STYLESHEET").isEmpty()) if (Config_getString("HTML_STYLESHEET").isEmpty())
...@@ -591,7 +595,6 @@ static void writeDefaultHeaderFile(QTextStream &t, const char *title, ...@@ -591,7 +595,6 @@ static void writeDefaultHeaderFile(QTextStream &t, const char *title,
} }
t << "\" rel=\"stylesheet\" type=\"text/css\">\n"; t << "\" rel=\"stylesheet\" type=\"text/css\">\n";
t << "<link href=\"" << relPathStr << "tabs.css\" rel=\"stylesheet\" type=\"text/css\">\n";
t << "</head><body>\n"; t << "</head><body>\n";
} }
......
src/lang_cfg.h
View file @ 78a0accf
...@@ -32,3 +32,4 @@ ...@@ -32,3 +32,4 @@
#define LANG_ZA #define LANG_ZA
#define LANG_AR #define LANG_AR
#define LANG_FA #define LANG_FA
#define LANG_VI
src/language.cpp
View file @ 78a0accf
...@@ -134,6 +134,9 @@ ...@@ -134,6 +134,9 @@
#ifdef LANG_SC #ifdef LANG_SC
#include "translator_sc.h" #include "translator_sc.h"
#endif #endif
#ifdef LANG_VI
#include "translator_vi.h"
#endif
#endif // !ENGLISH_ONLY #endif // !ENGLISH_ONLY
#define L_EQUAL(a) !stricmp(langName,a) #define L_EQUAL(a) !stricmp(langName,a)
...@@ -373,6 +376,12 @@ bool setTranslator(const char *langName) ...@@ -373,6 +376,12 @@ bool setTranslator(const char *langName)
theTranslator=new TranslatorMacedonian; theTranslator=new TranslatorMacedonian;
} }
#endif #endif
#ifdef LANG_VI
else if (L_EQUAL("vietnamese"))
{
theTranslator=new TranslatorVietnamese;
}
#endif
#endif // ENGLISH_ONLY #endif // ENGLISH_ONLY
else // use the default language (i.e. english) else // use the default language (i.e. english)
{ {
......
src/latexgen.cpp
View file @ 78a0accf
...@@ -365,6 +365,14 @@ static void writeDefaultStyleSheetPart3(QTextStream &t) ...@@ -365,6 +365,14 @@ static void writeDefaultStyleSheetPart3(QTextStream &t)
t << "\\addtocounter{secnumdepth}{1}\n"; t << "\\addtocounter{secnumdepth}{1}\n";
t << "\\sloppy\n"; t << "\\sloppy\n";
t << "\\usepackage[T1]{fontenc}\n"; t << "\\usepackage[T1]{fontenc}\n";
t << "\\makeatletter\n";
t << "\\renewcommand{\\paragraph}{\\@startsection{paragraph}{4}{0ex}%\n";
t << " {-3.25ex plus -1ex minus -0.2ex}%\n";
t << " {1.5ex plus 0.2ex}%\n";
t << " {\\normalfont\\normalsize\\bfseries}}\n";
t << "\\makeatother\n";
t << "\\stepcounter{secnumdepth}\n";
t << "\\stepcounter{tocdepth}\n";
} }
void LatexGenerator::writeHeaderFile(QFile &f) void LatexGenerator::writeHeaderFile(QFile &f)
......
src/libdoxycfg.pro.in
View file @ 78a0accf
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
TEMPLATE = libdoxycfg.t TEMPLATE = libdoxycfg.t
CONFIG = console warn_on staticlib $extraopts CONFIG = console warn_on staticlib $extraopts
HEADERS = config.h portable.h HEADERS = config.h configoptions.h portable.h
SOURCES = config.cpp portable.cpp SOURCES = config.cpp configoptions.cpp portable.cpp
win32:TMAKE_CXXFLAGS += -DQT_NODLL win32:TMAKE_CXXFLAGS += -DQT_NODLL
win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti win32-g++:TMAKE_CXXFLAGS += -fno-exceptions -fno-rtti
INCLUDEPATH += ../qtools INCLUDEPATH += ../qtools
......
src/libdoxygen.pro.in
View file @ 78a0accf
...@@ -137,6 +137,7 @@ HEADERS = bufstr.h \ ...@@ -137,6 +137,7 @@ HEADERS = bufstr.h \
translator_sr.h \ translator_sr.h \
translator_tw.h \ translator_tw.h \
translator_ua.h \ translator_ua.h \
translator_vi.h \
translator_za.h \ translator_za.h \
unistd.h \ unistd.h \
util.h \ util.h \
......
src/parserintf.h
View file @ 78a0accf
...@@ -109,22 +109,38 @@ class ParserManager ...@@ -109,22 +109,38 @@ class ParserManager
{ {
public: public:
/** Creates the parser manager object. /** Creates the parser manager object.
* @param defaultParser The default parser that is used when
* no explicit extension has been registered for
* a given input file.
*/ */
ParserManager(ParserInterface *defaultParser) ParserManager()
: m_defaultParser(defaultParser) { m_parsers.setAutoDelete(TRUE); } : m_defaultParser(0) { m_parsers.setAutoDelete(TRUE); }
/** Registers an additional parser. /** Registers an additional parser.
* @param[in] extension The file extension that will trigger * @param[in] name A symbolic name of the parser, i.e. "c",
* the use of this parser (e.g. ".py", or ".bas"). * "python", "fortran", "vhdl", ...
* @param[in] parser The parser that is to be used for the * @param[in] parser The parser that is to be used for the
* given extension. * given extension.
* @param[in] defParser Use this parser as the default parser, using
* for unregistered file extensions.
*/ */
void registerParser(const char *extension,ParserInterface *parser) void registerParser(const char *name,ParserInterface *parser,bool defParser=FALSE)
{ {
m_parsers.insert(extension,parser); if (defParser && m_defaultParser==0) m_defaultParser=parser;
m_parsers.insert(name,parser);
}
/** Registers a file \a extension with a parser with name \a parserName.
* Returns TRUE if the extension was successfully registered.
*/
bool registerExtension(const char *extension, const char *parserName)
{
if (parserName==0 || extension==0) return FALSE;
ParserInterface *intf = m_parsers.find(parserName);
if (intf==0) return FALSE;
if (m_extensions.find(extension)!=0) // extension already exists
{
m_extensions.remove(extension); // remove it
}
m_extensions.insert(extension,intf); // add new mapping
return TRUE;
} }
/** Gets the interface to the parser associated with given \a extension. /** Gets the interface to the parser associated with given \a extension.
...@@ -135,16 +151,17 @@ class ParserManager ...@@ -135,16 +151,17 @@ class ParserManager
{ {
if (extension==0) return m_defaultParser; if (extension==0) return m_defaultParser;
QCString ext = QCString(extension).lower(); QCString ext = QCString(extension).lower();
ParserInterface *intf = m_parsers.find(ext); ParserInterface *intf = m_extensions.find(ext);
if (intf==0 && ext.length()>4) if (intf==0 && ext.length()>4)
{ {
intf = m_parsers.find(ext.left(4)); intf = m_extensions.find(ext.left(4));
} }
return intf ? intf : m_defaultParser; return intf ? intf : m_defaultParser;
} }
private: private:
QDict<ParserInterface> m_parsers; QDict<ParserInterface> m_parsers;
QDict<ParserInterface> m_extensions;
ParserInterface *m_defaultParser; ParserInterface *m_defaultParser;
}; };
......
src/qhp.cpp
View file @ 78a0accf
...@@ -75,7 +75,7 @@ void Qhp::initialize() ...@@ -75,7 +75,7 @@ void Qhp::initialize()
m_doc.openCloseContent("virtualFolder", virtualFolder); m_doc.openCloseContent("virtualFolder", virtualFolder);
// Add custom filter // Add custom filter
QCString filterName = Config_getString("QHP_CUSTOM_FILTER_NAME"); QCString filterName = Config_getString("QHP_CUST_FILTER_NAME");
if (!filterName.isEmpty()) if (!filterName.isEmpty())
{ {
const char * tagAttributes[] = const char * tagAttributes[] =
......
src/scanner.l
View file @ 78a0accf
...@@ -4613,7 +4613,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?) ...@@ -4613,7 +4613,7 @@ TYPEDEFPREFIX (("typedef"{BN}+)?)((("volatile"|"const"){BN}+)?)
<Bases,ClassVar>("//"{B}*)?"/**"/[^/*] | <Bases,ClassVar>("//"{B}*)?"/**"/[^/*] |
<Bases,ClassVar>("//"{B}*)?"/*!" | <Bases,ClassVar>("//"{B}*)?"/*!" |
<Bases,ClassVar>"//!" | <Bases,ClassVar>"//!" |
<Bases,ClassVar>[\-+]{BN}+ { <Bases,ClassVar>[\-+]{BN}* {
if (!insideObjC) if (!insideObjC)
{ {
REJECT; REJECT;
......
src/translator_vi.h 0 → 100644
View file @ 78a0accf
/******************************************************************************
*
*
*
* Copyright (C) 1997-2008 by Dimitri van Heesch.
*
* Permission to use, copy, modify, and distribute this software and its
* documentation under the terms of the GNU General Public License is hereby
* granted. No representations are made about the suitability of this software
* for any purpose. It is provided "as is" without express or implied warranty.
* See the GNU General Public License for more details.
*
* Documents produced by Doxygen are derivative works derived from the
* input used in their production; they are not affected by this license.
*
*/
#ifndef TRANSLATOR_VI_H
#define TRANSLATOR_VI_H
/*
* 17 Oct 2008 : Translation to Vietnamese by
* Đặng Minh Tuấn <tuanvietkey@gmail.com>
*
*/
/*!
When defining a translator class for the new language, follow
the description in the documentation. One of the steps says
that you should copy the translator_en.h (this) file to your
translator_xx.h new file. Your new language should use the
Translator class as the base class. This means that you need to
implement exactly the same (pure virtual) methods as the
TranslatorEnglish does. Because of this, it is a good idea to
start with the copy of TranslatorEnglish and replace the strings
one by one.
It is not necessary to include "translator.h" or
"translator_adapter.h" here. The files are included in the
language.cpp correctly. Not including any of the mentioned
files frees the maintainer from thinking about whether the
first, the second, or both files should be included or not, and
why. This holds namely for localized translators because their
base class is changed occasionaly to adapter classes when the
Translator class changes the interface, or back to the
Translator class (by the local maintainer) when the localized
translator is made up-to-date again.
*/
class TranslatorVietnamese : public Translator
{
public:
// --- Language control methods -------------------
/*! Used for identification of the language. The identification
* should not be translated. It should be replaced by the name
* of the language in English using lower-case characters only
* (e.g. "czech", "japanese", "russian", etc.). It should be equal to
* the identification used in language.cpp.
*/
virtual QCString idLanguage()
{ return "vietnamese"; }
/*! Used to get the LaTeX command(s) for the language support.
* This method should return string with commands that switch
* LaTeX to the desired language. For example
* <pre>"\\usepackage[german]{babel}\n"
* </pre>
* or
* <pre>"\\usepackage{polski}\n"
* "\\usepackage[latin2]{inputenc}\n"
* "\\usepackage[T1]{fontenc}\n"
* </pre>
*
* The English LaTeX does not use such commands. Because of this
* the empty string is returned in this implementation.
*/
virtual QCString latexLanguageSupportCommand()
{
return "";
}
/*! return the language charset. This will be used for the HTML output */
virtual QCString idLanguageCharset()
{
return "utf-8";
}
// --- Language translation methods -------------------
/*! used in the compound documentation before a list of related functions. */
virtual QCString trRelatedFunctions()
{ return "Những hàm liên quan"; }
/*! subscript for the related functions. */
virtual QCString trRelatedSubscript()
{ return "(Chú ý những hàm này không phải là hàm thành viên.)"; }
/*! header that is put before the detailed description of files, classes and namespaces. */
virtual QCString trDetailedDescription()
{ return "Mô tả chi tiết"; }
/*! header that is put before the list of typedefs. */
virtual QCString trMemberTypedefDocumentation()
{ return "Thông tin về Member Typedef"; }
/*! header that is put before the list of enumerations. */
virtual QCString trMemberEnumerationDocumentation()
{ return "Thông tin về Member Enumeration"; }
/*! header that is put before the list of member functions. */
virtual QCString trMemberFunctionDocumentation()
{ return "Thông tin về hàm thành viên"; }
/*! header that is put before the list of member attributes. */
virtual QCString trMemberDataDocumentation()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Thông tin về trường";
}
else
{
return "Thông tin về Member Data";
}
}
/*! this is the text of a link put after brief descriptions. */
virtual QCString trMore()
{ return "Tiếp..."; }
/*! put in the class documentation */
virtual QCString trListOfAllMembers()
{ return "Liệt kê tất cả các thành viên."; }
/*! used as the title of the "list of all members" page of a class */
virtual QCString trMemberList()
{ return "Danh sách thành viên"; }
/*! this is the first part of a sentence that is followed by a class name */
virtual QCString trThisIsTheListOfAllMembers()
{ return "Danh sách các thành viên đầy đủ cho "; }
/*! this is the remainder of the sentence after the class name */
virtual QCString trIncludingInheritedMembers()
{ return ", cùng với tất cả các thành viên kế thừa."; }
/*! this is put at the author sections at the bottom of man pages.
* parameter s is name of the project name.
*/
virtual QCString trGeneratedAutomatically(const char *s)
{ QCString result="Được tạo ra bởi Doxygen";
if (s) result+=(QCString)" cho "+s;
result+=" từ mã nguồn.";
return result;
}
/*! put after an enum name in the list of all members */
virtual QCString trEnumName()
{ return "tên enum"; }
/*! put after an enum value in the list of all members */
virtual QCString trEnumValue()
{ return "giá trị enum"; }
/*! put after an undocumented member in the list of all members */
virtual QCString trDefinedIn()
{ return "được định nghĩa trong"; }
// quick reference sections
/*! This is put above each page as a link to the list of all groups of
* compounds or files (see the \\group command).
*/
virtual QCString trModules()
{ return "Các Modules"; }
/*! This is put above each page as a link to the class hierarchy */
virtual QCString trClassHierarchy()
{ return "Kiến trúc Class"; }
/*! This is put above each page as a link to the list of annotated classes */
virtual QCString trCompoundList()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Cấu trúc cơ sở dữ liệu (Data Structures)";
}
else
{
return "Danh mục các Class";
}
}
/*! This is put above each page as a link to the list of documented files */
virtual QCString trFileList()
{ return "Danh mục File"; }
/*! This is put above each page as a link to all members of compounds. */
virtual QCString trCompoundMembers()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Các trường dữ liệu";
}
else
{
return "Các thành viên của Class";
}
}
/*! This is put above each page as a link to all members of files. */
virtual QCString trFileMembers()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Toàn cục";
}
else
{
return "File thành viên";
}
}
/*! This is put above each page as a link to all related pages. */
virtual QCString trRelatedPages()
{ return "Các trang liên quan"; }
/*! This is put above each page as a link to all examples. */
virtual QCString trExamples()
{ return "Các ví dụ"; }
/*! This is put above each page as a link to the search engine. */
virtual QCString trSearch()
{ return "Tìm kiếm"; }
/*! This is an introduction to the class hierarchy. */
virtual QCString trClassHierarchyDescription()
{ return "Danh sách kế thừa đã được sắp xếp theo ABC, "
"nhưng chưa đầy đủ:";
}
/*! This is an introduction to the list with all files. */
virtual QCString trFileListDescription(bool extractAll)
{
QCString result="Danh mục đầy đủ tất cả các ";
if (!extractAll) result+="(đã được biên soạn) ";
result+="files cùng với các mô tả tóm tắt:";
return result;
}
/*! This is an introduction to the annotated compound list. */
virtual QCString trCompoundListDescription()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Đây là cấu trúc cơ sở dữ liệu với mô tả tóm tắt:";
}
else
{
return "Đây là các classes, structs, "
"unions và interfaces với các mô tả tóm tắt:";
}
}
/*! This is an introduction to the page with all class members. */
virtual QCString trCompoundMembersDescription(bool extractAll)
{
QCString result="Danh mục tất cả các ";
if (!extractAll)
{
result+="(đã được mô tả) ";
}
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
result+="struct và union fields";
}
else
{
result+="class members";
}
result+=" cùng với các các liên kết đến ";
if (!extractAll)
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
result+="Thông tin về struct/union cho từng trường:";
}
else
{
result+="Thông tin về class cho từng thành viên:";
}
}
else
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
result+="các structures/unions thuộc:";
}
else
{
result+="các lớp thuộc:";
}
}
return result;
}
/*! This is an introduction to the page with all file members. */
virtual QCString trFileMembersDescription(bool extractAll)
{
QCString result="Danh sách tất cả các ";
if (!extractAll) result+="(đã được mô tat) ";
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
result+="functions, variables, defines, enums, và typedefs";
}
else
{
result+="các file thành viên";
}
result+=" cùng với links tới ";
if (extractAll)
result+="các files thuộc:";
else
result+="tài liệu:";
return result;
}
/*! This is an introduction to the page with the list of all examples */
virtual QCString trExamplesDescription()
{ return "Danh sách tất cả các ví dụ:"; }
/*! This is an introduction to the page with the list of related pages */
virtual QCString trRelatedPagesDescription()
{ return "Danh sách tất cả các trang Thông tin có liên quan:"; }
/*! This is an introduction to the page with the list of class/file groups */
virtual QCString trModulesDescription()
{ return "Danh sách tất cả các thành viên:"; }
// index titles (the project name is prepended for these)
/*! This is used in HTML as the title of index.html. */
virtual QCString trDocumentation()
{ return "Thông tin"; }
/*! This is used in LaTeX as the title of the chapter with the
* index of all groups.
*/
virtual QCString trModuleIndex()
{ return "Chỉ mục (Index) Module"; }
/*! This is used in LaTeX as the title of the chapter with the
* class hierarchy.
*/
virtual QCString trHierarchicalIndex()
{ return "Hierarchical Index"; }
/*! This is used in LaTeX as the title of the chapter with the
* annotated compound index.
*/
virtual QCString trCompoundIndex()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Index cấu trúc cơ sở dữ liệu";
}
else
{
return "Class Index";
}
}
/*! This is used in LaTeX as the title of the chapter with the
* list of all files.
*/
virtual QCString trFileIndex()
{ return "File Index"; }
/*! This is used in LaTeX as the title of the chapter containing
* the documentation of all groups.
*/
virtual QCString trModuleDocumentation()
{ return "Thông tin về các Module"; }
/*! This is used in LaTeX as the title of the chapter containing
* the documentation of all classes, structs and unions.
*/
virtual QCString trClassDocumentation()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Thông tin về cấu trúc cơ sở dữ liệu";
}
else
{
return "Thông tin về Class";
}
}
/*! This is used in LaTeX as the title of the chapter containing
* the documentation of all files.
*/
virtual QCString trFileDocumentation()
{ return "Thông tin về File"; }
/*! This is used in LaTeX as the title of the chapter containing
* the documentation of all examples.
*/
virtual QCString trExampleDocumentation()
{ return "Thông tin về các ví dụ"; }
/*! This is used in LaTeX as the title of the chapter containing
* the documentation of all related pages.
*/
virtual QCString trPageDocumentation()
{ return "Trang Thông tin"; }
/*! This is used in LaTeX as the title of the document */
virtual QCString trReferenceManual()
{ return "Thông tin tham chiếu"; }
/*! This is used in the documentation of a file as a header before the
* list of defines
*/
virtual QCString trDefines()
{ return "Định nghĩa"; }
/*! This is used in the documentation of a file as a header before the
* list of function prototypes
*/
virtual QCString trFuncProtos()
{ return "Function Prototypes"; }
/*! This is used in the documentation of a file as a header before the
* list of typedefs
*/
virtual QCString trTypedefs()
{ return "Typedefs"; }
/*! This is used in the documentation of a file as a header before the
* list of enumerations
*/
virtual QCString trEnumerations()
{ return "Enumerations"; }
/*! This is used in the documentation of a file as a header before the
* list of (global) functions
*/
virtual QCString trFunctions()
{ return "Các hàm"; }
/*! This is used in the documentation of a file as a header before the
* list of (global) variables
*/
virtual QCString trVariables()
{ return "Các biến"; }
/*! This is used in the documentation of a file as a header before the
* list of (global) variables
*/
virtual QCString trEnumerationValues()
{ return "Enumerator"; }
/*! This is used in the documentation of a file before the list of
* documentation blocks for defines
*/
virtual QCString trDefineDocumentation()
{ return "Thông tin về định nghĩa"; }
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for function prototypes
*/
virtual QCString trFunctionPrototypeDocumentation()
{ return "Thông tin về Function Prototype"; }
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for typedefs
*/
virtual QCString trTypedefDocumentation()
{ return "Thông tin về Typedef"; }
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for enumeration types
*/
virtual QCString trEnumerationTypeDocumentation()
{ return "Thông tin về Enumeration Type"; }
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for functions
*/
virtual QCString trFunctionDocumentation()
{ return "Thông tin về hàm"; }
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for variables
*/
virtual QCString trVariableDocumentation()
{ return "Thông tin về các biến"; }
/*! This is used in the documentation of a file/namespace/group before
* the list of links to documented compounds
*/
virtual QCString trCompounds()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Cấu trúc cơ sở dữ liệu";
}
else
{
return "Classes";
}
}
/*! This is used in the standard footer of each page and indicates when
* the page was generated
*/
virtual QCString trGeneratedAt(const char *date,const char *projName)
{
QCString result=(QCString)"Được biên soạn vào "+date;
if (projName) result+=(QCString)" cho mã nguồn dự án "+projName;
result+=(QCString)" bởi";
return result;
}
/*! This is part of the sentence used in the standard footer of each page.
*/
virtual QCString trWrittenBy()
{
return "được viết bởi";
}
/*! this text is put before a class diagram */
virtual QCString trClassDiagram(const char *clName)
{
return (QCString)"Sơ đồ kế thừa cho "+clName+":";
}
/*! this text is generated when the \\internal command is used. */
virtual QCString trForInternalUseOnly()
{ return "Chỉ cho sử dụng nội bộ."; }
/*! this text is generated when the \\warning command is used. */
virtual QCString trWarning()
{ return "Lưu ý"; }
/*! this text is generated when the \\version command is used. */
virtual QCString trVersion()
{ return "Phiên bản"; }
/*! this text is generated when the \\date command is used. */
virtual QCString trDate()
{ return "Ngày"; }
/*! this text is generated when the \\return command is used. */
virtual QCString trReturns()
{ return "Giá trị trả về"; }
/*! this text is generated when the \\sa command is used. */
virtual QCString trSeeAlso()
{ return "Xem thêm"; }
/*! this text is generated when the \\param command is used. */
virtual QCString trParameters()
{ return "Các tham số"; }
/*! this text is generated when the \\exception command is used. */
virtual QCString trExceptions()
{ return "Exceptions"; }
/*! this text is used in the title page of a LaTeX document. */
virtual QCString trGeneratedBy()
{ return "Được biên soạn bởi"; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990307
//////////////////////////////////////////////////////////////////////////
/*! used as the title of page containing all the index of all namespaces. */
virtual QCString trNamespaceList()
{ return "Danh sách Namespace"; }
/*! used as an introduction to the namespace list */
virtual QCString trNamespaceListDescription(bool extractAll)
{
QCString result="Danh sách tất cả các ";
if (!extractAll) result+="(đã được biên tập) ";
result+="namespaces với mô tả tóm tắt:";
return result;
}
/*! used in the class documentation as a header before the list of all
* friends of a class
*/
virtual QCString trFriends()
{ return "Friends"; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990405
//////////////////////////////////////////////////////////////////////////
/*! used in the class documentation as a header before the list of all
* related classes
*/
virtual QCString trRelatedFunctionDocumentation()
{ return "Thông tin về Friends và các hàm liên quan"; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990425
//////////////////////////////////////////////////////////////////////////
/*! used as the title of the HTML page of a class/struct/union */
virtual QCString trCompoundReference(const char *clName,
ClassDef::CompoundType compType,
bool isTemplate)
{
QCString result=(QCString)clName;
switch(compType)
{
case ClassDef::Class: result+=" Class"; break;
case ClassDef::Struct: result+=" Struct"; break;
case ClassDef::Union: result+=" Union"; break;
case ClassDef::Interface: result+=" Interface"; break;
case ClassDef::Protocol: result+=" Protocol"; break;
case ClassDef::Category: result+=" Category"; break;
case ClassDef::Exception: result+=" Exception"; break;
}
if (isTemplate) result+=" Template";
result+=" Tham chiếu";
return result;
}
/*! used as the title of the HTML page of a file */
virtual QCString trFileReference(const char *fileName)
{
QCString result=fileName;
result+=" File Tham chiếu";
return result;
}
/*! used as the title of the HTML page of a namespace */
virtual QCString trNamespaceReference(const char *namespaceName)
{
QCString result=namespaceName;
result+=" Namespace Tham chiếu";
return result;
}
virtual QCString trPublicMembers()
{ return "Các hàm thành viên Public"; }
virtual QCString trPublicSlots()
{ return "Public Slots"; }
virtual QCString trSignals()
{ return "Signals"; }
virtual QCString trStaticPublicMembers()
{ return "Các hàm Static Public"; }
virtual QCString trProtectedMembers()
{ return "Các hàm thành viên Protected"; }
virtual QCString trProtectedSlots()
{ return "Protected Slots"; }
virtual QCString trStaticProtectedMembers()
{ return "Các hàm thành viên Static Protected"; }
virtual QCString trPrivateMembers()
{ return "Các hàm thành viên Private"; }
virtual QCString trPrivateSlots()
{ return "Private Slots"; }
virtual QCString trStaticPrivateMembers()
{ return "Các hàm thành viên Static Private"; }
/*! this function is used to produce a comma-separated list of items.
* use generateMarker(i) to indicate where item i should be put.
*/
virtual QCString trWriteList(int numEntries)
{
QCString result;
int i;
// the inherits list contain `numEntries' classes
for (i=0;i<numEntries;i++)
{
// use generateMarker to generate placeholders for the class links!
result+=generateMarker(i); // generate marker for entry i in the list
// (order is left to right)
if (i!=numEntries-1) // not the last entry, so we need a separator
{
if (i<numEntries-2) // not the fore last entry
result+=", ";
else // the fore last entry
result+=", và ";
}
}
return result;
}
/*! used in class documentation to produce a list of base classes,
* if class diagrams are disabled.
*/
virtual QCString trInheritsList(int numEntries)
{
return "Kế thừa "+trWriteList(numEntries)+".";
}
/*! used in class documentation to produce a list of super classes,
* if class diagrams are disabled.
*/
virtual QCString trInheritedByList(int numEntries)
{
return "Được kế thừa bởi "+trWriteList(numEntries)+".";
}
/*! used in member documentation blocks to produce a list of
* members that are hidden by this one.
*/
virtual QCString trReimplementedFromList(int numEntries)
{
return "Được thực thi lại từ "+trWriteList(numEntries)+".";
}
/*! used in member documentation blocks to produce a list of
* all member that overwrite the implementation of this member.
*/
virtual QCString trReimplementedInList(int numEntries)
{
return "Được thực thi lại trong "+trWriteList(numEntries)+".";
}
/*! This is put above each page as a link to all members of namespaces. */
virtual QCString trNamespaceMembers()
{ return "Thành viên Namespace"; }
/*! This is an introduction to the page with all namespace members */
virtual QCString trNamespaceMemberDescription(bool extractAll)
{
QCString result="Danh sách tất cả các ";
if (!extractAll) result+="(đã được biên soạn) ";
result+="các thành viên namespace cùng với link tới ";
if (extractAll)
result+="Thông tin namespace cho từng thành viên:";
else
result+=" namespaces mà phụ thuộc bởi:";
return result;
}
/*! This is used in LaTeX as the title of the chapter with the
* index of all namespaces.
*/
virtual QCString trNamespaceIndex()
{ return "Namespace Index"; }
/*! This is used in LaTeX as the title of the chapter containing
* the documentation of all namespaces.
*/
virtual QCString trNamespaceDocumentation()
{ return "Thông tin về Namespace"; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990522
//////////////////////////////////////////////////////////////////////////
/*! This is used in the documentation before the list of all
* namespaces in a file.
*/
virtual QCString trNamespaces()
{ return "Namespaces"; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990728
//////////////////////////////////////////////////////////////////////////
/*! This is put at the bottom of a class documentation page and is
* followed by a list of files that were used to generate the page.
*/
virtual QCString trGeneratedFromFiles(ClassDef::CompoundType compType,
bool single)
{ // here s is one of " Class", " Struct" or " Union"
// single is true implies a single file
QCString result=(QCString)"Thông tin cho ";
switch(compType)
{
case ClassDef::Class: result+="class"; break;
case ClassDef::Struct: result+="struct"; break;
case ClassDef::Union: result+="union"; break;
case ClassDef::Interface: result+="interface"; break;
case ClassDef::Protocol: result+="protocol"; break;
case ClassDef::Category: result+="category"; break;
case ClassDef::Exception: result+="exception"; break;
}
result+=" được biên soạn từ các file sau đây";
if (single) result+=":"; else result+=":";
return result;
}
/*! This is in the (quick) index as a link to the alphabetical compound
* list.
*/
virtual QCString trAlphabeticalList()
{ return "Danh sách theo ABC"; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990901
//////////////////////////////////////////////////////////////////////////
/*! This is used as the heading text for the retval command. */
virtual QCString trReturnValues()
{ return "Các giá trị trả về"; }
/*! This is in the (quick) index as a link to the main page (index.html)
*/
virtual QCString trMainPage()
{ return "Tranh chính"; }
/*! This is used in references to page that are put in the LaTeX
* documentation. It should be an abbreviation of the word page.
*/
virtual QCString trPageAbbreviation()
{ return "tr."; }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-991003
//////////////////////////////////////////////////////////////////////////
virtual QCString trDefinedAtLineInSourceFile()
{
return "Định nghĩa tại dòng @0 trong file @1.";
}
virtual QCString trDefinedInSourceFile()
{
return "Định nghĩa trong file @0.";
}
//////////////////////////////////////////////////////////////////////////
// new since 0.49-991205
//////////////////////////////////////////////////////////////////////////
virtual QCString trDeprecated()
{
return "Không tán thành";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.0.0
//////////////////////////////////////////////////////////////////////////
/*! this text is put before a collaboration diagram */
virtual QCString trCollaborationDiagram(const char *clName)
{
return (QCString)"Sơ đồ liên kết cho "+clName+":";
}
/*! this text is put before an include dependency graph */
virtual QCString trInclDepGraph(const char *fName)
{
return (QCString)"Kèm theo graph phụ thuộc cho "+fName+":";
}
/*! header that is put before the list of constructor/destructors. */
virtual QCString trConstructorDocumentation()
{
return "Thông tin về Constructor và Destructor";
}
/*! Used in the file documentation to point to the corresponding sources. */
virtual QCString trGotoSourceCode()
{
return "Tới mã nguồn của file này.";
}
/*! Used in the file sources to point to the corresponding documentation. */
virtual QCString trGotoDocumentation()
{
return "Tới Thông tin của file này.";
}
/*! Text for the \\pre command */
virtual QCString trPrecondition()
{
return "Điều kiện trước";
}
/*! Text for the \\post command */
virtual QCString trPostcondition()
{
return "Điều kiện sau";
}
/*! Text for the \\invariant command */
virtual QCString trInvariant()
{
return "Bất biến";
}
/*! Text shown before a multi-line variable/enum initialization */
virtual QCString trInitialValue()
{
return "Giá trị khởi tạo:";
}
/*! Text used the source code in the file index */
virtual QCString trCode()
{
return "mã nguồn";
}
virtual QCString trGraphicalHierarchy()
{
return "Kiến trúc đồ họa của Class";
}
virtual QCString trGotoGraphicalHierarchy()
{
return "Tới kiến trúc đồ họa của Class";
}
virtual QCString trGotoTextualHierarchy()
{
return "Tới kiến trúc text của Class";
}
virtual QCString trPageIndex()
{
return "Chỉ mục trang";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.1.0
//////////////////////////////////////////////////////////////////////////
virtual QCString trNote()
{
return "Ghi chú";
}
virtual QCString trPublicTypes()
{
return "Public Types";
}
virtual QCString trPublicAttribs()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "các trường đữ liệu";
}
else
{
return "Các thuộc tính Public";
}
}
virtual QCString trStaticPublicAttribs()
{
return "Các thuộc tính Static Public";
}
virtual QCString trProtectedTypes()
{
return "Các kiểu Protected";
}
virtual QCString trProtectedAttribs()
{
return "các thuộc tính Protected";
}
virtual QCString trStaticProtectedAttribs()
{
return "Các thuộc tính Static Protected";
}
virtual QCString trPrivateTypes()
{
return "Các kiểu Private";
}
virtual QCString trPrivateAttribs()
{
return "Các thuộc tính Private";
}
virtual QCString trStaticPrivateAttribs()
{
return "Các thuộc tính Static Private";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.1.3
//////////////////////////////////////////////////////////////////////////
/*! Used as a marker that is put before a \\todo item */
virtual QCString trTodo()
{
return "Mục tiêu";
}
/*! Used as the header of the todo list */
virtual QCString trTodoList()
{
return "Danh sách hàng mục cần thực hiện";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.1.4
//////////////////////////////////////////////////////////////////////////
virtual QCString trReferencedBy()
{
return "Tham chiếu bởi";
}
virtual QCString trRemarks()
{
return "Ghi chú";
}
virtual QCString trAttention()
{
return "Chú ý";
}
virtual QCString trInclByDepGraph()
{
return "Đồ thị này biểu thị những file nào trực tiếp hoặc"
"không trực tiếp bao gồm file này:";
}
virtual QCString trSince()
{
return "Từ";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.1.5
//////////////////////////////////////////////////////////////////////////
/*! title of the graph legend page */
virtual QCString trLegendTitle()
{
return "Chú giải Graph";
}
/*! page explaining how the dot graph's should be interpreted
* The %A in the text below are to prevent link to classes called "A".
*/
virtual QCString trLegendDocs()
{
return
"Trang này giải nghĩa các biểu đồ được biên soạn bởi "
" doxygen.<p>\n"
"Hãy xem xét các ví dụ sau:\n"
"\\code\n"
"/*! Các lướp không thấy được bởi sự cắt ngắn */\n"
"Lớp không nhìn thấy class { };\n\n"
"/*! class bị cắt, quan hệ kế thừa bị ẩn */\n"
"class bị cắt : bị ẩn toàn cục { };\n\n"
"/* Class không được mô tả với các chú giải doxygen */\n"
"class không được mô tả { };\n\n"
"/*! Class được kế thừa sử dụng các kế thừa public */\n"
"class PublicBase : public Truncated { };\n\n"
"/*! template class */\n"
"template<class T> class Templ { };\n\n"
"/*! Class được kế thừa sử dụng kế thừa protected */\n"
"class ProtectedBase { };\n\n"
"/*! Class được kế thừa sử dụng kế thừa protected private */\n"
"class PrivateBase { };\n\n"
"/*! Class được sử dụng bởi các class kế thừa */\n"
"class được sử dụng { };\n\n"
"/*! Super class kế thừa một số các class khác */\n"
"class được kế thừa : public PublicBase,\n"
" protected ProtectedBase,\n"
" private PrivateBase,\n"
" public Undocumented,\n"
" public Templ<int>\n"
"{\n"
" private:\n"
" Used *m_usedClass;\n"
"};\n"
"\\endcode\n"
"Kết quả trong biểu đồ sau đây:"
"<p><center><img alt=\"\" src=\"graph_legend."+Config_getEnum("DOT_IMAGE_FORMAT")+"\"></center>\n"
"<p>\n"
"Các hộp trong biểu đồ trên có ý nghĩa như sau:\n"
"<ul>\n"
"<li>%Hộp màu xám biểu thị cấu trúc clas cho "
"biểu đồ được thể hiện.\n"
"<li>%Hộp có khung mầu đen biểu thị struct hoặc class được mô tả.\n"
"<li>%Hộp có khung mầu xám biểu thị struct hoặc class chưa được mô tả.\n"
"<li>%Hộp có khung mầu đỏ biểu thị struct hoặc class được mổ tả "
"khi mà không phải tất cả các quan hệ kế thừa/containment được biển diễn.. %Biểu đồ bị "
"cắt nếu nó không nằm trọn trong các biên được cho trước..\n"
"</ul>\n"
"Các mũi tên có ý nghĩa như sau::\n"
"<ul>\n"
"<li>%Mũi tên mầu xanh đậm biểu thị các quan hệ kế thừa công khai "
"giữa 2 class.\n"
"<li>%Mũi tên màu xanh lá cây đậm biểu thị kế thừa được bảo về (protected).\n"
"<li>%Mũi tên đỏ đậm biểu thị kế thừa dạng private.\n"
"<li>%Mũi tên màu hồng đứt quảng biểu thị class được sử dụng "
"bởi class khác. Mũi tên được gán nhãn với các giá trị "
"mà các calsss hoặc struct được truy cập tới.\n"
"<li>%Mũi tên vàng đắt quãng được thị quan hệ giữa template instance và "
"template class được dẫn xuất từ đó. Mũi tên được gán nhãn với "
"tham số của template.\n"
"</ul>\n";
}
/*! text for the link to the legend page */
virtual QCString trLegend()
{
return "Chú giải";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.0
//////////////////////////////////////////////////////////////////////////
/*! Used as a marker that is put before a test item */
virtual QCString trTest()
{
return "Test";
}
/*! Used as the header of the test list */
virtual QCString trTestList()
{
return "Danh sách Test";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.1
//////////////////////////////////////////////////////////////////////////
/*! Used as a section header for KDE-2 IDL methods */
virtual QCString trDCOPMethods()
{
return "Các hàm thành viên DCOP";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.2
//////////////////////////////////////////////////////////////////////////
/*! Used as a section header for IDL properties */
virtual QCString trProperties()
{
return "Thuộc tính";
}
/*! Used as a section header for IDL property documentation */
virtual QCString trPropertyDocumentation()
{
return "Thông tin thuộc tính (Property)";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.4
//////////////////////////////////////////////////////////////////////////
/*! Used for Java classes in the summary section of Java packages */
virtual QCString trClasses()
{
if (Config_getBool("OPTIMIZE_OUTPUT_FOR_C"))
{
return "Cấu trúc dữ liệu";
}
else
{
return "Classes";
}
}
/*! Used as the title of a Java package */
virtual QCString trPackage(const char *name)
{
return (QCString)"Gói "+name;
}
/*! Title of the package index page */
virtual QCString trPackageList()
{
return "Danh sách gói";
}
/*! The description of the package index page */
virtual QCString trPackageListDescription()
{
return "Danh sách các gói cùng với mô tả tóm tắt (khi có thể có):";
}
/*! The link name in the Quick links header for each page */
virtual QCString trPackages()
{
return "Các gói";
}
/*! Text shown before a multi-line define */
virtual QCString trDefineValue()
{
return "Giá trị:";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.5
//////////////////////////////////////////////////////////////////////////
/*! Used as a marker that is put before a \\bug item */
virtual QCString trBug()
{
return "Lỗi";
}
/*! Used as the header of the bug list */
virtual QCString trBugList()
{
return "Danh sách lỗi";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.6
//////////////////////////////////////////////////////////////////////////
/*! Used as ansicpg for RTF file
*
* The following table shows the correlation of Charset name, Charset Value and
* <pre>
* Codepage number:
* Charset Name Charset Value(hex) Codepage number
* ------------------------------------------------------
* DEFAULT_CHARSET 1 (x01)
* SYMBOL_CHARSET 2 (x02)
* OEM_CHARSET 255 (xFF)
* ANSI_CHARSET 0 (x00) 1252
* RUSSIAN_CHARSET 204 (xCC) 1251
* EE_CHARSET 238 (xEE) 1250
* GREEK_CHARSET 161 (xA1) 1253
* TURKISH_CHARSET 162 (xA2) 1254
* BALTIC_CHARSET 186 (xBA) 1257
* HEBREW_CHARSET 177 (xB1) 1255
* ARABIC _CHARSET 178 (xB2) 1256
* SHIFTJIS_CHARSET 128 (x80) 932
* HANGEUL_CHARSET 129 (x81) 949
* GB2313_CHARSET 134 (x86) 936
* CHINESEBIG5_CHARSET 136 (x88) 950
* </pre>
*
*/
virtual QCString trRTFansicp()
{
return "1252";
}
/*! Used as ansicpg for RTF fcharset
* \see trRTFansicp() for a table of possible values.
*/
virtual QCString trRTFCharSet()
{
return "0";
}
/*! Used as header RTF general index */
virtual QCString trRTFGeneralIndex()
{
return "Chỉ số";
}
/*! 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 trClass(bool first_capital, bool singular)
{
QCString result((first_capital ? "Class" : "class"));
if (!singular) result+="es";
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 trFile(bool first_capital, bool singular)
{
QCString result((first_capital ? "File" : "file"));
if (!singular) result+="s";
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 trNamespace(bool first_capital, bool singular)
{
QCString result((first_capital ? "Namespace" : "namespace"));
if (!singular) result+="s";
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 trGroup(bool first_capital, bool singular)
{
QCString result((first_capital ? "Group" : "group"));
if (!singular) result+="s";
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 trPage(bool first_capital, bool singular)
{
QCString result((first_capital ? "Trang" : "trang"));
if (!singular) result+="";
return result;
}
/*! This is used for translation of the word that will possibly
* be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trMember(bool first_capital, bool singular)
{
QCString result((first_capital ? "Member" : "member"));
if (!singular) result+="s";
return result;
}
/*! This is used for translation of the word that will possibly
* be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trGlobal(bool first_capital, bool singular)
{
QCString result((first_capital ? "Global" : "global"));
if (!singular) result+="s";
return result;
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.7
//////////////////////////////////////////////////////////////////////////
/*! This text is generated when the \\author command is used and
* for the author section in man pages. */
virtual QCString trAuthor(bool first_capital, bool singular)
{
QCString result((first_capital ? "Tác giả" : "tác giả"));
if (!singular) result+="";
return result;
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.11
//////////////////////////////////////////////////////////////////////////
/*! This text is put before the list of members referenced by a member
*/
virtual QCString trReferences()
{
return "Tham chiếu";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.13
//////////////////////////////////////////////////////////////////////////
/*! used in member documentation blocks to produce a list of
* members that are implemented by this one.
*/
virtual QCString trImplementedFromList(int numEntries)
{
return "Thực hiện "+trWriteList(numEntries)+".";
}
/*! used in member documentation blocks to produce a list of
* all members that implement this abstract member.
*/
virtual QCString trImplementedInList(int numEntries)
{
return "Được thực hiện trong "+trWriteList(numEntries)+".";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.16
//////////////////////////////////////////////////////////////////////////
/*! used in RTF documentation as a heading for the Table
* of Contents.
*/
virtual QCString trRTFTableOfContents()
{
return "Mục lục";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.17
//////////////////////////////////////////////////////////////////////////
/*! Used as the header of the list of item that have been
* flagged deprecated
*/
virtual QCString trDeprecatedList()
{
return "Danh sách Deprecated";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.2.18
//////////////////////////////////////////////////////////////////////////
/*! Used as a header for declaration section of the events found in
* a C# program
*/
virtual QCString trEvents()
{
return "Sự kiện";
}
/*! Header used for the documentation section of a class' events. */
virtual QCString trEventDocumentation()
{
return "Thông tin về sự kiện";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.3
//////////////////////////////////////////////////////////////////////////
/*! Used as a heading for a list of Java class types with package scope.
*/
virtual QCString trPackageTypes()
{
return "Kiểu gói";
}
/*! Used as a heading for a list of Java class functions with package
* scope.
*/
virtual QCString trPackageMembers()
{
return "Các hàm Package";
}
/*! Used as a heading for a list of static Java class functions with
* package scope.
*/
virtual QCString trStaticPackageMembers()
{
return "Các hàm Static Package";
}
/*! Used as a heading for a list of Java class variables with package
* scope.
*/
virtual QCString trPackageAttribs()
{
return "Các thuộc tính Package";
}
/*! Used as a heading for a list of static Java class variables with
* package scope.
*/
virtual QCString trStaticPackageAttribs()
{
return "Các thuộc tính Static 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 "Tất cả";
}
/*! Put in front of the call graph for a function. */
virtual QCString trCallGraph()
{
return "Biểu đồ các lời gọi cho hàm này:";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.3.3
//////////////////////////////////////////////////////////////////////////
/*! When the search engine is enabled this text is put in the header
* of each page before the field where one can enter the text to search
* for.
*/
virtual QCString trSearchForIndex()
{
return "Tìm kiếm cho";
}
/*! This string is used as the title for the page listing the search
* results.
*/
virtual QCString trSearchResultsTitle()
{
return "Kết quả tìm kiếm";
}
/*! This string is put just before listing the search results. The
* text can be different depending on the number of documents found.
* Inside the text you can put the special marker $num to insert
* the number representing the actual number of search results.
* The @a numDocuments parameter can be either 0, 1 or 2, where the
* value 2 represents 2 or more matches. HTML markup is allowed inside
* the returned string.
*/
virtual QCString trSearchResults(int numDocuments)
{
if (numDocuments==0)
{
return "Không có tài liệu nào thỏa mãn các truy vấn của bạn.";
}
else if (numDocuments==1)
{
return "Tìm thấy <b>1</b> tài liệu thỏa mã truy vấn của bạn.";
}
else
{
return "Tìm thấy tất cả <b>$num</b> tài liệu thỏa mã truy vấn của bạn. "
"Hiển thị những thỏa mãn tốt nhất trước.";
}
}
/*! This string is put before the list of matched words, for each search
* result. What follows is the list of words that matched the query.
*/
virtual QCString trSearchMatches()
{
return "Các kết quả thỏa mãn đk:";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.3.8
//////////////////////////////////////////////////////////////////////////
/*! This is used in HTML as the title of page with source code for file filename
*/
virtual QCString trSourceFile(QCString& filename)
{
return filename + " File nguồn";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.3.9
//////////////////////////////////////////////////////////////////////////
/*! This is used as the name of the chapter containing the directory
* hierarchy.
*/
virtual QCString trDirIndex()
{ return "Cấu trúc thư mục"; }
/*! This is used as the name of the chapter containing the documentation
* of the directories.
*/
virtual QCString trDirDocumentation()
{ return "Thông tin về thư mục"; }
/*! This is used as the title of the directory index and also in the
* Quick links of an HTML page, to link to the directory hierarchy.
*/
virtual QCString trDirectories()
{ return "Các thư mục"; }
/*! This returns a sentences that introduces the directory hierarchy.
* and the fact that it is sorted alphabetically per level
*/
virtual QCString trDirDescription()
{ return "Thư mục đã được sắp xếp theo al-pha-bê, "
"nhưng chưa đầy đủ:";
}
/*! This returns the title of a directory page. The name of the
* directory is passed via \a dirName.
*/
virtual QCString trDirReference(const char *dirName)
{ QCString result=dirName; result+=" Tham chiếu thư mục"; return result; }
/*! This returns the word directory with or without starting capital
* (\a first_capital) and in sigular or plural form (\a singular).
*/
virtual QCString trDir(bool first_capital, bool singular)
{
QCString result((first_capital ? "Thư mục" : "thư mục"));
if (singular) result+=""; else result+="";
return result;
}
//////////////////////////////////////////////////////////////////////////
// new since 1.4.1
//////////////////////////////////////////////////////////////////////////
/*! This text is added to the documentation when the \\overload command
* is used for a overloaded function.
*/
virtual QCString trOverloadText()
{
return "Hàm thành viên dạng overloaded, "
"được chỉ ra cho việc tra cứu dễ dàng. Nó khác với hàm ở trên"
"chỉ ở chỗ những tham số nào nó chấp nhận.";
}
//////////////////////////////////////////////////////////////////////////
// new since 1.4.6
//////////////////////////////////////////////////////////////////////////
/*! This is used to introduce a caller (or called-by) graph */
virtual QCString trCallerGraph()
{
return "Biểu đồ các lời gọi cho hàm này:";
}
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for enumeration values
*/
virtual QCString trEnumerationValueDocumentation()
{ return "Thông tin Enumerator"; }
//////////////////////////////////////////////////////////////////////////
// new since 1.5.4 (mainly for Fortran)
//////////////////////////////////////////////////////////////////////////
/*! header that is put before the list of member subprograms (Fortran). */
virtual QCString trMemberFunctionDocumentationFortran()
{ return "Thông tin về các hàm và các thủ tục thành viên"; }
/*! This is put above each page as a link to the list of annotated data types (Fortran). */
virtual QCString trCompoundListFortran()
{ return "Danh sách kiêu dữ liệu"; }
/*! This is put above each page as a link to all members of compounds (Fortran). */
virtual QCString trCompoundMembersFortran()
{ return "Trường dữ liệu"; }
/*! This is an introduction to the annotated compound list (Fortran). */
virtual QCString trCompoundListDescriptionFortran()
{ return "Kiểu dữ liệu với các mô tả tóm tắt:"; }
/*! This is an introduction to the page with all data types (Fortran). */
virtual QCString trCompoundMembersDescriptionFortran(bool extractAll)
{
QCString result="Danh sách tất cả ";
if (!extractAll)
{
result+="(đã được mô tả) ";
}
result+="các kiểu dữ liệu thành viên";
result+=" cùng với liên kết với ";
if (!extractAll)
{
result+="Thông tin cấu trúc dữ liệu cho từng thành viên";
}
else
{
result+=" các kiểu dữ liệu thuộc:";
}
return result;
}
/*! This is used in LaTeX as the title of the chapter with the
* annotated compound index (Fortran).
*/
virtual QCString trCompoundIndexFortran()
{ return "Chỉ mục kiểu dữ liệu"; }
/*! This is used in LaTeX as the title of the chapter containing
* the documentation of all data types (Fortran).
*/
virtual QCString trTypeDocumentation()
{ return "Thông tin về kiểu dữ liệu"; }
/*! This is used in the documentation of a file as a header before the
* list of (global) subprograms (Fortran).
*/
virtual QCString trSubprograms()
{ return "Functions/Subroutines"; }
/*! This is used in the documentation of a file/namespace before the list
* of documentation blocks for subprograms (Fortran)
*/
virtual QCString trSubprogramDocumentation()
{ return "Thông tin về Function/Subroutine"; }
/*! This is used in the documentation of a file/namespace/group before
* the list of links to documented compounds (Fortran)
*/
virtual QCString trDataTypes()
{ return "Kiểu dữ liệu"; }
/*! used as the title of page containing all the index of all modules (Fortran). */
virtual QCString trModulesList()
{ return "Danh sách Modules"; }
/*! used as an introduction to the modules list (Fortran) */
virtual QCString trModulesListDescription(bool extractAll)
{
QCString result="Danh sách tất cả ";
if (!extractAll) result+="(đã được mô tả) ";
result+="các module với mô tả tóm tắt:";
return result;
}
/*! used as the title of the HTML page of a module/type (Fortran) */
virtual QCString trCompoundReferenceFortran(const char *clName,
ClassDef::CompoundType compType,
bool isTemplate)
{
QCString result=(QCString)clName;
switch(compType)
{
case ClassDef::Class: result+=" Module"; break;
case ClassDef::Struct: result+=" Type"; break;
case ClassDef::Union: result+=" Union"; break;
case ClassDef::Interface: result+=" Interface"; break;
case ClassDef::Protocol: result+=" Protocol"; break;
case ClassDef::Category: result+=" Category"; break;
case ClassDef::Exception: result+=" Exception"; break;
}
if (isTemplate) result+=" Template";
result+=" Tham chiếu";
return result;
}
/*! used as the title of the HTML page of a module (Fortran) */
virtual QCString trModuleReference(const char *namespaceName)
{
QCString result=namespaceName;
result+=" Tham chiếu Module";
return result;
}
/*! This is put above each page as a link to all members of modules. (Fortran) */
virtual QCString trModulesMembers()
{ return "Thành viên Module"; }
/*! This is an introduction to the page with all modules members (Fortran) */
virtual QCString trModulesMemberDescription(bool extractAll)
{
QCString result="Danh sách tất cả ";
if (!extractAll) result+="(đã được mô tả) ";
result+="các module thành viên cùng với liên kết tới ";
if (extractAll)
{
result+="Thông tin module cho từng thành viên:";
}
else
{
result+="các module thuộc:";
}
return result;
}
/*! This is used in LaTeX as the title of the chapter with the
* index of all modules (Fortran).
*/
virtual QCString trModulesIndex()
{ return "Chỉ mục các Module"; }
/*! 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 trModule(bool first_capital, bool singular)
{
QCString result((first_capital ? "Module" : "module"));
if (!singular) result+="";
return result;
}
/*! This is put at the bottom of a module documentation page and is
* followed by a list of files that were used to generate the page.
*/
virtual QCString trGeneratedFromFilesFortran(ClassDef::CompoundType compType,
bool single)
{ // here s is one of " Module", " Struct" or " Union"
// single is true implies a single file
QCString result=(QCString)"Thông tin cho ";
switch(compType)
{
case ClassDef::Class: result+="module"; break;
case ClassDef::Struct: result+="type"; break;
case ClassDef::Union: result+="union"; break;
case ClassDef::Interface: result+="interface"; break;
case ClassDef::Protocol: result+="protocol"; break;
case ClassDef::Category: result+="category"; break;
case ClassDef::Exception: result+="exception"; break;
}
result+=" được biên soạn từ các file sau đây";
if (single) result+=":"; else result+="s:";
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 trType(bool first_capital, bool singular)
{
QCString result((first_capital ? "Kiểu" : "kiểu"));
if (!singular) result+="";
return result;
}
/*! This is used for translation of the word that will possibly
* be followed by a single name or by a list of names
* of the category.
*/
virtual QCString trSubprogram(bool first_capital, bool singular)
{
QCString result((first_capital ? "Chương trình con" : "chương trình con"));
if (!singular) result+="";
return result;
}
/*! C# Type Constraint list */
virtual QCString trTypeConstraints()
{
return "Ràng buộc của kiểu (Type)";
}
};
#endif
src/util.cpp
View file @ 78a0accf
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
#include "doxygen.h" #include "doxygen.h"
#include "textdocvisitor.h" #include "textdocvisitor.h"
#include "portable.h" #include "portable.h"
#include "parserintf.h"
#define ENABLE_TRACINGSUPPORT 0 #define ENABLE_TRACINGSUPPORT 0
...@@ -4459,10 +4460,10 @@ QCString substituteClassNames(const QCString &s) ...@@ -4459,10 +4460,10 @@ QCString substituteClassNames(const QCString &s)
QCString substitute(const char *s,const char *src,const char *dst) QCString substitute(const char *s,const char *src,const char *dst)
{ {
if (s==0 || src==0 || dst==0) return s; if (s==0 || src==0) return s;
const char *p, *q; const char *p, *q;
int srcLen = strlen(src); int srcLen = strlen(src);
int dstLen = strlen(dst); int dstLen = dst ? strlen(dst) : 0;
int resLen; int resLen;
if (srcLen!=dstLen) if (srcLen!=dstLen)
{ {
...@@ -4481,7 +4482,7 @@ QCString substitute(const char *s,const char *src,const char *dst) ...@@ -4481,7 +4482,7 @@ QCString substitute(const char *s,const char *src,const char *dst)
int l = (int)(q-p); int l = (int)(q-p);
memcpy(r,p,l); memcpy(r,p,l);
r+=l; r+=l;
memcpy(r,dst,dstLen); if (dst) memcpy(r,dst,dstLen);
r+=dstLen; r+=dstLen;
} }
strcpy(r,p); strcpy(r,p);
...@@ -6374,30 +6375,32 @@ static QDict<int> g_extLookup; ...@@ -6374,30 +6375,32 @@ static QDict<int> g_extLookup;
static struct Lang2ExtMap static struct Lang2ExtMap
{ {
const char *langName; const char *langName;
const char *parserName;
SrcLangExt parserId; SrcLangExt parserId;
} }
g_lang2extMap[] = g_lang2extMap[] =
{ {
{ "idl", SrcLangExt_IDL }, // language parser parser option
{ "java", SrcLangExt_Java }, { "idl", "c", SrcLangExt_IDL },
{ "javascript", SrcLangExt_JS }, { "java", "c", SrcLangExt_Java },
{ "c#", SrcLangExt_CSharp }, { "javascript", "c", SrcLangExt_JS },
{ "d", SrcLangExt_D }, { "c#", "c", SrcLangExt_CSharp },
{ "php", SrcLangExt_PHP }, { "d", "c", SrcLangExt_D },
{ "objective-c", SrcLangExt_ObjC }, { "php", "c", SrcLangExt_PHP },
{ "python", SrcLangExt_Python }, { "objective-c", "c", SrcLangExt_ObjC },
{ "fortran", SrcLangExt_F90 }, { "c", "c", SrcLangExt_Cpp },
{ "vhdl", SrcLangExt_VHDL }, { "c++", "c", SrcLangExt_Cpp },
{ "c", SrcLangExt_Cpp }, { "python", "python", SrcLangExt_Python },
{ "c++", SrcLangExt_Cpp }, { "fortran", "fortran", SrcLangExt_F90 },
{ 0, (SrcLangExt)0 } { "vhdl", "vhdl", SrcLangExt_VHDL },
{ 0, 0, (SrcLangExt)0 }
}; };
bool updateLanguageMapping(const QCString &extension,const QCString &parser) bool updateLanguageMapping(const QCString &extension,const QCString &language)
{ {
getLanguageFromFileName("dummy"); // force initializion of the g_extLookup map //getLanguageFromFileName("dummy"); // force initializion of the g_extLookup map
const Lang2ExtMap *p = g_lang2extMap; const Lang2ExtMap *p = g_lang2extMap;
QCString langName = parser.lower(); QCString langName = language.lower();
while (p->langName) while (p->langName)
{ {
if (langName==p->langName) break; if (langName==p->langName) break;
...@@ -6405,49 +6408,58 @@ bool updateLanguageMapping(const QCString &extension,const QCString &parser) ...@@ -6405,49 +6408,58 @@ bool updateLanguageMapping(const QCString &extension,const QCString &parser)
} }
if (!p->langName) return FALSE; if (!p->langName) return FALSE;
// found the parser // found the language
SrcLangExt parserId = p->parserId; SrcLangExt parserId = p->parserId;
QCString extName = extension; QCString extName = extension;
if (extName.isEmpty()) return FALSE; if (extName.isEmpty()) return FALSE;
if (extName.at(0)!='.') extName.prepend("."); if (extName.at(0)!='.') extName.prepend(".");
if (g_extLookup.find(extension)!=0) // parser was already register for this ext if (g_extLookup.find(extension)!=0) // language was already register for this ext
{ {
g_extLookup.remove(extension); g_extLookup.remove(extension);
} }
g_extLookup.insert(extension,new int(parserId)); g_extLookup.insert(extension,new int(parserId));
if (!Doxygen::parserManager->registerExtension(extName,p->parserName))
{
err("Failed to assign extension %s to parser %s for language %s\n",
extName.data(),p->parserName,language.data());
}
else
{
//msg("Registered extension %s to language parser %s...\n",
// extName.data(),language.data());
}
return TRUE; return TRUE;
} }
void initDefaultExtensionMapping()
{
g_extLookup.setAutoDelete(TRUE);
updateLanguageMapping(".idl", "idl");
updateLanguageMapping(".ddl", "idl");
updateLanguageMapping(".odl", "idl");
updateLanguageMapping(".java", "java");
updateLanguageMapping(".as", "javascript");
updateLanguageMapping(".js", "javascript");
updateLanguageMapping(".cs", "c#");
updateLanguageMapping(".d", "d");
updateLanguageMapping(".php", "php");
updateLanguageMapping(".php4", "php");
updateLanguageMapping(".php5", "php");
updateLanguageMapping(".inc", "php");
updateLanguageMapping(".phtml", "php");
updateLanguageMapping(".m", "objective-c");
updateLanguageMapping(".M", "objective-c");
updateLanguageMapping(".mm", "objective-c");
updateLanguageMapping(".py", "python");
updateLanguageMapping(".f", "fortran");
updateLanguageMapping(".f90", "fortran");
updateLanguageMapping(".vhd", "vhdl");
updateLanguageMapping(".vhdl", "vhdl");
}
SrcLangExt getLanguageFromFileName(const QCString fileName) SrcLangExt getLanguageFromFileName(const QCString fileName)
{ {
int i = fileName.findRev('.'); int i = fileName.findRev('.');
static bool init=FALSE;
g_extLookup.setAutoDelete(TRUE);
if (!init) // one time initialization
{
g_extLookup.insert(".idl", new int(SrcLangExt_IDL));
g_extLookup.insert(".ddl", new int(SrcLangExt_IDL));
g_extLookup.insert(".odl", new int(SrcLangExt_IDL));
g_extLookup.insert(".java", new int(SrcLangExt_Java));
g_extLookup.insert(".as", new int(SrcLangExt_JS));
g_extLookup.insert(".js", new int(SrcLangExt_JS));
g_extLookup.insert(".cs", new int(SrcLangExt_CSharp));
g_extLookup.insert(".d", new int(SrcLangExt_D));
g_extLookup.insert(".php", new int(SrcLangExt_PHP));
g_extLookup.insert(".php4", new int(SrcLangExt_PHP));
g_extLookup.insert(".php5", new int(SrcLangExt_PHP));
g_extLookup.insert(".inc", new int(SrcLangExt_PHP));
g_extLookup.insert(".phtml", new int(SrcLangExt_PHP));
g_extLookup.insert(".m", new int(SrcLangExt_ObjC));
g_extLookup.insert(".M", new int(SrcLangExt_ObjC));
g_extLookup.insert(".mm", new int(SrcLangExt_ObjC));
g_extLookup.insert(".py", new int(SrcLangExt_Python));
g_extLookup.insert(".f", new int(SrcLangExt_F90));
g_extLookup.insert(".f90", new int(SrcLangExt_F90));
g_extLookup.insert(".vhd", new int(SrcLangExt_VHDL));
g_extLookup.insert(".vhdl", new int(SrcLangExt_VHDL));
init=TRUE;
}
if (i!=-1) // name has an extension if (i!=-1) // name has an extension
{ {
QCString extStr=fileName.right(fileName.length()-i); QCString extStr=fileName.right(fileName.length()-i);
...@@ -6456,7 +6468,7 @@ SrcLangExt getLanguageFromFileName(const QCString fileName) ...@@ -6456,7 +6468,7 @@ SrcLangExt getLanguageFromFileName(const QCString fileName)
int *pVal=g_extLookup.find(extStr); int *pVal=g_extLookup.find(extStr);
if (pVal) // listed extension if (pVal) // listed extension
{ {
return (SrcLangExt)*pVal; // cast void* address to enum value return (SrcLangExt)*pVal;
} }
} }
} }
......
src/util.h
View file @ 78a0accf
...@@ -330,6 +330,7 @@ void stringToSearchIndex(const QCString &docUrlBase,const QCString &title, ...@@ -330,6 +330,7 @@ void stringToSearchIndex(const QCString &docUrlBase,const QCString &title,
bool updateLanguageMapping(const QCString &extension,const QCString &parser); bool updateLanguageMapping(const QCString &extension,const QCString &parser);
SrcLangExt getLanguageFromFileName(const QCString fileName); SrcLangExt getLanguageFromFileName(const QCString fileName);
void initDefaultExtensionMapping();
bool checkIfTypedef(Definition *scope,FileDef *fileScope,const char *n); bool checkIfTypedef(Definition *scope,FileDef *fileScope,const char *n);
......
winbuild/Doxygen.vcproj
View file @ 78a0accf
...@@ -396,6 +396,10 @@ ...@@ -396,6 +396,10 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\src\configoptions.cpp"
>
</File>
<File <File
RelativePath="..\src\constexp.l" RelativePath="..\src\constexp.l"
> >
...@@ -1026,72 +1030,6 @@ ...@@ -1026,72 +1030,6 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\src\qhp.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\indexlog.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\qhpxmlwriter.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\src\image.cpp" RelativePath="..\src\image.cpp"
> >
...@@ -1136,6 +1074,28 @@ ...@@ -1136,6 +1074,28 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\src\indexlog.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\src\instdox.cpp" RelativePath="..\src\instdox.cpp"
> >
...@@ -1668,6 +1628,50 @@ ...@@ -1668,6 +1628,50 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath="..\src\qhp.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\qhpxmlwriter.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\src\reflist.cpp" RelativePath="..\src\reflist.cpp"
> >
...@@ -2155,18 +2159,6 @@ ...@@ -2155,18 +2159,6 @@
RelativePath="..\src\htmlhelp.h" RelativePath="..\src\htmlhelp.h"
> >
</File> </File>
<File
RelativePath="..\src\qhpxmlwriter.h"
>
</File>
<File
RelativePath="..\src\indexlog.h"
>
</File>
<File
RelativePath="..\src\qhp.h"
>
</File>
<File <File
RelativePath=".\iconv.h" RelativePath=".\iconv.h"
> >
...@@ -2183,6 +2175,10 @@ ...@@ -2183,6 +2175,10 @@
RelativePath="..\src\index_xsd.h" RelativePath="..\src\index_xsd.h"
> >
</File> </File>
<File
RelativePath="..\src\indexlog.h"
>
</File>
<File <File
RelativePath="..\src\instdox.h" RelativePath="..\src\instdox.h"
> >
...@@ -2311,6 +2307,14 @@ ...@@ -2311,6 +2307,14 @@
RelativePath="..\src\pyscanner.h" RelativePath="..\src\pyscanner.h"
> >
</File> </File>
<File
RelativePath="..\src\qhp.h"
>
</File>
<File
RelativePath="..\src\qhpxmlwriter.h"
>
</File>
<File <File
RelativePath="..\src\qtbc.h" RelativePath="..\src\qtbc.h"
> >
...@@ -2487,6 +2491,10 @@ ...@@ -2487,6 +2491,10 @@
RelativePath="..\src\translator_ru.h" RelativePath="..\src\translator_ru.h"
> >
</File> </File>
<File
RelativePath="..\src\translator_sc.h"
>
</File>
<File <File
RelativePath="..\src\translator_se.h" RelativePath="..\src\translator_se.h"
> >
...@@ -2511,6 +2519,10 @@ ...@@ -2511,6 +2519,10 @@
RelativePath="..\src\translator_ua.h" RelativePath="..\src\translator_ua.h"
> >
</File> </File>
<File
RelativePath="..\src\translator_vi.h"
>
</File>
<File <File
RelativePath="..\src\translator_za.h" RelativePath="..\src\translator_za.h"
> >
......
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