diff options
| author | Topi Reinio <topi.reinio@digia.com> | 2014-08-05 14:59:10 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@digia.com> | 2014-08-26 20:07:40 +0200 |
| commit | 4f2d1e2e048765b65cbe4511b408684f625c38fa (patch) | |
| tree | e1adedfaf58d8af3cedce15e24c3d74fbc08a6d3 | |
| parent | 92c7cb815522ad1b31e98cc1e7adeabde58057da (diff) | |
qdoc: Fix output of \br command
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>
| -rw-r--r-- | doc/global/macros.qdocconf | 3 | ||||
| -rw-r--r-- | src/tools/qdoc/doc.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf index 58d9a71c8c..71a9dc30d1 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -3,12 +3,11 @@ macro.Aring.HTML = "Å" macro.aring.HTML = "å" macro.Auml.HTML = "Ä" macro.author = "\\b{Author:}" -macro.br.HTML = "<br />" macro.BR.HTML = "<br />" macro.copyright.HTML = "©" macro.eacute.HTML = "é" macro.gui = "\\b" -macro.hr.HTML = "<hr />" +macro.HR.HTML = "<hr />" macro.iacute.HTML = "í" macro.key = "\\b" macro.menu = "\\b" diff --git a/src/tools/qdoc/doc.cpp b/src/tools/qdoc/doc.cpp index fcf5add514..752d3075d2 100644 --- a/src/tools/qdoc/doc.cpp +++ b/src/tools/qdoc/doc.cpp @@ -649,7 +649,7 @@ void DocParser::parse(const QString& source, append(Atom::CodeBad,getCode(CMD_BADCODE, marker)); break; case CMD_BR: - leavePara(); + enterPara(); append(Atom::BR); break; case CMD_BOLD: |