summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/commentscan.l2
-rw-r--r--testing/024/indexpage.xml16
-rw-r--r--testing/024_if.dox20
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.
*/