Doxygen Java fix quoting for \image command

Closes #2048
This commit is contained in:
William S Fulton 2022-10-06 00:29:03 +01:00
parent 45f4b4d936
commit 5644680788
6 changed files with 14 additions and 3 deletions

View File

@ -7,6 +7,10 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
Version 4.1.0 (in progress) Version 4.1.0 (in progress)
=========================== ===========================
2022-10-06: wsfulton
[Java] #Fix quoting for doxygen \image command to quote the output
file name generated into the html src attribute.
2022-10-05: benjamin-sch 2022-10-05: benjamin-sch
[Python] added an interpreter counter to fix deinitialization [Python] added an interpreter counter to fix deinitialization
issues if multiple subinterpreters are used issues if multiple subinterpreters are used

View File

@ -59,6 +59,7 @@
* \endif * \endif
* *
* \image html testImage.bmp "Hello, world!" width=10cm * \image html testImage.bmp "Hello, world!" width=10cm
* \image html "test image.jpg" "Test jpeg" width=10cm
* *
* <ul> * <ul>
* *

View File

@ -81,7 +81,7 @@ public class doxygen_translate_all_tags_runme {
" If not: SOMECONDITION {\n" + " If not: SOMECONDITION {\n" +
" This is printed if not \n" + " This is printed if not \n" +
" }\n" + " }\n" +
" <img src=testImage.bmp alt=\"Hello, world!\" />\n" + " <img src=\"testImage.bmp\" alt=\"Hello, world!\"/>\n" +
" Some text \n" + " Some text \n" +
" describing invariant. \n"); " describing invariant. \n");

View File

@ -69,7 +69,8 @@ public class doxygen_translate_runme {
" This is printed if not}\n" + " This is printed if not}\n" +
" \n" + " \n" +
" \n" + " \n" +
" <img src=testImage.bmp alt=\"Hello, world!\"/>\n" + " <img src=\"testImage.bmp\" alt=\"Hello, world!\"/>\n" +
" <img src=\"test image.jpg\" alt=\"Test jpeg\"/>\n" +
" \n" + " \n" +
" <ul> \n" + " <ul> \n" +
" \n" + " \n" +

View File

@ -58,6 +58,7 @@ If not: SOMECONDITION {
} }
Image: testImage.bmp("Hello, world!") Image: testImage.bmp("Hello, world!")
Image: "test image.jpg"("Test jpeg")

View File

@ -463,7 +463,11 @@ void JavaDocConverter::handleTagImage(DoxygenEntity &tag, std::string &translate
if (it != tag.entityList.end()) if (it != tag.entityList.end())
title = it->data; title = it->data;
translatedComment += "<img src=" + file; translatedComment += "<img src=";
if (file.size() >= 2 && file[0] == '"' and file[file.size() - 1] == '"')
translatedComment += file;
else
translatedComment += "\"" + file + "\"";
if (title.size()) if (title.size())
translatedComment += " alt=" + title; translatedComment += " alt=" + title;