summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-11-29 15:27:07 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-11-29 15:27:07 (GMT)
commit9d1c6f6f309cf35c1b413ee3767913f30cf1b84e (patch)
tree43fcbdc86c011a786bd59a035f8aba53ffdf539e
parent200b828ead9f6bb5b2f6f99919837d5828a250e4 (diff)
parent0cb39b4cf9f1e89720cb19f58158b90ecf0b75ef (diff)
downloadDoxygen-9d1c6f6f309cf35c1b413ee3767913f30cf1b84e.zip
Doxygen-9d1c6f6f309cf35c1b413ee3767913f30cf1b84e.tar.gz
Doxygen-9d1c6f6f309cf35c1b413ee3767913f30cf1b84e.tar.bz2
Merge pull request #249 from albert-github/feature/bug_latex_single_quotes
LaTeX problem with 2 consecutive single quotes
-rw-r--r--src/htmlentity.cpp2
-rw-r--r--src/util.cpp2
2 files changed, 3 insertions, 1 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/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!=' ')