Commit bfc2c287 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Merge branch 'master' of github.com:doxygen/doxygen

parents 2a4c230b cc39c80d
......@@ -817,7 +817,7 @@
<li> Additional Inherited Members could turn up empty of all members of
the inherited class were grouped and SUBGROUPING was set to NO.
</ul>
<\endhtmlonly
\endhtmlonly
\subsection log_1_8_1 Release 1.8.1
\htmlonly
<a name="1.8.1"></a>
......
......@@ -2029,7 +2029,8 @@ The \c DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
<![CDATA[
The \c BINARY_TOC flag
controls whether a binary table of contents is generated (\c YES) or a
normal table of contents (\c NO) in the `.chm` file.
normal table of contents (\c NO) in the `.chm` file. Furthermore it enables
the `Previous` and `Next` buttons.
]]>
</docs>
</option>
......
......@@ -495,9 +495,22 @@ void HtmlHelp::createProjectFile()
// the font-size one is not normally settable by the HTML Help Workshop
// utility but the way to set it is described here:
// http://support.microsoft.com/?scid=kb%3Ben-us%3B240062&x=17&y=18
t << "main=\"" << recode(Config_getString("PROJECT_NAME")) << "\",\"index.hhc\","
// NOTE: the 0x70387e number in addition to the above the Next and Prev button
// are shown. They can only be shown in case of a binary toc.
// dee http://www.mif2go.com/xhtml/htmlhelp_0016_943addingtabsandtoolbarbuttonstohtmlhelp.htm#Rz108x95873
// Value has been taken from htmlhelp.h file of the HTML Help Workshop
if (Config_getBool("BINARY_TOC"))
{
t << "main=\"" << recode(Config_getString("PROJECT_NAME")) << "\",\"index.hhc\","
"\"index.hhk\",\"" << indexName << "\",\"" <<
indexName << "\",,,,,0x23520,,0x70387e,,,,,,,,0" << endl << endl;
}
else
{
t << "main=\"" << recode(Config_getString("PROJECT_NAME")) << "\",\"index.hhc\","
"\"index.hhk\",\"" << indexName << "\",\"" <<
indexName << "\",,,,,0x23520,,0x10387e,,,,,,,,0" << endl << endl;
}
t << "[FILES]" << endl;
char *s = indexFiles.first();
......@@ -620,11 +633,14 @@ void HtmlHelp::addContentsItem(bool isDir,
Definition * /* def */)
{
// If we're using a binary toc then folders cannot have links.
if(Config_getBool("BINARY_TOC") && isDir)
{
file = 0;
anchor = 0;
}
// Tried this and I didn't see any problems, when not using
// the resetting of file and anchor the TOC works better
// (prev / next button)
//if(Config_getBool("BINARY_TOC") && isDir)
//{
//file = 0;
//anchor = 0;
//}
int i; for (i=0;i<dc;i++) cts << " ";
cts << "<LI><OBJECT type=\"text/sitemap\">";
cts << "<param name=\"Name\" value=\"" << convertToHtml(recode(name),TRUE) << "\">";
......@@ -693,6 +709,6 @@ void HtmlHelp::addIndexItem(Definition *context,MemberDef *md,
void HtmlHelp::addImageFile(const char *fileName)
{
imageFiles.append(fileName);
if (!imageFiles.contains(fileName)) imageFiles.append(fileName);
}
......@@ -1469,13 +1469,13 @@ void LatexDocVisitor::visitPost(DocText *)
void LatexDocVisitor::visitPre(DocHtmlBlockQuote *)
{
if (m_hide) return;
m_t << "\\begin{quotation}" << endl;
m_t << "\\begin{quote}" << endl;
}
void LatexDocVisitor::visitPost(DocHtmlBlockQuote *)
{
if (m_hide) return;
m_t << "\\end{quotation}" << endl;
m_t << "\\end{quote}" << endl;
}
void LatexDocVisitor::visitPre(DocVhdlFlow *)
......
......@@ -1770,7 +1770,7 @@ static int writeBlockQuote(GrowBuf &out,const char *data,int size)
{
for (l=level;l<curLevel;l++)
{
out.addStr("\n</blockquote>\n");
out.addStr("</blockquote>\n");
}
}
curLevel=level;
......@@ -1783,7 +1783,7 @@ static int writeBlockQuote(GrowBuf &out,const char *data,int size)
// end of comment within blockquote => add end markers
for (l=0;l<curLevel;l++)
{
out.addStr("\n</blockquote>\n");
out.addStr("</blockquote>\n");
}
return i;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment