summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Leroy <xavier.leroy@inria.fr>2017-10-09 16:44:16 +0200
committerXavier Leroy <xavier.leroy@inria.fr>2017-10-09 16:44:16 +0200
commit347b8363e10ca6f66114c5f9db498f187e45f02f (patch)
tree099014b726163c9356b17e0d02aad5c8363d775f
parent8eef73ea8d0a4994cb1c7210b83ba58e00d80144 (diff)
downloadocaml-347b8363e10ca6f66114c5f9db498f187e45f02f.tar.gz
MPR#7048: ocamldoc -latex, don't escape Latin-1 accented vowelsMPR7048
This causes trouble when the doc comments are actually in UTF8 and the user is providing their own preamble with an UTF8 inputenc. The default preamble still contains \usepackage[latin1]{inputenc}, so the Latin-1 accents will still display fine.
-rw-r--r--Changes3
-rw-r--r--ocamldoc/odoc_latex.ml13
2 files changed, 3 insertions, 13 deletions
diff --git a/Changes b/Changes
index 041d797f44..9e10536d89 100644
--- a/Changes
+++ b/Changes
@@ -349,6 +349,9 @@ Release branch for 4.06:
when no -title has been provided
(Pierre Boutillier)
+- MPR#7048: ocamldoc, in -latex mode, don't escape Latin-1 accented vowels
+ (Xavier Leroy, report by Hugo Herbelin)
+
- MPR#7575, GPR#1219: Switch default from -no-keep-locs to -keep-locs. This
provides better error messages by default.
(Daniel Bünzli)
diff --git a/ocamldoc/odoc_latex.ml b/ocamldoc/odoc_latex.ml
index 292d3d4ae8..0a0470abbd 100644
--- a/ocamldoc/odoc_latex.ml
+++ b/ocamldoc/odoc_latex.ml
@@ -109,19 +109,6 @@ class text =
"}", "\\\\}";
"\\$", "\\\\$";
"\\^", "{\\\\textasciicircum}";
- "\xE0", "\\\\`a";
- "\xE2", "\\\\^a";
- "\xE9", "\\\\'e";
- "\xE8", "\\\\`e";
- "\xEA", "\\\\^e";
- "\xEB", "\\\\\"e";
- "\xE7", "\\\\c{c}";
- "\xF4", "\\\\^o";
- "\xF6", "\\\\\"o";
- "\xEE", "\\\\^i";
- "\xEF", "\\\\\"i";
- "\xF9", "\\\\`u";
- "\xFB", "\\\\^u";
"%", "\\\\%";
"_", "\\\\_";
"~", "\\\\~{}";