diff --git a/Examples/test-suite/doxygen_translate.i b/Examples/test-suite/doxygen_translate.i
index 3a01deb22..181c0799e 100644
--- a/Examples/test-suite/doxygen_translate.i
+++ b/Examples/test-suite/doxygen_translate.i
@@ -54,7 +54,7 @@
* This is printed if not
* \endif
*
- * \image html testImage.bmp "Hello, world!" asd=10qwe
+ * \image html testImage.bmp "Hello, world!" width=10cm
*
*
*
diff --git a/Examples/test-suite/java/doxygen_translate_runme.java b/Examples/test-suite/java/doxygen_translate_runme.java
index 4ec0f0468..10b5af28d 100644
--- a/Examples/test-suite/java/doxygen_translate_runme.java
+++ b/Examples/test-suite/java/doxygen_translate_runme.java
@@ -75,7 +75,7 @@ public class doxygen_translate_runme {
" This is printed if not}\n" +
" \n" +
" \n" +
- "
\n" +
+ "
\n" +
" \n" +
" \n" +
" \n" +
diff --git a/Source/DoxygenTranslator/src/DoxygenParser.cpp b/Source/DoxygenTranslator/src/DoxygenParser.cpp
index 4a96fa922..eda17a7e9 100644
--- a/Source/DoxygenTranslator/src/DoxygenParser.cpp
+++ b/Source/DoxygenTranslator/src/DoxygenParser.cpp
@@ -201,21 +201,20 @@ std::string DoxygenParser::getNextWord() {
*/
while (m_tokenListIt != m_tokenList.end() && (m_tokenListIt->m_tokenType == PLAINSTRING)) {
// handle quoted strings as words
- if (m_tokenListIt->m_tokenString[0] == '"'
- && m_tokenListIt->m_tokenString[m_tokenListIt->m_tokenString.size() - 1] != '"') {
+ string token = m_tokenListIt->m_tokenString;
+ if (token == "\"") {
- string word = m_tokenListIt->m_tokenString + " ";
+ string word = m_tokenListIt->m_tokenString;
m_tokenListIt++;
while (true) {
- string nextWord = getNextWord();
+ string nextWord = getNextToken();
if (nextWord.empty()) { // maybe report unterminated string error
return word;
}
word += nextWord;
- if (word[word.size() - 1] == '"') { // strip quotes
- return word.substr(1, word.size() - 2);
+ if (nextWord == "\"") {
+ return word;
}
- word += " ";
}
}
diff --git a/Source/DoxygenTranslator/src/JavaDocConverter.cpp b/Source/DoxygenTranslator/src/JavaDocConverter.cpp
index ca83e9673..cc329e706 100644
--- a/Source/DoxygenTranslator/src/JavaDocConverter.cpp
+++ b/Source/DoxygenTranslator/src/JavaDocConverter.cpp
@@ -56,11 +56,11 @@ void JavaDocConverter::fillStaticTables() {
*
* entities must be translated - remain in Java, something meaningfull in Python (<, ...)
*
- * - enum inside class is missing comment
+ * - OK enum inside class is missing comment
* - crash if link in @see tag is split to two lines
* - whitespaces in tests
* - Python
- * - '\' not representing doxygen commands
+ * - OK '\' not representing doxygen commands
* - add comments also to auto-generated methods lilke equals(), delete() in Java,
* and methods for std::vector(), ...
*/
@@ -459,8 +459,11 @@ void JavaDocConverter::handleTagImage(DoxygenEntity& tag, std::string& translate
translatedComment += "
";
+ translatedComment += " alt=" + title;
+
+ // the size indication is supported for Latex only in Doxygen, see manual
+
+ translatedComment += "/>";
}