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

3 files changed, 4 insertions, 2 deletions

diff --git a/src/htmlentity.cpp b/src/htmlentity.cpp
index a4d5914..9327526 100644
--- a/src/htmlentity.cpp
+++ b/src/htmlentity.cpp
@@ -298,7 +298,7 @@ static struct htmlEntityInfo
 
   // doxygen extension to the HTML4 table of HTML entities
   { SYM(tm),       "\xe2\x84\xa2", "&trade;",    "<trademark/>",         "&#8482;",       "\\texttrademark{}",      "(TM)",   "\\'99",       { "trademark",  DocSymbol::Perl_symbol  }},
-  { SYM(apos),     "'",            "'",          "'",                    "&apos;",        "'",                      "'",      "'",           { "\\\'",       DocSymbol::Perl_string  }},
+  { SYM(apos),     "'",            "'",          "'",                    "&apos;",        "\\textquotesingle{}",    "'",      "'",           { "\\\'",       DocSymbol::Perl_string  }},
 
   // doxygen commands represented as HTML entities
   { SYM(BSlash),   "\\",           "\\",         "\\",                   "\\",            "\\textbackslash{}",      "\\\\",   "\\\\",        { "\\\\",       DocSymbol::Perl_string  }},
diff --git a/src/latexgen.cpp b/src/latexgen.cpp
index 874b485..e2c2a11 100644
--- a/src/latexgen.cpp
+++ b/src/latexgen.cpp
@@ -1065,7 +1065,7 @@ void LatexGenerator::endIndexItem(const char *ref,const char *fn)
 {
   if (!ref && fn)
   {
-    t << "}{\\pageref{" << fn << "}}{}" << endl;
+    t << "}{\\pageref{" << stripPath(fn) << "}}{}" << endl;
   }
 }
 
diff --git a/src/util.cpp b/src/util.cpp
index 64e63c8..8f7765a 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -6502,6 +6502,8 @@ void filterLatexString(FTextStream &t,const char *str,
                    break;           
         case '"':  t << "\\char`\\\"{}";
                    break;
+        case '\'': t << "\\textquotesingle{}";
+                   break;
 
         default:   
                    //if (!insideTabbing && forceBreaks && c!=' ' && *p!=' ')