Skip to content

Commit

Permalink
Tweaked the htmlonly sections in the manual so it produces valid HTML…
Browse files Browse the repository at this point in the history
… output
  • Loading branch information
Dimitri van Heesch committed Dec 26, 2015
1 parent 165498d commit de03970
Show file tree
Hide file tree
Showing 6 changed files with 1,229 additions and 1,179 deletions.
2,336 changes: 1,184 additions & 1,152 deletions doc/changelog.doc

Large diffs are not rendered by default.

55 changes: 29 additions & 26 deletions doc/commands.doc
Expand Up @@ -221,13 +221,13 @@ The following subsections provide a list of all commands that are recognized by
doxygen. Unrecognized commands are treated as normal text.


\htmlonly <center> \endhtmlonly
\htmlonly</p><center><p>\endhtmlonly
<h2>
\htmlonly --- \endhtmlonly
Structural indicators
\htmlonly --- \endhtmlonly
</h2>
\htmlonly </center> \endhtmlonly
\htmlonly</p></center><p>\endhtmlonly

\section cmdaddtogroup \\addtogroup <name> [(title)]
\addindex \\addtogroup
Expand Down Expand Up @@ -368,7 +368,7 @@ Structural indicators
for the corresponding \mbox{\LaTeX} documentation that is generated by doxygen.
\endlatexonly

<hr>
</p><hr>
\section cmddef \\def <name>

\addindex \\def
Expand All @@ -386,8 +386,7 @@ Structural indicators
for the corresponding \mbox{\LaTeX} documentation that is generated by doxygen.
\endlatexonly


<hr>
</p><hr>
\section cmddefgroup \\defgroup <name> (group title)

\addindex \\defgroup
Expand Down Expand Up @@ -439,7 +438,7 @@ Structural indicators
for the corresponding \mbox{\LaTeX} documentation that is generated by doxygen.
\endlatexonly

<hr>
</p><hr>
\section cmdexample \\example <file-name>

\addindex \\example
Expand Down Expand Up @@ -476,7 +475,7 @@ Structural indicators

\sa section \ref cmdinclude "\\include".

<hr>
</p><hr>
\section cmdendinternal \\endinternal

\addindex \\endinternal
Expand All @@ -498,6 +497,7 @@ Structural indicators
\htmlonly
Click <a href="examples/manual/html/index.html">here</a>
for the corresponding HTML documentation that is generated by doxygen.
</p>
\endhtmlonly
\latexonly
See \hyperlink{extends_example}{Extends example}
Expand Down Expand Up @@ -535,7 +535,7 @@ Structural indicators
\note In the above example \ref cfg_javadoc_autobrief "JAVADOC_AUTOBRIEF"
has been set to \c YES in the configuration file.

<hr>
</p><hr>
\section cmdfn \\fn (function declaration)

\addindex \\fn
Expand Down Expand Up @@ -573,7 +573,7 @@ Structural indicators
\sa sections \ref cmdvar "\\var", \ref cmdproperty "\\property", and
\ref cmdtypedef "\\typedef".

<hr>
</p><hr>
\section cmdheaderfile \\headerfile <header-file> [<header-name>]

\addindex \\headerfile
Expand Down Expand Up @@ -649,6 +649,7 @@ Structural indicators
\htmlonly
Click <a href="examples/manual/html/index.html">here</a>
for the corresponding HTML documentation that is generated by doxygen.
</p>
\endhtmlonly
\latexonly
See \hyperlink{extends_example}{Implements example}
Expand Down Expand Up @@ -759,7 +760,7 @@ Structural indicators
\ref cmdpublic "\\public", \ref cmdprotected "\\protected" and
\ref cmdprivate "\\private".

<hr>
</p><hr>
\section cmdname \\name [(header)]

\addindex \\name
Expand Down Expand Up @@ -827,7 +828,7 @@ Structural indicators
for the corresponding \mbox{\LaTeX} documentation that is generated by doxygen.
\endlatexonly

<hr>
</p><hr>
\section cmdpackage \\package <name>

\addindex \\package
Expand Down Expand Up @@ -868,7 +869,7 @@ Structural indicators
\ref cmdsubsection "\\subsection", and section
\ref cmdref "\\ref".

<hr>
</p><hr>
\section cmdprivate \\private

\addindex \\private
Expand Down Expand Up @@ -1015,7 +1016,7 @@ Structural indicators
for the corresponding \mbox{\LaTeX} documentation that is generated by doxygen.
\endlatexonly

<hr>
</p><hr>
\section cmdrelated \\related <name>

\addindex \\related
Expand Down Expand Up @@ -1126,13 +1127,13 @@ Structural indicators

<hr>

\htmlonly <center> \endhtmlonly
\htmlonly</p><center><p>\endhtmlonly
<h2>
\htmlonly --- \endhtmlonly
Section indicators
\htmlonly --- \endhtmlonly
</h2>
\htmlonly </center>\endhtmlonly
\htmlonly</p></center><p>\endhtmlonly

<hr>
\section cmdattention \\attention { attention text }
Expand Down Expand Up @@ -1170,7 +1171,7 @@ Section indicators
for the corresponding \mbox{\LaTeX} documentation that is generated by doxygen.
\endlatexonly

<hr>
</p><hr>
\section cmdauthors \\authors { list of authors }

\addindex \\authors
Expand Down Expand Up @@ -1517,7 +1518,7 @@ ALIASES = "english=\if english" \
for the corresponding \mbox{\LaTeX} documentation that is generated by doxygen.
\endlatexonly

<hr>
</p><hr>
\section cmdparam \\param [(dir)] <parameter-name> { parameter description }

\addindex \\param
Expand Down Expand Up @@ -1859,13 +1860,13 @@ void setPosition(double x,double y,double z,double t)

<hr>

\htmlonly <center> \endhtmlonly
\htmlonly</p><center><p>\endhtmlonly
<h2>
\htmlonly --- \endhtmlonly
Commands to create links
\htmlonly --- \endhtmlonly
</h2>
\htmlonly </center>\endhtmlonly
\htmlonly</p></center><p>\endhtmlonly

<hr>
\section cmdaddindex \\addindex (text)
Expand Down Expand Up @@ -2084,13 +2085,13 @@ Make sure you have first read \ref intro "the introduction".

<hr>

\htmlonly <center> \endhtmlonly
\htmlonly</p><center><p>\endhtmlonly
<h2>
\htmlonly --- \endhtmlonly
Commands for displaying examples
\htmlonly --- \endhtmlonly
</h2>
\htmlonly </center>\endhtmlonly
\htmlonly</p></center><p>\endhtmlonly

<hr>
\section cmddontinclude \\dontinclude <file-name>
Expand Down Expand Up @@ -2135,7 +2136,7 @@ Commands for displaying examples
\ref cmdskipline "\\skipline", \ref cmduntil "\\until", and
\ref cmdinclude "\\include".

<hr>
</p><hr>
\section cmdinclude \\include <file-name>

\addindex \\include
Expand Down Expand Up @@ -2339,13 +2340,13 @@ Commands for displaying examples

<hr>

\htmlonly <center> \endhtmlonly
\htmlonly</p><center><p>\endhtmlonly
<h2>
\htmlonly --- \endhtmlonly
Commands for visual enhancements
\htmlonly --- \endhtmlonly
</h2>
\htmlonly </center>\endhtmlonly
\htmlonly</p></center><p>\endhtmlonly

\section cmda \\a <word>

Expand Down Expand Up @@ -3321,13 +3322,13 @@ class Receiver
writing three consecutuve dashes to the output instead of one m-dash character (---).

<hr>
\htmlonly <center> \endhtmlonly
\htmlonly</p><center><p>\endhtmlonly
<h2>
\htmlonly --- \endhtmlonly
Commands included for Qt compatibility
\htmlonly --- \endhtmlonly
</h2>
\htmlonly </center>\endhtmlonly
\htmlonly</p></center><p>\endhtmlonly

The following commands are supported to remain compatible to the Qt class
browser generator. Do \e not use these commands in your own documentation.
Expand All @@ -3346,8 +3347,10 @@ browser generator. Do \e not use these commands in your own documentation.


\htmlonly
</p>
Go to the <a href="htmlcmds.html">next</a> section or return to the
<a href="index.html">index</a>.
<p>
\endhtmlonly

*/
Expand Down
3 changes: 2 additions & 1 deletion doc/diagrams.doc
Expand Up @@ -138,6 +138,7 @@ that doxygen can generate:
\include diagrams_e.h

\htmlonly
</p>
Click <a href="examples/diagrams/html/index.html">here</a>
for the corresponding HTML documentation that is generated by doxygen<br/>
(<code>EXTRACT_ALL</code> = <code>YES</code> is used here).
Expand All @@ -151,7 +152,7 @@ for the corresponding \mbox{\LaTeX} documentation that is generated by doxygen.
\endlatexonly

\htmlonly
<br><br>
<br/><br/>
Go to the <a href="preprocessing.html">next</a> section or return to the
<a href="index.html">index</a>.
\endhtmlonly
Expand Down
8 changes: 8 additions & 0 deletions doc/docblocks.doc
Expand Up @@ -259,6 +259,7 @@ located in front of the block instead of after the block.
Here is an example of the use of these comment blocks:
\include afterdoc.h
\htmlonly
</p>
Click <a href="examples/afterdoc/html/class_test.html">here</a>
for the corresponding HTML documentation that is generated by doxygen.
\endhtmlonly
Expand All @@ -279,6 +280,7 @@ Here is an example of the use of these comment blocks:
Here is an example of a documented piece of C++ code using the Qt style:
\include qtstyle.cpp
\htmlonly
</p>
Click <a href="examples/qtstyle/html/class_test.html">here</a>
for the corresponding HTML documentation that is generated by doxygen.
\endhtmlonly
Expand Down Expand Up @@ -313,6 +315,7 @@ Here is the same piece of code as shown above, this time documented using the
JavaDoc style and \ref cfg_javadoc_autobrief "JAVADOC_AUTOBRIEF" set to YES:
\include jdstyle.cpp
\htmlonly
</p>
Click <a href="examples/jdstyle/html/class_test.html">here</a>
for the corresponding HTML documentation that is generated by doxygen.
\endhtmlonly
Expand Down Expand Up @@ -393,6 +396,7 @@ Here is an example of a C header named \c structcmd.h that is documented
using structural commands:
\include structcmd.h
\htmlonly
</p>
Click <a href="examples/structcmd/html/structcmd_8h.html">here</a>
for the corresponding HTML documentation that is generated by doxygen.
\endhtmlonly
Expand Down Expand Up @@ -437,6 +441,7 @@ and assume they have to be represented in a preformatted way.

\include docstring.py
\htmlonly
</p>
Click <a href="examples/docstring/html/index.html">here</a>
for the corresponding HTML documentation that is generated by doxygen.
\endhtmlonly
Expand All @@ -457,6 +462,7 @@ Here is the same example again but now using doxygen style comments:

\include pyexample.py
\htmlonly
</p>
Click <a href="examples/pyexample/html/index.html">here</a>
for the corresponding HTML documentation that is generated by doxygen.
\endhtmlonly
Expand Down Expand Up @@ -486,6 +492,7 @@ Here is an example VHDL file with doxygen comments:

\include mux.vhdl
\htmlonly
</p>
Click <a href="examples/mux/html/index.html">here</a>
for the corresponding HTML documentation that is generated by doxygen.
\endhtmlonly
Expand Down Expand Up @@ -599,6 +606,7 @@ Following is an example using doxygen style comments:

\include tclexample.tcl
\htmlonly
</p>
Click <a href="examples/tclexample/html/index.html">here</a>
for the corresponding HTML documentation that is generated by doxygen.
\endhtmlonly
Expand Down
4 changes: 4 additions & 0 deletions doc/grouping.doc
Expand Up @@ -138,6 +138,7 @@ in .c files without having to duplicate the hierarchy exactly.
\include group.cpp

\htmlonly
</p>
Click <a href="examples/group/html/modules.html">here</a>
for the corresponding HTML documentation that is generated by Doxygen.
\endhtmlonly
Expand Down Expand Up @@ -195,6 +196,7 @@ documentation of the class.
\include memgrp.cpp

\htmlonly
</p>
Click <a href="examples/memgrp/html/class_test.html">here</a>
for the corresponding HTML documentation that is generated by Doxygen.
\endhtmlonly
Expand Down Expand Up @@ -224,8 +226,10 @@ two groups GA and GB, where GB is part of GA, page A is put in group GA,
and page B is put in group GB.

\htmlonly
</p>
Go to the <a href="formulas.html">next</a> section or return to the
<a href="index.html">index</a>.
<p>
\endhtmlonly

*/
2 changes: 2 additions & 0 deletions doc/translator.py
Expand Up @@ -1814,6 +1814,7 @@ def generateLanguageDoc(self):
# Define templates for HTML table parts of the documentation.
htmlTableTpl = '''\
\\htmlonly
</p>
<table align="center" cellspacing="0" cellpadding="0" border="0">
<tr bgcolor="#000000">
<td>
Expand All @@ -1832,6 +1833,7 @@ def generateLanguageDoc(self):
</td>
</tr>
</table>
<p>
\\endhtmlonly
'''
htmlTableTpl = textwrap.dedent(htmlTableTpl)
Expand Down

0 comments on commit de03970

Please sign in to comment.