Merge branch 'master' of github.com:doxygen/doxygen

17 files changed, 747 insertions, 518 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index be395f4..2218e82 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -73,7 +73,7 @@ set_source_files_properties(${GENERATED_SRC}/ce_parse.h PROPERTIES GENERATED 1)
 # lang_cfg.h
 add_custom_command(
     COMMENT  "Generating ${GENERATED_SRC}/lang_cfg.h"
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/lang_cfg.cmake ${LANG_CODES} 2> ${GENERATED_SRC}/lang_cfg.h
+    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/lang_cfg.cmake ${GENERATED_SRC}/lang_cfg.h ${LANG_CODES}
     DEPENDS ${LANGUAGE_FILES}
     OUTPUT ${GENERATED_SRC}/lang_cfg.h
 )
diff --git a/src/classdef.cpp b/src/classdef.cpp
index 111d59b..7ec4bb4 100644
--- a/src/classdef.cpp
+++ b/src/classdef.cpp
@@ -1935,7 +1935,21 @@ void ClassDef::writeDeclarationLink(OutputList &ol,bool &found,const char *heade
       if (rootNode && !rootNode->isEmpty())
       {
         ol.startMemberDescription(anchor());
+
+        ol.pushGeneratorState();
+        ol.disableAll();
+        ol.enable(OutputGenerator::RTF);
+        ol.writeString("{");
+        ol.popGeneratorState();
+
         ol.writeDoc(rootNode,this,0);
+
+        ol.pushGeneratorState();
+        ol.disableAll();
+        ol.enable(OutputGenerator::RTF);
+        ol.writeString("\\par}");
+        ol.popGeneratorState();
+
         if (isLinkableInProject())
         {
           writeMoreLink(ol,anchor());
diff --git a/src/code.l b/src/code.l
index b2564e9..fc511a0 100644
--- a/src/code.l
+++ b/src/code.l
@@ -126,6 +126,7 @@ static bool          g_lexInit = FALSE;
 
 static QStack<int>   g_classScopeLengthStack;
 
+static int           g_prefixed_with_this_keyword = FALSE;
 static Definition   *g_searchCtx;
 static bool          g_collectXRefs;
 
@@ -963,7 +964,7 @@ static void generateClassOrGlobalLink(CodeOutputInterface &ol,const char *clName
   bool isLocal=FALSE;
 
   //printf("generateClassOrGlobalLink(className=%s)\n",className.data());
-  if ((lcd=g_theVarContext.findVariable(className))==0) // not a local variable
+  if (!g_prefixed_with_this_keyword || (lcd=g_theVarContext.findVariable(className))==0) // not a local variable
   {
     Definition *d = g_currentDefinition;
     //printf("d=%s g_sourceFileDef=%s\n",d?d->name().data():"<none>",g_sourceFileDef?g_sourceFileDef->name().data():"<none>");
@@ -1019,6 +1020,8 @@ static void generateClassOrGlobalLink(CodeOutputInterface &ol,const char *clName
     isLocal=TRUE;
     DBG_CTX((stderr,"is a local variable cd=%p!\n",cd));
   }
+  g_prefixed_with_this_keyword = FALSE; // discard the "this" prefix for the next calls
+
   if (cd && cd->isLinkable()) // is it a linkable class
   {
     DBG_CTX((stderr,"is linkable class %s\n",clName));
@@ -1821,7 +1824,8 @@ SCOPETNAME (((({ID}{TEMPLIST}?){BN}*)?{SEP}{BN}*)*)((~{BN}*)?{ID})
 SCOPEPREFIX ({ID}{TEMPLIST}?{BN}*{SEP}{BN}*)+
 KEYWORD_OBJC ("@public"|"@private"|"@protected"|"@class"|"@implementation"|"@interface"|"@end"|"@selector"|"@protocol"|"@optional"|"@required"|"@throw"|"@synthesize"|"@property")
 KEYWORD ("asm"|"__assume"|"auto"|"class"|"const"|"delete"|"enum"|"explicit"|"extern"|"false"|"friend"|"gcnew"|"gcroot"|"set"|"get"|"inline"|"internal"|"mutable"|"namespace"|"new"|"nullptr"|"override"|"operator"|"pin_ptr"|"private"|"protected"|"public"|"raise"|"register"|"remove"|"self"|"sizeof"|"static"|"struct"|"__super"|"function"|"template"|"generic"|"this"|"true"|"typedef"|"typeid"|"typename"|"union"|"using"|"virtual"|"volatile"|"abstract"|"final"|"import"|"synchronized"|"transient"|"alignas"|"alignof"|{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")
+FLOWKW  ("break"|"catch"|"continue"|"default"|"do"|"else"|"finally"|"return"|"switch"|"throw"|"throws"|"@catch"|"@finally")
+FLOWCONDITION  ("case"|"for"|"foreach"|"for each"|"goto"|"if"|"try"|"while"|"@try")
 TYPEKW  ("bool"|"char"|"double"|"float"|"int"|"long"|"object"|"short"|"signed"|"unsigned"|"void"|"wchar_t"|"size_t"|"boolean"|"id"|"SEL"|"string"|"nullptr")
 CASTKW ("const_cast"|"dynamic_cast"|"reinterpret_cast"|"static_cast")
 CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^' \\\n]{1,4}"'"))
@@ -2408,6 +2412,7 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 <UsingName>\n				{ codifyLines(yytext); BEGIN(Body); }
 <UsingName>.				{ codifyLines(yytext); BEGIN(Body); }
 <Body,FuncCall>"$"?"this"("->"|".")	{ g_code->codify(yytext); // this-> for C++, this. for C#
+					  g_prefixed_with_this_keyword = TRUE;
                                         }
 <Body>{KEYWORD}/([^a-z_A-Z0-9]) 	{
   					  startFontClass("keyword");
@@ -2449,6 +2454,18 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					  g_inForEachExpression = (qstrcmp(yytext,"for each")==0 || qstrcmp(yytext, "foreach")==0);
 					  BEGIN(FuncCall);
   					}
+<Body>{FLOWCONDITION}/{BN}*"("          {
+                                          if (g_currentMemberDef && g_currentMemberDef->isFunction())
+                                          {
+                                            g_currentMemberDef->addFlowKeyWord();
+                                          }
+                                          startFontClass("keywordflow");
+                                          codifyLines(yytext);
+                                          endFontClass();
+                                          g_name.resize(0);g_type.resize(0);
+                                          g_inForEachExpression = (strcmp(yytext,"for each")==0 || strcmp(yytext, "foreach")==0);
+                                          BEGIN(FuncCall);
+                                        }
 <Body>{FLOWKW}/([^a-z_A-Z0-9]) 		{
   					  startFontClass("keywordflow");
   					  codifyLines(yytext);
@@ -2458,11 +2475,33 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
 					    g_inFunctionTryBlock=FALSE;
 					  }
   					}
+<Body>{FLOWCONDITION}/([^a-z_A-Z0-9]) 	{
+                                          if (g_currentMemberDef && g_currentMemberDef->isFunction())
+                                          {
+                                            g_currentMemberDef->addFlowKeyWord();
+                                          }
+                                          startFontClass("keywordflow");
+                                          codifyLines(yytext);
+                                          endFontClass();
+                                          if (g_inFunctionTryBlock && (strcmp(yytext,"catch")==0 || strcmp(yytext,"finally")==0))
+                                          {
+                                            g_inFunctionTryBlock=FALSE;
+                                          }
+                                        }
 <Body>{FLOWKW}/{B}* 			{
   					  startFontClass("keywordflow");
   					  codifyLines(yytext);
 					  endFontClass();
   					}
+<Body>{FLOWCONDITION}/{B}*              {
+                                          if (g_currentMemberDef && g_currentMemberDef->isFunction())
+                                          {
+                                            g_currentMemberDef->addFlowKeyWord();
+                                          }
+                                          startFontClass("keywordflow");
+                                          codifyLines(yytext);
+                                          endFontClass();
+                                        }
 <Body>"*"{B}*")"                        { // end of cast?
   					  g_code->codify(yytext);
 					  g_theCallContext.popScope();
@@ -2963,6 +3002,17 @@ RAWEND    ")"[^ \t\(\)\\]{0,16}\"
   					  g_code->codify(yytext);
 					  endFontClass();
 					}
+<MemberCall2,FuncCall>{FLOWCONDITION}/([^a-z_A-Z0-9]) {
+                                          if (g_currentMemberDef && g_currentMemberDef->isFunction())
+                                          {
+                                            g_currentMemberDef->addFlowKeyWord();
+                                          }
+                                          addParmType();
+                                          g_parmName=yytext;
+                                          startFontClass("keywordflow");
+                                          g_code->codify(yytext);
+                                          endFontClass();
+                                        }
 <MemberCall2,FuncCall>{ID}(({B}*"<"[^\n\[\](){}<>]*">")?({B}*"::"{B}*{ID})?)* {
 					  addParmType();
 					  g_parmName=yytext; 
diff --git a/src/commentcnv.l b/src/commentcnv.l
index 6fea6c9..ebee914 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -89,6 +89,8 @@ static int      g_lastBlockContext;
 static bool     g_pythonDocString;
 static int      g_nestingCount;
 
+static bool     g_vhdl; // for VHDL old style --! comment
+
 static SrcLangExt g_lang;
 static bool       isFixedForm; // For Fortran
 
@@ -250,7 +252,7 @@ void replaceComment(int offset);
 
 %%
 
-<Scan>[^"'!\/\n\\#-,]*              { /* eat anything that is not " / , or \n */ 
+<Scan>[^"'!\/\n\\#,\-]*             { /* eat anything that is not " / , or \n */
                                        copyToOutput(yytext,(int)yyleng);
                                     }
 <Scan>[,]                           { /* eat , so we have a nice separator in long initialization lines */ 
@@ -425,6 +427,7 @@ void replaceComment(int offset);
 				     }
 				     else
 				     {
+                                       g_vhdl = TRUE;
                                        copyToOutput(yytext,(int)yyleng); 
                                        g_nestingCount=0;
                                        g_commentStack.clear(); /*  to be on the save side */
@@ -664,7 +667,27 @@ void replaceComment(int offset);
                                        }
 				     }
                                    }
-<CComment>"\n"/[ \t]*[^#]	   { /* end of Python comment */
+  /* Python an VHDL share CComment, so special attention for ending commments is required */
+<CComment>"\n"/[ \t]*"#" 	   {
+                                     if (g_lang!=SrcLangExt_VHDL)
+                                     {
+                                       REJECT;
+                                     }
+                                     else
+                                     {
+                                       if (g_vhdl) // inside --! comment
+                                       {
+                                         g_vhdl = FALSE;
+				         copyToOutput(yytext,(int)yyleng);
+				         BEGIN(Scan);
+                                       }
+                                       else // C-type comment
+                                       {
+                                         REJECT;
+                                       }
+                                     }
+                                   }
+<CComment>"\n"/[ \t]*"-" 	   {
                                      if (g_lang!=SrcLangExt_Python || g_pythonDocString)
 				     {
 				       REJECT;
@@ -674,18 +697,38 @@ void replaceComment(int offset);
 				       copyToOutput(yytext,(int)yyleng);
 				       BEGIN(Scan);
 				     }
-  				   }
-<CComment>"\n"/[ \t]*[^\-]	   { /* end of VHDL comment */
-                                     if (g_lang!=SrcLangExt_VHDL)
-				     {
+                                   }
+<CComment>"\n"/[ \t]*[^ \t#\-] 	   {
+                                     if (g_lang==SrcLangExt_Python)
+                                     {
+                                       if (g_pythonDocString)
+                                       {
+                                         REJECT;
+                                       }
+                                       else
+                                       {
+				         copyToOutput(yytext,(int)yyleng);
+				         BEGIN(Scan);
+                                       }
+                                     }
+                                     else if (g_lang==SrcLangExt_VHDL)
+                                     {
+                                       if (g_vhdl) // inside --! comment
+                                       {
+                                         g_vhdl = FALSE;
+				         copyToOutput(yytext,(int)yyleng);
+				         BEGIN(Scan);
+                                       }
+                                       else // C-type comment
+                                       {
+                                         REJECT;
+                                       }
+                                     }
+                                     else
+                                     {
 				       REJECT;
-				     }
-				     else
-				     {
-				       copyToOutput(yytext,(int)yyleng);
-				       BEGIN(Scan);
-				     }
-  				   }
+                                     }
+                                   }
    /* removed for bug 674842 (bug was introduced in rev 768)
 <CComment>"'"			   {
   			             g_charContext = YY_START;
@@ -1001,6 +1044,7 @@ void convertCppComments(BufStr *inBuf,BufStr *outBuf,const char *fileName)
   g_condStack.setAutoDelete(TRUE);
   g_commentStack.clear();
   g_commentStack.setAutoDelete(TRUE);
+  g_vhdl = FALSE;
 
   printlex(yy_flex_debug, TRUE, __FILE__, fileName);
   isFixedForm = FALSE;
diff --git a/src/fortrancode.l b/src/fortrancode.l
index e002b57..1f22700 100644
--- a/src/fortrancode.l
+++ b/src/fortrancode.l
@@ -67,7 +67,7 @@
  * For fixed formatted code position 6 is of importance (continuation character).
  * The following variables and macros keep track of the column number
  * YY_USER_ACTION is always called for each scan action
- * YY_FTN_REST    is used to handle end of lines and reset the column counter
+ * YY_FTN_RESET   is used to handle end of lines and reset the column counter
  * YY_FTN_REJECT  resets the column counters when a pattern is rejected and thus rescanned.
  */
 int yy_old_start = 0;
@@ -135,6 +135,8 @@ static const char *  g_inputString;     //!< the code fragment as text
 static int	     g_inputPosition;   //!< read offset during parsing 
 static int           g_inputLines;      //!< number of line in the code fragment
 static int	     g_yyLineNr;        //!< current line number
+static int	     g_contLineNr;      //!< current, local, line number for continuation determination
+static int	    *g_hasContLine = NULL;     //!< signals whether or not a line has a continuation line (fixed source form)
 static bool          g_needsTermination;
 static Definition   *g_searchCtx;
 static bool          g_collectXRefs;
@@ -159,51 +161,6 @@ static int 	     bracketCount = 0;
 
 static bool      g_endComment;
 
-// simplified way to know if this is fixed form
-// duplicate in fortranscanner.l
-static bool recognizeFixedForm(const char* contents, FortranFormat format)
-{
-  int column=0;
-  bool skipLine=FALSE;
-
-  if (format == FortranFormat_Fixed) return TRUE;
-  if (format == FortranFormat_Free)  return FALSE;
-  for (int i=0;;i++)
-  {
-    column++;
-
-    switch(contents[i]) 
-    {
-      case '\n':
-        column=0;
-        skipLine=FALSE;
-        break;
-      case ' ':
-        break;
-      case '#':
-        skipLine=TRUE;
-        break;
-      case '\000':
-        return FALSE;
-      case 'C':
-      case 'c':
-      case '*':
-        if(column==1) return TRUE;
-        if(skipLine) break;
-        return FALSE;
-      case '!':
-        if(column>1 && column<7) return FALSE;
-        skipLine=TRUE;
-        break;
-      default:
-        if(skipLine) break;
-        if(column==7) return TRUE;
-        return FALSE;
-    }
-  }
-  return FALSE;
-}
-
 static void endFontClass()
 {
   if (g_currentFontClass)
@@ -567,7 +524,8 @@ static bool getLink(UseSDict *usedict, // dictonary with used modules
 
   if (getFortranDefs(memberName, currentModule, md, usedict) && md->isLinkable())
   { 
-    //if (md->isVariable()) return FALSE; // variables aren't handled yet	
+    if (md->isVariable() && (md->getLanguage()!=SrcLangExt_Fortran)) return FALSE; // Non Fortran variables aren't handled yet,
+                                                                                   // see also linkifyText in util.cpp
 
     Definition *d = md->getOuterScope()==Doxygen::globalScope ?
 	            md->getBodyDef() : md->getOuterScope();
@@ -840,7 +798,9 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
 					  BEGIN(UseOnly);     
                                         }           
 <UseOnly,Import>{BS},{BS}               { codifyLines(yytext); }
-<UseOnly,Import>{BS}&{BS}"\n"           { codifyLines(yytext); YY_FTN_RESET}
+<UseOnly,Import>{BS}&{BS}"\n"           { codifyLines(yytext);
+                                          g_contLineNr++;
+                                          YY_FTN_RESET}
 <UseOnly>{ID}                           {
                                           QCString tmp = yytext;
                                           tmp = tmp.lower();
@@ -867,7 +827,7 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
                                         }
  /*-------- fortran module  -----------------------------------------*/
 <Start>("block"{BS}"data"|"program"|"module"|"interface")/{BS_}|({COMMA}{ACCESS_SPEC})|\n {  //
-					  startScope();
+                                          startScope();
   					  startFontClass("keyword"); 
   					  codifyLines(yytext);
 					  endFontClass();
@@ -937,6 +897,7 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
  					  codifyLines(yytext);
                                         }
 <Subprog,Subprogend>"\n"                { codifyLines(yytext);
+					  g_contLineNr++;
                                           yy_pop_state();
                                           YY_FTN_RESET
                                         }
@@ -979,15 +940,22 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
 					  endFontClass();
   					}
 <Declaration>{ID}                       { // local var
-                                          if (g_currentMemberDef && g_currentMemberDef->isFunction() && bracketCount==0)
+                                          if (g_isFixedForm && yy_my_start == 1)
                                           {
-                                            g_code->codify(yytext);
-                                            addLocalVar(yytext);
+  					    startFontClass("comment");
+					    g_code->codify(yytext);
+					    endFontClass();
                                           }
-                                           else
+                                          else if (g_currentMemberDef && ((g_currentMemberDef->isFunction() && (g_currentMemberDef->typeString() != QCString("subroutine"))) ||
+                                                                          g_currentMemberDef->isVariable()))
                                           {
                                             generateLink(*g_code, yytext);
                                           }
+                                          else
+                                          {
+                                            g_code->codify(yytext);
+                                            addLocalVar(yytext);
+                                          }
 					}
 <Declaration>{BS}("=>"|"="){BS}                        { // Procedure binding
             BEGIN(DeclarationBinding);
@@ -1007,28 +975,36 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
 					  g_code->codify(yytext);
 					}
 
-<Declaration,DeclarationBinding>"&"                        { // continuation line
+<Declaration,DeclarationBinding>"&"     { // continuation line
 					  g_code->codify(yytext);
-                                          yy_push_state(YY_START);
-					  BEGIN(DeclContLine);					  
+                                          if (!g_isFixedForm)
+                                          {
+                                            yy_push_state(YY_START);
+					    BEGIN(DeclContLine);					  
+ 					  }
  					}
 <DeclContLine>"\n"                      { // declaration not yet finished
+					  g_contLineNr++;
                                           codifyLines(yytext);
 					  bracketCount = 0;
                                           yy_pop_state();
                                           YY_FTN_RESET
  				 	}
-<Declaration,DeclarationBinding>"\n"                       { // end declaration line
+<Declaration,DeclarationBinding>"\n"    { // end declaration line (?)
 					  if (g_endComment)
-            {
-            g_endComment=FALSE;
-            }
-            else
-            {
-            codifyLines(yytext);
-            }
+                                          {
+                                            g_endComment=FALSE;
+                                          }
+                                          else
+                                          {
+                                            codifyLines(yytext);
+                                          }
 					  bracketCount = 0;
-                                          yy_pop_state();
+					  g_contLineNr++;
+                                          if (!(g_hasContLine && g_hasContLine[g_contLineNr - 1]))
+                                          {
+                                            yy_pop_state();
+                                          }
                                           YY_FTN_RESET
  					}
 
@@ -1065,6 +1041,7 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
 <Start,Declaration,DeclarationBinding>\n?{BS}"!>"|"!<"                 { // start comment line or comment block
                                           if (yytext[0] == '\n')
                                           {
+					    g_contLineNr++;
                                             yy_old_start = 0;
                                             yy_my_start = 1;
                                             yy_end = yyleng;
@@ -1085,6 +1062,7 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
                                           docBlock+=yytext;
   					}
 <DocBlock>"\n"{BS}("!>"|"!<"|"!!")	{ // comment block (next line is also comment line)
+					  g_contLineNr++;
                                           yy_old_start = 0;
                                           yy_my_start = 1;
                                           yy_end = yyleng;
@@ -1094,6 +1072,7 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
    					}
 <DocBlock>"\n"        			{ // comment block ends at the end of this line
                                           // remove special comment (default config)
+					  g_contLineNr++;
   					  if (Config_getBool(STRIP_CODE_COMMENTS))
 					  {
 					    g_yyLineNr+=((QCString)docBlock).contains('\n');
@@ -1112,6 +1091,7 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
 					    endFontClass();
 					  }
             unput(*yytext);
+					  g_contLineNr--;
                                          yy_pop_state();
                                           YY_FTN_RESET
 					}
@@ -1145,6 +1125,7 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
  /*------ preprocessor  --------------------------------------------*/ 
 <Start>"#".*\n                          {
                                           if (g_isFixedForm && yy_my_start == 6) YY_FTN_REJECT;
+					  g_contLineNr++;
                                           startFontClass("preprocessor");
   					  codifyLines(yytext);
 					  endFontClass();
@@ -1165,6 +1146,7 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
 <*>"\\\""|\\\'                          { str+=yytext; /* ignore \"  */}
 
 <String>\n                              { // string with \n inside
+					  g_contLineNr++;
                                           str+=yytext;
   					  startFontClass("stringliteral");
   					  codifyLines(str);
@@ -1201,6 +1183,7 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
             {
             codifyLines(yytext);
             }
+					  g_contLineNr++;
                                           YY_FTN_RESET
   					}
 <*>^{BS}"type"{BS}"="                   { g_code->codify(yytext); }
@@ -1243,6 +1226,29 @@ PREFIX    (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I
 
 void resetFortranCodeParserState() {}
 
+bool recognizeFixedForm(const char* contents, FortranFormat format); /* prototype, implementation in fortranscanner.l */
+const char* prepassFixedForm(const char* contents, int *hasContLine); /* prototype, implementation in fortranscanner.l */
+static void checkContLines(const char *s)
+{
+  int numLines = 0;
+  int curLine = 0;
+  int i = 0;
+  const char *p = s;
+
+  numLines = 2; // one for element 0, one in case no \n at end
+  while (*p)
+  {
+    if (*p == '\n') numLines++;
+    p++;
+  }
+
+  g_hasContLine = (int *) malloc((numLines) * sizeof(int));
+  for (i = 0; i < numLines; i++)
+    g_hasContLine[i] = 0;
+  p = prepassFixedForm(s, g_hasContLine);
+  g_hasContLine[0] = 0;
+}
+
 void parseFortranCode(CodeOutputInterface &od,const char *className,const QCString &s, 
                   bool exBlock, const char *exName,FileDef *fd,
 		  int startLine,int endLine,bool inlineFragment,
@@ -1262,6 +1268,12 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
   g_inputString   = s;
   g_inputPosition = 0;
   g_isFixedForm = recognizeFixedForm((const char*)s,format);
+  g_contLineNr = 1;
+  g_hasContLine = NULL;
+  if (g_isFixedForm)
+  {
+    checkContLines(g_inputString);
+  }
   g_currentFontClass = 0;
   g_needsTermination = FALSE;
   g_searchCtx = searchCtx;
@@ -1276,7 +1288,6 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
   else
     g_inputLines  = g_yyLineNr + countLines() - 1;
 
-
   g_exampleBlock  = exBlock; 
   g_exampleName   = exName;
   g_sourceFileDef = fd;
@@ -1317,6 +1328,8 @@ void parseFortranCode(CodeOutputInterface &od,const char *className,const QCStri
     delete g_sourceFileDef;
     g_sourceFileDef=0;
   }
+  if (g_hasContLine) free(g_hasContLine);
+  g_hasContLine = NULL;
   printlex(yy_flex_debug, FALSE, __FILE__, fd ? fd->fileName().data(): NULL);
   return;
 }
diff --git a/src/fortranscanner.l b/src/fortranscanner.l
index 2f5567a..23c0970 100644
--- a/src/fortranscanner.l
+++ b/src/fortranscanner.l
@@ -1366,7 +1366,7 @@ void truncatePrepass(int index)
 
 // simplified way to know if this is fixed form
 // duplicate in fortrancode.l
-static bool recognizeFixedForm(const char* contents, FortranFormat format)
+bool recognizeFixedForm(const char* contents, FortranFormat format)
 {
   int column=0;
   bool skipLine=FALSE;
@@ -1419,7 +1419,8 @@ static void insertCharacter(char *contents, int length, int pos, char c)
 }
 
 /* change comments and bring line continuation character to previous line */
-static const char* prepassFixedForm(const char* contents)
+/* also used to set continuation marks in case of fortran code usage, done here as it is quite complicated code */
+const char* prepassFixedForm(const char* contents, int *hasContLine)
 {
   int column=0;
   int prevLineLength=0;
@@ -1434,6 +1435,7 @@ static const char* prepassFixedForm(const char* contents)
   bool fullCommentLine=TRUE;
   int newContentsSize = strlen(contents)+3; // \000, \n (when necessary) and one spare character (to avoid reallocation)
   char* newContents = (char*)malloc(newContentsSize);
+  int curLine = 1;
 
   for(int i=0, j=0;;i++,j++) {
     if(j>=newContentsSize-3) { // check for spare characters, which may be eventually used below (by & and '! ')
@@ -1454,6 +1456,11 @@ static const char* prepassFixedForm(const char* contents)
         else
         {
           prevLineLength+=column;
+          /* Even though a full comment line is not really a comment line it can be seen as one. An empty line is also seen as a comment line (small bonus) */
+          if (hasContLine)
+          {
+            hasContLine[curLine - 1] = 1;
+          }
         }
         fullCommentLine=TRUE;
         column=0;
@@ -1461,12 +1468,18 @@ static const char* prepassFixedForm(const char* contents)
         commented=FALSE;
         newContents[j]=c;
         prevQuote = thisQuote;
+        curLine++;
         break;
       case ' ':
       case '\t':
         newContents[j]=c;
         break;
       case '\000':
+        if (hasContLine)
+        {
+           free(newContents);
+           return NULL;
+        }
         newContents[j]='\000';
         newContentsSize = strlen(newContents);
         if (newContents[newContentsSize - 1] != '\n')
@@ -1545,12 +1558,15 @@ static const char* prepassFixedForm(const char* contents)
             newContents[j]=' ';
 
             if(prevLineAmpOrExclIndex==-1) { // add & just before end of previous line
-              insertCharacter(newContents, j+1, (j+1)-6-1, '&');
+              /* first line is not a continuation line in code, just in snippets etc. */
+              if (curLine != 1) insertCharacter(newContents, j+1, (j+1)-6-1, '&');
               j++;
             } else { // add & just before end of previous line comment
-              insertCharacter(newContents, j+1, (j+1)-6-prevLineLength+prevLineAmpOrExclIndex, '&');
+              /* first line is not a continuation line in code, just in snippets etc. */
+              if (curLine != 1) insertCharacter(newContents, j+1, (j+1)-6-prevLineLength+prevLineAmpOrExclIndex, '&');
               j++;
             }
+            if (hasContLine) hasContLine[curLine - 1] = 1;
 	  } else {
 	    newContents[j]=c; // , just handle like space
           }
@@ -1573,6 +1589,11 @@ static const char* prepassFixedForm(const char* contents)
     }
   }
 
+  if (hasContLine)
+  {
+    free(newContents);
+    return NULL;
+  }
   newContentsSize = strlen(newContents);
   if (newContents[newContentsSize - 1] != '\n')
   {
@@ -2517,7 +2538,7 @@ static void parseMain(const char *fileName,const char *fileBuf,Entry *rt, Fortra
 
       //printf("Input fixed form string:\n%s\n", fileBuf);
       //printf("===========================\n");
-      inputString = prepassFixedForm(fileBuf);
+      inputString = prepassFixedForm(fileBuf, NULL);
       //printf("Resulting free form string:\n%s\n", inputString);
       //printf("===========================\n");
 
diff --git a/src/ftvhelp.cpp b/src/ftvhelp.cpp
index 7249574..66ed971 100644
--- a/src/ftvhelp.cpp
+++ b/src/ftvhelp.cpp
@@ -4,8 +4,8 @@
  * Copyright (C) 1997-2015 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
+ * documentation under the terms of the GNU General Public License is hereby
+ * granted. No representations are made about the suitability of this software
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
@@ -99,11 +99,11 @@ int FTVNode::numNodesAtLevel(int level,int maxLevel) const
 
 //----------------------------------------------------------------------------
 
-/*! Constructs an ftv help object. 
- *  The object has to be \link initialize() initialized\endlink before it can 
+/*! Constructs an ftv help object.
+ *  The object has to be \link initialize() initialized\endlink before it can
  *  be used.
  */
-FTVHelp::FTVHelp(bool TLI) 
+FTVHelp::FTVHelp(bool TLI)
 {
   /* initial depth */
   m_indentNodes = new QList<FTVNode>[MAX_INDENT];
@@ -134,7 +134,7 @@ void FTVHelp::finalize()
   generateTreeView();
 }
 
-/*! Increase the level of the contents hierarchy. 
+/*! Increase the level of the contents hierarchy.
  *  This will start a new sublist in contents file.
  *  \sa decContentsDepth()
  */
@@ -204,7 +204,7 @@ void FTVHelp::addContentsItem(bool isDir,
     QList<FTVNode> *pnl = &m_indentNodes[m_indent-1];
     newNode->parent = pnl->getLast();
   }
-  
+
 }
 
 static QCString node2URL(FTVNode *n,bool overruleFile=FALSE,bool srcLink=FALSE)
@@ -385,7 +385,7 @@ void FTVHelp::generateTree(FTextStream &t, const QList<FTVNode> &nl,int level,in
       if (srcRef)
       {
         t << "<a href=\"" << srcRef->getSourceFileBase()
-          << Doxygen::htmlFileExtension 
+          << Doxygen::htmlFileExtension
           << "\">";
       }
       if (n->def && n->def->definitionType()==Definition::TypeGroup)
@@ -487,7 +487,7 @@ static QCString convertFileId2Var(const QCString &fileId)
   return substitute(varId,"-","_");
 }
 
-static bool generateJSTree(NavIndexEntryList &navIndex,FTextStream &t, 
+static bool generateJSTree(NavIndexEntryList &navIndex,FTextStream &t,
                            const QList<FTVNode> &nl,int level,bool &first)
 {
   static QCString htmlOutput = Config_getString(HTML_OUTPUT);
@@ -543,7 +543,7 @@ static bool generateJSTree(NavIndexEntryList &navIndex,FTextStream &t,
         {
           fileId+="_"+n->anchor;
         }
-        if (dupOfParent(n)) 
+        if (dupOfParent(n))
         {
           fileId+="_dup";
         }
@@ -553,7 +553,7 @@ static bool generateJSTree(NavIndexEntryList &navIndex,FTextStream &t,
           FTextStream tt(&f);
           tt << "var " << convertFileId2Var(fileId) << " =" << endl;
           generateJSTree(navIndex,tt,n->children,1,firstChild);
-          tt << endl << "];"; 
+          tt << endl << "];";
         }
         t << "\"" << fileId << "\" ]";
       }
@@ -571,7 +571,7 @@ static bool generateJSTree(NavIndexEntryList &navIndex,FTextStream &t,
       if (emptySection)
         t << "null ]";
       else
-        t << endl << indentStr << "  ] ]"; 
+        t << endl << indentStr << "  ] ]";
     }
   }
   return found;
@@ -588,6 +588,22 @@ static void generateJSNavTree(const QList<FTVNode> &nodeList)
     //tidx << "var NAVTREEINDEX =" << endl;
     //tidx << "{" << endl;
     FTextStream t(&f);
+		t << "/*\n@ @licstart  The following is the entire license notice for the\n"
+			"JavaScript code in this file.\n\nCopyright (C) 1997-2017 by Dimitri van Heesch\n\n"
+			"This program is free software; you can redistribute it and/or modify\n"
+			"it under the terms of the GNU General Public License as published by\n"
+			"the Free Software Foundation; either version 2 of the License, or\n"
+			"(at your option) any later version.\n\n"
+			"This program is distributed in the hope that it will be useful,\n"
+			"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+			" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+			" GNU General Public License for more details.\n\n"
+			"You should have received a copy of the GNU General Public License along\n"
+			"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+			"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n\n"
+			"@licend  The above is the entire license notice\n"
+			"for the JavaScript code in this file\n"
+			"*/\n";
     t << "var NAVTREE =" << endl;
     t << "[" << endl;
     t << "  [ ";
@@ -618,9 +634,9 @@ static void generateJSNavTree(const QList<FTVNode> &nodeList)
     bool first=TRUE;
     generateJSTree(navIndex,t,nodeList,1,first);
 
-    if (first) 
+    if (first)
       t << "]" << endl;
-    else 
+    else
       t << endl << "  ] ]" << endl;
     t << "];" << endl << endl;
 
@@ -660,7 +676,7 @@ static void generateJSNavTree(const QList<FTVNode> &nodeList)
         ++li;
         if (li.current() && elemCount<maxElemCount-1) tsidx << ","; // not last entry
         tsidx << endl;
-  
+
         elemCount++;
         if (li.current() && elemCount>=maxElemCount) // switch to new sub-index
         {
@@ -678,8 +694,8 @@ static void generateJSNavTree(const QList<FTVNode> &nodeList)
       tsidx << "};" << endl;
       t << endl << "];" << endl;
     }
-    t << endl << "var SYNCONMSG = '"  << theTranslator->trPanelSynchronisationTooltip(FALSE) << "';"; 
-    t << endl << "var SYNCOFFMSG = '" << theTranslator->trPanelSynchronisationTooltip(TRUE)  << "';"; 
+    t << endl << "var SYNCONMSG = '"  << theTranslator->trPanelSynchronisationTooltip(FALSE) << "';";
+    t << endl << "var SYNCOFFMSG = '" << theTranslator->trPanelSynchronisationTooltip(TRUE)  << "';";
   }
   ResourceMgr::instance().copyResource("navtree.js",htmlOutput);
 }
@@ -731,7 +747,7 @@ void FTVHelp::generateTreeViewInline(FTextStream &t)
   if (depth>1)
   {
     t << "<div class=\"levels\">[";
-    t << theTranslator->trDetailLevel(); 
+    t << theTranslator->trDetailLevel();
     t << " ";
     int i;
     for (i=1;i<=depth;i++)
@@ -779,4 +795,3 @@ void FTVHelp::generateTreeView()
   generateTreeViewImages();
   generateTreeViewScripts();
 }
-
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index 12b71e1..224c9b9 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2015 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
+ * documentation under the terms of the GNU General Public License is hereby
+ * granted. No representations are made about the suitability of this software
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
@@ -62,7 +62,7 @@ static void writeClientSearchBox(FTextStream &t,const char *relPath)
   t << "               onmouseover=\"return searchBox.OnSearchSelectShow()\"\n";
   t << "               onmouseout=\"return searchBox.OnSearchSelectHide()\"\n";
   t << "               alt=\"\"/>\n";
-  t << "          <input type=\"text\" id=\"MSearchField\" value=\"" 
+  t << "          <input type=\"text\" id=\"MSearchField\" value=\""
     << theTranslator->trSearch() << "\" accesskey=\"S\"\n";
   t << "               onfocus=\"searchBox.OnSearchFieldFocus(true)\" \n";
   t << "               onblur=\"searchBox.OnSearchFieldFocus(false)\" \n";
@@ -200,7 +200,7 @@ static QCString removeEmptyLines(const QCString &s)
       {
         const char *e = p;
         while (*e==' ' || *e=='\t') e++;
-        if (*e=='\n') 
+        if (*e=='\n')
         {
           p=e;
         }
@@ -279,11 +279,11 @@ static QCString substituteHtmlKeywords(const QCString &s,
     }
   }
 
-  if (timeStamp) 
+  if (timeStamp)
   {
     generatedBy = theTranslator->trGeneratedAt(dateToString(TRUE), convertToHtml(Config_getString(PROJECT_NAME)));
   }
-  else 
+  else
   {
     generatedBy = theTranslator->trGeneratedBy();
   }
@@ -291,12 +291,14 @@ static QCString substituteHtmlKeywords(const QCString &s,
   if (treeView)
   {
     treeViewCssJs = "<link href=\"$relpath^navtree.css\" rel=\"stylesheet\" type=\"text/css\"/>\n"
-                    "<script type=\"text/javascript\" src=\"$relpath^resize.js\"></script>\n"
-                    "<script type=\"text/javascript\" src=\"$relpath^navtreedata.js\"></script>\n"
-                    "<script type=\"text/javascript\" src=\"$relpath^navtree.js\"></script>\n"
-                    "<script type=\"text/javascript\">\n"
-                    "  $(document).ready(initResizable);\n"
-                    "</script>";
+			"<script type=\"text/javascript\" src=\"$relpath^resize.js\"></script>\n"
+			"<script type=\"text/javascript\" src=\"$relpath^navtreedata.js\"></script>\n"
+			"<script type=\"text/javascript\" src=\"$relpath^navtree.js\"></script>\n"
+			"<script type=\"text/javascript\">\n"
+			"/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n"
+			"  $(document).ready(initResizable);\n"
+			"/* @license-end */"
+			"</script>";
   }
 
   if (searchEngine)
@@ -313,8 +315,10 @@ static QCString substituteHtmlKeywords(const QCString &s,
       if (disableIndex || !Config_getBool(HTML_DYNAMIC_MENUS))
       {
         searchCssJs += "<script type=\"text/javascript\">\n"
-                       "  $(document).ready(function() { init_search(); });\n"
-                       "</script>";
+					"/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n";
+				"  $(document).ready(function() { init_search(); });\n"
+					"/* @license-end */\n"
+					"</script>";
       }
     }
     else
@@ -322,17 +326,19 @@ static QCString substituteHtmlKeywords(const QCString &s,
       if (disableIndex || !Config_getBool(HTML_DYNAMIC_MENUS))
       {
         searchCssJs += "<script type=\"text/javascript\">\n"
-                       "  $(document).ready(function() {\n"
-                       "    if ($('.searchresults').length > 0) { searchBox.DOMSearchField().focus(); }\n"
-                       "  });\n"
-                       "</script>\n";
+					"/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n"
+					"  $(document).ready(function() {\n"
+					"    if ($('.searchresults').length > 0) { searchBox.DOMSearchField().focus(); }\n"
+					"  });\n"
+					"  /* @license-end */\n"
+					"</script>\n";
       }
 
       // OPENSEARCH_PROVIDER {
       searchCssJs += "<link rel=\"search\" href=\"" + relPath +
                      "search_opensearch.php?v=opensearch.xml\" "
                      "type=\"application/opensearchdescription+xml\" title=\"" +
-                     (hasProjectName ? projectName : QCString("Doxygen")) + 
+                     (hasProjectName ? projectName : QCString("Doxygen")) +
                      "\"/>";
       // OPENSEARCH_PROVIDER }
     }
@@ -341,11 +347,11 @@ static QCString substituteHtmlKeywords(const QCString &s,
 
   if (mathJax)
   {
-    QCString path = Config_getString(MATHJAX_RELPATH);  
-    if (path.isEmpty() || path.left(2)=="..") // relative path  
-    {  
-      path.prepend(relPath);   
-    }  
+    QCString path = Config_getString(MATHJAX_RELPATH);
+    if (path.isEmpty() || path.left(2)=="..") // relative path
+    {
+      path.prepend(relPath);
+    }
     mathJaxJs = "<script type=\"text/x-mathjax-config\">\n"
                 "  MathJax.Hub.Config({\n"
                 "    extensions: [\"tex2jax.js\"";
@@ -389,7 +395,7 @@ static QCString substituteHtmlKeywords(const QCString &s,
   result = substitute(result,"$extrastylesheet",extraCssText);
   result = substitute(result,"$relpath$",relPath); //<-- obsolete: for backwards compatibility only
   result = substitute(result,"$relpath^",relPath); //<-- must be last
-  
+
   // additional HTML only conditional blocks
   result = selectBlock(result,"DISABLE_INDEX",disableIndex);
   result = selectBlock(result,"GENERATE_TREEVIEW",treeView);
@@ -412,7 +418,7 @@ HtmlCodeGenerator::HtmlCodeGenerator()
 {
 }
 
-HtmlCodeGenerator::HtmlCodeGenerator(FTextStream &t,const QCString &relPath) 
+HtmlCodeGenerator::HtmlCodeGenerator(FTextStream &t,const QCString &relPath)
    : m_col(0), m_relPath(relPath)
 {
   setTextStream(t);
@@ -433,7 +439,7 @@ void HtmlCodeGenerator::codify(const char *str)
 {
   static int tabSize = Config_getInt(TAB_SIZE);
   if (str && m_streamSet)
-  { 
+  {
     const char *p=str;
     char c;
     int spacesToNextTabStop;
@@ -442,19 +448,19 @@ void HtmlCodeGenerator::codify(const char *str)
       c=*p++;
       switch(c)
       {
-        case '\t': spacesToNextTabStop = 
-                         tabSize - (m_col%tabSize); 
-                   m_t << Doxygen::spaces.left(spacesToNextTabStop); 
-                   m_col+=spacesToNextTabStop; 
-                   break; 
-        case '\n': m_t << "\n"; m_col=0; 
+        case '\t': spacesToNextTabStop =
+                         tabSize - (m_col%tabSize);
+                   m_t << Doxygen::spaces.left(spacesToNextTabStop);
+                   m_col+=spacesToNextTabStop;
+                   break;
+        case '\n': m_t << "\n"; m_col=0;
                    break;
         case '\r': break;
-        case '<':  m_t << "&lt;"; m_col++; 
+        case '<':  m_t << "&lt;"; m_col++;
                    break;
-        case '>':  m_t << "&gt;"; m_col++; 
+        case '>':  m_t << "&gt;"; m_col++;
                    break;
-        case '&':  m_t << "&amp;"; m_col++; 
+        case '&':  m_t << "&amp;"; m_col++;
                    break;
         case '\'': m_t << "&#39;"; m_col++; // &apos; is not valid XHTML
                    break;
@@ -469,8 +475,8 @@ void HtmlCodeGenerator::codify(const char *str)
                      m_t << "\\";
                    m_col++;
                    break;
-        default:   p=writeUtf8Char(m_t,p-1);    
-                   m_col++;                    
+        default:   p=writeUtf8Char(m_t,p-1);
+                   m_col++;
                    break;
       }
     }
@@ -500,7 +506,7 @@ void HtmlCodeGenerator::docify(const char *str)
                    else
                      m_t << "\\";
                    break;
-        default:   m_t << c; 
+        default:   m_t << c;
       }
     }
   }
@@ -517,7 +523,7 @@ void HtmlCodeGenerator::writeLineNumber(const char *ref,const char *filename,
   qsnprintf(lineAnchor,maxLineNrStr,"l%05d",l);
 
   m_t << "<div class=\"line\">";
-  m_t << "<a name=\"" << lineAnchor << "\"></a><span class=\"lineno\">"; 
+  m_t << "<a name=\"" << lineAnchor << "\"></a><span class=\"lineno\">";
   if (filename)
   {
     _writeCodeLink("line",ref,filename,anchor,lineNumber,0);
@@ -526,7 +532,7 @@ void HtmlCodeGenerator::writeLineNumber(const char *ref,const char *filename,
   {
     codify(lineNumber);
   }
-  m_t << "</span>"; 
+  m_t << "</span>";
   m_t << "&#160;";
 }
 
@@ -544,7 +550,7 @@ void HtmlCodeGenerator::_writeCodeLink(const char *className,
                                       const char *anchor, const char *name,
                                       const char *tooltip)
 {
-  if (ref) 
+  if (ref)
   {
     m_t << "<a class=\"" << className << "Ref\" ";
     m_t << externalLinkTarget() << externalRef(m_relPath,ref,FALSE);
@@ -647,33 +653,33 @@ void HtmlCodeGenerator::writeTooltip(const char *id, const DocLinkInfo &docInfo,
 }
 
 
-void HtmlCodeGenerator::startCodeLine(bool hasLineNumbers) 
-{ 
+void HtmlCodeGenerator::startCodeLine(bool hasLineNumbers)
+{
   if (m_streamSet)
   {
     if (!hasLineNumbers) m_t << "<div class=\"line\">";
-    m_col=0; 
+    m_col=0;
   }
 }
 
-void HtmlCodeGenerator::endCodeLine() 
-{ 
+void HtmlCodeGenerator::endCodeLine()
+{
   if (m_streamSet) m_t << "</div>";
 }
 
-void HtmlCodeGenerator::startFontClass(const char *s) 
-{ 
-  if (m_streamSet) m_t << "<span class=\"" << s << "\">"; 
+void HtmlCodeGenerator::startFontClass(const char *s)
+{
+  if (m_streamSet) m_t << "<span class=\"" << s << "\">";
 }
 
-void HtmlCodeGenerator::endFontClass() 
-{ 
-  if (m_streamSet) m_t << "</span>"; 
+void HtmlCodeGenerator::endFontClass()
+{
+  if (m_streamSet) m_t << "</span>";
 }
 
-void HtmlCodeGenerator::writeCodeAnchor(const char *anchor) 
-{ 
-  if (m_streamSet) m_t << "<a name=\"" << anchor << "\"></a>"; 
+void HtmlCodeGenerator::writeCodeAnchor(const char *anchor)
+{
+  if (m_streamSet) m_t << "<a name=\"" << anchor << "\"></a>";
 }
 
 //--------------------------------------------------------------------------
@@ -699,29 +705,29 @@ void HtmlGenerator::init()
     exit(1);
   }
   //writeLogo(dname);
-  if (!Config_getString(HTML_HEADER).isEmpty()) 
+  if (!Config_getString(HTML_HEADER).isEmpty())
   {
     g_header=fileToString(Config_getString(HTML_HEADER));
     //printf("g_header='%s'\n",g_header.data());
   }
-  else 
+  else
   {
     g_header = ResourceMgr::instance().getAsString("header.html");
   }
 
-  if (!Config_getString(HTML_FOOTER).isEmpty()) 
+  if (!Config_getString(HTML_FOOTER).isEmpty())
   {
     g_footer=fileToString(Config_getString(HTML_FOOTER));
     //printf("g_footer='%s'\n",g_footer.data());
   }
-  else 
+  else
   {
     g_footer = ResourceMgr::instance().getAsString("footer.html");
   }
 
   if (Config_getBool(USE_MATHJAX))
   {
-    if (!Config_getString(MATHJAX_CODEFILE).isEmpty()) 
+    if (!Config_getString(MATHJAX_CODEFILE).isEmpty())
     {
       g_mathjax_code=fileToString(Config_getString(MATHJAX_CODEFILE));
       //printf("g_mathjax_code='%s'\n",g_mathjax_code.data());
@@ -875,7 +881,7 @@ void HtmlGenerator::startFile(const char *name,const char *,
   lastTitle=title;
   relPath = relativePathToRoot(fileName);
 
-  if (fileName.right(Doxygen::htmlFileExtension.length())!=Doxygen::htmlFileExtension) 
+  if (fileName.right(Doxygen::htmlFileExtension.length())!=Doxygen::htmlFileExtension)
   {
     fileName+=Doxygen::htmlFileExtension;
   }
@@ -883,19 +889,21 @@ void HtmlGenerator::startFile(const char *name,const char *,
   m_codeGen.setTextStream(t);
   m_codeGen.setRelativePath(relPath);
   Doxygen::indexList->addIndexFile(fileName);
-  
+
   lastFile = fileName;
   t << substituteHtmlKeywords(g_header,convertToHtml(filterTitle(title)),relPath);
 
-  t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen " 
+  t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen "
     << versionString << " -->" << endl;
   //static bool generateTreeView = Config_getBool(GENERATE_TREEVIEW);
   static bool searchEngine = Config_getBool(SEARCHENGINE);
   if (searchEngine /*&& !generateTreeView*/)
   {
     t << "<script type=\"text/javascript\">\n";
-    t << "var searchBox = new SearchBox(\"searchBox\", \""
+		t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n";
+		t << "var searchBox = new SearchBox(\"searchBox\", \""
       << relPath<< "search\",false,'" << theTranslator->trSearch() << "');\n";
+		t << "/* @license-end */\n";
     t << "</script>\n";
   }
   //generateDynamicSections(t,relPath);
@@ -995,8 +1003,8 @@ void HtmlGenerator::writeStyleInfo(int part)
     if (Config_getString(HTML_STYLESHEET).isEmpty()) // write default style sheet
     {
       //printf("write doxygen.css\n");
-      startPlainFile("doxygen.css"); 
-      
+      startPlainFile("doxygen.css");
+
       // alternative, cooler looking titles
       //t << "H1 { text-align: center; border-width: thin none thin none;" << endl;
       //t << "     border-style : double; border-color : blue; padding-left : 1em; padding-right : 1em }" << endl;
@@ -1096,7 +1104,7 @@ void HtmlGenerator::startIndexItem(const char *ref,const char *f)
   //printf("HtmlGenerator::startIndexItem(%s,%s)\n",ref,f);
   if (ref || f)
   {
-    if (ref) 
+    if (ref)
     {
       t << "<a class=\"elRef\" ";
       t << externalLinkTarget() << externalRef(relPath,ref,FALSE);
@@ -1141,7 +1149,7 @@ void HtmlGenerator::writeStartAnnoItem(const char *,const char *f,
 void HtmlGenerator::writeObjectLink(const char *ref,const char *f,
                                     const char *anchor, const char *name)
 {
-  if (ref) 
+  if (ref)
   {
     t << "<a class=\"elRef\" ";
     t << externalLinkTarget() << externalRef(relPath,ref,FALSE);
@@ -1164,7 +1172,7 @@ void HtmlGenerator::startTextLink(const char *f,const char *anchor)
   t << "<a href=\"";
   if (f)   t << relPath << f << Doxygen::htmlFileExtension;
   if (anchor) t << "#" << anchor;
-  t << "\">"; 
+  t << "\">";
 }
 
 void HtmlGenerator::endTextLink()
@@ -1179,7 +1187,7 @@ void HtmlGenerator::startHtmlLink(const char *url)
   if (generateTreeView) t << "target=\"top\" ";
   t << "href=\"";
   if (url) t << url;
-  t << "\">"; 
+  t << "\">";
 }
 
 void HtmlGenerator::endHtmlLink()
@@ -1275,7 +1283,7 @@ void HtmlGenerator::docify(const char *str,bool inHtmlComment)
                    else
                      t << "\\";
                    break;
-        default:   t << c; 
+        default:   t << c;
       }
     }
   }
@@ -1302,7 +1310,7 @@ static void startSectionHeader(FTextStream &t,
          "onclick=\"return toggleVisibility(this)\" "
          "class=\"dynheader closed\" "
          "style=\"cursor:pointer;\">" << endl;
-    t << "  <img id=\"dynsection-" << sectionCount << "-trigger\" src=\"" 
+    t << "  <img id=\"dynsection-" << sectionCount << "-trigger\" src=\""
       << relPath << "closed.png\" alt=\"+\"/> ";
   }
   else
@@ -1390,13 +1398,13 @@ void HtmlGenerator::endClassDiagram(const ClassDiagram &d,
 }
 
 
-void HtmlGenerator::startMemberList()  
-{ 
+void HtmlGenerator::startMemberList()
+{
   DBG_HTML(t << "<!-- startMemberList -->" << endl)
 }
 
-void HtmlGenerator::endMemberList()    
-{ 
+void HtmlGenerator::endMemberList()
+{
   DBG_HTML(t << "<!-- endMemberList -->" << endl)
 }
 
@@ -1404,8 +1412,8 @@ void HtmlGenerator::endMemberList()
 //  0 = single column right aligned
 //  1 = double column left aligned
 //  2 = single column left aligned
-void HtmlGenerator::startMemberItem(const char *anchor,int annoType,const char *inheritId) 
-{ 
+void HtmlGenerator::startMemberItem(const char *anchor,int annoType,const char *inheritId)
+{
   DBG_HTML(t << "<!-- startMemberItem() -->" << endl)
   if (m_emptySection)
   {
@@ -1427,10 +1435,10 @@ void HtmlGenerator::startMemberItem(const char *anchor,int annoType,const char *
   }
 }
 
-void HtmlGenerator::endMemberItem() 
-{ 
-  t << "</td></tr>"; 
-  t << endl; 
+void HtmlGenerator::endMemberItem()
+{
+  t << "</td></tr>";
+  t << endl;
 }
 
 void HtmlGenerator::startMemberTemplateParams()
@@ -1449,15 +1457,15 @@ void HtmlGenerator::endMemberTemplateParams(const char *anchor,const char *inher
 }
 
 
-void HtmlGenerator::insertMemberAlign(bool templ) 
-{ 
+void HtmlGenerator::insertMemberAlign(bool templ)
+{
   DBG_HTML(t << "<!-- insertMemberAlign -->" << endl)
   QCString className = templ ? "memTemplItemRight" : "memItemRight";
-  t << "&#160;</td><td class=\"" << className << "\" valign=\"bottom\">"; 
+  t << "&#160;</td><td class=\"" << className << "\" valign=\"bottom\">";
 }
 
-void HtmlGenerator::startMemberDescription(const char *anchor,const char *inheritId) 
-{ 
+void HtmlGenerator::startMemberDescription(const char *anchor,const char *inheritId)
+{
   DBG_HTML(t << "<!-- startMemberDescription -->" << endl)
     if (m_emptySection)
     {
@@ -1469,20 +1477,20 @@ void HtmlGenerator::startMemberDescription(const char *anchor,const char *inheri
   {
     t << " inherit " << inheritId;
   }
-  t << "\"><td class=\"mdescLeft\">&#160;</td><td class=\"mdescRight\">"; 
+  t << "\"><td class=\"mdescLeft\">&#160;</td><td class=\"mdescRight\">";
 }
 
-void HtmlGenerator::endMemberDescription()   
-{ 
+void HtmlGenerator::endMemberDescription()
+{
   DBG_HTML(t << "<!-- endMemberDescription -->" << endl)
-  t << "<br /></td></tr>" << endl; 
+  t << "<br /></td></tr>" << endl;
 }
 
 void HtmlGenerator::startMemberSections()
 {
   DBG_HTML(t << "<!-- startMemberSections -->" << endl)
   m_emptySection=TRUE; // we postpone writing <table> until we actually
-                       // write a row to prevent empty tables, which 
+                       // write a row to prevent empty tables, which
                        // are not valid XHTML!
 }
 
@@ -1533,9 +1541,9 @@ void HtmlGenerator::endMemberSubtitle()
   t << "</td></tr>" << endl;
 }
 
-void HtmlGenerator::startIndexList() 
-{ 
-  t << "<table>"  << endl; 
+void HtmlGenerator::startIndexList()
+{
+  t << "<table>"  << endl;
 }
 
 void HtmlGenerator::endIndexList()
@@ -1543,10 +1551,10 @@ void HtmlGenerator::endIndexList()
   t << "</table>" << endl;
 }
 
-void HtmlGenerator::startIndexKey() 
-{ 
+void HtmlGenerator::startIndexKey()
+{
   // inserted 'class = ...', 02 jan 2002, jh
-  t << "  <tr><td class=\"indexkey\">"; 
+  t << "  <tr><td class=\"indexkey\">";
 }
 
 void HtmlGenerator::endIndexKey()
@@ -1554,10 +1562,10 @@ void HtmlGenerator::endIndexKey()
   t << "</td>";
 }
 
-void HtmlGenerator::startIndexValue(bool) 
-{ 
+void HtmlGenerator::startIndexValue(bool)
+{
   // inserted 'class = ...', 02 jan 2002, jh
-  t << "<td class=\"indexvalue\">"; 
+  t << "<td class=\"indexvalue\">";
 }
 
 void HtmlGenerator::endIndexValue(const char *,bool)
@@ -1576,7 +1584,7 @@ void HtmlGenerator::endMemberDocList()
 }
 
 void HtmlGenerator::startMemberDoc( const char *clName, const char *memName,
-                                    const char *anchor, const char *title, 
+                                    const char *anchor, const char *title,
                                     int memCount, int memTotal, bool showInline)
 {
   DBG_HTML(t << "<!-- startMemberDoc -->" << endl;)
@@ -1610,7 +1618,7 @@ void HtmlGenerator::startMemberDocName(bool /*align*/)
   DBG_HTML(t << "<!-- startMemberDocName -->" << endl;)
 
   t << "      <table class=\"memname\">" << endl;
-    
+
   t << "        <tr>" << endl;
   t << "          <td class=\"memname\">";
 }
@@ -1713,8 +1721,8 @@ void HtmlGenerator::exceptionEntry(const char* prefix,bool closeBracket)
     t << "</td><td></td><td colspan=\"2\">";
 }
 
-void HtmlGenerator::endMemberDoc(bool hasArgs)     
-{ 
+void HtmlGenerator::endMemberDoc(bool hasArgs)
+{
   DBG_HTML(t << "<!-- endMemberDoc -->" << endl;)
   if (!hasArgs)
   {
@@ -1857,17 +1865,17 @@ void HtmlGenerator::endMemberGroup(bool)
 {
 }
 
-void HtmlGenerator::startIndent()        
-{ 
+void HtmlGenerator::startIndent()
+{
   DBG_HTML(t << "<!-- startIndent -->" << endl;)
 
   t << "<div class=\"memdoc\">\n";
 }
 
-void HtmlGenerator::endIndent()          
-{ 
+void HtmlGenerator::endIndent()
+{
   DBG_HTML(t << "<!-- endIndent -->" << endl;)
-  t << endl << "</div>" << endl << "</div>" << endl; 
+  t << endl << "</div>" << endl << "</div>" << endl;
 }
 
 void HtmlGenerator::addIndexItem(const char *,const char *)
@@ -1941,7 +1949,7 @@ void HtmlGenerator::startSimpleSect(SectionTypes,
 
 void HtmlGenerator::endSimpleSect()
 {
-  t << "</dl>"; 
+  t << "</dl>";
 }
 
 void HtmlGenerator::startParamList(ParamListTypes,
@@ -1954,21 +1962,21 @@ void HtmlGenerator::startParamList(ParamListTypes,
 
 void HtmlGenerator::endParamList()
 {
-  t << "</dl>"; 
+  t << "</dl>";
 }
 
 void HtmlGenerator::writeDoc(DocNode *n,Definition *ctx,MemberDef *)
 {
   HtmlDocVisitor *visitor = new HtmlDocVisitor(t,m_codeGen,ctx);
   n->accept(visitor);
-  delete visitor; 
+  delete visitor;
 }
 
 //---------------- helpers for index generation -----------------------------
 
 static void startQuickIndexList(FTextStream &t,bool compact,bool topLevel=TRUE)
 {
-  if (compact) 
+  if (compact)
   {
     if (topLevel)
     {
@@ -1978,9 +1986,9 @@ static void startQuickIndexList(FTextStream &t,bool compact,bool topLevel=TRUE)
     {
       t << "  <div id=\"navrow2\" class=\"tabs2\">\n";
     }
-    t << "    <ul class=\"tablist\">\n"; 
+    t << "    <ul class=\"tablist\">\n";
   }
-  else 
+  else
   {
     t << "<ul>";
   }
@@ -1988,12 +1996,12 @@ static void startQuickIndexList(FTextStream &t,bool compact,bool topLevel=TRUE)
 
 static void endQuickIndexList(FTextStream &t,bool compact)
 {
-  if (compact) 
+  if (compact)
   {
     t << "    </ul>\n";
     t << "  </div>\n";
   }
-  else 
+  else
   {
     t << "</ul>\n";
   }
@@ -2003,8 +2011,8 @@ static void startQuickIndexItem(FTextStream &t,const char *l,
                                 bool hl,bool /*compact*/,
                                 const QCString &relPath)
 {
-  t << "      <li"; 
-  if (hl) 
+  t << "      <li";
+  if (hl)
   {
     t << " class=\"current\"";
   }
@@ -2026,17 +2034,17 @@ static bool quickLinkVisible(LayoutNavEntry::Kind kind)
   static bool showNamespaces = Config_getBool(SHOW_NAMESPACES);
   switch (kind)
   {
-    case LayoutNavEntry::MainPage:         return TRUE; 
-    case LayoutNavEntry::User:             return TRUE;                                           
-    case LayoutNavEntry::UserGroup:        return TRUE;                                           
+    case LayoutNavEntry::MainPage:         return TRUE;
+    case LayoutNavEntry::User:             return TRUE;
+    case LayoutNavEntry::UserGroup:        return TRUE;
     case LayoutNavEntry::Pages:            return indexedPages>0;
     case LayoutNavEntry::Modules:          return documentedGroups>0;
     case LayoutNavEntry::Namespaces:       return documentedNamespaces>0 && showNamespaces;
     case LayoutNavEntry::NamespaceList:    return documentedNamespaces>0 && showNamespaces;
     case LayoutNavEntry::NamespaceMembers: return documentedNamespaceMembers[NMHL_All]>0;
     case LayoutNavEntry::Classes:          return annotatedClasses>0;
-    case LayoutNavEntry::ClassList:        return annotatedClasses>0; 
-    case LayoutNavEntry::ClassIndex:       return annotatedClasses>0; 
+    case LayoutNavEntry::ClassList:        return annotatedClasses>0;
+    case LayoutNavEntry::ClassIndex:       return annotatedClasses>0;
     case LayoutNavEntry::ClassHierarchy:   return hierarchyClasses>0;
     case LayoutNavEntry::ClassMembers:     return documentedClassMembers[CMHL_All]>0;
     case LayoutNavEntry::Files:            return documentedHtmlFiles>0 && showFiles;
@@ -2107,8 +2115,8 @@ static void renderQuickLinksAsTabs(FTextStream &t,const QCString &relPath,
         {
           QCString url = entry->url();
           startQuickIndexItem(t,url,
-              entry==hlEntry  && 
-              (entry->children().count()>0 || 
+              entry==hlEntry  &&
+              (entry->children().count()>0 ||
                (entry->kind()==kind && !highlightParent)
               ),
               TRUE,relPath);
@@ -2179,11 +2187,11 @@ static void writeDefaultQuickLinks(FTextStream &t,bool compact,
     case HLI_Pages:            kind = LayoutNavEntry::Pages;            break;
     case HLI_Examples:         kind = LayoutNavEntry::Examples;         break;
     case HLI_UserGroup:        kind = LayoutNavEntry::UserGroup;        break;
-    case HLI_ClassVisible:     kind = LayoutNavEntry::ClassList;        altKind = LayoutNavEntry::Classes;          
+    case HLI_ClassVisible:     kind = LayoutNavEntry::ClassList;        altKind = LayoutNavEntry::Classes;
                                highlightParent = TRUE; break;
-    case HLI_NamespaceVisible: kind = LayoutNavEntry::NamespaceList;    altKind = LayoutNavEntry::Namespaces;       
+    case HLI_NamespaceVisible: kind = LayoutNavEntry::NamespaceList;    altKind = LayoutNavEntry::Namespaces;
                                highlightParent = TRUE; break;
-    case HLI_FileVisible:      kind = LayoutNavEntry::FileList;         altKind = LayoutNavEntry::Files;            
+    case HLI_FileVisible:      kind = LayoutNavEntry::FileList;         altKind = LayoutNavEntry::Files;
                                highlightParent = TRUE; break;
     case HLI_None:   break;
     case HLI_Search: break;
@@ -2203,6 +2211,7 @@ static void writeDefaultQuickLinks(FTextStream &t,bool compact,
     t << "<script type=\"text/javascript\" src=\"" << relPath << "menudata.js\"></script>" << endl;
     t << "<script type=\"text/javascript\" src=\"" << relPath << "menu.js\"></script>" << endl;
     t << "<script type=\"text/javascript\">" << endl;
+		t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n";
     t << "$(function() {" << endl;
     t << "  initMenu('" << relPath << "',"
       << (searchEngine?"true":"false") << ","
@@ -2217,12 +2226,14 @@ static void writeDefaultQuickLinks(FTextStream &t,bool compact,
       }
       else
       {
+				t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n";
         t << "  $(document).ready(function() {\n"
           << "    if ($('.searchresults').length > 0) { searchBox.DOMSearchField().focus(); }\n"
           << "  });\n";
       }
     }
     t << "});" << endl;
+		t << "/* @license-end */";
     t << "</script>" << endl;
     t << "<div id=\"main-nav\"></div>" << endl;
   }
@@ -2235,7 +2246,7 @@ static void writeDefaultQuickLinks(FTextStream &t,bool compact,
     {
       highlightParent=TRUE;
       hlEntry = root->children().getFirst();
-      if (hlEntry==0) 
+      if (hlEntry==0)
       {
         return; // argl, empty index!
       }
@@ -2245,7 +2256,7 @@ static void writeDefaultQuickLinks(FTextStream &t,bool compact,
       LayoutNavEntry *e = hlEntry->children().getFirst();
       if (e)
       {
-        hlEntry = e; 
+        hlEntry = e;
       }
     }
     renderQuickLinksAsTabs(t,relPath,hlEntry,kind,highlightParent,hli==HLI_Search);
@@ -2269,23 +2280,25 @@ QCString HtmlGenerator::writeSplitBarAsString(const char *name,const char *relpa
   if (generateTreeView)
   {
     result = QCString(
-    "<div id=\"side-nav\" class=\"ui-resizable side-nav-resizable\">\n"
-    "  <div id=\"nav-tree\">\n"
-    "    <div id=\"nav-tree-contents\">\n"
-    "      <div id=\"nav-sync\" class=\"sync\"></div>\n"
-    "    </div>\n"
-    "  </div>\n"
-    "  <div id=\"splitbar\" style=\"-moz-user-select:none;\" \n"
-    "       class=\"ui-resizable-handle\">\n"
-    "  </div>\n"
-    "</div>\n"
-    "<script type=\"text/javascript\">\n"
-    "$(document).ready(function(){initNavTree('") + 
-    QCString(name) + Doxygen::htmlFileExtension + 
-    QCString("','") + relpath +
-    QCString("');});\n"
-    "</script>\n"
-    "<div id=\"doc-content\">\n");
+											"<div id=\"side-nav\" class=\"ui-resizable side-nav-resizable\">\n"
+											"  <div id=\"nav-tree\">\n"
+											"    <div id=\"nav-tree-contents\">\n"
+											"      <div id=\"nav-sync\" class=\"sync\"></div>\n"
+											"    </div>\n"
+											"  </div>\n"
+											"  <div id=\"splitbar\" style=\"-moz-user-select:none;\" \n"
+											"       class=\"ui-resizable-handle\">\n"
+											"  </div>\n"
+											"</div>\n"
+											"<script type=\"text/javascript\">\n"
+											"/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n"
+											"$(document).ready(function(){initNavTree('") +
+			QCString(name) + Doxygen::htmlFileExtension +
+			QCString("','") + relpath +
+			QCString("');});\n"
+							 "/* @license-end */\n"
+							 "</script>\n"
+							 "<div id=\"doc-content\">\n");
   }
   return result;
 }
@@ -2337,10 +2350,10 @@ void HtmlGenerator::writeSearchPage()
     t << ");\n\n";
     t << "$translator = array(\n";
     t << "  'search_results_title' => \"" << theTranslator->trSearchResultsTitle() << "\",\n";
-    t << "  'search_results' => array(\n";  
-    t << "    0 => \"" << theTranslator->trSearchResults(0) << "\",\n";     
-    t << "    1 => \"" << theTranslator->trSearchResults(1) << "\",\n";     
-    t << "    2 => \"" << substitute(theTranslator->trSearchResults(2), "$", "\\$") << "\",\n";     
+    t << "  'search_results' => array(\n";
+    t << "    0 => \"" << theTranslator->trSearchResults(0) << "\",\n";
+    t << "    1 => \"" << theTranslator->trSearchResults(1) << "\",\n";
+    t << "    2 => \"" << substitute(theTranslator->trSearchResults(2), "$", "\\$") << "\",\n";
     t << "  ),\n";
     t << "  'search_matches' => \"" << theTranslator->trSearchMatches() << "\",\n";
     t << "  'search' => \"" << theTranslator->trSearch() << "\",\n";
@@ -2361,11 +2374,13 @@ void HtmlGenerator::writeSearchPage()
     FTextStream t(&f);
     t << substituteHtmlKeywords(g_header,"Search","");
 
-    t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen " 
+    t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen "
       << versionString << " -->" << endl;
     t << "<script type=\"text/javascript\">\n";
-    t << "var searchBox = new SearchBox(\"searchBox\", \""
+		t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n";
+		t << "var searchBox = new SearchBox(\"searchBox\", \""
       << "search\",false,'" << theTranslator->trSearch() << "');\n";
+		t << "/* @license-end */\n";
     t << "</script>\n";
     if (!Config_getBool(DISABLE_INDEX))
     {
@@ -2413,11 +2428,13 @@ void HtmlGenerator::writeExternalSearchPage()
     FTextStream t(&f);
     t << substituteHtmlKeywords(g_header,"Search","");
 
-    t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen " 
+    t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen "
       << versionString << " -->" << endl;
     t << "<script type=\"text/javascript\">\n";
-    t << "var searchBox = new SearchBox(\"searchBox\", \""
+		t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n";
+		t << "var searchBox = new SearchBox(\"searchBox\", \""
       << "search\",false,'" << theTranslator->trSearch() << "');\n";
+		t << "/* @license-end */\n";
     t << "</script>\n";
     if (!Config_getBool(DISABLE_INDEX))
     {
@@ -2568,15 +2585,15 @@ void HtmlGenerator::startHeaderSection()
   t << "<div class=\"header\">" << endl;
 }
 
-void HtmlGenerator::startTitleHead(const char *) 
-{ 
+void HtmlGenerator::startTitleHead(const char *)
+{
   t << "  <div class=\"headertitle\">" << endl;
-  startTitle(); 
+  startTitle();
 }
 
-void HtmlGenerator::endTitleHead(const char *,const char *) 
-{ 
-  endTitle(); 
+void HtmlGenerator::endTitleHead(const char *,const char *)
+{
+  endTitle();
   t << "  </div>" << endl;
 }
 
@@ -2672,7 +2689,7 @@ void HtmlGenerator::endLabels()
 }
 
 void HtmlGenerator::writeInheritedSectionTitle(
-                  const char *id,    const char *ref, 
+                  const char *id,    const char *ref,
                   const char *file,  const char *anchor,
                   const char *title, const char *name)
 {
@@ -2692,7 +2709,7 @@ void HtmlGenerator::writeInheritedSectionTitle(
   classLink+=QCString("\">")+convertToHtml(name,FALSE)+"</a>";
   t << "<tr class=\"inherit_header " << id << "\">"
     << "<td colspan=\"2\" onclick=\"javascript:toggleInherit('" << id << "')\">"
-    << "<img src=\"" << relPath << "closed.png\" alt=\"-\"/>&#160;" 
+    << "<img src=\"" << relPath << "closed.png\" alt=\"-\"/>&#160;"
     << theTranslator->trInheritedFrom(convertToHtml(title,FALSE),classLink)
     << "</td></tr>" << endl;
 }
@@ -2748,4 +2765,3 @@ void HtmlGenerator::addWord(const char *word,bool hiPriority)
     Doxygen::searchIndex->addWord(word,hiPriority);
   }
 }
-
diff --git a/src/index.cpp b/src/index.cpp
index 10c1dcb..3a17c29 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2015 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
+ * documentation under the terms of the GNU General Public License is hereby
+ * granted. No representations are made about the suitability of this software
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
@@ -153,17 +153,17 @@ static void startQuickIndexList(OutputList &ol,bool letterTabs=FALSE)
   {
     if (letterTabs)
     {
-      ol.writeString("  <div id=\"navrow4\" class=\"tabs3\">\n"); 
+      ol.writeString("  <div id=\"navrow4\" class=\"tabs3\">\n");
     }
     else
     {
-      ol.writeString("  <div id=\"navrow3\" class=\"tabs2\">\n"); 
+      ol.writeString("  <div id=\"navrow3\" class=\"tabs2\">\n");
     }
-    ol.writeString("    <ul class=\"tablist\">\n"); 
+    ol.writeString("    <ul class=\"tablist\">\n");
   }
   else
   {
-    ol.writeString("  <div class=\"qindex\">"); 
+    ol.writeString("  <div class=\"qindex\">");
   }
 }
 
@@ -185,7 +185,7 @@ static void startQuickIndexItem(OutputList &ol,const char *l,
   first=FALSE;
   if (fancyTabs)
   {
-    ol.writeString("      <li"); 
+    ol.writeString("      <li");
     if (hl) ol.writeString(" class=\"current\"");
     ol.writeString("><a ");
   }
@@ -201,7 +201,7 @@ static void startQuickIndexItem(OutputList &ol,const char *l,
       ol.writeString("<a class=\"qindex\" ");
     }
   }
-  ol.writeString("href=\""); 
+  ol.writeString("href=\"");
   ol.writeString(l);
   ol.writeString("\">");
   if (fancyTabs)
@@ -296,7 +296,7 @@ void endFileWithNavPath(Definition *d,OutputList &ol)
 }
 
 //----------------------------------------------------------------------
-template<class T> 
+template<class T>
 void addMembersToIndex(T *def,LayoutDocManager::LayoutPart part,
                        const QCString &name,const QCString &anchor,
                        bool addToIndex=TRUE,bool preventSeparateIndex=FALSE)
@@ -341,7 +341,7 @@ void addMembersToIndex(T *def,LayoutDocManager::LayoutPart part,
             bool isAnonymous = md->name().find('@')!=-1;
             static bool hideUndocMembers = Config_getBool(HIDE_UNDOC_MEMBERS);
             static bool extractStatic = Config_getBool(EXTRACT_STATIC);
-            if (!isAnonymous && 
+            if (!isAnonymous &&
                 (!hideUndocMembers || md->hasDocumentation()) &&
                 (!md->isStatic() || extractStatic)
                )
@@ -389,8 +389,8 @@ void addMembersToIndex(T *def,LayoutDocManager::LayoutPart part,
           }
         }
       }
-      else if (lde->kind()==LayoutDocEntry::NamespaceClasses || 
-               lde->kind()==LayoutDocEntry::FileClasses || 
+      else if (lde->kind()==LayoutDocEntry::NamespaceClasses ||
+               lde->kind()==LayoutDocEntry::FileClasses ||
                lde->kind()==LayoutDocEntry::ClassNestedClasses
               )
       {
@@ -469,9 +469,9 @@ static void writeClassTree(OutputList &ol,const BaseClassList *bcl,bool hideSupe
         ol.startIndexItem(cd->getReference(),cd->getOutputFileBase());
         ol.parseText(cd->displayName());
         ol.endIndexItem(cd->getReference(),cd->getOutputFileBase());
-        if (cd->isReference()) 
-        { 
-          ol.startTypewriter(); 
+        if (cd->isReference())
+        {
+          ol.startTypewriter();
           ol.docify(" [external]");
           ol.endTypewriter();
         }
@@ -510,11 +510,11 @@ static void writeClassTree(OutputList &ol,const BaseClassList *bcl,bool hideSupe
         //printf("Class %s at %p visited=%d\n",cd->name().data(),cd,cd->visited);
         bool wasVisited=cd->visited;
         cd->visited=TRUE;
-        if (cd->getLanguage()==SrcLangExt_VHDL)	
+        if (cd->getLanguage()==SrcLangExt_VHDL)
         {
           writeClassTree(ol,cd->baseClasses(),wasVisited,level+1,ftv,addToIndex);
         }
-        else       
+        else
         {
           writeClassTree(ol,cd->subClasses(),wasVisited,level+1,ftv,addToIndex);
         }
@@ -522,7 +522,7 @@ static void writeClassTree(OutputList &ol,const BaseClassList *bcl,bool hideSupe
       ol.endIndexListItem();
     }
   }
-  if (started) 
+  if (started)
   {
     endIndexHierarchy(ol,level);
     if (addToIndex)
@@ -594,13 +594,13 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv
   //printf("gd=`%s': pageDict=%d\n",gd->name().data(),gd->pageDict->count());
   if (addToIndex)
   {
-    Doxygen::indexList->addContentsItem(isDir,dd->shortName(),dd->getReference(),dd->getOutputFileBase(),0,TRUE,TRUE); 
+    Doxygen::indexList->addContentsItem(isDir,dd->shortName(),dd->getReference(),dd->getOutputFileBase(),0,TRUE,TRUE);
     Doxygen::indexList->incContentsDepth();
   }
   if (ftv)
   {
     ftv->addContentsItem(isDir,dd->shortName(),dd->getReference(),
-                         dd->getOutputFileBase(),0,FALSE,TRUE,dd); 
+                         dd->getOutputFileBase(),0,FALSE,TRUE,dd);
     ftv->incContentsDepth();
   }
 
@@ -608,9 +608,9 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv
   ol.startIndexItem(dd->getReference(),dd->getOutputFileBase());
   ol.parseText(dd->shortName());
   ol.endIndexItem(dd->getReference(),dd->getOutputFileBase());
-  if (dd->isReference()) 
-  { 
-    ol.startTypewriter(); 
+  if (dd->isReference())
+  {
+    ol.startTypewriter();
     ol.docify(" [external]");
     ol.endTypewriter();
   }
@@ -625,7 +625,7 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv
     {
       writeDirTreeNode(ol,subdd,level+1,ftv,addToIndex);
     }
-    endIndexHierarchy(ol,level+1); 
+    endIndexHierarchy(ol,level+1);
   }
 
   FileList *fileList=dd->getFiles();
@@ -660,7 +660,7 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv
         doc = fileVisibleInIndex(fd,src);
         QCString reference;
         QCString outputBase;
-        if (doc) 
+        if (doc)
         {
           reference  = fd->getReference();
           outputBase = fd->getOutputFileBase();
@@ -677,11 +677,11 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv
             ftv->addContentsItem(FALSE,
                 fd->displayName(),
                 reference,outputBase,
-                0,FALSE,FALSE,fd); 
+                0,FALSE,FALSE,fd);
           }
         }
       }
-      endIndexHierarchy(ol,level+1); 
+      endIndexHierarchy(ol,level+1);
     }
   }
 
@@ -705,7 +705,7 @@ static void writeDirTreeNode(OutputList &ol, DirDef *dd, int level, FTVHelp* ftv
         else if (src)
         {
           Doxygen::indexList->addContentsItem(
-               FALSE, convertToHtml(fd->name(),TRUE), 0, 
+               FALSE, convertToHtml(fd->name(),TRUE), 0,
                fd->getSourceFileBase(), 0, FALSE, TRUE, fd);
         }
       }
@@ -727,7 +727,7 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
 {
   if (ftv)
   {
-    ol.pushGeneratorState(); 
+    ol.pushGeneratorState();
     ol.disable(OutputGenerator::Html);
   }
   static bool fullPathNames = Config_getBool(FULL_PATH_NAMES);
@@ -738,7 +738,7 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
     DirDef *dd;
     for (dli.toFirst();(dd=dli.current());++dli)
     {
-      if (dd->getOuterScope()==Doxygen::globalScope) 
+      if (dd->getOuterScope()==Doxygen::globalScope)
       {
         writeDirTreeNode(ol,dd,0,ftv,addToIndex);
       }
@@ -746,7 +746,7 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
   }
   if (ftv)
   {
-    FileNameListIterator fnli(*Doxygen::inputNameList); 
+    FileNameListIterator fnli(*Doxygen::inputNameList);
     FileName *fn;
     for (fnli.toFirst();(fn=fnli.current());++fnli)
     {
@@ -767,8 +767,8 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
           }
           if (doc || src)
           {
-            ftv->addContentsItem(FALSE,fd->displayName(),          
-                                 reference, outputBase, 0,         
+            ftv->addContentsItem(FALSE,fd->displayName(),
+                                 reference, outputBase, 0,
                                  FALSE,FALSE,fd);
           }
           if (addToIndex)
@@ -780,7 +780,7 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
             else if (src)
             {
               Doxygen::indexList->addContentsItem(
-                  FALSE, convertToHtml(fd->name(),TRUE), 0, 
+                  FALSE, convertToHtml(fd->name(),TRUE), 0,
                   fd->getSourceFileBase(), 0, FALSE, TRUE, fd);
             }
           }
@@ -788,10 +788,10 @@ static void writeDirHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
       }
     }
   }
-  endIndexHierarchy(ol,0); 
+  endIndexHierarchy(ol,0);
   if (ftv)
   {
-    ol.popGeneratorState(); 
+    ol.popGeneratorState();
   }
 }
 
@@ -837,7 +837,7 @@ static void writeClassTreeForList(OutputList &ol,ClassSDict *cl,bool &started,FT
           started=TRUE;
         }
         ol.startIndexListItem();
-        bool hasChildren = !cd->visited && classHasVisibleChildren(cd); 
+        bool hasChildren = !cd->visited && classHasVisibleChildren(cd);
         //printf("list: Has children %s: %d\n",cd->name().data(),hasChildren);
         if (cd->isLinkable())
         {
@@ -846,9 +846,9 @@ static void writeClassTreeForList(OutputList &ol,ClassSDict *cl,bool &started,FT
           ol.startIndexItem(cd->getReference(),cd->getOutputFileBase());
           ol.parseText(cd->displayName());
           ol.endIndexItem(cd->getReference(),cd->getOutputFileBase());
-          if (cd->isReference()) 
+          if (cd->isReference())
           {
-            ol.startTypewriter(); 
+            ol.startTypewriter();
             ol.docify(" [external]");
             ol.endTypewriter();
           }
@@ -859,7 +859,7 @@ static void writeClassTreeForList(OutputList &ol,ClassSDict *cl,bool &started,FT
           }
           if (ftv)
           {
-            ftv->addContentsItem(hasChildren,cd->displayName(),cd->getReference(),cd->getOutputFileBase(),cd->anchor(),FALSE,FALSE,cd); 
+            ftv->addContentsItem(hasChildren,cd->displayName(),cd->getReference(),cd->getOutputFileBase(),cd->anchor(),FALSE,FALSE,cd);
           }
         }
         else
@@ -873,10 +873,10 @@ static void writeClassTreeForList(OutputList &ol,ClassSDict *cl,bool &started,FT
           }
           if (ftv)
           {
-            ftv->addContentsItem(hasChildren,cd->displayName(),0,0,0,FALSE,FALSE,cd); 
+            ftv->addContentsItem(hasChildren,cd->displayName(),0,0,0,FALSE,FALSE,cd);
           }
         }
-        if (cd->getLanguage()==SrcLangExt_VHDL && hasChildren) 
+        if (cd->getLanguage()==SrcLangExt_VHDL && hasChildren)
         {
           writeClassTree(ol,cd->baseClasses(),cd->visited,1,ftv,addToIndex);
           cd->visited=TRUE;
@@ -898,13 +898,13 @@ static void writeClassHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
   initClassHierarchy(Doxygen::hiddenClasses);
   if (ftv)
   {
-    ol.pushGeneratorState(); 
+    ol.pushGeneratorState();
     ol.disable(OutputGenerator::Html);
   }
   bool started=FALSE;
   writeClassTreeForList(ol,Doxygen::classSDict,started,ftv,addToIndex);
   writeClassTreeForList(ol,Doxygen::hiddenClasses,started,ftv,addToIndex);
-  if (started) 
+  if (started)
   {
     endIndexHierarchy(ol,0);
     if (addToIndex)
@@ -914,7 +914,7 @@ static void writeClassHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
   }
   if (ftv)
   {
-    ol.popGeneratorState(); 
+    ol.popGeneratorState();
   }
 }
 
@@ -1003,21 +1003,21 @@ static void writeHierarchicalIndex(OutputList &ol)
   // ---------------
   // Dynamic class hierarchical index for HTML
   // ---------------
-  ol.pushGeneratorState(); 
+  ol.pushGeneratorState();
   //2.{
   ol.disableAllBut(OutputGenerator::Html);
 
   {
     if (addToIndex)
     {
-      Doxygen::indexList->addContentsItem(TRUE,title,0,"hierarchy",0,TRUE,TRUE); 
+      Doxygen::indexList->addContentsItem(TRUE,title,0,"hierarchy",0,TRUE,TRUE);
     }
     FTVHelp* ftv = new FTVHelp(FALSE);
     writeClassHierarchy(ol,ftv,addToIndex);
     QGString outStr;
     FTextStream t(&outStr);
     ftv->generateTreeViewInline(t);
-    ol.pushGeneratorState(); 
+    ol.pushGeneratorState();
     ol.disableAllBut(OutputGenerator::Html);
     ol.writeString(outStr);
     ol.popGeneratorState();
@@ -1179,7 +1179,7 @@ static void writeFileIndex(OutputList &ol)
 
   startFile(ol,"files",0,title,HLI_Files);
   startTitle(ol,0);
-  //if (!Config_getString(PROJECT_NAME).isEmpty()) 
+  //if (!Config_getString(PROJECT_NAME).isEmpty())
   //{
   //  title.prepend(Config_getString(PROJECT_NAME)+" ");
   //}
@@ -1190,7 +1190,7 @@ static void writeFileIndex(OutputList &ol)
 
   if (addToIndex)
   {
-    Doxygen::indexList->addContentsItem(TRUE,title,0,"files",0,TRUE,TRUE); 
+    Doxygen::indexList->addContentsItem(TRUE,title,0,"files",0,TRUE,TRUE);
     Doxygen::indexList->incContentsDepth();
   }
 
@@ -1211,7 +1211,7 @@ static void writeFileIndex(OutputList &ol)
 
   if (Config_getBool(FULL_PATH_NAMES))
   {
-    // re-sort input files in (dir,file) output order instead of (file,dir) input order 
+    // re-sort input files in (dir,file) output order instead of (file,dir) input order
     FileNameListIterator fnli(*Doxygen::inputNameList);
     FileName *fn;
     for (fnli.toFirst();(fn=fnli.current());++fnli)
@@ -1279,7 +1279,7 @@ static void writeFileIndex(OutputList &ol)
   // ---------------
   // Hierarchical file index for HTML
   // ---------------
-  ol.pushGeneratorState(); 
+  ol.pushGeneratorState();
   ol.disableAllBut(OutputGenerator::Html);
 
   FTVHelp* ftv = new FTVHelp(FALSE);
@@ -1325,9 +1325,9 @@ void writeClassTree(ClassSDict *clDict,FTVHelp *ftv,bool addToIndex,bool globalO
     ClassDef *cd;
     for (;(cd=cli.current());++cli)
     {
-      if (cd->getLanguage()==SrcLangExt_VHDL) 
+      if (cd->getLanguage()==SrcLangExt_VHDL)
       {
-        if ((VhdlDocGen::VhdlClasses)cd->protection()==VhdlDocGen::PACKAGECLASS || 
+        if ((VhdlDocGen::VhdlClasses)cd->protection()==VhdlDocGen::PACKAGECLASS ||
             (VhdlDocGen::VhdlClasses)cd->protection()==VhdlDocGen::PACKBODYCLASS
            )// no architecture
         {
@@ -1337,13 +1337,13 @@ void writeClassTree(ClassSDict *clDict,FTVHelp *ftv,bool addToIndex,bool globalO
         {
           QCString n=cd->name();
           cd->setClassName(n.data());
-        }         
+        }
       }
 
-      if (!globalOnly || 
-           cd->getOuterScope()==0 || 
-           cd->getOuterScope()==Doxygen::globalScope 
-         ) 
+      if (!globalOnly ||
+           cd->getOuterScope()==0 ||
+           cd->getOuterScope()==Doxygen::globalScope
+         )
       {
         int count=0;
         if (cd->getClassSDict())
@@ -1352,19 +1352,19 @@ void writeClassTree(ClassSDict *clDict,FTVHelp *ftv,bool addToIndex,bool globalO
           ClassDef *ccd;
           for (;(ccd=ccit.current());++ccit)
           {
-            if (ccd->isLinkableInProject() && ccd->templateMaster()==0) 
+            if (ccd->isLinkableInProject() && ccd->templateMaster()==0)
             {
               count++;
             }
           }
         }
-        if (classVisibleInIndex(cd) && cd->templateMaster()==0) 
-        { 
+        if (classVisibleInIndex(cd) && cd->templateMaster()==0)
+        {
           ftv->addContentsItem(count>0,cd->displayName(FALSE),cd->getReference(),
-              cd->getOutputFileBase(),cd->anchor(),FALSE,TRUE,cd); 
-          if (addToIndex && 
+              cd->getOutputFileBase(),cd->anchor(),FALSE,TRUE,cd);
+          if (addToIndex &&
               /*cd->partOfGroups()==0 &&*/
-              (cd->getOuterScope()==0 || 
+              (cd->getOuterScope()==0 ||
                cd->getOuterScope()->definitionType()!=Definition::TypeClass
               )
              )
@@ -1395,15 +1395,15 @@ static void writeNamespaceTree(NamespaceSDict *nsDict,FTVHelp *ftv,
     NamespaceDef *nd;
     for (nli.toFirst();(nd=nli.current());++nli)
     {
-      if (nd->localName().find('@')==-1 && 
+      if (nd->localName().find('@')==-1 &&
           (!rootOnly || nd->getOuterScope()==Doxygen::globalScope))
       {
 
         bool hasChildren = namespaceHasVisibleChild(nd,showClasses);
         bool isLinkable  = nd->isLinkableInProject();
 
-        QCString ref; 
-        QCString file; 
+        QCString ref;
+        QCString file;
         if (isLinkable)
         {
           ref  = nd->getReference();
@@ -1416,7 +1416,7 @@ static void writeNamespaceTree(NamespaceSDict *nsDict,FTVHelp *ftv,
 
         if ((isLinkable && !showClasses) || hasChildren)
         {
-          ftv->addContentsItem(hasChildren,nd->localName(),ref,file,0,FALSE,TRUE,nd); 
+          ftv->addContentsItem(hasChildren,nd->localName(),ref,file,0,FALSE,TRUE,nd);
 
           if (addToIndex)
           {
@@ -1431,7 +1431,7 @@ static void writeNamespaceTree(NamespaceSDict *nsDict,FTVHelp *ftv,
             if (addToIndex) Doxygen::indexList->incContentsDepth();
             ftv->incContentsDepth();
             writeNamespaceTree(nd->getNamespaceSDict(),ftv,FALSE,showClasses,addToIndex);
-            if (showClasses) 
+            if (showClasses)
             {
               writeClassTree(nd->getClassSDict(),ftv,addToIndex,FALSE);
             }
@@ -1470,7 +1470,7 @@ static void writeNamespaceIndex(OutputList &ol)
   // ---------------
   ol.pushGeneratorState();
   ol.disable(OutputGenerator::Html);
-  
+
   NamespaceSDict::Iterator nli(*Doxygen::namespaceSDict);
   NamespaceDef *nd;
   for (nli.toFirst();(nd=nli.current());++nli)
@@ -1522,13 +1522,13 @@ static void writeNamespaceIndex(OutputList &ol)
   // ---------------
   // Hierarchical namespace index for HTML
   // ---------------
-  ol.pushGeneratorState(); 
+  ol.pushGeneratorState();
   ol.disableAllBut(OutputGenerator::Html);
 
   {
     if (addToIndex)
     {
-      Doxygen::indexList->addContentsItem(TRUE,title,0,"namespaces",0,TRUE,TRUE); 
+      Doxygen::indexList->addContentsItem(TRUE,title,0,"namespaces",0,TRUE,TRUE);
       Doxygen::indexList->incContentsDepth();
     }
     FTVHelp* ftv = new FTVHelp(FALSE);
@@ -1561,13 +1561,13 @@ static int countAnnotatedClasses(int *cp)
   ClassDef *cd;
   for (;(cd=cli.current());++cli)
   {
-    if (cd->isLinkableInProject() && cd->templateMaster()==0) 
-    { 
+    if (cd->isLinkableInProject() && cd->templateMaster()==0)
+    {
       if (!cd->isEmbeddedInOuterScope())
       {
         countPrinted++;
       }
-      count++; 
+      count++;
     }
   }
   *cp = countPrinted;
@@ -1580,20 +1580,20 @@ static void writeAnnotatedClassList(OutputList &ol)
   //LayoutNavEntry *lne = LayoutDocManager::instance().rootNavEntry()->find(LayoutNavEntry::ClassList);
   //bool addToIndex = lne==0 || lne->visible();
 
-  ol.startIndexList(); 
+  ol.startIndexList();
   ClassSDict::Iterator cli(*Doxygen::classSDict);
   ClassDef *cd;
-  
+
   for (cli.toFirst();(cd=cli.current());++cli)
   {
-    if (cd->getLanguage()==SrcLangExt_VHDL && 
-        ((VhdlDocGen::VhdlClasses)cd->protection()==VhdlDocGen::PACKAGECLASS || 
+    if (cd->getLanguage()==SrcLangExt_VHDL &&
+        ((VhdlDocGen::VhdlClasses)cd->protection()==VhdlDocGen::PACKAGECLASS ||
          (VhdlDocGen::VhdlClasses)cd->protection()==VhdlDocGen::PACKBODYCLASS)
        ) // no architecture
     {
       continue;
     }
- 
+
     ol.pushGeneratorState();
     if (cd->isEmbeddedInOuterScope())
     {
@@ -1698,10 +1698,10 @@ class PrefixIgnoreClassList : public ClassList
 class AlphaIndexTableCell
 {
   public:
-    AlphaIndexTableCell(int row,int col,uint letter,ClassDef *cd) : 
-      m_letter(letter), m_class(cd), m_row(row), m_col(col) 
+    AlphaIndexTableCell(int row,int col,uint letter,ClassDef *cd) :
+      m_letter(letter), m_class(cd), m_row(row), m_col(col)
     { //printf("AlphaIndexTableCell(%d,%d,%c,%s)\n",row,col,letter!=0 ? letter: '-',
-      //       cd!=(ClassDef*)0x8 ? cd->name().data() : "<null>"); 
+      //       cd!=(ClassDef*)0x8 ? cd->name().data() : "<null>");
     }
 
     ClassDef *classDef() const { return m_class; }
@@ -1727,7 +1727,7 @@ class AlphaIndexTableRows : public QList<AlphaIndexTableCell>
 class AlphaIndexTableRowsIterator : public QListIterator<AlphaIndexTableCell>
 {
   public:
-    AlphaIndexTableRowsIterator(const AlphaIndexTableRows &list) : 
+    AlphaIndexTableRowsIterator(const AlphaIndexTableRows &list) :
       QListIterator<AlphaIndexTableCell>(list) {}
 };
 
@@ -1774,7 +1774,7 @@ static void writeAlphabeticalClassList(OutputList &ol)
     {
       if (cd->getLanguage()==SrcLangExt_VHDL && !((VhdlDocGen::VhdlClasses)cd->protection()==VhdlDocGen::ENTITYCLASS ))// no architecture
         continue;
-	     
+
       int index = getPrefixIndex(cd->className());
       //printf("name=%s index=%d %d\n",cd->className().data(),index,cd->protection());
       startLetter=getUtf8CodeToLower(cd->className(),index);
@@ -1793,8 +1793,8 @@ static void writeAlphabeticalClassList(OutputList &ol)
     headerItems++;
     QCString li = letterToLabel(*pLetter);
     QCString ls = QString(QChar(*pLetter)).utf8();
-    alphaLinks += (QCString)"<a class=\"qindex\" href=\"#letter_" + 
-                  li + "\">" + 
+    alphaLinks += (QCString)"<a class=\"qindex\" href=\"#letter_" +
+                  li + "\">" +
                   ls + "</a>";
   }
   alphaLinks += "</div>\n";
@@ -1824,12 +1824,12 @@ static void writeAlphabeticalClassList(OutputList &ol)
   {
     if (cd->getLanguage()==SrcLangExt_VHDL && !((VhdlDocGen::VhdlClasses)cd->protection()==VhdlDocGen::ENTITYCLASS ))// no architecture
       continue;
-    
+
     if (cd->isLinkableInProject() && cd->templateMaster()==0)
     {
       int index = getPrefixIndex(cd->className());
       startLetter=getUtf8CodeToLower(cd->className(),index);
-      // Do some sorting again, since the classes are sorted by name with 
+      // Do some sorting again, since the classes are sorted by name with
       // prefix, which should be ignored really.
       if (cd->getLanguage()==SrcLangExt_VHDL)
       {
@@ -1877,7 +1877,7 @@ static void writeAlphabeticalClassList(OutputList &ol)
     ClassDef *cd = cit.current();
     ++cit;
     tableRows->append(new AlphaIndexTableCell(row,col,0,cd));
-    row++; 
+    row++;
     NEXT_ROW();
     for (;(cd=cit.current()); ++cit)
     {
@@ -1910,7 +1910,7 @@ static void writeAlphabeticalClassList(OutputList &ol)
     //ol.nextTableRow();
     ol.writeString("<tr>");
     // the last column may contain less items then the others
-    //int colsInRow = (i<rows-1) ? columns : itemsInLastRow; 
+    //int colsInRow = (i<rows-1) ? columns : itemsInLastRow;
     //printf("row [%d]\n",i);
     for (j=0;j<columns;j++) // foreach table column
     {
@@ -1930,7 +1930,7 @@ static void writeAlphabeticalClassList(OutputList &ol)
               ol.writeString("\"></a>");
               ol.writeString("<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">"
                   "<tr>"
-                  "<td><div class=\"ah\">&#160;&#160;"); 
+                  "<td><div class=\"ah\">&#160;&#160;");
               ol.writeString(QString(QChar(cell->letter())).utf8());
               ol.writeString(         "&#160;&#160;</div>"
                   "</td>"
@@ -1993,7 +1993,7 @@ static void writeAlphabeticalClassList(OutputList &ol)
     ol.writeString("</tr>\n");
   }
   ol.writeString("</table>\n");
-  
+
   ol.writeString(alphaLinks);
 
   // release the temporary memory
@@ -2015,7 +2015,7 @@ static void writeAlphabeticalIndex(OutputList &ol)
   QCString title = lne ? lne->title() : theTranslator->trCompoundIndex();
   bool addToIndex = lne==0 || lne->visible();
 
-  startFile(ol,"classes",0,title,HLI_Classes); 
+  startFile(ol,"classes",0,title,HLI_Classes);
 
   startTitle(ol,0);
   ol.parseText(title);
@@ -2023,7 +2023,7 @@ static void writeAlphabeticalIndex(OutputList &ol)
 
   if (addToIndex)
   {
-    Doxygen::indexList->addContentsItem(FALSE,title,0,"classes",0,FALSE,TRUE); 
+    Doxygen::indexList->addContentsItem(FALSE,title,0,"classes",0,FALSE,TRUE);
   }
 
   ol.startContents();
@@ -2040,7 +2040,7 @@ static void writeAnnotatedIndex(OutputList &ol)
   //printf("writeAnnotatedIndex: count=%d printed=%d\n",
   //    annotatedClasses,annotatedClassesPrinted);
   if (annotatedClasses==0) return;
-  
+
   ol.pushGeneratorState();
   ol.disable(OutputGenerator::Man);
   if (annotatedClassesPrinted==0)
@@ -2053,7 +2053,7 @@ static void writeAnnotatedIndex(OutputList &ol)
   QCString title = lne ? lne->title() : theTranslator->trCompoundList();
   bool addToIndex = lne==0 || lne->visible();
 
-  
+
   startFile(ol,"annotated",0,title,HLI_Annotated);
 
   startTitle(ol,0);
@@ -2081,13 +2081,13 @@ static void writeAnnotatedIndex(OutputList &ol)
   // ---------------
   // Hierarchical class index for HTML
   // ---------------
-  ol.pushGeneratorState(); 
+  ol.pushGeneratorState();
   ol.disableAllBut(OutputGenerator::Html);
 
   {
     if (addToIndex)
     {
-      Doxygen::indexList->addContentsItem(TRUE,title,0,"annotated",0,TRUE,TRUE); 
+      Doxygen::indexList->addContentsItem(TRUE,title,0,"annotated",0,TRUE,TRUE);
       Doxygen::indexList->incContentsDepth();
     }
     FTVHelp* ftv = new FTVHelp(FALSE);
@@ -2106,7 +2106,7 @@ static void writeAnnotatedIndex(OutputList &ol)
 
   ol.popGeneratorState();
   // ------
-  
+
   endFile(ol); // contains ol.endContents()
   ol.popGeneratorState();
 }
@@ -2165,9 +2165,9 @@ static void writeMemberList(OutputList &ol,bool useSections,int page,
                                    QCString &prevNamespaceName);
 
   // each index tab has its own write function
-  static writeLinkForMember_t writeLinkForMemberMap[3] = 
-  { 
-    &writeClassLinkForMember, 
+  static writeLinkForMember_t writeLinkForMemberMap[3] =
+  {
+    &writeClassLinkForMember,
     &writeFileLinkForMember,
     &writeNamespaceLinkForMember
   };
@@ -2192,14 +2192,14 @@ static void writeMemberList(OutputList &ol,bool useSections,int page,
     for (mli.toFirst();(md=mli.current());++mli)
     {
       const char *sep;
-      bool isFunc=!md->isObjCMethod() && 
-        (md->isFunction() || md->isSlot() || md->isSignal()); 
+      bool isFunc=!md->isObjCMethod() &&
+        (md->isFunction() || md->isSlot() || md->isSignal());
       QCString name=md->name();
       int startIndex = getPrefixIndex(name);
       if (QCString(name.data()+startIndex)!=prevName) // new entry
       {
-        if ((prevName.isEmpty() || 
-            tolower(name.at(startIndex))!=tolower(prevName.at(0))) && 
+        if ((prevName.isEmpty() ||
+            tolower(name.at(startIndex))!=tolower(prevName.at(0))) &&
             useSections) // new section
         {
           if (!firstItem)    ol.endItemListItem();
@@ -2267,20 +2267,20 @@ void addClassMemberNameToIndex(MemberDef *md)
   static bool hideFriendCompounds = Config_getBool(HIDE_FRIEND_COMPOUNDS);
   ClassDef *cd=0;
 
- 
-  
-  if (md->isLinkableInProject() && 
-      (cd=md->getClassDef())    && 
+
+
+  if (md->isLinkableInProject() &&
+      (cd=md->getClassDef())    &&
       cd->isLinkableInProject() &&
       cd->templateMaster()==0)
   {
     QCString n = md->name();
     int index = getPrefixIndex(n);
     uint letter = getUtf8CodeToLower(n,index);
-    if (!n.isEmpty()) 
+    if (!n.isEmpty())
     {
       bool isFriendToHide = hideFriendCompounds &&
-        (QCString(md->typeString())=="friend class" || 
+        (QCString(md->typeString())=="friend class" ||
          QCString(md->typeString())=="friend struct" ||
          QCString(md->typeString())=="friend union");
       if (!(md->isFriend() && isFriendToHide) &&
@@ -2363,12 +2363,12 @@ void addNamespaceMemberNameToIndex(MemberDef *md)
         documentedNamespaceMembers[NMHL_All]++;
       }
 
-      if (md->isFunction()) 
+      if (md->isFunction())
       {
         g_namespaceIndexLetterUsed[NMHL_Functions].append(letter,md);
         documentedNamespaceMembers[NMHL_Functions]++;
       }
-      else if (md->isVariable()) 
+      else if (md->isVariable())
       {
         g_namespaceIndexLetterUsed[NMHL_Variables].append(letter,md);
         documentedNamespaceMembers[NMHL_Variables]++;
@@ -2412,7 +2412,7 @@ void addFileMemberNameToIndex(MemberDef *md)
     QCString n = md->name();
     int index = getPrefixIndex(n);
     uint letter = getUtf8CodeToLower(n,index);
-    if (!n.isEmpty()) 
+    if (!n.isEmpty())
     {
       if (!md->isEnumValue() || (md->getEnumScope() && !md->getEnumScope()->isStrong()))
       {
@@ -2420,12 +2420,12 @@ void addFileMemberNameToIndex(MemberDef *md)
         documentedFileMembers[FMHL_All]++;
       }
 
-      if (md->isFunction()) 
+      if (md->isFunction())
       {
         g_fileIndexLetterUsed[FMHL_Functions].append(letter,md);
         documentedFileMembers[FMHL_Functions]++;
       }
-      else if (md->isVariable()) 
+      else if (md->isVariable())
       {
         g_fileIndexLetterUsed[FMHL_Variables].append(letter,md);
         documentedFileMembers[FMHL_Variables]++;
@@ -2473,9 +2473,9 @@ static void writeQuickMemberIndex(OutputList &ol,
     QCString extension=Doxygen::htmlFileExtension;
     if (!multiPage)
       anchor="#index_";
-    else if (first) 
+    else if (first)
       anchor=fullName+extension+"#index_";
-    else 
+    else
       anchor=fullName+"_"+letterToLabel(i)+extension+"#index_";
     startQuickIndexItem(ol,anchor+is,i==page,TRUE,first);
     ol.writeString(ci);
@@ -2499,11 +2499,11 @@ static const CmhlInfo *getCmhlInfo(int hl)
 {
   static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN);
   static bool vhdlOpt    = Config_getBool(OPTIMIZE_OUTPUT_VHDL);
-  static CmhlInfo cmhlInfo[] = 
+  static CmhlInfo cmhlInfo[] =
   {
     CmhlInfo("functions",     theTranslator->trAll()),
     CmhlInfo("functions_func",
-        fortranOpt ? theTranslator->trSubprograms() : 
+        fortranOpt ? theTranslator->trSubprograms() :
         vhdlOpt    ? VhdlDocGen::trFunctionAndProc() :
                      theTranslator->trFunctions()),
     CmhlInfo("functions_vars",theTranslator->trVariables()),
@@ -2553,7 +2553,7 @@ static void writeClassMemberIndexFiltered(OutputList &ol, ClassMemberHighlight h
     uint page = ml->letter();
     QCString fileName = getCmhlInfo(hl)->fname;
     if (multiPageIndex)
-    { 
+    {
       if (!first)
       {
         fileName+="_"+letterToLabel(page);
@@ -2645,7 +2645,7 @@ static void writeClassMemberIndex(OutputList &ol)
 
   if (documentedClassMembers[CMHL_All]>0 && addToIndex)
   {
-    Doxygen::indexList->addContentsItem(TRUE,lne ? lne->title() : theTranslator->trCompoundMembers(),0,"functions",0); 
+    Doxygen::indexList->addContentsItem(TRUE,lne ? lne->title() : theTranslator->trCompoundMembers(),0,"functions",0);
     Doxygen::indexList->incContentsDepth();
   }
   writeClassMemberIndexFiltered(ol,CMHL_All);
@@ -2667,7 +2667,7 @@ static void writeClassMemberIndex(OutputList &ol)
 //----------------------------------------------------------------------------
 
 /** Helper class representing a file member in the navigation menu. */
-struct FmhlInfo 
+struct FmhlInfo
 {
   FmhlInfo(const char *fn,const char *t) : fname(fn), title(t) {}
   const char *fname;
@@ -2678,12 +2678,12 @@ static const FmhlInfo *getFmhlInfo(int hl)
 {
   static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN);
   static bool vhdlOpt    = Config_getBool(OPTIMIZE_OUTPUT_VHDL);
-  static FmhlInfo fmhlInfo[] = 
+  static FmhlInfo fmhlInfo[] =
   {
     FmhlInfo("globals",     theTranslator->trAll()),
     FmhlInfo("globals_func",
-         fortranOpt ? theTranslator->trSubprograms()  : 
-         vhdlOpt    ? VhdlDocGen::trFunctionAndProc() : 
+         fortranOpt ? theTranslator->trSubprograms()  :
+         vhdlOpt    ? VhdlDocGen::trFunctionAndProc() :
                       theTranslator->trFunctions()),
     FmhlInfo("globals_vars",theTranslator->trVariables()),
     FmhlInfo("globals_type",theTranslator->trTypedefs()),
@@ -2815,7 +2815,7 @@ static void writeFileMemberIndex(OutputList &ol)
   bool addToIndex = lne==0 || lne->visible();
   if (documentedFileMembers[FMHL_All]>0 && addToIndex)
   {
-    Doxygen::indexList->addContentsItem(FALSE,lne ? lne->title() : theTranslator->trFileMembers(),0,"globals",0); 
+    Doxygen::indexList->addContentsItem(FALSE,lne ? lne->title() : theTranslator->trFileMembers(),0,"globals",0);
     Doxygen::indexList->incContentsDepth();
   }
   writeFileMemberIndexFiltered(ol,FMHL_All);
@@ -2846,7 +2846,7 @@ static const NmhlInfo *getNmhlInfo(int hl)
 {
   static bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN);
   static bool vhdlOpt    = Config_getBool(OPTIMIZE_OUTPUT_VHDL);
-  static NmhlInfo nmhlInfo[] = 
+  static NmhlInfo nmhlInfo[] =
   {
     NmhlInfo("namespacemembers",     theTranslator->trAll()),
     NmhlInfo("namespacemembers_func",
@@ -2986,7 +2986,7 @@ static void writeNamespaceMemberIndex(OutputList &ol)
   bool addToIndex = lne==0 || lne->visible();
   if (documentedNamespaceMembers[NMHL_All]>0 && addToIndex)
   {
-    Doxygen::indexList->addContentsItem(FALSE,lne ? lne->title() : theTranslator->trNamespaceMembers(),0,"namespacemembers",0); 
+    Doxygen::indexList->addContentsItem(FALSE,lne ? lne->title() : theTranslator->trNamespaceMembers(),0,"namespacemembers",0);
     Doxygen::indexList->incContentsDepth();
   }
   //bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN);
@@ -3026,7 +3026,7 @@ static void writeExampleIndex(OutputList &ol)
 
   if (addToIndex)
   {
-    Doxygen::indexList->addContentsItem(TRUE,title,0,"examples",0,TRUE,TRUE); 
+    Doxygen::indexList->addContentsItem(TRUE,title,0,"examples",0,TRUE,TRUE);
     Doxygen::indexList->incContentsDepth();
   }
 
@@ -3082,7 +3082,7 @@ static void countRelatedPages(int &docPages,int &indexPages)
   {
     if ( pd->visibleInIndex())
     {
-      indexPages++; 
+      indexPages++;
     }
     if ( pd->documentedPage())
     {
@@ -3129,7 +3129,7 @@ static void writePages(PageDef *pd,FTVHelp *ftv)
       ftv->addContentsItem(
           hasSubPages,pageTitle,
           pd->getReference(),pd->getOutputFileBase(),
-          0,hasSubPages,TRUE,pd); 
+          0,hasSubPages,TRUE,pd);
     }
     if (addToIndex && pd!=Doxygen::mainPage)
     {
@@ -3280,7 +3280,7 @@ void writeGraphInfo(OutputList &ol)
   QCString imgExt = getDotImageExtension();
   if (imgExt=="svg" && s!=-1 && e!=-1)
   {
-    legendDocs = legendDocs.left(s+8) + "[!-- SVG 0 --]\n" + legendDocs.mid(e); 
+    legendDocs = legendDocs.left(s+8) + "[!-- SVG 0 --]\n" + legendDocs.mid(e);
     //printf("legendDocs=%s\n",legendDocs.data());
   }
   FileDef fd("","graph_legend");
@@ -3303,7 +3303,7 @@ void writeGraphInfo(OutputList &ol)
 static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp* ftv, bool addToIndex)
 {
   //bool fortranOpt = Config_getBool(OPTIMIZE_FOR_FORTRAN);
-  //bool vhdlOpt    = Config_getBool(OPTIMIZE_OUTPUT_VHDL);  
+  //bool vhdlOpt    = Config_getBool(OPTIMIZE_OUTPUT_VHDL);
   if (level>20)
   {
     warn(gd->getDefFileName(),gd->getDefLine(),
@@ -3313,7 +3313,7 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp*
   }
 
   /* Some groups should appear twice under different parent-groups.
-   * That is why we should not check if it was visited 
+   * That is why we should not check if it was visited
    */
   if (/*!gd->visited &&*/ (!gd->isASubGroup() || level>0) &&
       gd->isVisible() &&
@@ -3347,17 +3347,17 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp*
     //printf("gd=`%s': pageDict=%d\n",gd->name().data(),gd->pageDict->count());
     if (addToIndex)
     {
-      Doxygen::indexList->addContentsItem(isDir,gd->groupTitle(),gd->getReference(),gd->getOutputFileBase(),0,isDir,TRUE); 
+      Doxygen::indexList->addContentsItem(isDir,gd->groupTitle(),gd->getReference(),gd->getOutputFileBase(),0,isDir,TRUE);
       Doxygen::indexList->incContentsDepth();
     }
     if (ftv)
     {
       ftv->addContentsItem(hasSubGroups,gd->groupTitle(),
                            gd->getReference(),gd->getOutputFileBase(),0,
-                           FALSE,FALSE,gd); 
+                           FALSE,FALSE,gd);
       ftv->incContentsDepth();
     }
-    
+
     //ol.writeListItem();
     //ol.startTextLink(gd->getOutputFileBase(),0);
     //parseText(ol,gd->groupTitle());
@@ -3367,9 +3367,9 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp*
     ol.startIndexItem(gd->getReference(),gd->getOutputFileBase());
     ol.parseText(gd->groupTitle());
     ol.endIndexItem(gd->getReference(),gd->getOutputFileBase());
-    if (gd->isReference()) 
-    { 
-      ol.startTypewriter(); 
+    if (gd->isReference())
+    {
+      ol.startTypewriter();
       ol.docify(" [external]");
       ol.endTypewriter();
     }
@@ -3421,7 +3421,7 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp*
         ClassDef *cd;
         for (;(cd=it.current());++it)
         {
-          //bool nestedClassInSameGroup = 
+          //bool nestedClassInSameGroup =
           //    cd->getOuterScope() && cd->getOuterScope()->definitionType()==Definition::TypeClass &&
           //    cd->getOuterScope()->partOfGroups()!=0 && cd->getOuterScope()->partOfGroups()->contains(gd);
           //printf("===== GroupClasses: %s visible=%d nestedClassInSameGroup=%d\n",cd->name().data(),cd->isVisible(),nestedClassInSameGroup);
@@ -3528,13 +3528,13 @@ static void writeGroupTreeNode(OutputList &ol, GroupDef *gd, int level, FTVHelp*
           {
             writeGroupTreeNode(ol,subgd,level+1,ftv,addToIndex);
           }
-          endIndexHierarchy(ol,level+1); 
+          endIndexHierarchy(ol,level+1);
         }
       }
     }
 
     ol.endIndexListItem();
-    
+
     if (addToIndex)
     {
       Doxygen::indexList->decContentsDepth();
@@ -3551,7 +3551,7 @@ static void writeGroupHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
 {
   if (ftv)
   {
-    ol.pushGeneratorState(); 
+    ol.pushGeneratorState();
     ol.disable(OutputGenerator::Html);
   }
   startIndexHierarchy(ol,0);
@@ -3561,10 +3561,10 @@ static void writeGroupHierarchy(OutputList &ol, FTVHelp* ftv,bool addToIndex)
   {
     writeGroupTreeNode(ol,gd,0,ftv,addToIndex);
   }
-  endIndexHierarchy(ol,0); 
+  endIndexHierarchy(ol,0);
   if (ftv)
   {
-    ol.popGeneratorState(); 
+    ol.popGeneratorState();
   }
 }
 
@@ -3573,7 +3573,7 @@ static void writeGroupTree(GroupDef *gd,FTVHelp *ftv,int level,bool addToIndex)
 {
   static bool externalGroups = Config_getBool(EXTERNAL_GROUPS);
   /* Some groups should appear twice under different parent-groups.
-   * That is why we should not check if it was visited 
+   * That is why we should not check if it was visited
    */
   if ((!gd->isASubGroup() || level>0) &&
       gd->isVisible() &&
@@ -3582,7 +3582,7 @@ static void writeGroupTree(GroupDef *gd,FTVHelp *ftv,int level,bool addToIndex)
   {
     if (ftv)
     {
-      ftv->addContentsItem(hasSubGroups,gd->groupTitle(),gd->getReference(),gd->getOutputFileBase(),0); 
+      ftv->addContentsItem(hasSubGroups,gd->groupTitle(),gd->getReference(),gd->getOutputFileBase(),0);
       ftv->incContentsDepth();
     }
     if (ftv)
@@ -3607,8 +3607,8 @@ static void writeGroupTree(FTVHelp *ftv,bool addToIndex)
 
 static void writeGroupIndex(OutputList &ol)
 {
-  if (documentedGroups==0) return; 
-  ol.pushGeneratorState(); 
+  if (documentedGroups==0) return;
+  ol.pushGeneratorState();
   // 1.{
   ol.disable(OutputGenerator::Man);
   LayoutNavEntry *lne = LayoutDocManager::instance().rootNavEntry()->find(LayoutNavEntry::Modules);
@@ -3642,13 +3642,13 @@ static void writeGroupIndex(OutputList &ol)
   // interactive group index for HTML
   // ---------------
   // 2.{
-  ol.pushGeneratorState(); 
+  ol.pushGeneratorState();
   ol.disableAllBut(OutputGenerator::Html);
 
   {
     if (addToIndex)
     {
-      Doxygen::indexList->addContentsItem(TRUE,title,0,"modules",0,TRUE,TRUE); 
+      Doxygen::indexList->addContentsItem(TRUE,title,0,"modules",0,TRUE,TRUE);
       Doxygen::indexList->incContentsDepth();
     }
     FTVHelp* ftv = new FTVHelp(FALSE);
@@ -3677,8 +3677,8 @@ static void writeGroupIndex(OutputList &ol)
 #if 0
 static void writeDirIndex(OutputList &ol)
 {
-  if (documentedDirs==0) return; 
-  ol.pushGeneratorState(); 
+  if (documentedDirs==0) return;
+  ol.pushGeneratorState();
   ol.disable(OutputGenerator::Man);
   LayoutNavEntry *lne = LayoutDocManager::instance().rootNavEntry()->find(LayoutNavEntry::Dirs);
   QCString title = lne ? lne->title() : theTranslator->trDirectories();
@@ -3693,7 +3693,7 @@ static void writeDirIndex(OutputList &ol)
 
   if (addToIndex)
   {
-    Doxygen::indexList->addContentsItem(TRUE,title,0,"dirs",0,TRUE,TRUE); 
+    Doxygen::indexList->addContentsItem(TRUE,title,0,"dirs",0,TRUE,TRUE);
     Doxygen::indexList->incContentsDepth();
   }
   ol.parseText(lne ? lne->intro() : theTranslator->trDirDescription());
@@ -3713,7 +3713,7 @@ static void writeDirIndex(OutputList &ol)
     QGString outStr;
     FTextStream t(&outStr);
     ftv->generateTreeViewInline(t);
-    ol.pushGeneratorState(); 
+    ol.pushGeneratorState();
     ol.disableAllBut(OutputGenerator::Html);
     ol.writeString(outStr);
     ol.popGeneratorState();
@@ -3788,7 +3788,7 @@ static void writeIndex(OutputList &ol)
   //--------------------------------------------------------------------
   ol.disableAllBut(OutputGenerator::Html);
 
-  QCString defFileName = 
+  QCString defFileName =
     Doxygen::mainPage ? Doxygen::mainPage->docFile().data() : "[generated]";
   int defLine =
     Doxygen::mainPage ? Doxygen::mainPage->docLine() : -1;
@@ -3805,14 +3805,14 @@ static void writeIndex(OutputList &ol)
 
   QCString indexName="index";
   ol.startFile(indexName,0,title);
-  
+
   if (Doxygen::mainPage)
   {
     if (
         (!projectName.isEmpty() && mainPageHasTitle() && qstricmp(title,projectName)!=0)
        ) // to avoid duplicate entries in the treeview
     {
-      Doxygen::indexList->addContentsItem(Doxygen::mainPage->hasSubPages(),title,0,indexName,0,Doxygen::mainPage->hasSubPages(),TRUE); 
+      Doxygen::indexList->addContentsItem(Doxygen::mainPage->hasSubPages(),title,0,indexName,0,Doxygen::mainPage->hasSubPages(),TRUE);
     }
     if (Doxygen::mainPage->hasSubPages() || Doxygen::mainPage->hasSections())
     {
@@ -3821,7 +3821,7 @@ static void writeIndex(OutputList &ol)
   }
 
   ol.startQuickIndices();
-  if (!Config_getBool(DISABLE_INDEX)) 
+  if (!Config_getBool(DISABLE_INDEX))
   {
     ol.writeQuickLinks(TRUE,HLI_Main,0);
   }
@@ -3858,7 +3858,7 @@ static void writeIndex(OutputList &ol)
   }
 
   ol.startContents();
-  if (Config_getBool(DISABLE_INDEX) && Doxygen::mainPage==0) 
+  if (Config_getBool(DISABLE_INDEX) && Doxygen::mainPage==0)
   {
     ol.writeQuickLinks(FALSE,HLI_Main,0);
   }
@@ -3879,10 +3879,10 @@ static void writeIndex(OutputList &ol)
 
     Doxygen::insideMainPage=FALSE;
   }
-  
+
   endFile(ol);
   ol.disable(OutputGenerator::Html);
-  
+
   //--------------------------------------------------------------------
   // write LaTeX/RTF index
   //--------------------------------------------------------------------
@@ -3891,7 +3891,7 @@ static void writeIndex(OutputList &ol)
 
   ol.startFile("refman",0,0);
   ol.startIndexSection(isTitlePageStart);
-  if (!Config_getString(LATEX_HEADER).isEmpty()) 
+  if (!Config_getString(LATEX_HEADER).isEmpty())
   {
     ol.disable(OutputGenerator::Latex);
   }
@@ -3907,7 +3907,7 @@ static void writeIndex(OutputList &ol)
 
   if (!Config_getString(PROJECT_NUMBER).isEmpty())
   {
-    ol.startProjectNumber(); 
+    ol.startProjectNumber();
     ol.generateDoc(defFileName,defLine,Doxygen::mainPage,0,Config_getString(PROJECT_NUMBER),FALSE,FALSE);
     ol.endProjectNumber();
   }
@@ -3940,7 +3940,7 @@ static void writeIndex(OutputList &ol)
     bool first=Doxygen::mainPage==0;
     for (pdi.toFirst();(pd=pdi.current());++pdi)
     {
-      if (!pd->getGroupDef() && !pd->isReference() && 
+      if (!pd->getGroupDef() && !pd->isReference() &&
           (!pd->hasParentPage() ||                    // not inside other page
            (Doxygen::mainPage==pd->getOuterScope()))  // or inside main page
          )
@@ -4003,7 +4003,7 @@ static void writeIndex(OutputList &ol)
     {
       ol.startIndexSection(isClassHierarchyIndex);
       ol.parseText(/*projPrefix+*/
-          (fortranOpt ? theTranslator->trCompoundIndexFortran() : 
+          (fortranOpt ? theTranslator->trCompoundIndexFortran() :
            vhdlOpt    ? VhdlDocGen::trDesignUnitIndex()         :
                         theTranslator->trHierarchicalIndex()
           ));
@@ -4014,7 +4014,7 @@ static void writeIndex(OutputList &ol)
       ol.startIndexSection(isCompoundIndex);
       ol.parseText(/*projPrefix+*/
           (fortranOpt ? theTranslator->trCompoundIndexFortran() :
-              vhdlOpt ? VhdlDocGen::trDesignUnitIndex()         : 
+              vhdlOpt ? VhdlDocGen::trDesignUnitIndex()         :
                         theTranslator->trCompoundIndex()
           ));
       ol.endIndexSection(isCompoundIndex);
@@ -4103,26 +4103,26 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
     {
       switch(kind)
       {
-        case LayoutNavEntry::MainPage: 
+        case LayoutNavEntry::MainPage:
           msg("Generating index page...\n");
-          writeIndex(ol); 
+          writeIndex(ol);
           break;
-        case LayoutNavEntry::Pages: 
+        case LayoutNavEntry::Pages:
           msg("Generating page index...\n");
           writePageIndex(ol);
           break;
-        case LayoutNavEntry::Modules: 
+        case LayoutNavEntry::Modules:
           msg("Generating module index...\n");
           writeGroupIndex(ol);
           break;
-        case LayoutNavEntry::Namespaces: 
+        case LayoutNavEntry::Namespaces:
           {
             static bool showNamespaces = Config_getBool(SHOW_NAMESPACES);
             if (showNamespaces)
             {
               if (documentedNamespaces>0 && addToIndex)
               {
-                Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,0,0); 
+                Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,lne->baseFile(),0);
                 Doxygen::indexList->incContentsDepth();
                 needsClosing=TRUE;
               }
@@ -4134,7 +4134,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
             }
           }
           break;
-        case LayoutNavEntry::NamespaceList: 
+        case LayoutNavEntry::NamespaceList:
           {
             static bool showNamespaces = Config_getBool(SHOW_NAMESPACES);
             if (showNamespaces)
@@ -4144,14 +4144,14 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
             }
           }
           break;
-        case LayoutNavEntry::NamespaceMembers: 
+        case LayoutNavEntry::NamespaceMembers:
           msg("Generating namespace member index...\n");
           writeNamespaceMemberIndex(ol);
           break;
-        case LayoutNavEntry::Classes: 
+        case LayoutNavEntry::Classes:
           if (annotatedClasses>0 && addToIndex)
           {
-            Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,"annotated",0); 
+            Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,lne->baseFile(),0);
             Doxygen::indexList->incContentsDepth();
             needsClosing=TRUE;
           }
@@ -4161,7 +4161,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
             writeAnnotatedIndex(ol);
           }
           break;
-        case LayoutNavEntry::ClassList: 
+        case LayoutNavEntry::ClassList:
           msg("Generating annotated compound index...\n");
           writeAnnotatedIndex(ol);
           break;
@@ -4169,7 +4169,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
           msg("Generating alphabetical compound index...\n");
           writeAlphabeticalIndex(ol);
           break;
-        case LayoutNavEntry::ClassHierarchy: 
+        case LayoutNavEntry::ClassHierarchy:
           msg("Generating hierarchical class index...\n");
           writeHierarchicalIndex(ol);
           if (Config_getBool(HAVE_DOT) && Config_getBool(GRAPHICAL_HIERARCHY))
@@ -4178,18 +4178,18 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
             writeGraphicalClassHierarchy(ol);
           }
           break;
-        case LayoutNavEntry::ClassMembers: 
+        case LayoutNavEntry::ClassMembers:
           msg("Generating member index...\n");
           writeClassMemberIndex(ol);
           break;
-        case LayoutNavEntry::Files: 
+        case LayoutNavEntry::Files:
           {
             static bool showFiles = Config_getBool(SHOW_FILES);
             if (showFiles)
             {
               if (documentedHtmlFiles>0 && addToIndex)
               {
-                Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,0,0); 
+                Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,lne->baseFile(),0);
                 Doxygen::indexList->incContentsDepth();
                 needsClosing=TRUE;
               }
@@ -4201,7 +4201,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
             }
           }
           break;
-        case LayoutNavEntry::FileList: 
+        case LayoutNavEntry::FileList:
           {
             static bool showFiles = Config_getBool(SHOW_FILES);
             if (showFiles)
@@ -4211,15 +4211,15 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
             }
           }
           break;
-        case LayoutNavEntry::FileGlobals: 
+        case LayoutNavEntry::FileGlobals:
           msg("Generating file member index...\n");
           writeFileMemberIndex(ol);
           break;
-        case LayoutNavEntry::Examples: 
+        case LayoutNavEntry::Examples:
           msg("Generating example index...\n");
           writeExampleIndex(ol);
           break;
-        case LayoutNavEntry::User: 
+        case LayoutNavEntry::User:
           {
             // prepend a ! or ^ marker to the URL to avoid tampering with it
             QCString url = correctURL(lne->url(),"!"); // add ! to relative URL
@@ -4229,7 +4229,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
               url.prepend("^"); // prepend ^ to absolute URL
             }
             bool isRef = lne->baseFile().left(4)=="@ref" || lne->baseFile().left(4)=="\\ref";
-            Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,url,0,FALSE,isRef || isRelative); 
+            Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,url,0,FALSE,isRef || isRelative);
           }
           break;
         case LayoutNavEntry::UserGroup:
@@ -4240,7 +4240,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
             {
               if (url=="![none]")
               {
-                Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,0,0,FALSE,FALSE); 
+                Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,0,0,FALSE,FALSE);
               }
               else
               {
@@ -4250,12 +4250,12 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
                   url.prepend("^"); // prepend ^ to absolute URL
                 }
                 bool isRef = lne->baseFile().left(4)=="@ref" || lne->baseFile().left(4)=="\\ref";
-                Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,url,0,FALSE,isRef || isRelative); 
+                Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,url,0,FALSE,isRef || isRelative);
               }
             }
-            else 
+            else
             {
-              Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,lne->baseFile(),0,TRUE,TRUE); 
+              Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,lne->baseFile(),0,TRUE,TRUE);
             }
             Doxygen::indexList->incContentsDepth();
             needsClosing=TRUE;
@@ -4273,10 +4273,10 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
     {
       switch(kind)
       {
-        case LayoutNavEntry::Namespaces: 
-        case LayoutNavEntry::Classes: 
-        case LayoutNavEntry::Files: 
-        case LayoutNavEntry::UserGroup: 
+        case LayoutNavEntry::Namespaces:
+        case LayoutNavEntry::Classes:
+        case LayoutNavEntry::Files:
+        case LayoutNavEntry::UserGroup:
           Doxygen::indexList->decContentsDepth();
           break;
         default:
@@ -4293,17 +4293,17 @@ static bool quickLinkVisible(LayoutNavEntry::Kind kind)
   static bool showNamespaces = Config_getBool(SHOW_NAMESPACES);
   switch (kind)
   {
-    case LayoutNavEntry::MainPage:         return TRUE; 
-    case LayoutNavEntry::User:             return TRUE;                                           
-    case LayoutNavEntry::UserGroup:        return TRUE;                                           
+    case LayoutNavEntry::MainPage:         return TRUE;
+    case LayoutNavEntry::User:             return TRUE;
+    case LayoutNavEntry::UserGroup:        return TRUE;
     case LayoutNavEntry::Pages:            return indexedPages>0;
     case LayoutNavEntry::Modules:          return documentedGroups>0;
     case LayoutNavEntry::Namespaces:       return documentedNamespaces>0 && showNamespaces;
     case LayoutNavEntry::NamespaceList:    return documentedNamespaces>0 && showNamespaces;
     case LayoutNavEntry::NamespaceMembers: return documentedNamespaceMembers[NMHL_All]>0;
     case LayoutNavEntry::Classes:          return annotatedClasses>0;
-    case LayoutNavEntry::ClassList:        return annotatedClasses>0; 
-    case LayoutNavEntry::ClassIndex:       return annotatedClasses>0; 
+    case LayoutNavEntry::ClassList:        return annotatedClasses>0;
+    case LayoutNavEntry::ClassIndex:       return annotatedClasses>0;
     case LayoutNavEntry::ClassHierarchy:   return hierarchyClasses>0;
     case LayoutNavEntry::ClassMembers:     return documentedClassMembers[CMHL_All]>0;
     case LayoutNavEntry::Files:            return documentedHtmlFiles>0 && showFiles;
@@ -4437,6 +4437,22 @@ static void writeMenuData()
   if (f.open(IO_WriteOnly))
   {
     FTextStream t(&f);
+		t << "/*\n@ @licstart  The following is the entire license notice for the\n"
+			"JavaScript code in this file.\n\nCopyright (C) 1997-2017 by Dimitri van Heesch\n\n"
+			"This program is free software; you can redistribute it and/or modify\n"
+			"it under the terms of the GNU General Public License as published by\n"
+			"the Free Software Foundation; either version 2 of the License, or\n"
+			"(at your option) any later version.\n\n"
+			"This program is distributed in the hope that it will be useful,\n"
+			"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+			" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+			" GNU General Public License for more details.\n\n"
+			"You should have received a copy of the GNU General Public License along\n"
+			"with this program; if not, write to the Free Software Foundation, Inc.,\n"
+			"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\n\n"
+			"@licend  The above is the entire license notice\n"
+			"for the JavaScript code in this file\n"
+			"*/\n";
     t << "var menudata={";
     bool hasChildren = renderQuickLinksAsJs(t,root,TRUE);
     if (hasChildren) t << "]";
@@ -4453,4 +4469,3 @@ void writeIndexHierarchy(OutputList &ol)
     writeIndexHierarchyEntries(ol,lne->children());
   }
 }
-
diff --git a/src/memberdef.cpp b/src/memberdef.cpp
index 26001a1..8403374 100644
--- a/src/memberdef.cpp
+++ b/src/memberdef.cpp
@@ -750,6 +750,7 @@ MemberDef::MemberDef(const char *df,int dl,int dc,
   //printf("MemberDef::MemberDef(%s)\n",na);
   m_impl = new MemberDefImpl;
   m_impl->init(this,t,a,e,p,v,s,r,mt,tal,al);
+  number_of_flowkw = 1;
   m_isLinkableCached    = 0;
   m_isConstructorCached = 0;
   m_isDestructorCached  = 0;
@@ -4910,6 +4911,16 @@ void MemberDef::invalidateCachedArgumentTypes()
   invalidateCachedTypesInArgumentList(m_impl->declArgList);
 }
 
+void MemberDef::addFlowKeyWord()
+{
+  number_of_flowkw++;
+}
+
+int MemberDef::numberOfFlowKeyWords()
+{
+  return number_of_flowkw;
+}
+
 //----------------
 
 QCString MemberDef::displayName(bool) const
diff --git a/src/memberdef.h b/src/memberdef.h
index c0825b2..bf7ea9a 100644
--- a/src/memberdef.h
+++ b/src/memberdef.h
@@ -178,6 +178,7 @@ class MemberDef : public Definition
     bool isStrongEnumValue() const;
     bool livesInsideEnum() const;
 
+    int numberOfFlowKeyWords();
     // derived getters
     bool isFriendToHide() const;
     bool isNotFriend() const;
@@ -272,6 +273,8 @@ class MemberDef : public Definition
     // ----  setters -----
     //-----------------------------------------------------------------------------------
 
+    void addFlowKeyWord();
+
     // set functions
     void setMemberType(MemberType t);
     void setDefinition(const char *d);
@@ -424,6 +427,9 @@ class MemberDef : public Definition
     void _addToSearchIndex();
 
     static int s_indentLevel;
+
+    int number_of_flowkw;
+
     // disable copying of member defs
     MemberDef(const MemberDef &);
     MemberDef &operator=(const MemberDef &);
diff --git a/src/pagedef.cpp b/src/pagedef.cpp
index 1210305..e797b050 100644
--- a/src/pagedef.cpp
+++ b/src/pagedef.cpp
@@ -169,6 +169,11 @@ void PageDef::writeDocumentation(OutputList &ol)
   ol.endTitleHead(manPageName, manPageName);
   if (si)
   {
+    ol.pushGeneratorState();
+    ol.disableAllBut(OutputGenerator::Man);
+    ol.writeString(" - ");
+    ol.popGeneratorState();
+
     ol.generateDoc(docFile(),docLine(),this,0,si->title,TRUE,FALSE,0,TRUE,FALSE);
     ol.endSection(si->label,si->type);
   }
@@ -230,7 +235,7 @@ void PageDef::writePageDocumentation(OutputList &ol)
 
   ol.startTextBlock();
   QCString docStr = documentation()+inbodyDocumentation();
-  if (!docStr.isEmpty())
+  if (hasBriefDescription() && !Doxygen::sectionDict->find(name()))
   {
     ol.pushGeneratorState();
     ol.disableAllBut(OutputGenerator::Man);
diff --git a/src/pre.l b/src/pre.l
index 4c4763d..bf1ec9b 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -1984,6 +1984,11 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
   					  g_defArgsStr+=*yytext;
   					  BEGIN(ReadString);
   					}
+<FindDefineArgs>'                       {
+                                          if (getLanguageFromFileName(g_yyFileName)!=SrcLangExt_Fortran) REJECT;
+                                          g_defArgsStr+=*yytext;
+                                          BEGIN(ReadString);
+                                        }
 <FindDefineArgs>\n			{
                                           g_defArgsStr+=' ';
   					  g_yyLineNr++;
@@ -2014,6 +2019,12 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
   					  g_defArgsStr+=*yytext;
 					  BEGIN(FindDefineArgs);
   					}
+<ReadString>"'"                         {
+                                          if (getLanguageFromFileName(g_yyFileName)!=SrcLangExt_Fortran) REJECT;
+                                          g_defArgsStr+=*yytext;
+                                          BEGIN(FindDefineArgs);
+                                        }
+
 <ReadString>"//"|"/*"			{
   					  g_defArgsStr+=yytext;
   					}
@@ -2902,7 +2913,7 @@ CHARLIT   (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
                                           }
   					}
 <*>"//"[/]?				{
-                                          if (YY_START==SkipVerbatim || YY_START==SkipCond)
+                                          if (YY_START==SkipVerbatim || YY_START==SkipCond || getLanguageFromFileName(g_yyFileName)==SrcLangExt_Fortran)
                                           {
                                             REJECT;
                                           }
diff --git a/src/searchindex.cpp b/src/searchindex.cpp
index 18d007f..6fb2432 100644
--- a/src/searchindex.cpp
+++ b/src/searchindex.cpp
@@ -1,12 +1,12 @@
 /******************************************************************************
  *
- * 
+ *
  *
  * Copyright (C) 1997-2015 by Dimitri van Heesch.
  *
  * Permission to use, copy, modify, and distribute this software and its
- * documentation under the terms of the GNU General Public License is hereby 
- * granted. No representations are made about the suitability of this software 
+ * documentation under the terms of the GNU General Public License is hereby
+ * granted. No representations are made about the suitability of this software
  * for any purpose. It is provided "as is" without express or implied warranty.
  * See the GNU General Public License for more details.
  *
@@ -41,10 +41,10 @@
 // file format: (all multi-byte values are stored in big endian format)
 //   4 byte header
 //   256*256*4 byte index (4 bytes)
-//   for each index entry: a zero terminated list of words 
+//   for each index entry: a zero terminated list of words
 //   for each word: a \0 terminated string + 4 byte offset to the stats info
 //   padding bytes to align at 4 byte boundary
-//   for each word: the number of urls (4 bytes) 
+//   for each word: the number of urls (4 bytes)
 //               + for each url containing the word 8 bytes statistics
 //                 (4 bytes index to url string + 4 bytes frequency counter)
 //   for each url: a \0 terminated string
@@ -75,7 +75,7 @@ void IndexWord::addUrlIndex(int idx,bool hiPriority)
 
 //--------------------------------------------------------------------
 
-SearchIndex::SearchIndex() : SearchIndexIntf(Internal), 
+SearchIndex::SearchIndex() : SearchIndexIntf(Internal),
       m_words(328829), m_index(numIndexEntries), m_url2IdMap(10007), m_urls(10007), m_urlIndex(-1)
 {
   int i;
@@ -94,13 +94,13 @@ void SearchIndex::setCurrentDoc(Definition *ctx,const char *anchor,bool isSource
   QCString url=isSourceFile ? ((FileDef*)ctx)->getSourceFileBase() : ctx->getOutputFileBase();
   url+=Config_getString(HTML_FILE_EXTENSION);
   QCString baseUrl = url;
-  if (anchor) url+=QCString("#")+anchor;  
+  if (anchor) url+=QCString("#")+anchor;
   if (!isSourceFile) baseUrl=url;
   QCString name=ctx->qualifiedName();
   if (ctx->definitionType()==Definition::TypeMember)
   {
     MemberDef *md = (MemberDef *)ctx;
-    name.prepend((md->getLanguage()==SrcLangExt_Fortran  ? 
+    name.prepend((md->getLanguage()==SrcLangExt_Fortran  ?
                  theTranslator->trSubprogram(TRUE,TRUE) :
                  theTranslator->trMember(TRUE,TRUE))+" ");
   }
@@ -188,7 +188,7 @@ static int charsToIndex(const char *word)
   //register ushort h=0;
   //const char *k = word;
   //ushort mask=0xfc00;
-  //while ( *k ) 
+  //while ( *k )
   //{
   //  h = (h&mask)^(h<<6)^(*k++);
   //}
@@ -275,7 +275,7 @@ void SearchIndex::write(const char *fileName)
       IndexWord *iw;
       for (iwi.toFirst();(iw=iwi.current());++iwi)
       {
-        int ws = iw->word().length()+1; 
+        int ws = iw->word().length()+1;
         size+=ws+4; // word + url info list offset
       }
       size+=1; // zero list terminator
@@ -295,8 +295,8 @@ void SearchIndex::write(const char *fileName)
       IndexWord *iw;
       for (iwi.toFirst();(iw=iwi.current());++iwi)
       {
-        offset+= iw->word().length()+1; 
-        offset+=4; // word + offset to url info array 
+        offset+= iw->word().length()+1;
+        offset+=4; // word + offset to url info array
       }
       offset+=1; // zero list terminator
     }
@@ -312,7 +312,7 @@ void SearchIndex::write(const char *fileName)
   //int statsOffset = size;
   //IndexWord *iw;
   int *wordStatOffsets = new int[m_words.count()];
-  
+
   int count=0;
 
   // third pass: compute offset to stats info for each word
@@ -417,7 +417,7 @@ struct SearchDocEntry
   QCString name;
   QCString args;
   QCString extId;
-  QCString url; 
+  QCString url;
   GrowBuf  importantText;
   GrowBuf  normalText;
 };
@@ -476,7 +476,7 @@ static QCString definitionToName(Definition *ctx)
   {
     switch(ctx->definitionType())
     {
-      case Definition::TypeClass: 
+      case Definition::TypeClass:
         return ((ClassDef*)ctx)->compoundTypeString();
       case Definition::TypeFile:
         return "file";
@@ -647,23 +647,23 @@ static void addMemberToSearchIndex(MemberDef *md)
       }
     }
   }
-  else if (isLinkable && 
-      (((nd=md->getNamespaceDef()) && nd->isLinkable()) || 
+  else if (isLinkable &&
+      (((nd=md->getNamespaceDef()) && nd->isLinkable()) ||
        ((fd=md->getFileDef())      && fd->isLinkable())
       )
      )
   {
     QCString n = md->name();
-    if (!n.isEmpty()) 
+    if (!n.isEmpty())
     {
       uint letter = getUtf8CodeToLower(n,0);
       g_searchIndexInfo[SEARCH_INDEX_ALL].symbolList.append(letter,md);
 
-      if (md->isFunction()) 
+      if (md->isFunction())
       {
         g_searchIndexInfo[SEARCH_INDEX_FUNCTIONS].symbolList.append(letter,md);
       }
-      else if (md->isVariable()) 
+      else if (md->isVariable())
       {
         g_searchIndexInfo[SEARCH_INDEX_VARIABLES].symbolList.append(letter,md);
       }
@@ -940,18 +940,22 @@ void writeJavascriptSearchIndex()
           t << "<div class=\"SRStatus\" id=\"Loading\">" << theTranslator->trLoading() << "</div>" << endl;
           t << "<div id=\"SRResults\"></div>" << endl; // here the results will be inserted
           t << "<script type=\"text/javascript\"><!--" << endl;
+					t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n";
           t << "createResults();" << endl; // this function will insert the results
+					t << "/* @license-end */\n";
           t << "--></script>" << endl;
-          t << "<div class=\"SRStatus\" id=\"Searching\">" 
+          t << "<div class=\"SRStatus\" id=\"Searching\">"
             << theTranslator->trSearching() << "</div>" << endl;
           t << "<div class=\"SRStatus\" id=\"NoMatches\">"
             << theTranslator->trNoMatches() << "</div>" << endl;
 
           t << "<script type=\"text/javascript\"><!--" << endl;
+					t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n";
           t << "document.getElementById(\"Loading\").style.display=\"none\";" << endl;
           t << "document.getElementById(\"NoMatches\").style.display=\"none\";" << endl;
           t << "var searchResults = new SearchResults(\"searchResults\");" << endl;
           t << "searchResults.Search();" << endl;
+					t << "/* @license-end */\n";
           t << "--></script>" << endl;
           t << "</div>" << endl; // SRIndex
           t << "</body>" << endl;
@@ -1074,13 +1078,13 @@ void writeJavascriptSearchIndex()
               bool found=FALSE;
               overloadedFunction = ((prevScope!=0 && scope==prevScope) ||
                   (scope && scope==nextScope)
-                  ) && md && 
+                  ) && md &&
                 (md->isFunction() || md->isSlot());
               QCString prefix;
               if (md) prefix=convertToXML(md->localName());
               if (overloadedFunction) // overloaded member function
               {
-                prefix+=convertToXML(md->argsString()); 
+                prefix+=convertToXML(md->argsString());
                 // show argument list to disambiguate overloaded functions
               }
               else if (md) // unique member function
@@ -1112,11 +1116,11 @@ void writeJavascriptSearchIndex()
                   }
                 }
               }
-              else if (md && (md->getClassDef() || md->getNamespaceDef())) 
+              else if (md && (md->getClassDef() || md->getNamespaceDef()))
                 // member in class or namespace scope
               {
                 SrcLangExt lang = md->getLanguage();
-                name = convertToXML(d->getOuterScope()->qualifiedName()) 
+                name = convertToXML(d->getOuterScope()->qualifiedName())
                   + getLanguageSpecificSeparator(lang) + prefix;
                 found = TRUE;
               }
@@ -1321,5 +1325,3 @@ void finializeSearchIndexer()
 {
   delete Doxygen::searchIndex;
 }
-
-
diff --git a/src/translator_cn.h b/src/translator_cn.h
index 832d2c7..d37da94 100644
--- a/src/translator_cn.h
+++ b/src/translator_cn.h
@@ -843,7 +843,7 @@ class TranslatorChinese : public Translator
 
     virtual QCString trReferencedBy()
     {
-      return "参考自";
+      return "被这些函数引用";
     }
 
     virtual QCString trRemarks()
@@ -1204,7 +1204,7 @@ class TranslatorChinese : public Translator
      */
     virtual QCString trReferences()
     {
-      return "参考";
+      return "引用了";
     }
 
 //////////////////////////////////////////////////////////////////////////
diff --git a/src/util.cpp b/src/util.cpp
index e44f825..0cda153 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -2161,10 +2161,16 @@ void linkifyText(const TextGeneratorIntf &out,Definition *scope,
         if (md!=self && (self==0 || md->name()!=self->name())) 
           // name check is needed for overloaded members, where getDefs just returns one
         {
-          out.writeLink(md->getReference(),md->getOutputFileBase(),
-              md->anchor(),word);
-          //printf("found symbol %s\n",matchWord.data());
-          found=TRUE;
+          /* in case of Fortran scop and the variable is a non Fortran variable: don't link,
+           * see also getLink in fortrancode.l
+           */
+          if (!(scope && (scope->getLanguage() == SrcLangExt_Fortran) && md->isVariable() && (md->getLanguage() != SrcLangExt_Fortran)))
+          {
+            out.writeLink(md->getReference(),md->getOutputFileBase(),
+                md->anchor(),word);
+            //printf("found symbol %s\n",matchWord.data());
+            found=TRUE;
+          }
         }
       }
     }
diff --git a/src/vhdldocgen.cpp b/src/vhdldocgen.cpp
index d09de09..7883327 100644
--- a/src/vhdldocgen.cpp
+++ b/src/vhdldocgen.cpp
@@ -3995,10 +3995,10 @@ void FlowChart::createSVG()
   //if (m)
   //  fprintf(stderr,"\n creating  flowchart  : %s  %s in file %s \n",VhdlDocGen::trTypeString(m->getMemberSpecifiers()),m->name().data(),m->getFileDef()->name().data());
 
-  QCString dir=" -o "+ov+qcs;
+  QCString dir=" -o \""+ov+qcs+"\"";
   ov+="/flow_design.dot";
 
-  QCString vlargs="-Tsvg "+ov+dir ;
+  QCString vlargs="-Tsvg \""+ov+"\" "+dir ;
 
   if (portable_system("dot",vlargs)!=0)
   {