fixed bug with caption in command 'image'
This commit is contained in:
parent
d52de0f36f
commit
9a1bb671c1
4 changed files with 15 additions and 13 deletions
|
|
@ -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
|
||||
*
|
||||
* <ul>
|
||||
*
|
||||
|
|
|
|||
|
|
@ -75,7 +75,7 @@ public class doxygen_translate_runme {
|
|||
" This is printed if not}\n" +
|
||||
" \n" +
|
||||
" \n" +
|
||||
" <img src=testImage.bmp alt=\"Hello, world!\" />\n" +
|
||||
" <img src=testImage.bmp alt=\"Hello, world!\"/>\n" +
|
||||
" \n" +
|
||||
" <ul> \n" +
|
||||
" \n" +
|
||||
|
|
|
|||
|
|
@ -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 += " ";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 += "<img src=" + file;
|
||||
if (title.size())
|
||||
translatedComment += " alt=\"" + title +"\"";
|
||||
translatedComment += " />";
|
||||
translatedComment += " alt=" + title;
|
||||
|
||||
// the size indication is supported for Latex only in Doxygen, see manual
|
||||
|
||||
translatedComment += "/>";
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue