Commit d233732e authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Fixed code block render glitch for empty lines + Solaris compile issue

parent 98849cac
Loading
Loading
Loading
Loading
+14 −3
Original line number Original line Diff line number Diff line
@@ -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_file_extension HTML_FILE_EXTENSION
\refitem cfg_html_footer HTML_FOOTER
\refitem cfg_html_footer HTML_FOOTER
\refitem cfg_html_header HTML_HEADER
\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_output HTML_OUTPUT
\refitem cfg_html_stylesheet HTML_STYLESHEET
\refitem cfg_html_stylesheet HTML_STYLESHEET
\refitem cfg_html_timestamp HTML_TIMESTAMP
\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
 \addindex HTML_DYNAMIC_SECTIONS
 If the \c HTML_DYNAMIC_SECTIONS tag is set to \c YES then the generated HTML
 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
 documentation will contain sections that can be hidden and shown after the
 page has loaded. For this to work a browser that supports
 page has loaded. 
 JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox

 Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). 
\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
\anchor cfg_generate_docset
<dt>\c GENERATE_DOCSET <dd>
<dt>\c GENERATE_DOCSET <dd>
+1 −3
Original line number Original line Diff line number Diff line
@@ -891,9 +891,7 @@ this to NO can help when comparing the output of multiple runs.
    <option type='bool' id='HTML_DYNAMIC_SECTIONS' docs='
    <option type='bool' id='HTML_DYNAMIC_SECTIONS' docs='
If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
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 
documentation will contain sections that can be hidden and shown after the 
page has loaded. For this to work a browser that supports 
page has loaded. 
JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). 
' defval='0' depends='GENERATE_HTML'/>
' defval='0' depends='GENERATE_HTML'/>
    <option type='int' id='HTML_INDEX_NUM_ENTRIES' docs='
    <option type='int' id='HTML_INDEX_NUM_ENTRIES' docs='
With HTML_INDEX_NUM_ENTRIES one can control the preferred number of 
With HTML_INDEX_NUM_ENTRIES one can control the preferred number of 
+1 −3
Original line number Original line Diff line number Diff line
@@ -1278,9 +1278,7 @@ void addConfigOptions(Config *cfg)
                 "HTML_DYNAMIC_SECTIONS",
                 "HTML_DYNAMIC_SECTIONS",
                 "If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML\n"
                 "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"
                 "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"
                 "page has loaded.",
                 "JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox\n"
                 "Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).",
                 FALSE
                 FALSE
                );
                );
  cb->addDependency("GENERATE_HTML");
  cb->addDependency("GENERATE_HTML");
+1 −0
Original line number Original line Diff line number Diff line
@@ -172,6 +172,7 @@ div.fragment {
div.line {
div.line {
	font-family: monospace, fixed;
	font-family: monospace, fixed;
        font-size: 13px;
        font-size: 13px;
	min-height: 13px;
	line-height: 1.0;
	line-height: 1.0;
	text-wrap: unrestricted;
	text-wrap: unrestricted;
	white-space: -moz-pre-wrap; /* Moz */
	white-space: -moz-pre-wrap; /* Moz */
+18 −10
Original line number Original line Diff line number Diff line
@@ -602,22 +602,26 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv
      {
      {
        bool doc,src;
        bool doc,src;
        doc = fileVisibleInIndex(fd,src);
        doc = fileVisibleInIndex(fd,src);
        QCString reference;
        QCString outputBase;
        if (doc) 
        {
          reference  = fd->getReference();
          outputBase = fd->getOutputFileBase();
        }
        if (doc || src)
        if (doc || src)
        {
        {
          ol.startIndexListItem();
          ol.startIndexListItem();
          ol.startIndexItem(doc ? fd->getReference() : 0,
          ol.startIndexItem(reference,outputBase);
                            doc ? fd->getOutputFileBase() : 0);
          ol.parseText(fd->displayName());
          ol.parseText(fd->displayName());
          ol.endIndexItem(doc ? fd->getReference() : 0,
          ol.endIndexItem(reference,outputBase);
                          doc ? fd->getOutputFileBase() : 0);
          ol.endIndexListItem();
          ol.endIndexListItem();
          if (ftv)
          if (ftv)
          {
          {
            ftv->addContentsItem(FALSE,
            ftv->addContentsItem(FALSE,
                fd->displayName(),
                fd->displayName(),
                doc ? fd->getReference() : 0,
                reference,outputBase,
                doc ? fd->getOutputFileBase() : 0,0,
                0,FALSE,FALSE,fd); 
                FALSE,FALSE,fd); 
          }
          }
        }
        }
        fd=fileList->next();
        fd=fileList->next();
@@ -689,13 +693,17 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
      {
      {
        bool doc,src;
        bool doc,src;
        doc = fileVisibleInIndex(fd,src);
        doc = fileVisibleInIndex(fd,src);
        QCString reference,outputBase;
        if (doc)
        {
          reference = fd->getReference();
          outputBase = fd->getOutputFileBase();
        }
        static bool fullPathNames = Config_getBool("FULL_PATH_NAMES");
        static bool fullPathNames = Config_getBool("FULL_PATH_NAMES");
        if ((!fullPathNames || fd->getDirDef()==0) && (doc || src))
        if ((!fullPathNames || fd->getDirDef()==0) && (doc || src))
        {
        {
          ftv->addContentsItem(FALSE,fd->displayName(),
          ftv->addContentsItem(FALSE,fd->displayName(),
              doc ? fd->getReference() : 0,
              reference, outputBase, 0,
              doc ? fd->getOutputFileBase() : 0, 
              0,
              FALSE,FALSE,fd); 
              FALSE,FALSE,fd); 
          if (addToIndex)
          if (addToIndex)
          {
          {