From d61d1ef89f610b2fb747ea499adea0f25343be37 Mon Sep 17 00:00:00 2001
From: dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>
Date: Sun, 20 May 2012 11:50:37 +0000
Subject: Fixed code block render glitch for empty lines + Solaris compile
 issue

---
 doc/config.doc        | 17 ++++++++++++++---
 src/config.xml        |  4 +---
 src/configoptions.cpp |  4 +---
 src/doxygen.css       |  1 +
 src/index.cpp         | 28 ++++++++++++++++++----------
 5 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/doc/config.doc b/doc/config.doc
index c9027b5..fd4897a 100644
--- a/doc/config.doc
+++ b/doc/config.doc
@@ -167,6 +167,7 @@ followed by the descriptions of the tags grouped by category.
 \refitem cfg_html_file_extension HTML_FILE_EXTENSION
 \refitem cfg_html_footer HTML_FOOTER
 \refitem cfg_html_header HTML_HEADER
+\refitem cfg_html_index_num_entries HTML_INDEX_NUM_ENTRIES
 \refitem cfg_html_output HTML_OUTPUT
 \refitem cfg_html_stylesheet HTML_STYLESHEET
 \refitem cfg_html_timestamp HTML_TIMESTAMP
@@ -1498,9 +1499,19 @@ doxygen -w html new_header.html new_footer.html new_stylesheet.css YourConfigFil
  \addindex HTML_DYNAMIC_SECTIONS
  If the \c HTML_DYNAMIC_SECTIONS tag is set to \c 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. 
+
+\anchor cfg_html_index_num_entries
+<dt>\c HTML_NUM_INDEX_ENTRIES <dd>
+ \addindex HTML_NUM_INDEX_ENTRIES
+ With HTML_INDEX_NUM_ENTRIES one can control the preferred number of 
+ entries shown in the various tree structured indices initially; the user 
+ can expand and collapse entries dynamically later on. Doxygen will expand 
+ the tree to such a level that at most the specified number of entries are 
+ visible (unless a fully collapsed tree already exceeds this amount). 
+ So setting the number of entries 1 will produce a full collapsed tree by 
+ default. 0 is a special value representing an infinite number of entries 
+ and will result in a full expanded tree by default.
 
 \anchor cfg_generate_docset
 <dt>\c GENERATE_DOCSET <dd>
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)
           {
-- 
cgit v0.12