summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2001-02-11 18:24:41 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2001-02-11 18:24:41 (GMT)
commit863353b89b228b87789e6d6c9257605acd796fff (patch)
treef98b164f024c28a0d6378b68142ed268239dba97 /src
parent1b90a1cf58b6b94d00e28d8212828956e8f9d177 (diff)
downloadDoxygen-863353b89b228b87789e6d6c9257605acd796fff.zip
Doxygen-863353b89b228b87789e6d6c9257605acd796fff.tar.gz
Doxygen-863353b89b228b87789e6d6c9257605acd796fff.tar.bz2
Release-1.2.5-20010211
Diffstat (limited to 'src')
-rw-r--r--src/code.l2
-rw-r--r--src/config.h4
-rw-r--r--src/config.l32
-rw-r--r--src/definition.cpp28
-rw-r--r--src/doc.l54
-rw-r--r--src/dot.cpp6
-rw-r--r--src/doxygen.cpp11
-rw-r--r--src/ftvhelp.cpp17
-rw-r--r--src/htmlgen.h4
-rw-r--r--src/htmlhelp.cpp6
-rw-r--r--src/latexgen.h4
-rw-r--r--src/mangen.h4
-rw-r--r--src/outputgen.h2
-rw-r--r--src/outputlist.h8
-rw-r--r--src/rtfgen.h4
-rw-r--r--src/scanner.l1
-rw-r--r--src/translator.h2
-rw-r--r--src/translator_cz.h5
-rw-r--r--src/translator_de.h39
-rw-r--r--src/translator_hr.h62
20 files changed, 233 insertions, 62 deletions
diff --git a/src/code.l b/src/code.l
index 53e3ff5..14b738e 100644
--- a/src/code.l
+++ b/src/code.l
@@ -809,7 +809,7 @@ TYPEKW ("bool"|"char"|"double"|"float"|"int"|"long"|"short"|"signed"|"unsigned"
if (!g_insideTemplate)
BEGIN( ClassName );
}
-<ReadInclude>[a-z_A-Z0-9.]+(("/"[a-z_A-Z0-9.]+)*)/(">"|"\"") {
+<ReadInclude>[^\n\"\>]+/(">"|"\"") {
//FileInfo *f;
bool ambig;
FileDef *fd;
diff --git a/src/config.h b/src/config.h
index a8495bd..ce14ac8 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,4 +1,4 @@
-/* This file was generated by configgen on Sat Feb 3 18:53:37 2001
+/* This file was generated by configgen on Thu Feb 8 22:26:39 2001
* from config_templ.h
*
* DO NOT EDIT!
@@ -97,6 +97,7 @@ struct Config
static QCString htmlStyleSheet; // user defined cascading style sheet
static bool htmlAlignMemberFlag; // align members in HTML using tables.
static bool htmlHelpFlag; // should html help files be generated?
+ static bool htmlHelpChiFlag; // should chi file be generated?
static bool noIndexFlag; // generate condensed index flag
static int enumValuesPerLine; // number of enum values that are put on one line
static bool ftvHelpFlag; // should a folder tree view be generated?
@@ -140,6 +141,7 @@ struct Config
static int maxDotGraphWidth; // max dot graph width
static int maxDotGraphHeight; // max dot graph height
static bool generateLegend; // generate legend page
+ static bool dotCleanUp; // remove intermedia dot files?
static bool searchEngineFlag; // generate search engine flag
static QCString cgiName; // the name of the CGI binary
static QCString cgiURL; // the absolute URL to the CGI binary
diff --git a/src/config.l b/src/config.l
index 6786b88..7221429 100644
--- a/src/config.l
+++ b/src/config.l
@@ -1,4 +1,4 @@
-/* This file was generated by configgen on Sat Feb 3 18:53:38 2001
+/* This file was generated by configgen on Thu Feb 8 22:26:39 2001
* from config_templ.l
*
* DO NOT EDIT!
@@ -134,6 +134,7 @@ QCString Config::footerFile;
QCString Config::htmlStyleSheet;
bool Config::htmlAlignMemberFlag = TRUE;
bool Config::htmlHelpFlag = FALSE;
+bool Config::htmlHelpChiFlag = FALSE;
bool Config::noIndexFlag = FALSE;
int Config::enumValuesPerLine = 4;
bool Config::ftvHelpFlag = FALSE;
@@ -177,6 +178,7 @@ QCString Config::dotPath;
int Config::maxDotGraphWidth = 1024;
int Config::maxDotGraphHeight = 1024;
bool Config::generateLegend = TRUE;
+bool Config::dotCleanUp = TRUE;
bool Config::searchEngineFlag = FALSE;
QCString Config::cgiName = "search.cgi";
QCString Config::cgiURL;
@@ -416,6 +418,7 @@ static void readIncludeFile(const char *incName)
<Start>"HTML_STYLESHEET"[ \t]*"=" { BEGIN(GetString); s=&Config::htmlStyleSheet; s->resize(0); }
<Start>"HTML_ALIGN_MEMBERS"[ \t]*"=" { BEGIN(GetBool); b=&Config::htmlAlignMemberFlag; }
<Start>"GENERATE_HTMLHELP"[ \t]*"=" { BEGIN(GetBool); b=&Config::htmlHelpFlag; }
+<Start>"GENERATE_CHI"[ \t]*"=" { BEGIN(GetBool); b=&Config::htmlHelpChiFlag; }
<Start>"DISABLE_INDEX"[ \t]*"=" { BEGIN(GetBool); b=&Config::noIndexFlag; }
<Start>"ENUM_VALUES_PER_LINE"[ \t]*"=" { BEGIN(GetString); s=&enumValuesPerLineString; s->resize(0); }
<Start>"GENERATE_TREEVIEW"[ \t]*"=" { BEGIN(GetBool); b=&Config::ftvHelpFlag; }
@@ -465,6 +468,7 @@ static void readIncludeFile(const char *incName)
<Start>"MAX_DOT_GRAPH_WIDTH"[ \t]*"=" { BEGIN(GetString); s=&maxDotGraphWidthString; s->resize(0); }
<Start>"MAX_DOT_GRAPH_HEIGHT"[ \t]*"=" { BEGIN(GetString); s=&maxDotGraphHeightString; s->resize(0); }
<Start>"GENERATE_LEGEND"[ \t]*"=" { BEGIN(GetBool); b=&Config::generateLegend; }
+<Start>"DOT_CLEANUP"[ \t]*"=" { BEGIN(GetBool); b=&Config::dotCleanUp; }
<Start>"SEARCHENGINE"[ \t]*"=" { BEGIN(GetBool); b=&Config::searchEngineFlag; }
<Start>"CGI_NAME"[ \t]*"=" { BEGIN(GetString); s=&Config::cgiName; s->resize(0); }
<Start>"CGI_URL"[ \t]*"=" { BEGIN(GetString); s=&Config::cgiURL; s->resize(0); }
@@ -718,6 +722,7 @@ void dumpConfig()
printf("htmlStyleSheet=`%s'\n",Config::htmlStyleSheet.data());
printf("htmlAlignMemberFlag=`%d'\n",Config::htmlAlignMemberFlag);
printf("htmlHelpFlag=`%d'\n",Config::htmlHelpFlag);
+ printf("htmlHelpChiFlag=`%d'\n",Config::htmlHelpChiFlag);
printf("noIndexFlag=`%d'\n",Config::noIndexFlag);
printf("enumValuesPerLine=`%d'\n",Config::enumValuesPerLine);
printf("ftvHelpFlag=`%d'\n",Config::ftvHelpFlag);
@@ -809,6 +814,7 @@ void dumpConfig()
printf("maxDotGraphWidth=`%d'\n",Config::maxDotGraphWidth);
printf("maxDotGraphHeight=`%d'\n",Config::maxDotGraphHeight);
printf("generateLegend=`%d'\n",Config::generateLegend);
+ printf("dotCleanUp=`%d'\n",Config::dotCleanUp);
printf("# Configuration::addtions related to the search engine \n");
printf("searchEngineFlag=`%d'\n",Config::searchEngineFlag);
printf("cgiName=`%s'\n",Config::cgiName.data());
@@ -888,6 +894,7 @@ void Config::init()
Config::htmlStyleSheet.resize(0);
Config::htmlAlignMemberFlag = TRUE;
Config::htmlHelpFlag = FALSE;
+ Config::htmlHelpChiFlag = FALSE;
Config::noIndexFlag = FALSE;
Config::enumValuesPerLine = 4;
Config::ftvHelpFlag = FALSE;
@@ -931,6 +938,7 @@ void Config::init()
Config::maxDotGraphWidth = 1024;
Config::maxDotGraphHeight = 1024;
Config::generateLegend = TRUE;
+ Config::dotCleanUp = TRUE;
Config::searchEngineFlag = FALSE;
Config::cgiName = "search.cgi";
Config::cgiURL.resize(0);
@@ -1727,6 +1735,17 @@ void writeTemplateConfig(QFile *f,bool sl)
if (!sl)
{
t << "\n";
+ t << "# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag \n";
+ t << "# controls if a separate .chi index file is generated (YES) or that \n";
+ t << "# it should be included in the master .chm file (NO).\n";
+ t << "\n";
+ }
+ t << "GENERATE_CHI = ";
+ writeBoolValue(t,Config::htmlHelpChiFlag);
+ t << "\n";
+ if (!sl)
+ {
+ t << "\n";
t << "# The DISABLE_INDEX tag can be used to turn on/off the condensed index at \n";
t << "# top of each HTML page. The value NO (the default) enables the index and \n";
t << "# the value YES disables it. \n";
@@ -2251,6 +2270,17 @@ void writeTemplateConfig(QFile *f,bool sl)
if (!sl)
{
t << "\n";
+ t << "# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will \n";
+ t << "# remove the intermedate dot files that are used to generate \n";
+ t << "# the various graphs. \n";
+ t << "\n";
+ }
+ t << "DOT_CLEANUP = ";
+ writeBoolValue(t,Config::dotCleanUp);
+ t << "\n";
+ if (!sl)
+ {
+ t << "\n";
}
t << "#---------------------------------------------------------------------------\n";
t << "# Configuration::addtions related to the search engine \n";
diff --git a/src/definition.cpp b/src/definition.cpp
index b068d79..ebd126c 100644
--- a/src/definition.cpp
+++ b/src/definition.cpp
@@ -141,7 +141,7 @@ void Definition::setBriefDescription(const char *b)
}
/*! Reads a fragment of code from file \a fileName starting at
- * line \a startLine and ending at line \a endLine. The fragment is
+ * line \a startLine and ending at line \a endLine (inclusive). The fragment is
* stored in \a result. If FALSE is returned the code fragment could not be
* found.
*
@@ -201,10 +201,15 @@ static bool readCodeFragment(const char *fileName,
}
if (found)
{
- // fill the line with spaces until the right column
- QCString spaces;
- spaces.fill(' ',col);
- result+=spaces;
+ // For code with more than one line,
+ // fill the line with spaces until we are at the right column
+ // so that the opening brace lines up with the closing brace
+ if (endLine!=startLine)
+ {
+ QCString spaces;
+ spaces.fill(' ',col);
+ result+=spaces;
+ }
// copy until end of line
result+=c;
if (c==':') result+=cn;
@@ -221,15 +226,16 @@ static bool readCodeFragment(const char *fileName,
} while (size_read == (maxLineLength-1));
lineNr++;
- } while (lineNr<endLine && !f.atEnd());
+ } while (lineNr<=endLine && !f.atEnd());
- int charIndex = result.findRev('}');
- if (charIndex > 0)
+ // strip stuff after closing bracket
+ int newLineIndex = result.findRev('\n');
+ int braceIndex = result.findRev('}');
+ if (braceIndex > newLineIndex)
{
- result.truncate(charIndex+1);
- result+='\n';
+ result.truncate(braceIndex+1);
}
- endLine=lineNr;
+ endLine=lineNr-1;
return TRUE;
}
}
diff --git a/src/doc.l b/src/doc.l
index 5c449b3..efeb291 100644
--- a/src/doc.l
+++ b/src/doc.l
@@ -472,8 +472,12 @@ static void endBlock()
{
outDoc->endDescTableData();
outDoc->endDescTable();
+ outDoc->endParamList();
+ }
+ else
+ {
+ outDoc->endDescList();
}
- outDoc->endDescList();
currentListIndent.pop();
inParamBlock=inRetValBlock=inSeeBlock=inReturnBlock=inAuthorBlock=
inVersionBlock=inSinceBlock=inDateBlock=inBugBlock=inNoteBlock=inWarningBlock=
@@ -1037,7 +1041,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
}
BEGIN(DocPar);
}
-<DocPar>[^\n]*{BN} {
+<DocPar>[^\n]*{BN}+ {
QCString title=QCString(yytext).stripWhiteSpace();
bool b = inBlock();
if (!title.isEmpty())
@@ -1059,7 +1063,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
}
BEGIN(DocScan);
}
-<DocScan>{CMD}"warning"/{BN} {
+<DocScan>{CMD}"warning"{BN}+ {
endArgumentList();
if (!inWarningBlock)
{
@@ -1078,7 +1082,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
outDoc->writeDescItem();
}
}
-<DocScan>{CMD}"remark"[s]?/{BN} {
+<DocScan>{CMD}"remark"[s]?{BN}+ {
endArgumentList();
if (!inRemarkBlock)
{
@@ -1097,7 +1101,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
outDoc->writeDescItem();
}
}
-<DocScan>{CMD}"attention"[s]?/{BN} {
+<DocScan>{CMD}"attention"{BN}+ {
endArgumentList();
if (!inAttentionBlock)
{
@@ -1116,7 +1120,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
outDoc->writeDescItem();
}
}
-<DocScan>{CMD}"bug"[s]?/{BN} {
+<DocScan>{CMD}"bug"[s]?{BN}+ {
endArgumentList();
if (!inBugBlock)
{
@@ -1135,7 +1139,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
outDoc->writeDescItem();
}
}
-<DocScan>{CMD}"note"[s]?/{BN} {
+<DocScan>{CMD}"note"[s]?{BN}+ {
endArgumentList();
if (!inNoteBlock)
{
@@ -1154,7 +1158,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
outDoc->writeDescItem();
}
}
-<DocScan>{CMD}"pre"/{BN} {
+<DocScan>{CMD}"pre"{BN}+ {
endArgumentList();
if (!inPreBlock)
{
@@ -1173,7 +1177,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
outDoc->writeDescItem();
}
}
-<DocScan>{CMD}"post"/{BN} {
+<DocScan>{CMD}"post"{BN}+ {
endArgumentList();
if (!inPostBlock)
{
@@ -1192,7 +1196,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
outDoc->writeDescItem();
}
}
-<DocScan>{CMD}"invariant"/{BN} {
+<DocScan>{CMD}"invariant"{BN}+ {
endArgumentList();
if (!inInvarBlock)
{
@@ -1211,7 +1215,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
outDoc->writeDescItem();
}
}
-<DocScan>{CMD}"version"/{BN} {
+<DocScan>{CMD}"version"{BN}+ {
endArgumentList();
if (!inVersionBlock)
{
@@ -1230,7 +1234,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
outDoc->writeDescItem();
}
}
-<DocScan>{CMD}"since"/{BN} {
+<DocScan>{CMD}"since"{BN}+ {
endArgumentList();
if (!inSinceBlock)
{
@@ -1249,7 +1253,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
outDoc->writeDescItem();
}
}
-<DocScan>{CMD}"date"/{BN} {
+<DocScan>{CMD}"date"{BN}+ {
endArgumentList();
if (!inDateBlock)
{
@@ -1312,7 +1316,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
currentListIndent.pop();
}
}
-<DocScan>{CMD}"deprecated"/{BN} {
+<DocScan>{CMD}"deprecated"{BN}+ {
endArgumentList();
if (!inDeprecatedBlock)
{
@@ -1350,7 +1354,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
outDoc->endDescList();
currentListIndent.pop();
}
-<DocScan>{CMD}"author"/{BN} {
+<DocScan>{CMD}"author"{BN}+ {
endArgumentList();
if (!inAuthorBlock)
{
@@ -1369,7 +1373,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
outDoc->docify(", ");
}
}
-<DocScan>{CMD}("return"([s])?|"result")/{BN} {
+<DocScan>{CMD}("return"([s])?|"result"){BN}+ {
endArgumentList();
if (!inReturnBlock)
{
@@ -1384,7 +1388,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
outDoc->writeDescItem();
}
}
-<DocScan>{CMD}("sa"|"see")/{BN} {
+<DocScan>{CMD}("sa"|"see"){BN}+ {
endArgumentList();
if (!inSeeBlock)
{
@@ -1403,7 +1407,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
outDoc->docify(", ");
}
}
-<DocScan>(({B}*"\n"){2,}{B}*)?{CMD}"param"/{BN} {
+<DocScan>(({B}*"\n"){2,}{B}*)?{CMD}"param"{BN}+ {
QCString t=yytext;
if (t.contains('\n')>1 && insideItemList)
{
@@ -1415,7 +1419,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
if (inBlock()) endBlock();
inParamBlock=TRUE;
currentListIndent.push("D");
- outDoc->startDescList();
+ outDoc->startParamList();
outDoc->startBold();
scanString(theTranslator->trParameters()+": ");
outDoc->endBold();
@@ -1429,7 +1433,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
}
BEGIN(DocParam);
}
-<DocScan>(({B}*"\n"){2,}{B}*)?{CMD}"retval"/{BN} {
+<DocScan>(({B}*"\n"){2,}{B}*)?{CMD}"retval"{BN}+ {
QCString t=yytext;
if (t.contains('\n')>1 && insideItemList)
{
@@ -1441,7 +1445,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
if (inBlock()) endBlock();
inRetValBlock=TRUE;
currentListIndent.push("D");
- outDoc->startDescList();
+ outDoc->startParamList();
outDoc->startBold();
scanString(theTranslator->trReturnValues()+": ");
outDoc->endBold();
@@ -1455,7 +1459,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
}
BEGIN(DocParam);
}
-<DocScan>(({B}*"\n"){2,}{B}*)?{CMD}("exception"|"throw")s?/{BN} {
+<DocScan>(({B}*"\n"){2,}{B}*)?{CMD}("exception"|"throw")s?{BN}+ {
QCString t=yytext;
if (t.contains('\n')>1 && insideItemList)
{
@@ -1467,7 +1471,7 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
if (inBlock()) endBlock();
inExceptionBlock=TRUE;
currentListIndent.push("D");
- outDoc->startDescList();
+ outDoc->startParamList();
outDoc->startBold();
scanString(theTranslator->trExceptions()+": ");
outDoc->endBold();
@@ -1482,10 +1486,10 @@ OPMASK ({B}*{OPNORM}({OPARG}?))|({OPCAST}{OPARG})
BEGIN(DocException);
}
<DocScan>"\\capt".*
-<DocParam>({DOCPARAM}{BN}*","{BN}*)*{DOCPARAM} {
+<DocParam>({DOCPARAM}{BN}*","{BN}*)*{DOCPARAM}{BN}* {
outDoc->startDescTableTitle();
outDoc->startEmphasis();
- outDoc->docify(substitute(yytext,"\"",""));
+ outDoc->docify(substitute(yytext,"\"","").stripWhiteSpace());
outDoc->endEmphasis();
outDoc->endDescTableTitle();
outDoc->startDescTableData();
diff --git a/src/dot.cpp b/src/dot.cpp
index 5824794..7b3309c 100644
--- a/src/dot.cpp
+++ b/src/dot.cpp
@@ -602,7 +602,7 @@ void DotGfxHierarchyTable::writeGraph(QTextStream &out,const char *path)
out << "<map name=\"" << n->m_label << "_map\">" << endl;
convertMapFile(out,mapName);
out << "</map>" << endl;
- thisDir.remove(dotName);
+ if (Config::dotCleanUp) thisDir.remove(dotName);
thisDir.remove(mapName);
}
out << "</table>" << endl;
@@ -1187,7 +1187,7 @@ void DotClassGraph::writeGraph(QTextStream &out,
"\\end{center}\n"
"\\end{figure}\n";
}
- thisDir.remove(baseName+".dot");
+ if (Config::dotCleanUp) thisDir.remove(baseName+".dot");
QDir::setCurrent(oldDir);
}
@@ -1387,7 +1387,7 @@ void DotInclDepGraph::writeGraph(QTextStream &out,
"\\end{figure}\n";
}
- thisDir.remove(baseName+".dot");
+ if (Config::dotCleanUp) thisDir.remove(baseName+".dot");
QDir::setCurrent(oldDir);
}
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 9523342..4964bc0 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -6405,12 +6405,6 @@ void generateOutput()
writeGraphicalClassHierarchy(*outputList);
}
- //if (Config::generateXML)
- //{
- // msg("Generating XML output\n");
- // generateXML();
- //}
-
if (Doxygen::formulaList.count()>0 && Config::generateHtml)
{
msg("Generating bitmaps for formulas in HTML...\n");
@@ -6439,8 +6433,7 @@ void generateOutput()
delete tag;
}
-
- if (Config::generateHtml) removeDoxFont(Config::htmlOutputDir);
- if (Config::generateRTF) removeDoxFont(Config::rtfOutputDir);
+ if (Config::generateHtml && Config::dotCleanUp) removeDoxFont(Config::htmlOutputDir);
+ if (Config::generateRTF && Config::dotCleanUp) removeDoxFont(Config::rtfOutputDir);
}
diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp
index 71a053b..5936894 100644
--- a/src/ftvhelp.cpp
+++ b/src/ftvhelp.cpp
@@ -12,6 +12,7 @@
#include <stdlib.h>
#include <qlist.h>
#include <qdict.h>
+#include <qfileinfo.h>
#include "ftvhelp.h"
#include "config.h"
@@ -302,7 +303,21 @@ static void generateFolderTreeViewData()
{
QTextStream t(&f);
t << "<html><head>" << endl;
- t << "<link rel=\"stylesheet\" href=\"doxygen.css\">" << endl;
+ t << "<link rel=\"stylesheet\" href=\"";
+ if (Config::htmlStyleSheet.isEmpty())
+ {
+ t << "doxygen.css";
+ }
+ else
+ {
+ QFileInfo cssfi(Config::htmlStyleSheet);
+ if (!cssfi.exists())
+ {
+ err("Error: user specified HTML style sheet file does not exist!\n");
+ }
+ t << cssfi.fileName();
+ }
+ t << "\">" << endl;
t << "<script src=\"treeview.js\"></script>" << endl;
t << "<script src=\"tree.js\"></script>" << endl;
t << "<script>" << endl;
diff --git a/src/htmlgen.h b/src/htmlgen.h
index e817cc2..c0fb455 100644
--- a/src/htmlgen.h
+++ b/src/htmlgen.h
@@ -179,9 +179,11 @@ class HtmlGenerator : public OutputGenerator
void writeRing(char c) { t << "&" << c << "ring;"; }
void writeSharpS() { t << "&szlig;"; }
void startDescList() { t << "<dl compact><dt>" << endl; }
+ void endDescList() { t << "</dl>"; }
+ void startParamList() { startDescList(); }
+ void endParamList() { endDescList(); }
void endDescTitle() {}
void writeDescItem() { t << "<dd>" << endl; }
- void endDescList() { t << "</dl>"; }
void startSection(const char *,const char *,bool);
void endSection(const char *,bool);
void writeSectionRef(const char *,const char *,const char *,const char *);
diff --git a/src/htmlhelp.cpp b/src/htmlhelp.cpp
index 5d16f59..e3c2608 100644
--- a/src/htmlhelp.cpp
+++ b/src/htmlhelp.cpp
@@ -306,9 +306,9 @@ void HtmlHelp::createProjectFile()
"Default Window=main\n"
"Default topic=" << indexName << "\n"
"Index file=index.hhk\n"
- "Binary TOC=YES\n"
- "Create CHI file=YES\n"
- "Title=" << Config::projectName << endl << endl;
+ "Binary TOC=YES\n";
+ if (Config::htmlHelpChiFlag) t << "Create CHI file=YES\n";
+ t << "Title=" << Config::projectName << endl << endl;
t << "[WINDOWS]" << endl;
t << "main=\"" << Config::projectName << "\",\"index.hhc\","
diff --git a/src/latexgen.h b/src/latexgen.h
index 4b264ce..b000c27 100644
--- a/src/latexgen.h
+++ b/src/latexgen.h
@@ -177,9 +177,11 @@ class LatexGenerator : public OutputGenerator
void startMemberDescription() { t << "\\begin{CompactList}\\small\\item\\em "; }
void endMemberDescription() { t << "\\item\\end{CompactList}"; }
void startDescList() { t << "\\begin{Desc}\n\\item["; }
+ void endDescList() { t << "\\end{Desc}" << endl; }
+ void startParamList() { startDescList(); }
+ void endParamList() { endDescList(); }
void endDescTitle() { t << "]"; }
void writeDescItem() { t << "\\par" << endl; }
- void endDescList() { t << "\\end{Desc}" << endl; }
void startSection(const char *,const char *,bool);
void endSection(const char *,bool);
void writeSectionRef(const char *,const char *,const char *,const char *);
diff --git a/src/mangen.h b/src/mangen.h
index 3826518..96aa174 100644
--- a/src/mangen.h
+++ b/src/mangen.h
@@ -167,9 +167,11 @@ class ManGenerator : public OutputGenerator
void startMemberDescription() { t << "\n.RI \"\\fI"; firstCol=FALSE; }
void endMemberDescription() { t << "\\fR\""; firstCol=FALSE; }
void startDescList();
+ void endDescList() {}
+ void startParamList() { startDescList(); }
+ void endParamList() { endDescList(); }
void endDescTitle();
void writeDescItem();
- void endDescList() {}
void startSection(const char *,const char *,bool) {}
void endSection(const char *,bool) {}
void writeSectionRef(const char *,const char *,const char *,const char *) {}
diff --git a/src/outputgen.h b/src/outputgen.h
index 7d7834a..436ebcb 100644
--- a/src/outputgen.h
+++ b/src/outputgen.h
@@ -204,6 +204,8 @@ class BaseOutputDocInterface
virtual void writeSharpS() = 0;
virtual void startDescList() = 0;
virtual void endDescList() = 0;
+ virtual void startParamList() = 0;
+ virtual void endParamList() = 0;
virtual void endDescTitle() = 0;
virtual void writeDescItem() = 0;
virtual void startTitle() = 0;
diff --git a/src/outputlist.h b/src/outputlist.h
index 5b1899c..7ae1973 100644
--- a/src/outputlist.h
+++ b/src/outputlist.h
@@ -302,12 +302,16 @@ class OutputList : public OutputDocInterface
{ forall(&OutputGenerator::endMemberDescription); }
void startDescList()
{ forall(&OutputGenerator::startDescList); }
+ void endDescList()
+ { forall(&OutputGenerator::endDescList); }
+ void startParamList()
+ { forall(&OutputGenerator::startParamList); }
+ void endParamList()
+ { forall(&OutputGenerator::endParamList); }
void endDescTitle()
{ forall(&OutputGenerator::endDescTitle); }
void writeDescItem()
{ forall(&OutputGenerator::writeDescItem); }
- void endDescList()
- { forall(&OutputGenerator::endDescList); }
void startIndent()
{ forall(&OutputGenerator::startIndent); }
void endIndent()
diff --git a/src/rtfgen.h b/src/rtfgen.h
index 0179dd5..2f1355a 100644
--- a/src/rtfgen.h
+++ b/src/rtfgen.h
@@ -163,9 +163,11 @@ class RTFGenerator : public OutputGenerator
void startMemberDescription();
void endMemberDescription();
void startDescList();
+ void endDescList();
+ void startParamList() { startDescList(); }
+ void endParamList() { endDescList(); }
void endDescTitle();
void writeDescItem();
- void endDescList();
void startSection(const char *,const char *,bool);
void endSection(const char *,bool);
void writeSectionRef(const char *,const char *,const char *,const char *);
diff --git a/src/scanner.l b/src/scanner.l
index 413b489..452ee69 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -264,6 +264,7 @@ static void addSection()
if (Doxygen::sectionDict.find(sectionLabel)==0)
{
SectionInfo *si=new SectionInfo(sectionLabel,sectionTitle,sectionType);
+ si->fileName = current->name;
//printf("Adding section addr=%p label=`%s' sectionTitle=`%s' fileName=%s\n",si,sectionLabel.data(),sectionTitle.data(),si->fileName.data());
Doxygen::sectionDict.insert(sectionLabel,si);
current->anchors->append(new QCString(sectionLabel));
diff --git a/src/translator.h b/src/translator.h
index 8d45cb1..83c3c08 100644
--- a/src/translator.h
+++ b/src/translator.h
@@ -588,7 +588,7 @@ class Translator
/*! this text is put before a class diagram */
virtual QCString trClassDiagram(const char *clName)
{
- return (QCString)"Inheritance diagram for "+clName;
+ return (QCString)"Inheritance diagram for "+clName+":";
}
/*! this text is generated when the \internal command is used. */
diff --git a/src/translator_cz.h b/src/translator_cz.h
index 51c1530..a3e5606 100644
--- a/src/translator_cz.h
+++ b/src/translator_cz.h
@@ -1177,6 +1177,11 @@ class TranslatorCzech : public Translator
{
return Decode("Dokumentace balíku");
}
+ /*! Text shown before a multi-line define */
+ virtual QCString trDefineValue()
+ {
+ return Decode("Hodnota:");
+ }
};
#endif // TRANSLATOR_CZ_H
diff --git a/src/translator_de.h b/src/translator_de.h
index 633c984..dca9345 100644
--- a/src/translator_de.h
+++ b/src/translator_de.h
@@ -862,6 +862,45 @@ class TranslatorGerman : public Translator
return "Legende";
}
+//////////////////////////////////////////////////////////////////////////
+// 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 "Test-Liste";
+ }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.1
+//////////////////////////////////////////////////////////////////////////
+
+ /*! Used as a section header for KDE-2 IDL methods */
+ virtual QCString trDCOPMethods()
+ {
+ return "DCOP Methoden";
+ }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.2
+//////////////////////////////////////////////////////////////////////////
+
+ /*! Used as a section header for IDL properties */
+ virtual QCString trProperties()
+ {
+ return "Eigenschaften";
+ }
+ /*! Used as a section header for IDL property documentation */
+ virtual QCString trPropertyDocumentation()
+ {
+ return "Dokumentation der Eigenschaften";
+ }
};
diff --git a/src/translator_hr.h b/src/translator_hr.h
index 20ed696..a32e2fa 100644
--- a/src/translator_hr.h
+++ b/src/translator_hr.h
@@ -28,6 +28,9 @@
// - Removed unneeeded decode() calls
// - Changed some CS terminology
//
+// 2001/01/22
+// - Added strings from 1.2.4
+//
#ifndef TRANSLATOR_HR_H
#define TRANSLATOR_HR_H
@@ -749,6 +752,65 @@ class TranslatorCroatian : public Translator
{
return "DCOP metode";
}
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.2
+//////////////////////////////////////////////////////////////////////////
+
+ /*! Used as a section header for IDL properties */
+ virtual QCString trProperties()
+ {
+ return "Svojstva (property)";
+ }
+ /*! Used as a section header for IDL property documentation */
+ virtual QCString trPropertyDocumentation()
+ {
+ return "Dokumentacija svojstava";
+ }
+
+//////////////////////////////////////////////////////////////////////////
+// new since 1.2.4
+//////////////////////////////////////////////////////////////////////////
+
+ /*! Used for Java interfaces in the summary section of Java packages */
+ virtual QCString trInterfaces()
+ {
+ return decode("Sučelja (interfaces)");
+ }
+ /*! Used for Java classes in the summary section of Java packages */
+ virtual QCString trClasses()
+ {
+ return "Klase";
+ }
+ /*! Used as the title of a Java package */
+ virtual QCString trPackage(const char *name)
+ {
+ return decode((QCString)"Paket "+name);
+ }
+ /*! Title of the package index page */
+ virtual QCString trPackageList()
+ {
+ return "Lista paketa";
+ }
+ /*! The description of the package index page */
+ virtual QCString trPackageListDescription()
+ {
+ return "Paketi s kratkim opisom (ukoliko postoji):";
+ }
+ /*! The link name in the Quick links header for each page */
+ virtual QCString trPackages()
+ {
+ return "Paketi";
+ }
+ /*! Used as a chapter title for Latex & RTF output */
+ virtual QCString trPackageDocumentation()
+ {
+ return "Dokumentacija paketa";
+ }
+ /*! Text shown before a multi-line define */
+ virtual QCString trDefineValue()
+ {
+ return "Vrijednost:";
+ }
};
#endif