diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-01-26 09:53:05 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-01-26 09:53:05 (GMT) |
| commit | 545e7c6d0b5f133234c95062a934d8fd9064e45e (patch) | |
| tree | 2ff98fe3690513e5df4b93d0a50ca13ed9916cf5 | |
| parent | ece0461582b622bc4051f1acb8f47f674bd8b232 (diff) | |
| parent | b47de248b2c4d54bd83a4c679fa6a58dbaf3fe11 (diff) | |
| download | Doxygen-545e7c6d0b5f133234c95062a934d8fd9064e45e.zip Doxygen-545e7c6d0b5f133234c95062a934d8fd9064e45e.tar.gz Doxygen-545e7c6d0b5f133234c95062a934d8fd9064e45e.tar.bz2 | |
Merge branch 'ifspacing'
| -rw-r--r-- | src/commentscan.l | 2 | ||||
| -rw-r--r-- | testing/024/indexpage.xml | 16 | ||||
| -rw-r--r-- | testing/024_if.dox | 20 |
3 files changed, 37 insertions, 1 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index 9c672cd..a3741e5 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -2409,6 +2409,7 @@ static bool handleElseIf(yyscan_t yyscanner,const QCString &, const QCStringList else { yyextra->guardType = yyextra->enabledSectionFound ? Guard_Skip : Guard_If; + yyextra->spaceBeforeIf = yyextra->spaceBeforeCmd; BEGIN(GuardParam); } return FALSE; @@ -2424,6 +2425,7 @@ static bool handleElse(yyscan_t yyscanner,const QCString &, const QCStringList & } else { + yyextra->spaceBeforeIf = yyextra->spaceBeforeCmd; BEGIN( SkipGuardedSection ); } return FALSE; diff --git a/testing/024/indexpage.xml b/testing/024/indexpage.xml index 7396177..fd94e77 100644 --- a/testing/024/indexpage.xml +++ b/testing/024/indexpage.xml @@ -6,7 +6,21 @@ <briefdescription> </briefdescription> <detaileddescription> - <para>Unconditional (start) Enabled (if). Enabled (else). Unconditional (middle) Enabled (else). Unconditional (end) </para> + <para>Unconditional (start) Enabled (if). Enabled (else). Unconditional (middle) Enabled (else). Unconditional (end)</para> + <sect1 id="index_1autotoc_md0"> + <title>with spaces</title> + <para>test1 test3 test4.</para> + <para>test1 test2 test4.</para> + <para>test1 test2 test3.</para> + <para>test1 test3.</para> + </sect1> + <sect1 id="index_1autotoc_md1"> + <title>without spaces</title> + <para>test1test3test4.</para> + <para>test1test2test4.</para> + <para>test1test2test3.</para> + <para>test1test3. </para> + </sect1> </detaileddescription> </compounddef> </doxygen> diff --git a/testing/024_if.dox b/testing/024_if.dox index f24be43..281ffe5 100644 --- a/testing/024_if.dox +++ b/testing/024_if.dox @@ -18,4 +18,24 @@ * Enabled (else). * \endif * Unconditional (end) + * + * # with spaces + * + * test1 \ifnot GUARD_ENABLED test2 \else test3 \endif test4. + * + * test1 \if GUARD_ENABLED test2 \else test3 \endif test4. + * + * test1 \if GUARD_ENABLED test2 \endif test3. + * + * test1 \if NOT_ENABLED test2 \endif test3. + * + * # without spaces + * + * test1\ifnot GUARD_ENABLED test2\else test3\endif test4. + * + * test1\if GUARD_ENABLED test2\else test3\endif test4. + * + * test1\if GUARD_ENABLED test2\endif test3. + * + * test1\if NOT_ENABLED test2\endif test3. */ |