diff options
author | albert-github <albert.tests@gmail.com> | 2018-11-25 15:34:58 (GMT) |
---|---|---|
committer | albert-github <albert.tests@gmail.com> | 2018-11-25 15:34:58 (GMT) |
commit | 1c0a565a28582d0bc0776988ffef16565563e950 (patch) | |
tree | 2ec63650e76e2f1e57bfa1f6eef0d84059e07b52 /src/doctokenizer.l | |
parent | 4c1d17ef7579dabd4db55dc4777185c290edb256 (diff) | |
download | Doxygen-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 'src/doctokenizer.l')
-rw-r--r-- | src/doctokenizer.l | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index f50b9ae..dd2c183 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -455,6 +455,7 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} %x St_SetScope %x St_SetScopeEnd %x St_Options +%x St_Block %x St_Sections %s St_SecLabel1 @@ -1219,6 +1220,12 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} <St_Options>"}" { return TK_WORD; } +<St_Block>{ID} { + g_token->name+=yytext; + } +<St_Block>"]" { + return TK_WORD; + } <St_File>{FILEMASK} { g_token->name = yytext; return TK_WORD; @@ -1587,6 +1594,12 @@ void doctokenizerYYsetStateOptions() BEGIN(St_Options); } +void doctokenizerYYsetStateBlock() +{ + g_token->name=""; + BEGIN(St_Block); +} + void doctokenizerYYcleanup() { yy_delete_buffer( YY_CURRENT_BUFFER ); |