diff options
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | src/config.xml | 4 | ||||
| -rw-r--r-- | src/filedef.cpp | 9 | ||||
| -rw-r--r-- | src/fortrancode.l | 11 | ||||
| -rw-r--r-- | src/htmlentity.cpp | 2 | ||||
| -rw-r--r-- | src/latexgen.cpp | 1 | ||||
| -rw-r--r-- | src/libdoxygen.pro.in | 1 |
7 files changed, 32 insertions, 7 deletions
@@ -554,8 +554,13 @@ fi if test "$f_libclang" = YES; then printf " Checking for libclang ... " - 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" + 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 diff --git a/src/config.xml b/src/config.xml index 1e97b47..d46b8ef 100644 --- a/src/config.xml +++ b/src/config.xml @@ -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 diff --git a/src/filedef.cpp b/src/filedef.cpp index 9c18e20..3ff69a4 100644 --- a/src/filedef.cpp +++ b/src/filedef.cpp @@ -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(); } diff --git a/src/fortrancode.l b/src/fortrancode.l index ac6a73b..101137a 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -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(); + } %% /*@ ---------------------------------------------------------------------------- diff --git a/src/htmlentity.cpp b/src/htmlentity.cpp index 216b65c..a4d5914 100644 --- a/src/htmlentity.cpp +++ b/src/htmlentity.cpp @@ -193,7 +193,7 @@ static struct htmlEntityInfo { SYM(upsih), "\xcf\x92", "ϒ", "<upsih/>", "ϒ", "{$\\Upsilon$}", NULL, "\\u978?", { NULL, DocSymbol::Perl_unknown }}, { SYM(piv), "\xcf\x96", "ϖ", "<piv/>", "ϖ", "{$\\varpi$}", NULL, "\\u982?", { NULL, DocSymbol::Perl_unknown }}, { SYM(bull), "\xe2\x80\xa2", "•", "<bull/>", "•", "\\textbullet{}", NULL, "\\'95", { NULL, DocSymbol::Perl_unknown }}, - { SYM(hellip), "\xe2\x80\xa6", "…", "<hellip/>", "…", "{$\\cdots$}", NULL, "\\'85", { NULL, DocSymbol::Perl_unknown }}, + { SYM(hellip), "\xe2\x80\xa6", "…", "<hellip/>", "…", "{$\\dots$}", NULL, "\\'85", { NULL, DocSymbol::Perl_unknown }}, { SYM(prime), "\xe2\x80\xb2", "′", "<prime/>", "′", "'", NULL, "\\u8242?", { "\\\'", DocSymbol::Perl_string }}, { SYM(Prime), "\xe2\x80\xb3", "″", "<Prime/>", "″", "''", NULL, "\\u8243?", { "\"", DocSymbol::Perl_char }}, { SYM(oline), "\xe2\x80\xbe", "‾", "<oline/>", "‾", "{$\\overline{\\,}$}", NULL, "\\u8254?", { NULL, DocSymbol::Perl_unknown }}, diff --git a/src/latexgen.cpp b/src/latexgen.cpp index 4ad577e..7cdfeaf 100644 --- a/src/latexgen.cpp +++ b/src/latexgen.cpp @@ -316,7 +316,6 @@ static void writeDefaultHeaderPart1(FTextStream &t) // Define default fonts t << "% Font selection\n" "\\usepackage[T1]{fontenc}\n" - "\\usepackage{mathptmx}\n" "\\usepackage[scaled=.90]{helvet}\n" "\\usepackage{courier}\n" "\\usepackage{amssymb}\n" diff --git a/src/libdoxygen.pro.in b/src/libdoxygen.pro.in index 703b885..c5943c6 100644 --- a/src/libdoxygen.pro.in +++ b/src/libdoxygen.pro.in @@ -230,6 +230,7 @@ win32-g++:TMAKE_CXXFLAGS += -fno-exceptions linux-g++:TMAKE_CXXFLAGS += -fno-exceptions INCLUDEPATH += ../generated_src/doxygen ../src ../qtools ../libmd5 ../vhdlparser INCLUDEPATH += %%SQLITE3_INC%% +INCLUDEPATH += %%LIBCLANG_INC%% DEPENDPATH += ../generated_src/doxygen win32:INCLUDEPATH += . DESTDIR = ../lib |