Skip to content

Commit 3fbb1b6

Browse files
author
Dimitri van Heesch
committed
Bug 756604 - Unable to prevent a numbered list
1 parent 6dd85db commit 3fbb1b6

File tree

3 files changed

+33
-10
lines changed

3 files changed

+33
-10
lines changed

src/docparser.cpp

+30-9
Original file line numberDiff line numberDiff line change
@@ -1367,15 +1367,6 @@ static bool defaultHandleToken(DocNode *parent,int tok, QList<DocNode> &children
13671367
case CMD_HASH:
13681368
children.append(new DocSymbol(parent,DocSymbol::Sym_Hash));
13691369
break;
1370-
case CMD_PUNT:
1371-
children.append(new DocSymbol(parent,DocSymbol::Sym_Dot));
1372-
break;
1373-
case CMD_PLUS:
1374-
children.append(new DocSymbol(parent,DocSymbol::Sym_Plus));
1375-
break;
1376-
case CMD_MINUS:
1377-
children.append(new DocSymbol(parent,DocSymbol::Sym_Minus));
1378-
break;
13791370
case CMD_DCOLON:
13801371
children.append(new DocSymbol(parent,DocSymbol::Sym_DoubleColon));
13811372
break;
@@ -1394,6 +1385,15 @@ static bool defaultHandleToken(DocNode *parent,int tok, QList<DocNode> &children
13941385
case CMD_QUOTE:
13951386
children.append(new DocSymbol(parent,DocSymbol::Sym_Quot));
13961387
break;
1388+
case CMD_PUNT:
1389+
children.append(new DocSymbol(parent,DocSymbol::Sym_Dot));
1390+
break;
1391+
case CMD_PLUS:
1392+
children.append(new DocSymbol(parent,DocSymbol::Sym_Plus));
1393+
break;
1394+
case CMD_MINUS:
1395+
children.append(new DocSymbol(parent,DocSymbol::Sym_Minus));
1396+
break;
13971397
case CMD_EMPHASIS:
13981398
{
13991399
children.append(new DocStyleChange(parent,g_nodeStack.count(),DocStyleChange::Italic,TRUE));
@@ -3238,6 +3238,9 @@ int DocIndexEntry::parse()
32383238
case CMD_NDASH: m_entry+="--"; break;
32393239
case CMD_MDASH: m_entry+="---"; break;
32403240
case CMD_QUOTE: m_entry+='"'; break;
3241+
case CMD_PUNT: m_entry+='.'; break;
3242+
case CMD_PLUS: m_entry+='+'; break;
3243+
case CMD_MINUS: m_entry+='-'; break;
32413244
default:
32423245
warn_doc_error(g_fileName,doctokenizerYYlineno,"Unexpected command %s found as argument of \\addindex",
32433246
qPrint(g_token->name));
@@ -5346,6 +5349,15 @@ int DocPara::handleCommand(const QCString &cmdName)
53465349
case CMD_QUOTE:
53475350
m_children.append(new DocSymbol(this,DocSymbol::Sym_Quot));
53485351
break;
5352+
case CMD_PUNT:
5353+
m_children.append(new DocSymbol(this,DocSymbol::Sym_Dot));
5354+
break;
5355+
case CMD_PLUS:
5356+
m_children.append(new DocSymbol(this,DocSymbol::Sym_Plus));
5357+
break;
5358+
case CMD_MINUS:
5359+
m_children.append(new DocSymbol(this,DocSymbol::Sym_Minus));
5360+
break;
53495361
case CMD_SA:
53505362
g_inSeeBlock=TRUE;
53515363
retval = handleSimpleSection(DocSimpleSect::See);
@@ -6857,6 +6869,15 @@ void DocText::parse()
68576869
case CMD_QUOTE:
68586870
m_children.append(new DocSymbol(this,DocSymbol::Sym_Quot));
68596871
break;
6872+
case CMD_PUNT:
6873+
m_children.append(new DocSymbol(this,DocSymbol::Sym_Dot));
6874+
break;
6875+
case CMD_PLUS:
6876+
m_children.append(new DocSymbol(this,DocSymbol::Sym_Plus));
6877+
break;
6878+
case CMD_MINUS:
6879+
m_children.append(new DocSymbol(this,DocSymbol::Sym_Minus));
6880+
break;
68606881
default:
68616882
warn_doc_error(g_fileName,doctokenizerYYlineno,"Unexpected command `%s' found",
68626883
qPrint(g_token->name));

testing/051/indexpage.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<compoundname>index</compoundname>
55
<title>My Project</title>
66
<detaileddescription>
7-
<para>Dollar $ At @ Backslash \ Amphasand &amp; Less &lt; Greater &gt; Hash # Percent % Quote " Dot . Double colon :: Pipe | </para>
7+
<para>Dollar $ At @ Backslash \ Amphasand &amp; Less &lt; Greater &gt; Hash # Percent % Quote " Dot . Double colon :: Pipe | Plus + Minus - </para>
88
</detaileddescription>
99
</compounddef>
1010
</doxygen>

testing/051_escape.dox

+2
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@ Quote \"
1414
Dot \.
1515
Double colon \::
1616
Pipe \|
17+
Plus \+
18+
Minus \-
1719

1820
*/

0 commit comments

Comments
 (0)