summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2012-05-20 11:50:37 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2012-05-20 11:50:37 (GMT)
commitd233732e774e36b870069a3c5679588a49ebb23f (patch)
tree706106834c6681dd84b642a8140b4bdaa0801485 /src
parent98849cac48159a733a1b3c3ab1466f72a96f216a (diff)
downloadDoxygen-d233732e774e36b870069a3c5679588a49ebb23f.zip
Doxygen-d233732e774e36b870069a3c5679588a49ebb23f.tar.gz
Doxygen-d233732e774e36b870069a3c5679588a49ebb23f.tar.bz2
Fixed code block render glitch for empty lines + Solaris compile issue
Diffstat (limited to 'src')
-rw-r--r--src/config.xml4
-rw-r--r--src/configoptions.cpp4
-rw-r--r--src/doxygen.css1
-rw-r--r--src/index.cpp28
4 files changed, 21 insertions, 16 deletions
diff --git a/src/config.xml b/src/config.xml
index 06c08f8..e455ffd 100644
--- a/src/config.xml
+++ b/src/config.xml
@@ -891,9 +891,7 @@ this to NO can help when comparing the output of multiple runs.
<option type='bool' id='HTML_DYNAMIC_SECTIONS' docs='
If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
documentation will contain sections that can be hidden and shown after the
-page has loaded. For this to work a browser that supports
-JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+page has loaded.
' defval='0' depends='GENERATE_HTML'/>
<option type='int' id='HTML_INDEX_NUM_ENTRIES' docs='
With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
diff --git a/src/configoptions.cpp b/src/configoptions.cpp
index 6c6be0c..9ae97af 100644
--- a/src/configoptions.cpp
+++ b/src/configoptions.cpp
@@ -1278,9 +1278,7 @@ void addConfigOptions(Config *cfg)
"HTML_DYNAMIC_SECTIONS",
"If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML\n"
"documentation will contain sections that can be hidden and shown after the\n"
- "page has loaded. For this to work a browser that supports\n"
- "JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox\n"
- "Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).",
+ "page has loaded.",
FALSE
);
cb->addDependency("GENERATE_HTML");
diff --git a/src/doxygen.css b/src/doxygen.css
index 23c84ee..32d4d9c 100644
--- a/src/doxygen.css
+++ b/src/doxygen.css
@@ -172,6 +172,7 @@ div.fragment {
div.line {
font-family: monospace, fixed;
font-size: 13px;
+ min-height: 13px;
line-height: 1.0;
text-wrap: unrestricted;
white-space: -moz-pre-wrap; /* Moz */
diff --git a/src/index.cpp b/src/index.cpp
index 30a1ab0..ea240f4 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -602,22 +602,26 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv
{
bool doc,src;
doc = fileVisibleInIndex(fd,src);
+ QCString reference;
+ QCString outputBase;
+ if (doc)
+ {
+ reference = fd->getReference();
+ outputBase = fd->getOutputFileBase();
+ }
if (doc || src)
{
ol.startIndexListItem();
- ol.startIndexItem(doc ? fd->getReference() : 0,
- doc ? fd->getOutputFileBase() : 0);
+ ol.startIndexItem(reference,outputBase);
ol.parseText(fd->displayName());
- ol.endIndexItem(doc ? fd->getReference() : 0,
- doc ? fd->getOutputFileBase() : 0);
+ ol.endIndexItem(reference,outputBase);
ol.endIndexListItem();
if (ftv)
{
ftv->addContentsItem(FALSE,
fd->displayName(),
- doc ? fd->getReference() : 0,
- doc ? fd->getOutputFileBase() : 0,0,
- FALSE,FALSE,fd);
+ reference,outputBase,
+ 0,FALSE,FALSE,fd);
}
}
fd=fileList->next();
@@ -689,13 +693,17 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
{
bool doc,src;
doc = fileVisibleInIndex(fd,src);
+ QCString reference,outputBase;
+ if (doc)
+ {
+ reference = fd->getReference();
+ outputBase = fd->getOutputFileBase();
+ }
static bool fullPathNames = Config_getBool("FULL_PATH_NAMES");
if ((!fullPathNames || fd->getDirDef()==0) && (doc || src))
{
ftv->addContentsItem(FALSE,fd->displayName(),
- doc ? fd->getReference() : 0,
- doc ? fd->getOutputFileBase() : 0,
- 0,
+ reference, outputBase, 0,
FALSE,FALSE,fd);
if (addToIndex)
{