Commit 963d7c52 authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

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

parents a9dcbfe2 a3771cf0

configure

+8 −3
Original line number Diff line number Diff line
@@ -554,8 +554,13 @@ fi 


if test "$f_libclang" = YES; then

  printf "  Checking for libclang ... "

  if llvm-config --version > /dev/null 2>&1; then

    libclang_hdr_dir=$(llvm-config --includedir)

    libclang_lib_dir=$(llvm-config --libdir)

  else

    libclang_hdr_dir="/usr/include /usr/local/include /opt/local/include"

    libclang_lib_dir="/usr/lib /usr/local/lib /opt/local/lib /usr/lib64/llvm /usr/lib/llvm"

  fi

  if test "$f_libclangstatic" = NO; then

    libclang_lib_name="libclang.so libclang.dylib libclang.a libclang.dll.a"

  else
@@ -952,7 +957,7 @@ EOF 
     #if test "$f_thread" = YES; then

     #  realopts="$realopts thread"

     #fi

     cat $SRC .tmakeconfig | sed -e "s/\$extraopts/$realopts/g" -e "s;%%SQLITE3_INC%%;$sqlite3_hdr_dir;g" -e "s;%%SQLITE3_LIBS%%;$sqlite3_link;g" -e "s;%%LIBCLANG_LIBS%%;$libclang_link;g" >> $DST

     cat $SRC .tmakeconfig | sed -e "s/\$extraopts/$realopts/g" -e "s;%%SQLITE3_INC%%;$sqlite3_hdr_dir;g" -e "s;%%SQLITE3_LIBS%%;$sqlite3_link;g" -e "s;%%LIBCLANG_INC%%;$libclang_hdr_dir;g" -e "s;%%LIBCLANG_LIBS%%;$libclang_link;g" >> $DST

     echo "  Created $DST from $SRC..."

done

src/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -3304,7 +3304,7 @@ to be found in the default search path. 
]]>

      </docs>

    </option>

    <option type='string' id='PLANTUML_JAR_PATH' format='dir' defval='' depends='HAVE_DOT'>

    <option type='string' id='PLANTUML_JAR_PATH' format='dir' defval=''>

      <docs>

<![CDATA[

 When using plantuml, the \c PLANTUML_JAR_PATH tag should be used to specify the path where
@@ -3314,7 +3314,7 @@ to be found in the default search path. 
]]>

      </docs>

    </option>

    <option type='list' id='PLANTUML_INCLUDE_PATH' format='dir' defval='' depends='HAVE_DOT'>

    <option type='list' id='PLANTUML_INCLUDE_PATH' format='dir' defval=''>

      <docs>

<![CDATA[

 When using plantuml, the specified paths are searched for files specified by the \c !include

src/filedef.cpp

+9 −0
Original line number Diff line number Diff line
@@ -327,6 +327,13 @@ void FileDef::writeDetailedDescription(OutputList &ol,const QCString &title) 
    //printf("Writing source ref for file %s\n",name().data());

    if (Config_getBool("SOURCE_BROWSER")) 

    {

      //if Latex enabled and LATEX_SOURCE_CODE isn't -> skip, bug_738548

      ol.pushGeneratorState();

      if (ol.isEnabled(OutputGenerator::Latex) && !Config_getBool("LATEX_SOURCE_CODE"))

      { 

        ol.disable(OutputGenerator::Latex);

      }



      ol.startParagraph();

      QCString refText = theTranslator->trDefinedInSourceFile();

      int fileMarkerPos = refText.find("@0");
@@ -339,6 +346,8 @@ void FileDef::writeDetailedDescription(OutputList &ol,const QCString &title) 
              refText.length()-fileMarkerPos-2)); // text right from marker 2

      }

      ol.endParagraph();

      //Restore settings, bug_738548

      ol.popGeneratorState();

    }

    ol.endTextBlock();

  }

src/fortrancode.l

+11 −0
Original line number Diff line number Diff line
@@ -1136,6 +1136,17 @@ PREFIX (RECURSIVE{BS_}|IMPURE{BS_}|PURE{BS_}|ELEMENTAL{BS_}){0,3}(RECURSIVE|I 
<*>{LOG_OPER}                           { // Fortran logical comparison keywords

                                          g_code->codify(yytext);

                                        }

<*><<EOF>>                              {

                                          if (YY_START == DocBlock) {

                                            if (!Config_getBool("STRIP_CODE_COMMENTS"))

                                            {

                                              startFontClass("comment");

                                              codifyLines(docBlock);

                                              endFontClass();

                                            }

                                          }

                                          yyterminate();

                                        }

%%



/*@ ----------------------------------------------------------------------------

src/htmlentity.cpp

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ static struct htmlEntityInfo 
  { SYM(upsih),    "\xcf\x92",     "&upsih;",    "<upsih/>",             "&#978;",        "{$\\Upsilon$}",          NULL,     "\\u978?",     { NULL,         DocSymbol::Perl_unknown }},

  { SYM(piv),      "\xcf\x96",     "&piv;",      "<piv/>",               "&#982;",        "{$\\varpi$}",            NULL,     "\\u982?",     { NULL,         DocSymbol::Perl_unknown }},

  { SYM(bull),     "\xe2\x80\xa2", "&bull;",     "<bull/>",              "&#8226;",       "\\textbullet{}",         NULL,     "\\'95",       { NULL,         DocSymbol::Perl_unknown }},

  { SYM(hellip),   "\xe2\x80\xa6", "&hellip;",   "<hellip/>",            "&#8230;",       "{$\\cdots$}",            NULL,     "\\'85",       { NULL,         DocSymbol::Perl_unknown }},

  { SYM(hellip),   "\xe2\x80\xa6", "&hellip;",   "<hellip/>",            "&#8230;",       "{$\\dots$}",             NULL,     "\\'85",       { NULL,         DocSymbol::Perl_unknown }},

  { SYM(prime),    "\xe2\x80\xb2", "&prime;",    "<prime/>",             "&#8242;",       "'",                      NULL,     "\\u8242?",    { "\\\'",       DocSymbol::Perl_string  }},

  { SYM(Prime),    "\xe2\x80\xb3", "&Prime;",    "<Prime/>",             "&#8243;",       "''",                     NULL,     "\\u8243?",    { "\"",         DocSymbol::Perl_char    }},

  { SYM(oline),    "\xe2\x80\xbe", "&oline;",    "<oline/>",             "&#8254;",       "{$\\overline{\\,}$}",    NULL,     "\\u8254?",    { NULL,         DocSymbol::Perl_unknown }},