1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdoc: Fix output of \br command

Browse Source 
Since the \br was promoted from a macro to a QDoc command, its output
has been enclosed in extra paragraph end/start tags, adding to the
visible vertical space.

This change fixes the issue by not closing the paragraph when QDoc
encounters a \br command.

Also removes the now-obsolete \br and \hr macros, as they are both
proper commands. \BR and \HR substitute macros are kept.

Task-number: QTBUG-37361
Change-Id: Iabbefb6e79268419792ccba42386f6342ccd175d
Reviewed-by: Martin Smith <martin.smith@digia.com>
This commit is contained in:
Topi Reinio 2014-08-05 14:59:10 +02:00 committed by Topi Reiniö
parent 92c7cb8155
commit 4f2d1e2e04
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/global/macros.qdocconf
View File

@ -3,12 +3,11 @@ macro.Aring.HTML = "&Aring;"
macro.aring.HTML = "&aring;" macro.aring.HTML = "&aring;"
macro.Auml.HTML = "&Auml;" macro.Auml.HTML = "&Auml;"
macro.author = "\\b{Author:}" macro.author = "\\b{Author:}"
macro.br.HTML = "<br />"
macro.BR.HTML = "<br />" macro.BR.HTML = "<br />"
macro.copyright.HTML = "&copy;" macro.copyright.HTML = "&copy;"
macro.eacute.HTML = "&eacute;" macro.eacute.HTML = "&eacute;"
macro.gui = "\\b" macro.gui = "\\b"
macro.hr.HTML = "<hr />" macro.HR.HTML = "<hr />"
macro.iacute.HTML = "&iacute;" macro.iacute.HTML = "&iacute;"
macro.key = "\\b" macro.key = "\\b"
macro.menu = "\\b" macro.menu = "\\b"

2
src/tools/qdoc/doc.cpp
View File

@ -649,7 +649,7 @@ void DocParser::parse(const QString& source,
append(Atom::CodeBad,getCode(CMD_BADCODE, marker)); append(Atom::CodeBad,getCode(CMD_BADCODE, marker));
break; break;
case CMD_BR: case CMD_BR:
leavePara(); enterPara();
append(Atom::BR); append(Atom::BR);
break; break;
case CMD_BOLD: case CMD_BOLD: