From 537a1c67f316c5a9d2d4542e94a4ace439a78b3a Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 5 Mar 2016 19:42:45 +0100 Subject: Bug 763104 - hyperref link label drop underscores underscores were not escaped in the content for "PDF summary/index in the left tab" --- src/util.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util.cpp b/src/util.cpp index 592d0b2..91f83ae 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -6737,6 +6737,7 @@ QCString latexEscapePDFString(const char *s) case '\\': t << "\\textbackslash{}"; break; case '{': t << "\\{"; break; case '}': t << "\\}"; break; + case '_': t << "\\_"; break; default: t << c; break; -- cgit v0.12 From c873fad0b4c2948551e53c082a3829243c4ccb9f Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 5 Mar 2016 19:53:51 +0100 Subject: Adding compilation options for flex/lex and bison/yacc The pull request #419 didn't work for the ninja build platform The pull request #442 did only work when cmake was called but not during compilation ("make") In this patch we set the LEX_FLAGS and YACC_FLAGS when specified on the command line with cmake to the specified value, in the other case these flags are for the Ninja build system they are omitted and for all other build systems they are set to $(LEX_FLAGS) and $(YACC_FLAGS) so they can be used during runtime as well. --- CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a020f41..4c55859 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,14 @@ if (WIN32) add_definitions(-DLIBICONV_STATIC -D_CRT_SECURE_NO_WARNINGS) endif() +if ("${CMAKE_GENERATOR}" MATCHES "Ninja") + set(LEX_FLAGS ) + set(YACC_FLAGS ) +else ("${CMAKE_GENERATOR}" MATCHES "Ninja") + set(LEX_FLAGS $(LEX_FLAGS)) + set(YACC_FLAGS $(YACC_FLAGS)) +endif ("${CMAKE_GENERATOR}" MATCHES "Ninja") + find_program(DOT NAMES dot) find_package(PythonInterp REQUIRED) find_package(FLEX REQUIRED) -- cgit v0.12 From d4ab02c2da7df472bebbf2724419ba00f2de229c Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 5 Mar 2016 20:35:16 +0100 Subject: Bug 762982 - regression, Unescaped percent sign in doxygen output Besides the fact that the % sign was not escaped also the & was missing and had to be escaped as well. --- src/util.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/util.cpp b/src/util.cpp index 91f83ae..ab45798 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -6738,6 +6738,8 @@ QCString latexEscapePDFString(const char *s) case '{': t << "\\{"; break; case '}': t << "\\}"; break; case '_': t << "\\_"; break; + case '%': t << "\\%"; break; + case '&': t << "\\&"; break; default: t << c; break; -- cgit v0.12