diff options
author | albert-github <albert.tests@gmail.com> | 2018-05-16 11:19:44 (GMT) |
---|---|---|
committer | albert-github <albert.tests@gmail.com> | 2018-05-16 11:19:44 (GMT) |
commit | e570fd61c6975ef067efbf6a9c09b79cc58d96f5 (patch) | |
tree | 605c6c044f9dc163a03e2edaa6067398d0de7aa8 /src/docparser.cpp | |
parent | df0d9c3df44dbce633c38e99d33be4de06706f7b (diff) | |
download | Doxygen-e570fd61c6975ef067efbf6a9c09b79cc58d96f5.zip Doxygen-e570fd61c6975ef067efbf6a9c09b79cc58d96f5.tar.gz Doxygen-e570fd61c6975ef067efbf6a9c09b79cc58d96f5.tar.bz2 |
Corrected warning in case of a not supported output format with \image command.
When using a not supported output format with the image command e.g.
\image man foo.png
we get the warning message:
warning: image type man specified as the first argument of man is not valid
this is corrected to:
warning: output format man specified as the first argument of image command is not valid
Diffstat (limited to 'src/docparser.cpp')
-rw-r--r-- | src/docparser.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp index 215439a..29c6ca7 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -5037,25 +5037,27 @@ void DocPara::handleIncludeOperator(const QCString &cmdName,DocIncOperator::Type void DocPara::handleImage(const QCString &cmdName) { + QCString saveCmdName = cmdName; + int tok=doctokenizerYYlex(); if (tok!=TK_WHITESPACE) { warn_doc_error(g_fileName,doctokenizerYYlineno,"expected whitespace after %s command", - qPrint(cmdName)); + qPrint(saveCmdName)); return; } tok=doctokenizerYYlex(); if (tok!=TK_WORD && tok!=TK_LNKWORD) { warn_doc_error(g_fileName,doctokenizerYYlineno,"unexpected token %s as the argument of %s", - tokToString(tok),qPrint(cmdName)); + tokToString(tok),qPrint(saveCmdName)); return; } tok=doctokenizerYYlex(); if (tok!=TK_WHITESPACE) { warn_doc_error(g_fileName,doctokenizerYYlineno,"expected whitespace after %s command", - qPrint(cmdName)); + qPrint(saveCmdName)); return; } DocImage::Type t; @@ -5066,9 +5068,9 @@ void DocPara::handleImage(const QCString &cmdName) else if (imgType=="rtf") t=DocImage::Rtf; else { - warn_doc_error(g_fileName,doctokenizerYYlineno,"image type %s specified as the first argument of " - "%s is not valid", - qPrint(imgType),qPrint(cmdName)); + warn_doc_error(g_fileName,doctokenizerYYlineno,"output format %s specified as the first argument of " + "%s command is not valid", + qPrint(imgType),qPrint(saveCmdName)); return; } doctokenizerYYsetStateFile(); @@ -5077,7 +5079,7 @@ void DocPara::handleImage(const QCString &cmdName) if (tok!=TK_WORD) { warn_doc_error(g_fileName,doctokenizerYYlineno,"unexpected token %s as the argument of %s", - tokToString(tok),qPrint(cmdName)); + tokToString(tok),qPrint(saveCmdName)); return; } HtmlAttribList attrList; |