diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2018-10-13 14:51:45 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-13 14:51:45 (GMT) |
commit | 2f50bc0bcc39cfb27537109b779d18d7389f81f1 (patch) | |
tree | 385229892ce091026d5cc906b46c7c01d2b90e9c | |
parent | d555896d9ac7460a7a1abf08603149b16c6b8bde (diff) | |
parent | 7ef3ba54570275a423ce52f65437607446c15b12 (diff) | |
download | Doxygen-2f50bc0bcc39cfb27537109b779d18d7389f81f1.zip Doxygen-2f50bc0bcc39cfb27537109b779d18d7389f81f1.tar.gz Doxygen-2f50bc0bcc39cfb27537109b779d18d7389f81f1.tar.bz2 |
Merge pull request #6553 from albert-github/feature/bug_719541
Bug 719541 - Error with inserting images to PDF with Markdown
-rw-r--r-- | src/markdown.cpp | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/src/markdown.cpp b/src/markdown.cpp index afa39cb..59ce108 100644 --- a/src/markdown.cpp +++ b/src/markdown.cpp @@ -649,6 +649,27 @@ static int processEmphasis(GrowBuf &out,const char *data,int offset,int size) return 0; } +static void writeMarkdownImage(GrowBuf &out, const char *fmt, bool explicitTitle, QCString title, QCString content, QCString link, FileDef *fd) +{ + out.addStr("@image "); + out.addStr(fmt); + out.addStr(" "); + out.addStr(link.mid(fd ? 0 : 5)); + if (!explicitTitle && !content.isEmpty()) + { + out.addStr(" \""); + out.addStr(content); + out.addStr("\""); + } + else if ((content.isEmpty() || explicitTitle) && !title.isEmpty()) + { + out.addStr(" \""); + out.addStr(title); + out.addStr("\""); + } + out.addStr("\n"); +} + static int processLink(GrowBuf &out,const char *data,int,int size) { QCString content; @@ -856,20 +877,10 @@ static int processLink(GrowBuf &out,const char *data,int,int size) (fd=findFileDef(Doxygen::imageNameDict,link,ambig))) // assume doxygen symbol link or local image link { - out.addStr("@image html "); - out.addStr(link.mid(fd ? 0 : 5)); - if (!explicitTitle && !content.isEmpty()) - { - out.addStr(" \""); - out.addStr(content); - out.addStr("\""); - } - else if ((content.isEmpty() || explicitTitle) && !title.isEmpty()) - { - out.addStr(" \""); - out.addStr(title); - out.addStr("\""); - } + writeMarkdownImage(out, "html", explicitTitle, title, content, link, fd); + writeMarkdownImage(out, "latex", explicitTitle, title, content, link, fd); + writeMarkdownImage(out, "rtf", explicitTitle, title, content, link, fd); + writeMarkdownImage(out, "docbook", explicitTitle, title, content, link, fd); } else { |