diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2015-11-14 15:26:23 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-11-14 15:26:23 (GMT) |
| commit | 3fbb1b66bd5303fa789a36317694bd77eb22ee19 (patch) | |
| tree | ce17d5a6c8d18dda71078a39c906f98fc3efd999 | |
| parent | 6dd85db545956e2b2ebb0f35c46f27e623f13462 (diff) | |
| download | Doxygen-3fbb1b66bd5303fa789a36317694bd77eb22ee19.zip Doxygen-3fbb1b66bd5303fa789a36317694bd77eb22ee19.tar.gz Doxygen-3fbb1b66bd5303fa789a36317694bd77eb22ee19.tar.bz2 | |
Bug 756604 - Unable to prevent a numbered list
| -rw-r--r-- | src/docparser.cpp | 39 | ||||
| -rw-r--r-- | testing/051/indexpage.xml | 2 | ||||
| -rw-r--r-- | testing/051_escape.dox | 2 |
3 files changed, 33 insertions, 10 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp index d425914..b706c9b 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -1367,15 +1367,6 @@ reparsetoken: case CMD_HASH: children.append(new DocSymbol(parent,DocSymbol::Sym_Hash)); break; - case CMD_PUNT: - children.append(new DocSymbol(parent,DocSymbol::Sym_Dot)); - break; - case CMD_PLUS: - children.append(new DocSymbol(parent,DocSymbol::Sym_Plus)); - break; - case CMD_MINUS: - children.append(new DocSymbol(parent,DocSymbol::Sym_Minus)); - break; case CMD_DCOLON: children.append(new DocSymbol(parent,DocSymbol::Sym_DoubleColon)); break; @@ -1394,6 +1385,15 @@ reparsetoken: case CMD_QUOTE: children.append(new DocSymbol(parent,DocSymbol::Sym_Quot)); break; + case CMD_PUNT: + children.append(new DocSymbol(parent,DocSymbol::Sym_Dot)); + break; + case CMD_PLUS: + children.append(new DocSymbol(parent,DocSymbol::Sym_Plus)); + break; + case CMD_MINUS: + children.append(new DocSymbol(parent,DocSymbol::Sym_Minus)); + break; case CMD_EMPHASIS: { children.append(new DocStyleChange(parent,g_nodeStack.count(),DocStyleChange::Italic,TRUE)); @@ -3238,6 +3238,9 @@ int DocIndexEntry::parse() case CMD_NDASH: m_entry+="--"; break; case CMD_MDASH: m_entry+="---"; break; case CMD_QUOTE: m_entry+='"'; break; + case CMD_PUNT: m_entry+='.'; break; + case CMD_PLUS: m_entry+='+'; break; + case CMD_MINUS: m_entry+='-'; break; default: warn_doc_error(g_fileName,doctokenizerYYlineno,"Unexpected command %s found as argument of \\addindex", qPrint(g_token->name)); @@ -5346,6 +5349,15 @@ int DocPara::handleCommand(const QCString &cmdName) case CMD_QUOTE: m_children.append(new DocSymbol(this,DocSymbol::Sym_Quot)); break; + case CMD_PUNT: + m_children.append(new DocSymbol(this,DocSymbol::Sym_Dot)); + break; + case CMD_PLUS: + m_children.append(new DocSymbol(this,DocSymbol::Sym_Plus)); + break; + case CMD_MINUS: + m_children.append(new DocSymbol(this,DocSymbol::Sym_Minus)); + break; case CMD_SA: g_inSeeBlock=TRUE; retval = handleSimpleSection(DocSimpleSect::See); @@ -6857,6 +6869,15 @@ void DocText::parse() case CMD_QUOTE: m_children.append(new DocSymbol(this,DocSymbol::Sym_Quot)); break; + case CMD_PUNT: + m_children.append(new DocSymbol(this,DocSymbol::Sym_Dot)); + break; + case CMD_PLUS: + m_children.append(new DocSymbol(this,DocSymbol::Sym_Plus)); + break; + case CMD_MINUS: + m_children.append(new DocSymbol(this,DocSymbol::Sym_Minus)); + break; default: warn_doc_error(g_fileName,doctokenizerYYlineno,"Unexpected command `%s' found", qPrint(g_token->name)); diff --git a/testing/051/indexpage.xml b/testing/051/indexpage.xml index 4f13f56..82c58cc 100644 --- a/testing/051/indexpage.xml +++ b/testing/051/indexpage.xml @@ -4,7 +4,7 @@ <compoundname>index</compoundname> <title>My Project</title> <detaileddescription> - <para>Dollar $ At @ Backslash \ Amphasand & Less < Greater > Hash # Percent % Quote " Dot . Double colon :: Pipe | </para> + <para>Dollar $ At @ Backslash \ Amphasand & Less < Greater > Hash # Percent % Quote " Dot . Double colon :: Pipe | Plus + Minus - </para> </detaileddescription> </compounddef> </doxygen> diff --git a/testing/051_escape.dox b/testing/051_escape.dox index 1497ad1..290b298 100644 --- a/testing/051_escape.dox +++ b/testing/051_escape.dox @@ -14,5 +14,7 @@ Quote \" Dot \. Double colon \:: Pipe \| +Plus \+ +Minus \- */ |