Fix for missing space after \endlink in doxygen

The "endlink" command is processed in processWordCommands, which by
default skips space occuring after the command, which is intended for
removing leading space from a command argument.  For "end" commands,
we don't want to do this.  Note that certain end commands such as
"endcode" aren't processed by processWordCommands (believe
addCommandUnique ends up handling them).

Update usage of \link in doxygen_translate_all_tags.i to test handling
of space after \endlink.

Tweaking some of the usage in doxygen_misc_constructs.i to remove what
seems to be an extra space from the input (otherwise we would need to
add an extra space to the expected output).
This commit is contained in:
John McFarland 2020-05-02 18:34:50 -05:00
parent ae0efd3d74
commit 61dbc4b50c
5 changed files with 9 additions and 5 deletions

View File

@ -36,7 +36,7 @@
* @param line line number
* @param isGetSize if set, for every object location both address and size are returned
*
* @link Connection::getId() @endlink <br>
* @link Connection::getId() @endlink<br>
*/
void getAddress(int &fileName,
int line,
@ -62,7 +62,7 @@
* used for unspecified parameters.
* <p>
*
* @link advancedWinIDEALaunching.py Python example.@endlink <br>
* @link advancedWinIDEALaunching.py Python example.@endlink<br>
*/
class CConnectionConfig
{

View File

@ -210,7 +210,7 @@ void func05(int a)
*
* \line example
*
* \link someMember Some description follows \endlink
* \link someMember Some description follows\endlink with text after
*
* \mainpage Some title
*

View File

@ -93,7 +93,7 @@ public class doxygen_translate_all_tags_runme {
" </li><li>With lots of items \n" +
" </li><li>lots of lots of items \n" +
" </li></ul> \n" +
" {@link someMember Some description follows }\n" +
" {@link someMember Some description follows} with text after\n" +
" This will only appear in man\n");
wantedComments.put("doxygen_translate_all_tags.doxygen_translate_all_tags.func07(int, int, int, int)",

View File

@ -175,7 +175,7 @@ This will only appear in LATeX
someMember Some description follows
someMember Some description follows with text after

View File

@ -1196,6 +1196,10 @@ void DoxygenParser::processWordCommands(size_t &pos, const std::string &line) {
// do it every time.)
if (getBaseCommand(cmd) == CMD_CODE) skipLeadingSpace = true;
else skipLeadingSpace = false;
} else if (cmd.substr(0,3) == "end") {
// If processing an "end" command such as "endlink", don't skip
// the space before the next string
skipLeadingSpace = false;
}
if (skipLeadingSpace) {