summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/code.l8
-rw-r--r--src/doxygen.cpp16
-rw-r--r--src/entry.h16
-rw-r--r--src/htmlgen.cpp82
-rw-r--r--src/htmlgen.h4
-rw-r--r--src/latexgen.cpp5
-rw-r--r--src/latexgen.h4
-rw-r--r--src/mangen.h4
-rw-r--r--src/memberdef.cpp15
-rw-r--r--src/memberdef.h2
-rw-r--r--src/outputgen.h4
-rw-r--r--src/outputlist.h8
-rw-r--r--src/rtfgen.h4
-rw-r--r--src/scanner.l19
-rw-r--r--src/translator_br.h53
-rw-r--r--src/translator_es.h19
-rw-r--r--src/translator_fi.h24
-rw-r--r--src/translator_fr.h62
-rw-r--r--src/translator_gr.h15
19 files changed, 278 insertions, 86 deletions
diff --git a/src/code.l b/src/code.l
index a343058..fd47652 100644
--- a/src/code.l
+++ b/src/code.l
@@ -1807,6 +1807,10 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'"))
g_code->codify(yytext);
g_curlyCount++;
g_inClass=TRUE;
+ if (YY_START==ClassVar)
+ {
+ g_curClassName = g_name.copy();
+ }
if (g_searchingForBody)
{
g_searchingForBody=FALSE;
@@ -2397,12 +2401,12 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'"))
BEGIN( SkipInits );
}
}
-<CallEnd>("const"|"volatile")({BN}+("const"|"volatile"))*{BN}*/";" {
+<CallEnd>("const"|"volatile")({BN}+("const"|"volatile"))*{BN}*/[;=] {
startFontClass("keyword");
codifyLines(yytext);
endFontClass();
}
-<CallEnd,OldStyleArgs>("const"|"volatile")*({BN}+("const"|"volatile"))*"{" {
+<CallEnd,OldStyleArgs>("const"|"volatile")*({BN}+("const"|"volatile"))*{BN}*"{" {
if (g_insideBody)
{
g_theVarContext.pushScope();
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 6419935..00d4dde 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -4453,6 +4453,20 @@ static void findMember(Entry *root,
}
scopeName=stripTemplateSpecifiersFromScope(
removeRedundantWhiteSpace(scopeName),FALSE,&funcSpec);
+
+ // funcSpec contains the last template specifiers of the given scope.
+ // If this method does not have any template arguments or they are
+ // empty while funcSpec is not empty we assume this is a
+ // specialization of a method. If not, we clear the funcSpec and treat
+ // this as a normal method of a template class.
+ if (!(root->tArgLists &&
+ root->tArgLists->count()>0 &&
+ root->tArgLists->first()->count()==0
+ )
+ )
+ {
+ funcSpec.resize(0);
+ }
// split scope into a namespace and a class part
extractNamespaceName(scopeName,className,namespaceName,TRUE);
@@ -4897,7 +4911,7 @@ static void findMember(Entry *root,
}
else
{
- //printf("Specialized member %s of unknown scope %s%s found!\n",
+ //printf("*** Specialized member %s of unknown scope %s%s found!\n",
// scopeName.data(),funcName.data(),funcArgs.data());
}
}
diff --git a/src/entry.h b/src/entry.h
index 1c7a0ee..16aef94 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -235,13 +235,15 @@ class Entry
};
enum MemberSpecifier
{
- Inline = 0x01,
- Explicit = 0x02,
- Mutable = 0x04,
- Settable = 0x08,
- Gettable = 0x10,
- Readable = 0x20,
- Writable = 0x40
+ Inline = 0x0001,
+ Explicit = 0x0002,
+ Mutable = 0x0004,
+ Settable = 0x0008,
+ Gettable = 0x0010,
+ Readable = 0x0020,
+ Writable = 0x0040,
+ Final = 0x0080,
+ Abstract = 0x0100,
};
Entry();
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 53e2520..87b168d 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -189,7 +189,7 @@ static const char *defaultStyleSheet =
"}\n"
".mdescLeft {\n"
" padding: 0px 8px 4px 8px;\n"
-" font-size: 14px;\n"
+" font-size: 12px;\n"
" font-style: italic;\n"
" background-color: #FAFAFA;\n"
" border-top: 1px none #E0E0E0;\n"
@@ -200,7 +200,7 @@ static const char *defaultStyleSheet =
"}\n"
".mdescRight {\n"
" padding: 0px 8px 4px 8px;\n"
-" font-size: 14px;\n"
+" font-size: 12px;\n"
" font-style: italic;\n"
" background-color: #FAFAFA;\n"
" border-top: 1px none #E0E0E0;\n"
@@ -216,11 +216,11 @@ static const char *defaultStyleSheet =
" border-right-width: 1px;\n"
" border-bottom-width: 1px;\n"
" border-left-width: 1px;\n"
-" border-top-style: solid;\n"
" border-top-color: #E0E0E0;\n"
" border-right-color: #E0E0E0;\n"
" border-bottom-color: #E0E0E0;\n"
" border-left-color: #E0E0E0;\n"
+" border-top-style: solid;\n"
" border-right-style: none;\n"
" border-bottom-style: none;\n"
" border-left-style: none;\n"
@@ -234,17 +234,72 @@ static const char *defaultStyleSheet =
" border-right-width: 1px;\n"
" border-bottom-width: 1px;\n"
" border-left-width: 1px;\n"
+" border-top-color: #E0E0E0;\n"
+" border-right-color: #E0E0E0;\n"
+" border-bottom-color: #E0E0E0;\n"
+" border-left-color: #E0E0E0;\n"
" border-top-style: solid;\n"
+" border-right-style: none;\n"
+" border-bottom-style: none;\n"
+" border-left-style: none;\n"
+" background-color: #FAFAFA;\n"
+" font-size: 13px;\n"
+"}\n"
+".memTemplItemLeft {\n"
+" padding: 1px 0px 0px 8px;\n"
+" margin: 4px;\n"
+" border-top-width: 1px;\n"
+" border-right-width: 1px;\n"
+" border-bottom-width: 1px;\n"
+" border-left-width: 1px;\n"
+" border-top-color: #E0E0E0;\n"
+" border-right-color: #E0E0E0;\n"
+" border-bottom-color: #E0E0E0;\n"
+" border-left-color: #E0E0E0;\n"
+" border-top-style: none;\n"
+" border-right-style: none;\n"
+" border-bottom-style: none;\n"
+" border-left-style: none;\n"
+" background-color: #FAFAFA;\n"
+" font-size: 12px;\n"
+"}\n"
+".memTemplItemRight {\n"
+" padding: 1px 8px 0px 8px;\n"
+" margin: 4px;\n"
+" border-top-width: 1px;\n"
+" border-right-width: 1px;\n"
+" border-bottom-width: 1px;\n"
+" border-left-width: 1px;\n"
" border-top-color: #E0E0E0;\n"
" border-right-color: #E0E0E0;\n"
" border-bottom-color: #E0E0E0;\n"
" border-left-color: #E0E0E0;\n"
+" border-top-style: none;\n"
" border-right-style: none;\n"
" border-bottom-style: none;\n"
" border-left-style: none;\n"
" background-color: #FAFAFA;\n"
" font-size: 13px;\n"
"}\n"
+".memTemplParams {\n"
+" padding: 1px 0px 0px 8px;\n"
+" margin: 4px;\n"
+" border-top-width: 1px;\n"
+" border-right-width: 1px;\n"
+" border-bottom-width: 1px;\n"
+" border-left-width: 1px;\n"
+" border-top-color: #E0E0E0;\n"
+" border-right-color: #E0E0E0;\n"
+" border-bottom-color: #E0E0E0;\n"
+" border-left-color: #E0E0E0;\n"
+" border-top-style: solid;\n"
+" border-right-style: none;\n"
+" border-bottom-style: none;\n"
+" border-left-style: none;\n"
+" color: #606060;\n"
+" background-color: #FAFAFA;\n"
+" font-size: 12px;\n"
+"}\n"
".search { color: #003399;\n"
" font-weight: bold;\n"
"}\n"
@@ -866,7 +921,8 @@ void HtmlGenerator::startMemberItem(int annoType)
{
case 0: t << "<td class=\"memItemLeft\" nowrap align=\"right\" valign=\"top\">"; break;
case 1: t << "<td class=\"memItemLeft\" nowrap>"; break;
- default: t << "<td class=\"memItemLeft\" nowrap valign=\"top\">"; break;
+ case 2: t << "<td class=\"memItemLeft\" nowrap valign=\"top\">"; break;
+ default: t << "<td class=\"memTemplParams\" nowrap colspan=\"2\">"; break;
}
}
else
@@ -885,13 +941,27 @@ void HtmlGenerator::endMemberItem()
t << endl;
}
+void HtmlGenerator::startMemberTemplateParams()
+{
+}
+
+void HtmlGenerator::endMemberTemplateParams()
+{
+ if (Config_getBool("HTML_ALIGN_MEMBERS"))
+ {
+ t << "</td></tr>" << endl;
+ t << "<tr><td class=\"memTemplItemLeft\" nowrap align=\"right\" valign=\"top\">";
+ }
+}
+
-void HtmlGenerator::insertMemberAlign()
+void HtmlGenerator::insertMemberAlign(bool templ)
{
DBG_HTML(t << "<!-- insertMemberAlign -->" << endl)
if (Config_getBool("HTML_ALIGN_MEMBERS"))
{
- t << "&nbsp;</td><td class=\"memItemRight\" valign=\"bottom\">";
+ QCString className = templ ? "memTemplItemRight" : "memItemRight";
+ t << "&nbsp;</td><td class=\"" << className << "\" valign=\"bottom\">";
}
}
diff --git a/src/htmlgen.h b/src/htmlgen.h
index a58d986..ee2112a 100644
--- a/src/htmlgen.h
+++ b/src/htmlgen.h
@@ -100,6 +100,8 @@ class HtmlGenerator : public OutputGenerator
void endAnonTypeScope(int) {}
void startMemberItem(int);
void endMemberItem();
+ void startMemberTemplateParams();
+ void endMemberTemplateParams();
void startMemberGroupHeader(bool);
void endMemberGroupHeader();
@@ -108,7 +110,7 @@ class HtmlGenerator : public OutputGenerator
void startMemberGroup();
void endMemberGroup(bool);
- void insertMemberAlign();
+ void insertMemberAlign(bool);
void startMemberDescription();
void endMemberDescription();
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index fed312d..0554b19 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -159,7 +159,7 @@ void LatexGenerator::init()
QTextStream t(&file);
if (!Config_getBool("USE_PDFLATEX")) // use plain old latex
{
- t << "all: refman.dvi" << endl
+ t << "all clean: refman.dvi" << endl
<< endl
<< "ps: refman.ps" << endl
<< endl
@@ -208,7 +208,7 @@ void LatexGenerator::init()
}
else // use pdflatex for higher quality output
{
- t << "all: refman.pdf" << endl << endl;
+ t << "all clean: refman.pdf" << endl << endl;
t << "refman.pdf: refman.tex" << endl;
t << "\tpdflatex refman.tex" << endl;
t << "\tmakeindex refman.idx" << endl;
@@ -1391,6 +1391,7 @@ void LatexGenerator::endMemberDescription()
else
{
t << "}\\\\";
+ m_indent=0;
}
}
diff --git a/src/latexgen.h b/src/latexgen.h
index 6506794..7b2be4f 100644
--- a/src/latexgen.h
+++ b/src/latexgen.h
@@ -98,6 +98,8 @@ class LatexGenerator : public OutputGenerator
void endAnonTypeScope(int);
void startMemberItem(int);
void endMemberItem();
+ void startMemberTemplateParams() {}
+ void endMemberTemplateParams() {}
void startMemberGroupHeader(bool);
void endMemberGroupHeader();
@@ -106,7 +108,7 @@ class LatexGenerator : public OutputGenerator
void startMemberGroup();
void endMemberGroup(bool);
- void insertMemberAlign() {}
+ void insertMemberAlign(bool) {}
void writeRuler() { t << endl << endl; /*t << "\\vspace{0.4cm}\\hrule\\vspace{0.2cm}" << endl; */ }
void writeAnchor(const char *fileName,const char *name);
diff --git a/src/mangen.h b/src/mangen.h
index ac5bbe5..ddc5adb 100644
--- a/src/mangen.h
+++ b/src/mangen.h
@@ -93,7 +93,7 @@ class ManGenerator : public OutputGenerator
void endMemberSections() {}
void startMemberHeader();
void endMemberHeader();
- void insertMemberAlign() {}
+ void insertMemberAlign(bool) {}
void startMemberSubtitle() {}
void endMemberSubtitle() {}
void writeListItem();
@@ -103,6 +103,8 @@ class ManGenerator : public OutputGenerator
void endAnonTypeScope(int);
void startMemberItem(int);
void endMemberItem();
+ void startMemberTemplateParams() {}
+ void endMemberTemplateParams() {}
void startMemberGroupHeader(bool);
void endMemberGroupHeader();
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 4d505f4..b5e40af 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -178,7 +178,7 @@ static bool writeDefArgumentList(OutputList &ol,ClassDef *cd,
}
if (!a->name.isEmpty() || (a->name.isEmpty() && a->type=="...")) // argument has a name
{
- if (!hasFuncPtrType);
+ if (!hasFuncPtrType)
{
ol.docify(" ");
}
@@ -886,8 +886,9 @@ void MemberDef::writeDeclaration(OutputList &ol,
ClassDef *annoClassDef=getClassDefOfAnonymousType();
// start a new member declaration
+ bool isAnonymous = annoClassDef || annMemb || annEnumType;
///printf("startMemberItem for %s\n",name().data());
- ol.startMemberItem((annoClassDef || annMemb || annEnumType) ? 1 : 0);
+ ol.startMemberItem( isAnonymous ? 1 : tArgList ? 3 : 0);
// If there is no detailed description we need to write the anchor here.
bool detailsVisible = isDetailedSectionLinkable();
@@ -915,8 +916,9 @@ void MemberDef::writeDeclaration(OutputList &ol,
if (tArgList)
{
+ if (!isAnonymous) ol.startMemberTemplateParams();
writeTemplatePrefix(ol,tArgList);
- //ol.lineBreak();
+ if (!isAnonymous) ol.endMemberTemplateParams();
}
QCString ltype(type);
@@ -1001,7 +1003,7 @@ void MemberDef::writeDeclaration(OutputList &ol,
}
else
{
- ol.insertMemberAlign();
+ ol.insertMemberAlign(tArgList!=0);
}
// write name
@@ -1433,7 +1435,8 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
isMutable() || (isInline() && Config_getBool("INLINE_INFO")) ||
isSignal() || isSlot() ||
isStatic() || (classDef && classDef!=container) ||
- isSettable() || isGettable() || isReadable() || isWritable()
+ isSettable() || isGettable() || isReadable() || isWritable() ||
+ isFinal() || isAbstract()
)
)
{
@@ -1455,6 +1458,8 @@ void MemberDef::writeDocumentation(MemberList *ml,OutputList &ol,
if (isSettable()) sl.append("set");
if (isReadable()) sl.append("read");
if (isWritable()) sl.append("write");
+ if (isFinal()) sl.append("final");
+ if (isAbstract()) sl.append("abstract");
if (protection()==Protected) sl.append("protected");
else if (protection()==Private) sl.append("private");
else if (protection()==Package) sl.append("package");
diff --git a/src/memberdef.h b/src/memberdef.h
index b7dbf46..5456e98 100644
--- a/src/memberdef.h
+++ b/src/memberdef.h
@@ -132,6 +132,8 @@ class MemberDef : public Definition
bool isSettable() const { return (memSpec&Entry::Settable)!=0; }
bool isReadable() const { return (memSpec&Entry::Readable)!=0; }
bool isWritable() const { return (memSpec&Entry::Writable)!=0; }
+ bool isFinal() const { return (memSpec&Entry::Final)!=0; }
+ bool isAbstract() const { return (memSpec&Entry::Abstract)!=0; }
bool isImplementation() const { return m_implOnly; }
bool isExternal() const { return explExt; }
bool isTemplateSpecialization() const { return tspec; }
diff --git a/src/outputgen.h b/src/outputgen.h
index 214ffaf..8d02b82 100644
--- a/src/outputgen.h
+++ b/src/outputgen.h
@@ -307,13 +307,15 @@ class OutputGenerator : public BaseOutputDocInterface
virtual void endAnonTypeScope(int) = 0;
virtual void startMemberItem(int) = 0;
virtual void endMemberItem() = 0;
+ virtual void startMemberTemplateParams() = 0;
+ virtual void endMemberTemplateParams() = 0;
virtual void startMemberGroupHeader(bool) = 0;
virtual void endMemberGroupHeader() = 0;
virtual void startMemberGroupDocs() = 0;
virtual void endMemberGroupDocs() = 0;
virtual void startMemberGroup() = 0;
virtual void endMemberGroup(bool) = 0;
- virtual void insertMemberAlign() = 0;
+ virtual void insertMemberAlign(bool) = 0;
virtual void startMemberDoc(const char *,const char *,
const char *,const char *) = 0;
virtual void endMemberDoc(bool) = 0;
diff --git a/src/outputlist.h b/src/outputlist.h
index ffd4c51..a4be838 100644
--- a/src/outputlist.h
+++ b/src/outputlist.h
@@ -170,6 +170,10 @@ class OutputList : public OutputDocInterface
{ forall(&OutputGenerator::startMemberItem,i1); }
void endMemberItem()
{ forall(&OutputGenerator::endMemberItem); }
+ void startMemberTemplateParams()
+ { forall(&OutputGenerator::startMemberTemplateParams); }
+ void endMemberTemplateParams()
+ { forall(&OutputGenerator::endMemberTemplateParams); }
void startMemberGroupHeader(bool b)
{ forall(&OutputGenerator::startMemberGroupHeader,b); }
void endMemberGroupHeader()
@@ -182,8 +186,8 @@ class OutputList : public OutputDocInterface
{ forall(&OutputGenerator::startMemberGroup); }
void endMemberGroup(bool last)
{ forall(&OutputGenerator::endMemberGroup,last); }
- void insertMemberAlign()
- { forall(&OutputGenerator::insertMemberAlign); }
+ void insertMemberAlign(bool templ=FALSE)
+ { forall(&OutputGenerator::insertMemberAlign,templ); }
void writeRuler()
{ forall(&OutputGenerator::writeRuler); }
void writeAnchor(const char *fileName,const char *name)
diff --git a/src/rtfgen.h b/src/rtfgen.h
index 8cfbed5..b4c1dac 100644
--- a/src/rtfgen.h
+++ b/src/rtfgen.h
@@ -106,9 +106,11 @@ class RTFGenerator : public OutputGenerator
void endAnonTypeScope(int) {}
void startMemberItem(int);
void endMemberItem();
+ void startMemberTemplateParams() {}
+ void endMemberTemplateParams() {}
//void memberGroupSpacing(bool) {}
//void memberGroupSeparator() {}
- void insertMemberAlign() {}
+ void insertMemberAlign(bool) {}
void writeRuler() { rtfwriteRuler_thin(); }
diff --git a/src/scanner.l b/src/scanner.l
index 3260974..870590c 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -1209,8 +1209,12 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
if (!insidePHP)
{
current->type += " abstract ";
+ current->virt = Pure;
+ }
+ else
+ {
+ current->memSpec|=Entry::Abstract;
}
- current->virt = Pure;
lineCount();
}
<FindMembers>{B}*"inline"{BN}+ { current->memSpec|=Entry::Inline;
@@ -3295,6 +3299,19 @@ PHPKW ("require"|"require_once"|"include"|"include_once"|"echo")[^a-zA-Z0-9_;]
}
}
//printf("Adding entry `%s'\n",current->name.data());
+ if ( insidePHP)
+ {
+ if (current->type.left(6) == "final " )
+ {
+ current->type = current->type.mid(6);
+ current->memSpec |= Entry::Final;
+ }
+ if (current->type.left(9) == "abstract " )
+ {
+ current->type = current->type.mid(9);
+ current->memSpec |= Entry::Abstract;
+ }
+ }
if ( insidePHP && current->type.left(8) != "function" )
{
initEntry();
diff --git a/src/translator_br.h b/src/translator_br.h
index 4ebccad..576b6a3 100644
--- a/src/translator_br.h
+++ b/src/translator_br.h
@@ -15,6 +15,8 @@
* Version: 1.3.8 (2004/06/30)
*
* History:
+ * 1.3.9
+ * - Updated to Doxygen 1.3.9
* 1.3.8
* - Updated to Doxygen 1.3.8
* 1.3.3:
@@ -32,7 +34,7 @@
#ifndef TRANSLATOR_BR_H
#define TRANSLATOR_BR_H
-class TranslatorBrazilian : public TranslatorAdapter_1_3_9
+class TranslatorBrazilian : public Translator
{
public:
@@ -1547,6 +1549,53 @@ class TranslatorBrazilian : public TranslatorAdapter_1_3_9
{
return "Código-Fonte de " + filename;
}
-
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.3.9
+//////////////////////////////////////////////////////////////////////////
+
+ /*! This is used as the name of the chapter containing the directory
+ * hierarchy.
+ */
+ virtual QCString trDirIndex()
+ { return "Hierarquia de Diretórios"; }
+
+ /*! This is used as the name of the chapter containing the documentation
+ * of the directories.
+ */
+ virtual QCString trDirDocumentation()
+ { return "Documentação do Directório"; }
+
+ /*! This is used as the title of the directory index and also in the
+ * Quick links of a HTML page, to link to the directory hierarchy.
+ */
+ virtual QCString trDirectories()
+ { return "Diretórios"; }
+
+ /*! This returns a sentences that introduces the directory hierarchy.
+ * and the fact that it is sorted alphabetically per level
+ */
+ virtual QCString trDirDescription()
+ { return "Esta Hierarquia de Diretórios está parcialmente ordenada (ordem alfabética)"; }
+
+ /*! This returns the title of a directory page. The name of the
+ * directory is passed via \a dirName.
+ */
+ virtual QCString trDirReference(const char *dirName)
+ {
+ QCString result = "Referência do diretório ";
+ result += dirName;
+ return result;
+ }
+
+ /*! This returns the word directory with or without starting capital
+ * (\a first_capital) and in sigular or plural form (\a singular).
+ */
+ virtual QCString trDir(bool first_capital, bool singular)
+ {
+ QCString result((first_capital ? "Diretório" : "diretório"));
+ if (!singular) result+="s";
+ return result;
+ }
};
#endif
diff --git a/src/translator_es.h b/src/translator_es.h
index d6f4b48..6baad28 100644
--- a/src/translator_es.h
+++ b/src/translator_es.h
@@ -30,9 +30,6 @@ class TranslatorSpanish : public TranslatorAdapter_1_3_8
public:
virtual QCString idLanguage()
{ return "spanish"; }
- /*! returns the name of the package that is included by LaTeX */
- virtual QCString latexBabelPackage()
- { return ""; }
/*! Used to get the LaTeX command(s) for the language support.
* This method should return string with commands that switch
@@ -129,12 +126,6 @@ class TranslatorSpanish : public TranslatorAdapter_1_3_8
virtual QCString trDefinedIn()
{ return "definido en"; }
- /*! put as in introduction in the verbatim header file of a class.
- * parameter f is the name of the include file.
- */
- virtual QCString trVerbatimText(const char *f)
- { return (QCString)"Este es el texto al pie de la letra del archivo "+f+" adjunto."; }
-
// quick reference sections
/*! This is put above each page as a link to the list of all groups of
@@ -412,12 +403,6 @@ class TranslatorSpanish : public TranslatorAdapter_1_3_8
virtual QCString trCompounds()
{ return "Clases"; }
- /*! This is used in the documentation of a group before the list of
- * links to documented files
- */
- virtual QCString trFiles()
- { return "Archivos"; }
-
/*! This is used in the standard footer of each page and indicates when
* the page was generated
*/
@@ -465,10 +450,6 @@ class TranslatorSpanish : public TranslatorAdapter_1_3_8
virtual QCString trDate()
{ return "Fecha"; }
- /*! this text is generated when the \\author command is used. */
- virtual QCString trAuthors()
- { return "Autor(es)"; }
-
/*! this text is generated when the \return command is used. */
virtual QCString trReturns()
{ return "Devuelve"; }
diff --git a/src/translator_fi.h b/src/translator_fi.h
index 19d4b62..053e45c 100644
--- a/src/translator_fi.h
+++ b/src/translator_fi.h
@@ -90,9 +90,6 @@ class TranslatorFinnish : public TranslatorEnglish
QCString idLanguage()
{ return "finnish"; }
- QCString latexBabelPackage()
- // returns the name of the package that is included by LaTeX
- { return "finnish"; }
QCString trRelatedFunctions()
// used in the compound documentation before a list of related functions.
@@ -124,18 +121,6 @@ class TranslatorFinnish : public TranslatorEnglish
// header that is put before the list of member attributes.
{ return "Jäsen Datan Dokumentaatio"; } // "Member Data Documentation"
- QCString trGeneratedFrom(const char *s,bool single)
- { // here s is one of " Class", " Struct" or " Union"
- // single is true implies a single file
- QCString result=(QCString)"Tämän "+s+ // "The documentation for this"+s+
- " dokumentaatio on generoitu ";// " was generated from the following file";
- if (single)
- result+="seuraavasta tiedostosta:";
- else
- result+="seuraavista tiedostoista:";
- return result;
- }
-
QCString trMore()
// this is the text of a link put after brief descriptions.
{ return "Lisää..."; } // "More..."
@@ -180,11 +165,6 @@ class TranslatorFinnish : public TranslatorEnglish
// put after an undocumented member in the list of all members
{ return "määritelty"; } // "defined in"
- QCString trVerbatimText(const char *f)
- // put as in introduction in the verbatim header file of a class.
- // parameter f is the name of the include file.
- { return (QCString)"Tämä on lyhennetty esitys "+f+" include tiedostosta."; } // "This is the verbatim text of the "+f+" include file."
-
// quick reference sections
QCString trModules()
// This is put above each page as a link to the list of all groups of
@@ -349,10 +329,6 @@ class TranslatorFinnish : public TranslatorEnglish
// list of (global) variables
{ return "Enumeraation arvot"; } // "Enumeration values"
- QCString trAuthor()
- // This is used in man pages as the author section.
- { return "Tekijä"; } // "Author"
-
QCString trDefineDocumentation()
// This is used in the documentation of a file before the list of
// documentation blocks for defines
diff --git a/src/translator_fr.h b/src/translator_fr.h
index 0fb4c12..7b32cb9 100644
--- a/src/translator_fr.h
+++ b/src/translator_fr.h
@@ -85,7 +85,7 @@
// Translator class (by the local maintainer) when the localized
// translator is made up-to-date again.
-class TranslatorFrench : public TranslatorAdapter_1_3_8
+class TranslatorFrench : public Translator
{
public:
@@ -1590,6 +1590,66 @@ class TranslatorFrench : public TranslatorAdapter_1_3_8
return "Correspondances:";
}
+//////////////////////////////////////////////////////////////////////////
+// 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 " Fichier source de " + filename;
+ }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.3.9
+//////////////////////////////////////////////////////////////////////////
+
+ /*! This is used as the name of the chapter containing the directory
+ * hierarchy.
+ */
+ virtual QCString trDirIndex()
+ { return "Hiérarchie de répertoires"; }
+
+ /*! This is used as the name of the chapter containing the documentation
+ * of the directories.
+ */
+ virtual QCString trDirDocumentation()
+ { return "Documentation des répertoires"; }
+
+ /*! This is used as the title of the directory index and also in the
+ * Quick links of a HTML page, to link to the directory hierarchy.
+ */
+ virtual QCString trDirectories()
+ { return "Répertoires"; }
+
+ /*! This returns a sentences that introduces the directory hierarchy.
+ * and the fact that it is sorted alphabetically per level
+ */
+ virtual QCString trDirDescription()
+ { return "Cette hiérarchie de répertoire est triée approximativement, "
+ "mais pas complètement, par ordre alphabétique:";
+ }
+
+ /*! 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="Répertoire de référence de "; result+=dirName;
+ return result;
+ }
+
+ /*! This returns the word directory with or without starting capital
+ * (\a first_capital) and in sigular or plural form (\a singular).
+ */
+ virtual QCString trDir(bool first_capital, bool singular)
+ {
+ QCString result((first_capital ? "Répertoire" : "répertoire"));
+ if (singular) result+=""; else result+="s";
+ return result;
+ }
+
};
#endif
diff --git a/src/translator_gr.h b/src/translator_gr.h
index 3e39781..dbe373a 100644
--- a/src/translator_gr.h
+++ b/src/translator_gr.h
@@ -37,15 +37,12 @@ class TranslatorGreek : public TranslatorAdapter_1_2_11
*/
virtual QCString idLanguage()
{ return "greek"; }
- virtual QCString latexBabelPackage()
- {
- return "greek";
- }
- virtual QCString latexLanguageSupportCommand()
- {
- return "\\usepackage[greek,english]{babel}\n\\usepackage[iso-8859-7]{inputenc}\n";
- }
-
+
+ virtual QCString latexLanguageSupportCommand()
+ {
+ return "\\usepackage[greek,english]{babel}\n\\usepackage[iso-8859-7]{inputenc}\n";
+ }
+
/*! return the language charset. This will be used for the HTML output */
virtual QCString idLanguageCharset()
{