Commit 94f3e728 authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Release-1.5.9

parent 2ae3ed65

INSTALL

+2 −2
Original line number Diff line number Diff line 
DOXYGEN Version 1.5.8-20090304

DOXYGEN Version 1.5.9



Please read the installation section of the manual 

(http://www.doxygen.org/install.html) for instructions.



--------

Dimitri van Heesch (04 March 2009)
 
Dimitri van Heesch (30 April 2009)

README

+2 −2
Original line number Diff line number Diff line 
DOXYGEN Version 1.5.8_20090304

DOXYGEN Version 1.5.9



Please read INSTALL for compilation instructions.
@@ -17,4 +17,4 @@ to subscribe to the lists or to visit the archives. 


Enjoy,



Dimitri van Heesch (dimitri@stack.nl) (04 March 2009)
 
Dimitri van Heesch (dimitri@stack.nl) (30 April 2009)

src/code.l

+1 −1
Original line number Diff line number Diff line
@@ -1711,7 +1711,7 @@ TEMPLIST "<"[^\"\}\{\(\)\/\n\>]*">" 
SCOPETNAME ((({ID}{TEMPLIST}?){BN}*"::"{BN}*)*)((~{BN}*)?{ID})

SCOPEPREFIX ({ID}{TEMPLIST}?{BN}*"::"{BN}*)+

KEYWORD_OBJC ("@public"|"@private"|"@protected"|"@class"|"@implementation"|"@interface"|"@end"|"@selector"|"@protocol"|"@optional"|"@required"|"@throw"|"@synthesize")

KEYWORD ("add"|"asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"set"|"sizeof"|"static"|"struct"|"__super"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|{KEYWORD_OBJC})

KEYWORD ("asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"set"|"sizeof"|"static"|"struct"|"__super"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|{KEYWORD_OBJC})

FLOWKW  ("break"|"case"|"catch"|"continue"|"default"|"do"|"else"|"finally"|"for"|"foreach"|"for each"|"goto"|"if"|"return"|"switch"|"throw"|"throws"|"try"|"while"|"@try"|"@catch"|"@finally")

TYPEKW  ("bool"|"char"|"double"|"float"|"int"|"long"|"object"|"short"|"signed"|"unsigned"|"void"|"wchar_t"|"size_t"|"boolean"|"id"|"SEL"|"string")

CASTKW ("const_cast"|"dynamic_cast"|"reinterpret_cast"|"static_cast")

src/definition.cpp

+27 −4
Original line number Diff line number Diff line
@@ -844,6 +844,7 @@ void Definition::writeInlineCode(OutputList &ol,const char *scopeName) 
void Definition::_writeSourceRefList(OutputList &ol,const char *scopeName,

    const QCString &text,MemberSDict *members,bool /*funcOnly*/)

{

static bool latexSourceCode = Config_getBool("LATEX_SOURCE_CODE"); 

 ol.pushGeneratorState();

  if (/*Config_getBool("SOURCE_BROWSER") &&*/ members)

  {
@@ -890,7 +891,14 @@ void Definition::_writeSourceRefList(OutputList &ol,const char *scopeName, 
          //printf("md->getBodyDef()=%p global=%p\n",md->getBodyDef(),Doxygen::globalScope); 

          // for HTML write a real link

          ol.pushGeneratorState();

          ol.disableAllBut(OutputGenerator::Html);

          //ol.disableAllBut(OutputGenerator::Html);

           

         ol.disable(OutputGenerator::RTF); 

         ol.disable(OutputGenerator::Man); 

         if (!latexSourceCode)

         {

          ol.disable(OutputGenerator::Latex);

        }

          QCString lineStr,anchorStr;

          anchorStr.sprintf("l%05d",md->getStartBodyLine());

          //printf("Write object link to %s\n",md->getBodyDef()->getSourceFileBase().data());
@@ -900,6 +908,10 @@ void Definition::_writeSourceRefList(OutputList &ol,const char *scopeName, 
          // for the other output formats just mention the name

          ol.pushGeneratorState();

           ol.disable(OutputGenerator::Html);

           if (latexSourceCode)

          {

            ol.disable(OutputGenerator::Latex);

           }

          ol.docify(name);

          ol.popGeneratorState();

        }
@@ -907,7 +919,14 @@ void Definition::_writeSourceRefList(OutputList &ol,const char *scopeName, 
        {

          // for HTML write a real link

          ol.pushGeneratorState();

          ol.disableAllBut(OutputGenerator::Html);

          //ol.disableAllBut(OutputGenerator::Html); 

          ol.disable(OutputGenerator::RTF); 

          ol.disable(OutputGenerator::Man); 

          if (!latexSourceCode)

          {

            ol.disable(OutputGenerator::Latex);

           }

     

          ol.writeObjectLink(md->getReference(),

                             md->getOutputFileBase(),

                             md->anchor(),name);
@@ -916,6 +935,10 @@ void Definition::_writeSourceRefList(OutputList &ol,const char *scopeName, 
          // for the other output formats just mention the name

          ol.pushGeneratorState();

          ol.disable(OutputGenerator::Html);

           if (latexSourceCode)

           {

            ol.disable(OutputGenerator::Latex);

           }

          ol.docify(name);

          ol.popGeneratorState();

        }

src/docparser.cpp

+6 −2
Original line number Diff line number Diff line
@@ -978,9 +978,11 @@ static void handleLinkedWord(DocNode *parent,QList<DocNode> &children) 
  QString name = linkToText(g_token->name,TRUE);

  int len = g_token->name.length();

  ClassDef *cd=0;

  bool ambig;

  FileDef *fd = findFileDef(Doxygen::inputNameDict,g_fileName,ambig);

  //printf("handleLinkedWord(%s) g_context=%s\n",name.data(),g_context.data());

  if (!g_insideHtmlLink && 

      (resolveRef(g_context,g_token->name,g_inSeeBlock,&compound,&member)

      (resolveRef(g_context,g_token->name,g_inSeeBlock,&compound,&member,TRUE,fd)

       || (!g_context.isEmpty() &&  // also try with global scope

           resolveRef("",g_token->name,g_inSeeBlock,&compound,&member))

      )
@@ -1412,7 +1414,7 @@ DocSymbol::SymType DocSymbol::decodeSymbol(const QString &symName,char *letter) 
  DBG(("decodeSymbol(%s) l=%d\n",symName.data(),l));

  if      (symName=="&copy;")  return DocSymbol::Copy;

  else if (symName=="&trade;") return DocSymbol::Tm;

  else if (symName=="&tm;")    return DocSymbol::Tm; // alias for &trace;

  else if (symName=="&tm;")    return DocSymbol::Tm; // alias for &trade;

  else if (symName=="&reg;")   return DocSymbol::Reg;

  else if (symName=="&lt;")    return DocSymbol::Less;

  else if (symName=="&gt;")    return DocSymbol::Greater;
@@ -1427,6 +1429,8 @@ DocSymbol::SymType DocSymbol::decodeSymbol(const QString &symName,char *letter) 
  else if (symName=="&mdash;") return DocSymbol::Mdash;

  else if (symName=="&szlig;") return DocSymbol::Szlig;

  else if (symName=="&nbsp;")  return DocSymbol::Nbsp;

  else if (symName=="&AElig;") return DocSymbol::AElig;

  else if (symName=="&aelig;") return DocSymbol::Aelig;

  else if (l==6 && symName.right(4)=="uml;")  

  {

    *letter=symName.at(1);