summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2018-11-25 15:34:58 (GMT)
committeralbert-github <albert.tests@gmail.com>2018-11-25 15:34:58 (GMT)
commit1c0a565a28582d0bc0776988ffef16565563e950 (patch)
tree2ec63650e76e2f1e57bfa1f6eef0d84059e07b52 /testing
parent4c1d17ef7579dabd4db55dc4777185c290edb256 (diff)
downloadDoxygen-1c0a565a28582d0bc0776988ffef16565563e950.zip
Doxygen-1c0a565a28582d0bc0776988ffef16565563e950.tar.gz
Doxygen-1c0a565a28582d0bc0776988ffef16565563e950.tar.bz2
Incorrect number tag sequence for xhtml with htmlinclude command possible
Analogous to the `\htmlonly` also with the `\htmlinclude` command it is possible that some parts are added that cannot be inside a `<p> ... <\/p>` and thus we have to temporary close (and later reopen) the paragraph. The option `[block]` has been added to the `\htmlinclude` command (analogous to the `\htmlonly` command). Problem can be seen with the default doxygen test 30 (`[030_htmlinclude.dox]: test the \htmlinclude command`).
Diffstat (limited to 'testing')
-rw-r--r--testing/030/indexpage.xml2
-rw-r--r--testing/030_htmlinclude.dox2
2 files changed, 2 insertions, 2 deletions
diff --git a/testing/030/indexpage.xml b/testing/030/indexpage.xml
index 6731890..a45eb8d 100644
--- a/testing/030/indexpage.xml
+++ b/testing/030/indexpage.xml
@@ -6,7 +6,7 @@
<briefdescription>
</briefdescription>
<detaileddescription>
- <para>Some text. <htmlonly>&lt;h1&gt;Hello world&lt;/h1&gt;
+ <para>Some text. <htmlonly block="yes">&lt;h1&gt;Hello world&lt;/h1&gt;
</htmlonly> More text. </para>
</detaileddescription>
</compounddef>
diff --git a/testing/030_htmlinclude.dox b/testing/030_htmlinclude.dox
index a8e8af6..17d934d 100644
--- a/testing/030_htmlinclude.dox
+++ b/testing/030_htmlinclude.dox
@@ -2,6 +2,6 @@
// check: indexpage.xml
/** \mainpage
* Some text.
- * \htmlinclude sample.html
+ * \htmlinclude[block] sample.html
* More text.
*/