Commit c6e41226 authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Bug 740218 - Full scope needed when making link inside cross-referenced section

parent 9f477b87

src/classdef.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -3879,7 +3879,8 @@ void ClassDef::addListReferences() 
                                      : theTranslator->trClass(TRUE,TRUE),

                                      : theTranslator->trClass(TRUE,TRUE),

             getOutputFileBase(),

             getOutputFileBase(),

             displayName(),

             displayName(),

             0

             0,

             this

            );

            );

  }

  }

  if (m_impl->memberGroupSDict)

  if (m_impl->memberGroupSDict)

src/cmdmapper.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -140,6 +140,7 @@ CommandMap cmdMap[] = 
  { "diafile",       CMD_DIAFILE },

  { "diafile",       CMD_DIAFILE },

  { "--",            CMD_NDASH },

  { "--",            CMD_NDASH },

  { "---",           CMD_MDASH },

  { "---",           CMD_MDASH },

  { "_setscope",     CMD_SETSCOPE },

  { 0,               0 },

  { 0,               0 },

};

};

src/cmdmapper.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -129,7 +129,8 @@ enum CommandType 
  CMD_NDASH        = 99,

  CMD_NDASH        = 99,

  CMD_MDASH        = 100,

  CMD_MDASH        = 100,

  CMD_STARTUML     = 101,

  CMD_STARTUML     = 101,

  CMD_ENDUML       = 102

  CMD_ENDUML       = 102,

  CMD_SETSCOPE     = 103

};

};





enum HtmlTagType

enum HtmlTagType

src/docparser.cpp

+11 −0
Original line number Original line Diff line number Diff line
@@ -1410,6 +1410,17 @@ reparsetoken: 
            doctokenizerYYsetStatePara();

            doctokenizerYYsetStatePara();

          }

          }

          break;

          break;

        case CMD_SETSCOPE:

          {

            QCString scope;

            doctokenizerYYsetStateSetScope();

            doctokenizerYYlex();

            scope = g_token->name;

            g_context = scope;

            //printf("Found scope='%s'\n",scope.data());

            doctokenizerYYsetStatePara();

          }

          break;

        default:

        default:

          return FALSE;

          return FALSE;

      }

      }

src/doctokenizer.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -161,5 +161,6 @@ void doctokenizerYYsetStateSnippet(); 
void doctokenizerYYstartAutoList();

void doctokenizerYYstartAutoList();

void doctokenizerYYendAutoList();

void doctokenizerYYendAutoList();

void doctokenizerYYsetStatePlantUML();

void doctokenizerYYsetStatePlantUML();

void doctokenizerYYsetStateSetScope();





#endif
 
#endif