summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/code.l75
-rw-r--r--src/definition.cpp6
-rw-r--r--src/definition.h2
-rw-r--r--src/doc.l2
-rw-r--r--src/doxygen.cpp27
-rw-r--r--src/filedef.cpp36
-rw-r--r--src/formula.cpp7
-rw-r--r--src/htmlgen.cpp12
-rw-r--r--src/htmlhelp.cpp5
-rw-r--r--src/memberdef.cpp1
-rw-r--r--src/memberdef.h7
-rw-r--r--src/translator_adapter.h42
-rw-r--r--src/translator_cz.h16
-rw-r--r--src/translator_ru.h27
-rw-r--r--src/xmlgen.cpp16
15 files changed, 161 insertions, 120 deletions
diff --git a/src/code.l b/src/code.l
index fe7e3a2..d6ae4aa 100644
--- a/src/code.l
+++ b/src/code.l
@@ -163,6 +163,14 @@ void VariableContext::addVariable(const QCString &type,const QCString &name)
{
QCString ltype = type.simplifyWhiteSpace();
QCString lname = name.simplifyWhiteSpace();
+ if (ltype.left(7)=="struct ")
+ {
+ ltype = ltype.right(ltype.length()-7);
+ }
+ else if (ltype.left(6)=="union ")
+ {
+ ltype = ltype.right(ltype.length()-6);
+ }
if (ltype.isEmpty() || lname.isEmpty()) return;
DBG_CTX((stderr,"** AddVariable trying: type=%s name=%s\n",ltype.data(),lname.data()));
Scope *scope = m_scopes.count()==0 ? &m_globalScope : m_scopes.getLast();
@@ -338,7 +346,7 @@ static void startCodeLine()
g_realScope = d->name().copy();
//printf("Real scope: `%s'\n",g_realScope.data());
g_bodyCurlyCount = 0;
- if (g_currentMemberDef) anchor=g_currentMemberDef->anchor();
+ if (g_currentMemberDef) anchor=g_currentMemberDef->getBodyAnchor();
g_code->startCodeAnchor(lineAnchor);
g_code->writeCodeLink(d->getReference(),d->getOutputFileBase(),
anchor,lineNumber);
@@ -562,15 +570,25 @@ static MemberDef *setCallContextForVar(const QCString &name)
static void generateClassOrGlobalLink(OutputDocInterface &ol,char *clName,int *clNameLen=0)
{
int i=0;
+ if (*clName=='~') // correct for matching negated values i.s.o. destructors.
+ {
+ g_code->codify("~");
+ clName++;
+ }
QCString className=clName;
if (clNameLen) *clNameLen=0;
if (className.isEmpty()) return;
- ClassDef *cd=getResolvedClass(g_currentDefinition,className);
- if (cd==0 && (i=className.find('<'))!=-1)
+ ClassDef *cd=0;
+
+ if (!g_theVarContext.findVariable(className)) // not a local variable
{
- cd=getResolvedClass(g_currentDefinition,className.left(i));
+ cd = getResolvedClass(g_currentDefinition,className);
+ if (cd==0 && (i=className.find('<'))!=-1)
+ {
+ cd=getResolvedClass(g_currentDefinition,className.left(i));
+ }
}
- if (cd && cd->isLinkable())
+ if (cd && cd->isLinkable()) // is it a linkable class
{
if (g_exampleBlock)
{
@@ -598,17 +616,18 @@ static void generateClassOrGlobalLink(OutputDocInterface &ol,char *clName,int *c
MemberDef *md = setCallContextForVar(clName);
if (md)
{
- Definition *d=md->getOuterScope();
- if (d && md->isLinkable())
+ Definition *d = md->getOuterScope()==Doxygen::globalScope ?
+ md->getBodyDef() : md->getOuterScope();
+ if (d && d->isLinkable() && md->isLinkable())
{
- writeMultiLineCodeLink(ol,d->getReference(),d->getOutputFileBase(),md->anchor(),clName);
+ writeMultiLineCodeLink(ol,d->getReference(),d->getOutputFileBase(),md->getBodyAnchor(),clName);
if (g_currentMemberDef)
{
- if (Config_getBool("REFERENCED_BY_RELATION"))
+ if (Config_getBool("REFERENCED_BY_RELATION") && g_currentMemberDef->isFunction())
{
md->addSourceReferencedBy(g_currentMemberDef);
}
- if (Config_getBool("REFERENCES_RELATION"))
+ if (Config_getBool("REFERENCES_RELATION") && g_currentMemberDef->isFunction())
{
g_currentMemberDef->addSourceReferences(md);
}
@@ -666,11 +685,11 @@ static bool getLink(const char *className,
if (g_currentDefinition && g_currentMemberDef &&
md!=g_currentMemberDef && g_insideBody)
{
- if (Config_getBool("REFERENCED_BY_RELATION"))
+ if (Config_getBool("REFERENCED_BY_RELATION") && g_currentMemberDef->isFunction())
{
md->addSourceReferencedBy(g_currentMemberDef);
}
- if (Config_getBool("REFERENCES_RELATION"))
+ if (Config_getBool("REFERENCES_RELATION") && g_currentMemberDef->isFunction())
{
g_currentMemberDef->addSourceReferences(md);
}
@@ -678,7 +697,7 @@ static bool getLink(const char *className,
//printf("d->getOutputBase()=`%s' name=`%s' member name=`%s'\n",d->getOutputFileBase().data(),d->name().data(),md->name().data());
writeMultiLineCodeLink(result,d->getReference(),d->getOutputFileBase(),
- md->anchor(),text ? text : memberName);
+ md->getBodyAnchor(),text ? text : memberName);
return TRUE;
}
}
@@ -702,7 +721,8 @@ static bool generateClassMemberLink(OutputDocInterface &ol,ClassDef *mcd,const c
g_theCallContext.setClass(stripClassName(xmd->typeString()));
- Definition *xd = xmd->getOuterScope();
+ Definition *xd = xmd->getOuterScope()==Doxygen::globalScope ?
+ xmd->getBodyDef() : xmd->getOuterScope();
if (xd)
{
@@ -710,11 +730,11 @@ static bool generateClassMemberLink(OutputDocInterface &ol,ClassDef *mcd,const c
if (g_currentDefinition && g_currentMemberDef &&
xmd!=g_currentMemberDef && g_insideBody)
{
- if (Config_getBool("REFERENCED_BY_RELATION"))
+ if (Config_getBool("REFERENCED_BY_RELATION") && g_currentMemberDef->isFunction())
{
xmd->addSourceReferencedBy(g_currentMemberDef);
}
- if (Config_getBool("REFERENCES_RELATION"))
+ if (Config_getBool("REFERENCES_RELATION") && g_currentMemberDef->isFunction())
{
g_currentMemberDef->addSourceReferences(xmd);
}
@@ -722,7 +742,7 @@ static bool generateClassMemberLink(OutputDocInterface &ol,ClassDef *mcd,const c
// write the actual link
writeMultiLineCodeLink(ol,xd->getReference(),
- xd->getOutputFileBase(),xmd->anchor(),memName);
+ xd->getOutputFileBase(),xmd->getBodyAnchor(),memName);
return TRUE;
}
}
@@ -1068,11 +1088,16 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
generateClassOrGlobalLink(*g_code,yytext);
BEGIN( ClassVar );
}
+<ClassVar>"=" {
+ g_code->codify(yytext);
+ unput(*yytext);
+ BEGIN( Body );
+ }
<ClassVar>{ID} {
g_type = g_curClassName.copy();
g_name = yytext;
g_theVarContext.addVariable(g_type,g_name);
- g_code->codify(yytext);
+ generateClassOrGlobalLink(*g_code,yytext);
}
<ClassName,ClassVar>[ \t\n]*":"[ \t\n]* {
codifyLines(yytext);
@@ -1501,10 +1526,18 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
g_scopeStack.push(INNERBLOCK);
}
g_code->codify(")");
- startFontClass("keyword");
yytext[yyleng-1]='\0';
- codifyLines(yytext+1);
- endFontClass();
+ QCString cv(yytext+1);
+ if (!cv.stripWhiteSpace().isEmpty())
+ {
+ startFontClass("keyword");
+ codifyLines(yytext+1);
+ endFontClass();
+ }
+ else // just whitespace
+ {
+ codifyLines(yytext+1);
+ }
g_code->codify("{");
if (g_searchingForBody)
{
diff --git a/src/definition.cpp b/src/definition.cpp
index 7597ead..dcd1517 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -347,7 +347,7 @@ void Definition::writeInlineCode(OutputList &ol,const char *scopeName)
* definition is used.
*/
void Definition::writeSourceRefList(OutputList &ol,const char *scopeName,
- const QCString &text,MemberSDict *members)
+ const QCString &text,MemberSDict *members,bool /*funcOnly*/)
{
ol.pushGeneratorState();
if (Config_getBool("SOURCE_BROWSER") && members)
@@ -425,12 +425,12 @@ void Definition::writeSourceRefList(OutputList &ol,const char *scopeName,
void Definition::writeSourceReffedBy(OutputList &ol,const char *scopeName)
{
- writeSourceRefList(ol,scopeName,theTranslator->trReferencedBy(),m_sourceRefByDict);
+ writeSourceRefList(ol,scopeName,theTranslator->trReferencedBy(),m_sourceRefByDict,FALSE);
}
void Definition::writeSourceRefs(OutputList &ol,const char *scopeName)
{
- writeSourceRefList(ol,scopeName,theTranslator->trReferences(),m_sourceRefsDict);
+ writeSourceRefList(ol,scopeName,theTranslator->trReferences(),m_sourceRefsDict,TRUE);
}
bool Definition::hasDocumentation() const
diff --git a/src/definition.h b/src/definition.h
index b98f0f2..0b9d4ff 100644
--- a/src/definition.h
+++ b/src/definition.h
@@ -141,7 +141,7 @@ class Definition
private:
void writeSourceRefList(OutputList &ol,const char *scopeName,
- const QCString &text,MemberSDict *members);
+ const QCString &text,MemberSDict *members,bool);
//QCString m_qualifiedName; // name of the definition
QCString m_brief; // brief description
QCString m_doc; // detailed description
diff --git a/src/doc.l b/src/doc.l
index 86a2d3f..ab8ab2f 100644
--- a/src/doc.l
+++ b/src/doc.l
@@ -1135,7 +1135,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
if (formula)
{
QCString formName;
- formName.sprintf("form-%d.gif",formula->getId());
+ formName.sprintf("form_%d",formula->getId());
outDoc->writeFormula(formName,formula->getFormulaText());
}
}
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 005fb56..6db5d5d 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -2101,11 +2101,13 @@ static void findFriends()
{
mmd->setBodySegment(fmd->getStartBodyLine(),fmd->getEndBodyLine());
mmd->setBodyDef(fmd->getBodyDef());
+ mmd->setBodyMember(fmd);
}
else if (mmd->getStartBodyLine()!=-1 && fmd->getStartBodyLine()==-1)
{
fmd->setBodySegment(mmd->getStartBodyLine(),mmd->getEndBodyLine());
fmd->setBodyDef(mmd->getBodyDef());
+ fmd->setBodyMember(mmd);
}
}
}
@@ -2180,12 +2182,14 @@ static void transferFunctionDocumentation()
if (mdec->getStartBodyLine()!=-1 && mdef->getStartBodyLine()==-1)
{
mdef->setBodySegment(mdec->getStartBodyLine(),mdec->getEndBodyLine());
- mdef->setBodyDef(mdec->getFileDef());
+ mdef->setBodyDef(mdec->getBodyDef());
+ mdef->setBodyMember(mdec);
}
else if (mdef->getStartBodyLine()!=-1 && mdec->getStartBodyLine()==-1)
{
mdec->setBodySegment(mdef->getStartBodyLine(),mdef->getEndBodyLine());
- mdec->setBodyDef(mdef->getFileDef());
+ mdec->setBodyDef(mdef->getBodyDef());
+ mdec->setBodyMember(mdef);
}
mdec->mergeMemberSpecifiers(mdef->getMemberSpecifiers());
mdef->mergeMemberSpecifiers(mdec->getMemberSpecifiers());
@@ -6194,7 +6198,12 @@ static int readFileOrDirectory(const char *s,
bool errorIfNotExist=TRUE
)
{
- QFileInfo fi(s);
+ // strip trailing slashes
+ QCString fs = s;
+ char lc = fs.at(fs.length()-1);
+ if (lc=='/' || lc=='\\') fs = fs.left(fs.length()-1);
+
+ QFileInfo fi(fs);
//printf("readFileOrDirectory(%s)\n",s);
int totalSize=0;
{
@@ -6666,12 +6675,12 @@ void parseInput()
s=imagePathList.next();
}
- QDictIterator<FileName> fndi(*Doxygen::imageNameDict);
- FileName *fn;
- for (;(fn=fndi.current());++fndi)
- {
- printf("File Name %s\n",fn->fileName());
- }
+ //QDictIterator<FileName> fndi(*Doxygen::imageNameDict);
+ //FileName *fn;
+ //for (;(fn=fndi.current());++fndi)
+ //{
+ // printf("File Name %s\n",fn->fileName());
+ //}
msg("Searching for dot files...\n");
diff --git a/src/filedef.cpp b/src/filedef.cpp
index 9384952..56b9fa2 100644
--- a/src/filedef.cpp
+++ b/src/filedef.cpp
@@ -425,48 +425,18 @@ void FileDef::writeSource(OutputList &ol)
initParseCodeContext();
ol.startCodeFragment();
+ //if (name().left(9)=="memory.c")
+ //{
parseCode(ol,0,
fileToString(absFilePath(),Config_getBool("FILTER_SOURCE_FILES")),
FALSE,0,this
);
+ //}
ol.endCodeFragment();
endFile(ol);
ol.enableAll();
}
-#if 0
-/*! Adds a member \a md to the member group with id \a groupId.
- */
-void FileDef::addMemberListToGroup(MemberList *ml,
- bool (MemberDef::*func)() const)
-{
- MemberListIterator mli(*ml);
- MemberDef *md;
- for (;(md=mli.current());++mli)
- {
- int groupId=md->getMemberGroupId();
- if ((md->*func)() && groupId!=-1)
- {
- QCString *pGrpHeader = Doxygen::memberHeaderDict[groupId];
- QCString *pDocs = Doxygen::memberDocDict[groupId];
- //printf("Member `%s' pGrpHeader=%p\n",md->name().data(),pGrpHeader);
- if (pGrpHeader)
- {
- MemberGroup *mg = memberGroupDict->find(groupId);
- if (mg==0)
- {
- mg = new MemberGroup(groupId,*pGrpHeader,pDocs ? pDocs->data() : 0);
- memberGroupDict->insert(groupId,mg);
- memberGroupList->append(mg);
- }
- //printf("insert member %s in group %s\n",md->name().data(),pGrpHeader->data());
- mg->insertMember(md);
- md->setMemberGroup(mg);
- }
- }
- }
-}
-#endif
void FileDef::addMembersToMemberGroup()
{
diff --git a/src/formula.cpp b/src/formula.cpp
index f7c77b8..96d2137 100644
--- a/src/formula.cpp
+++ b/src/formula.cpp
@@ -85,7 +85,7 @@ void FormulaList::generateBitmaps(const char *path)
for (fli.toFirst();(formula=fli.current());++fli)
{
QCString resultName;
- resultName.sprintf("form-%d.gif",formula->getId());
+ resultName.sprintf("form_%d.gif",formula->getId());
// only formulas for which no image exists are generated
QFileInfo fi(resultName);
if (!fi.exists())
@@ -116,7 +116,7 @@ void FormulaList::generateBitmaps(const char *path)
for (;(pagePtr=pli.current());++pli,++pageIndex)
{
int pageNum=*pagePtr;
- msg("Generating image form-%d.gif for formula\n",pageNum);
+ msg("Generating image form_%d.gif for formula\n",pageNum);
char dviArgs[4096];
QCString formBase;
formBase.sprintf("_form%d",pageNum);
@@ -269,6 +269,7 @@ void FormulaList::generateBitmaps(const char *path)
}
// down-sample the image to 1/16th of the area using 16 gray scale
// colors.
+ // TODO: optimize this code.
for (y=0;y<dstImage.getHeight();y++)
{
for (x=0;x<dstImage.getWidth();x++)
@@ -298,7 +299,7 @@ void FormulaList::generateBitmaps(const char *path)
}
// save the result as a gif
QCString resultName;
- resultName.sprintf("form-%d.gif",pageNum);
+ resultName.sprintf("form_%d.gif",pageNum);
// the option parameter 1 is used here as a temporary hack
// to select the right color palette!
dstImage.save(resultName,1);
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 3bf5fb3..6193223 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -637,14 +637,14 @@ void HtmlGenerator::writeFormula(const char *n,const char *text)
{
if (text && text[0]=='\\') t << "<p><center>" << endl;
t << "<img align=";
-//#if !defined(_WIN32)
-// t << "\"top\""; // assume Unix users use Netscape 4.x which does
-// // not seem to support align == "middle" :-((
-//#else
+#if !defined(_WIN32)
+ t << "\"top\""; // assume Unix users use Netscape 4.x which does
+ // not seem to support align == "middle" :-((
+#else
t << "\"middle\""; // assume Windows users use IE or HtmlHelp which only
// displays formulas nicely with align == "middle"
-//#endif
- t << " src=\"" << n << "\">" << endl;
+#endif
+ t << " src=\"" << n << ".gif\">" << endl;
if (text && text[0]=='\\') t << "</center><p>" << endl;
}
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index e024585..ee2863c 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -315,7 +315,8 @@ void HtmlHelp::createProjectFile()
"Contents file=index.hhc\n"
"Default Window=main\n"
"Default topic=" << indexName << "\n"
- "Index file=index.hhk\n";
+ "Index file=index.hhk\n"
+ "Language=0x409 English (United States)\n";
if (Config_getBool("BINARY_TOC")) t << "Binary TOC=YES\n";
if (Config_getBool("GENERATE_CHI")) t << "Create CHI file=YES\n";
t << "Title=" << Config_getString("PROJECT_NAME") << endl << endl;
@@ -323,7 +324,7 @@ void HtmlHelp::createProjectFile()
t << "[WINDOWS]" << endl;
t << "main=\"" << Config_getString("PROJECT_NAME") << "\",\"index.hhc\","
"\"index.hhk\",\"" << indexName << "\",\"" <<
- indexName << "\",,,,,0x23520,,0x3006,,,,,,,,0" << endl << endl;
+ indexName << "\",,,,,0x23520,,0x387e,,,,,,,,0" << endl << endl;
t << "[FILES]" << endl;
char *s = indexFiles.first();
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index f0e4d5f..8ed96af 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -305,6 +305,7 @@ MemberDef::MemberDef(const char *df,int dl,
annEnumType=0;
indDepth=0;
section=0;
+ bodyMemb=0;
explExt=FALSE;
cachedAnonymousType=0;
maxInitLines=Config_getInt("MAX_INITIALIZER_LINES");
diff --git a/src/memberdef.h b/src/memberdef.h
index 64cb11f..a0d15b7 100644
--- a/src/memberdef.h
+++ b/src/memberdef.h
@@ -231,6 +231,12 @@ class MemberDef : public Definition
ArgumentList *actualArgs);
void setTemplateMaster(MemberDef *mt) { m_templateMaster=mt; }
void addListReference(Definition *d);
+
+ QCString getBodyAnchor() const
+ {
+ return bodyMemb ? bodyMemb->anchor() : anchor();
+ }
+ void setBodyMember(MemberDef *md) { bodyMemb = md; }
bool visited;
@@ -260,6 +266,7 @@ class MemberDef : public Definition
//int declLine; // line where the declaration was found
QCString def; // member definition in code (fully qualified name)
QCString anc; // HTML anchor name
+ MemberDef *bodyMemb; // Member containing the definition
Specifier virt; // normal/virtual/pure virtual
Protection prot; // protection type [Public/Protected/Private]
bool related; // is this a member that is only related to a class
diff --git a/src/translator_adapter.h b/src/translator_adapter.h
index 1b9a7d6..136cc75 100644
--- a/src/translator_adapter.h
+++ b/src/translator_adapter.h
@@ -5,10 +5,12 @@
/*! \brief Base of the translator adapter tree
*
- * This class provides access to the english translations, to be used
- * as a substitute for not implemented local translations.
+
+ * This abstract class provides access to the english
+ * translations, to be used as a substitute for not implemented
+ * local translations.
*/
-class TranslatorAdapterCVS : public Translator
+class TranslatorAdapterBase : public Translator
{
protected:
TranslatorEnglish english;
@@ -27,35 +29,17 @@ class TranslatorAdapterCVS : public Translator
}
public:
- /*! A method to generate a warning message to signal the user
- * that the translation of his/her language of choice needs
- * updating.
+ /*! This method is used to generate a warning message to signal
+ * the user that the translation of his/her language of choice
+ * needs updating. It must be implemented by the translator
+ * adapter class (pure virtual).
+ *
+ * \sa createUpdateNeededMessage()
*/
- virtual QCString updateNeededMessage()
- {
- QCString vs("CVS release ");
- vs += versionString; // the one from the version.cpp
- return createUpdateNeededMessage(idLanguage(), vs);
- }
-//-----------------------------------------------------------------------
-// The things below this line should go to the new
-// TranslatorAdapter_1_2_x, as public methods. The things above
-// should stay in TranslatorAdapterCVS and need not to be touched.
-// The first five lines below should be uncommented, and the
-// release number at the fifth of those lines should be set.
-
-// class TranslatorAdapter_1_2_x : public TranslatorAdapterCVS
-// {
-// public:
-// virtual QCString updateNeededMessage()
-// { return createUpdateNeededMessage(idLanguage(),"release 1.2.x"); }
-
- // Put new adapter methods below...
- //
-
+ virtual QCString updateNeededMessage() = 0;
};
-class TranslatorAdapter_1_2_11 : public TranslatorAdapterCVS
+class TranslatorAdapter_1_2_11 : public TranslatorAdapterBase
{
public:
virtual QCString updateNeededMessage()
diff --git a/src/translator_cz.h b/src/translator_cz.h
index 36e785c..5972f42 100644
--- a/src/translator_cz.h
+++ b/src/translator_cz.h
@@ -128,6 +128,9 @@
// 2001/07/16
// - trClassDocumentation() updated as in the English translator.
//
+// 2001/11/06
+// - trReferences() implemented.
+//
//
// Todo
// ----
@@ -148,7 +151,7 @@
// probably slightly faster.
-class TranslatorCzech : public TranslatorAdapter_1_2_11
+class TranslatorCzech : public Translator
{
private:
/*! The decode() inline assumes the source written in the
@@ -1465,6 +1468,17 @@ class TranslatorCzech : public TranslatorAdapter_1_2_11
return decode(result);
}
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.11
+//////////////////////////////////////////////////////////////////////////
+
+ /*! This text is put before the list of members referenced by a member
+ */
+ virtual QCString trReferences()
+ {
+ return decode("Odkazuje se na");
+ }
+
};
#endif // TRANSLATOR_CZ_H
diff --git a/src/translator_ru.h b/src/translator_ru.h
index c96bdae..524a395 100644
--- a/src/translator_ru.h
+++ b/src/translator_ru.h
@@ -50,7 +50,7 @@
#ifndef TRANSLATOR_RU_H
#define TRANSLATOR_RU_H
-class TranslatorRussian : public TranslatorAdapter_1_2_11
+class TranslatorRussian : public Translator
{
private:
/*! The Decode() inline assumes the source written in the
@@ -146,7 +146,7 @@ class TranslatorRussian : public TranslatorAdapter_1_2_11
/*! this is the first part of a sentence that is followed by a class name */
/* Dosn't use when optimization for C is on. */
virtual QCString trThisIsTheListOfAllMembers()
- { return decode("Полный список членов класса"); }
+ { return decode("Полный список членов класса "); }
/*! this is the remainder of the sentence after the class name */
/* Dosn't use when optimization for C is on. */
@@ -628,7 +628,7 @@ class TranslatorRussian : public TranslatorAdapter_1_2_11
*/
virtual QCString trRelatedFunctionDocumentation()
{ return decode("Документация по друзьям класса и функциям отноносящихся"
- "к классу"); }
+ " к классу"); }
//////////////////////////////////////////////////////////////////////////
// new since 0.49-990425
@@ -1357,6 +1357,27 @@ class TranslatorRussian : public TranslatorAdapter_1_2_11
if (!singular) result+="ы";
return decode(result);
}
+
+ /*! This text is generated when the \\requirements command is used
+ */
+ virtual QCString trRequirements(bool first_capital, bool singular)
+ {
+ QCString result((first_capital ? "Требовани" : "требовани"));
+ if (!singular) result+="я"; else result+="е";
+ return decode(result);
+ }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.11
+//////////////////////////////////////////////////////////////////////////
+
+ /*! This text is put before the list of members referenced by a member
+ */
+ virtual QCString trReferences()
+ {
+ return "Перекрестные ссылки";
+ }
+
};
#endif
diff --git a/src/xmlgen.cpp b/src/xmlgen.cpp
index 9ff6199..463d16a 100644
--- a/src/xmlgen.cpp
+++ b/src/xmlgen.cpp
@@ -579,21 +579,21 @@ class XMLGenerator : public OutputDocInterface
docify(text);
m_t << "</formula>";
}
- void startImage(const char *name,const char *size,bool caption)
+ void startImage(const char *name,const char *size,bool /*caption*/)
{
startParMode();
- m_t << "<image name=\"" << name << "\" size=\"" << size
- << "\" caption=\"" << (caption ? "1" : "0") << "\">"; // non docbook
+ m_t << "<image name=\"" << name << "\"";
+ if (size) m_t << " size=\"" << size << "\"";
+ m_t << ">"; // non docbook
}
void endImage(bool)
{
m_t << "</image>";
}
- void startDotFile(const char *name,bool caption)
+ void startDotFile(const char *name,bool /*caption*/)
{
startParMode();
- m_t << "<dotfile name=\"" << name << "\" "
- << "caption=\"" << (caption ? "1" : "0") << "\">"; // non docbook
+ m_t << "<dotfile name=\"" << name << "\">"; // non docbook
}
void endDotFile(bool)
{
@@ -1176,9 +1176,9 @@ void generateXMLForFile(FileDef *fd,QTextStream &t)
t << " <detaileddescription>" << endl;
writeXMLDocBlock(t,fd->getDefFileName(),fd->getDefLine(),0,0,fd->documentation());
t << " </detaileddescription>" << endl;
- t << " <sourcecode>" << endl;
+ t << " <programlisting>" << endl;
writeXMLCodeBlock(t,fd);
- t << " </sourcecode>" << endl;
+ t << " </programlisting>" << endl;
t << " <location file=\""
<< fd->getDefFileName() << "\" line=\""
<< fd->getDefLine() << "\"/>" << endl;
generated by cgit v0.12 at 2024-11-02 14:23:26 (GMT)