From b352cf7a80e0841017ca198f27f9da49d7256739 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 26 Nov 2018 17:32:51 -0500 Subject: [PATCH] Fix translation of special characters in psql's LaTeX output modes. latex_escaped_print() mistranslated \ and failed to provide any translation for # ^ and ~, all of which would typically lead to LaTeX document syntax errors. In addition it didn't translate < > and |, which would typically render as unexpected characters. To some extent this represents shortcomings in ancient versions of LaTeX, which if memory serves had no easy way to render these control characters as ASCII text. But that's been fixed for, um, decades. In any case there is no value in emitting guaranteed-to-fail output for these characters. Noted while fooling with test cases added by commit 9a98984f4. Back-patch the code change to all supported versions. --- src/fe_utils/print.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c index cb9a9a0613..22f67710d2 100644 --- a/src/fe_utils/print.c +++ b/src/fe_utils/print.c @@ -2187,14 +2187,34 @@ latex_escaped_print(const char *in, FILE *fout) for (p = in; *p; p++) switch (*p) { - case '&': - fputs("\\&", fout); + /* + * We convert ASCII characters per the recommendations in + * Scott Pakin's "The Comprehensive LATEX Symbol List", + * available from CTAN. For non-ASCII, you're on your own. + */ + case '#': + fputs("\\#", fout); + break; + case '$': + fputs("\\$", fout); break; case '%': fputs("\\%", fout); break; - case '$': - fputs("\\$", fout); + case '&': + fputs("\\&", fout); + break; + case '<': + fputs("\\textless{}", fout); + break; + case '>': + fputs("\\textgreater{}", fout); + break; + case '\\': + fputs("\\textbackslash{}", fout); + break; + case '^': + fputs("\\^{}", fout); break; case '_': fputs("\\_", fout); @@ -2202,13 +2222,17 @@ latex_escaped_print(const char *in, FILE *fout) case '{': fputs("\\{", fout); break; + case '|': + fputs("\\textbar{}", fout); + break; case '}': fputs("\\}", fout); break; - case '\\': - fputs("\\backslash", fout); + case '~': + fputs("\\~{}", fout); break; case '\n': + /* This is not right, but doing it right seems too hard */ fputs("\\\\", fout); break; default: