diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2018-11-25 17:15:18 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2018-11-25 17:15:18 (GMT) |
| commit | 01a8fb038a4a012a5d1f8ab60a4a2777c8aee021 (patch) | |
| tree | 12794b293d0c967c6d2df4938eb452bbfe6882d6 /src | |
| parent | 206a420a1a3feabef5000085af9f23e94809206b (diff) | |
| parent | 4c1d17ef7579dabd4db55dc4777185c290edb256 (diff) | |
| download | Doxygen-01a8fb038a4a012a5d1f8ab60a4a2777c8aee021.zip Doxygen-01a8fb038a4a012a5d1f8ab60a4a2777c8aee021.tar.gz Doxygen-01a8fb038a4a012a5d1f8ab60a4a2777c8aee021.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
| -rw-r--r-- | src/docbookvisitor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/docbookvisitor.cpp b/src/docbookvisitor.cpp index 51d1755..f7fb10f 100644 --- a/src/docbookvisitor.cpp +++ b/src/docbookvisitor.cpp @@ -64,7 +64,7 @@ void DocbookDocVisitor::visitPreStart(FTextStream &t, const QCString &height, bool inlineImage) { - if (hasCaption) + if (hasCaption && !inlineImage) { t << " <figure>" << endl; t << " <title>" << endl; @@ -84,7 +84,7 @@ void DocbookDocVisitor::visitPreStart(FTextStream &t, } else { - if (!inlineImage) t << " width=\"50%\""; + if (!height.isEmpty() && !inlineImage) t << " width=\"50%\""; } if (!height.isEmpty()) { @@ -93,7 +93,7 @@ void DocbookDocVisitor::visitPreStart(FTextStream &t, t << " align=\"center\" valign=\"middle\" scalefit=\"0\" fileref=\"" << name << "\">"; t << "</imagedata>" << endl; t << " </imageobject>" << endl; - if (hasCaption) + if (hasCaption && !inlineImage) { t << " <!--" << endl; // Needed for general formatting with title for other formats } @@ -102,12 +102,12 @@ void DocbookDocVisitor::visitPreStart(FTextStream &t, void DocbookDocVisitor::visitPostEnd(FTextStream &t, bool hasCaption, bool inlineImage) { t << endl; - if (hasCaption) + if (hasCaption && !inlineImage) { t << " -->" << endl; // Needed for general formatting with title for other formats } t << " </mediaobject>" << endl; - if (hasCaption) + if (hasCaption && !inlineImage) { t << " </figure>" << endl; } |