Permalink
Browse files

Bug 756604 - Unable to prevent a numbered list

  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed Nov 14, 2015
1 parent 6dd85db commit 3fbb1b66bd5303fa789a36317694bd77eb22ee19
Showing with 33 additions and 10 deletions.
  1. +30 −9 src/docparser.cpp
  2. +1 −1 testing/051/indexpage.xml
  3. +2 −0 testing/051_escape.dox
View
@@ -1367,15 +1367,6 @@ static bool defaultHandleToken(DocNode *parent,int tok, QList<DocNode> &children
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 @@ static bool defaultHandleToken(DocNode *parent,int tok, QList<DocNode> &children
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));
@@ -4,7 +4,7 @@
<compoundname>index</compoundname>
<title>My Project</title>
<detaileddescription>
<para>Dollar $ At @ Backslash \ Amphasand &amp; Less &lt; Greater &gt; Hash # Percent % Quote " Dot . Double colon :: Pipe | </para>
<para>Dollar $ At @ Backslash \ Amphasand &amp; Less &lt; Greater &gt; Hash # Percent % Quote " Dot . Double colon :: Pipe | Plus + Minus - </para>
</detaileddescription>
</compounddef>
</doxygen>
View
@@ -14,5 +14,7 @@ Quote \"
Dot \.
Double colon \::
Pipe \|
Plus \+
Minus \-
*/

0 comments on commit 3fbb1b6

Please sign in to comment.