Mercurial > hg > octave-lyh > gnulib-hg
changeset 16246:6c6649e7d5ea
quotearg: do not use grave accent for left quote
* lib/quotearg.c (gettext_quote): Map "`" to "'" for locale_quoting_style.
(quotearg_buffer_restyled): Fix example.
* tests/test-quotearg-simple.c (results_g): Adjust test vectors.
author | Paolo Bonzini <bonzini@gnu.org> |
---|---|
date | Sun, 18 Dec 2011 15:44:17 +0100 |
parents | 530509562116 |
children | b8b6b841b8bd |
files | NEWS lib/quotearg.c tests/test-quotearg-simple.c |
diffstat | 3 files changed, 17 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS +++ b/NEWS @@ -1,6 +1,15 @@ Important notes --------------- +Date Modules Changes + +2011-12-20 quotearg In the C locale, the function will no longer use + the grave accent character to begin a quoted + string (`like this'). It will use apostrophes + 'like these' or, in Unicode locales, single quotes + ‘like these’. You may want to adjust any error + messages that hard code the quoting characters. + 2010-09-04 gnulib-tool The option '--import' is no longer cumulative; it now expects the complete list of modules and other options on the command line. If you want to
--- a/lib/quotearg.c +++ b/lib/quotearg.c @@ -221,10 +221,7 @@ if (STRCASEEQ (locale_code, "GB18030", 'G','B','1','8','0','3','0',0,0)) return msgid[0] == '`' ? "\xa1\ae": "\xa1\xaf"; - if (s == clocale_quoting_style) - return "\""; - - return translation; + return (s == clocale_quoting_style ? "\"" : "'"); } /* Place into buffer BUFFER (of size BUFFERSIZE) a quoted version of @@ -303,7 +300,7 @@ use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and Unicode U+2019 (RIGHT SINGLE QUOTATION MARK). If the current locale is not Unicode, locale_quoting_style - will quote `like this', and clocale_quoting_style will + will quote 'like this', and clocale_quoting_style will quote "like this". You should always include translations for "`" and "'" even if U+2018 and U+2019 are appropriate for your locale.
--- a/tests/test-quotearg-simple.c +++ b/tests/test-quotearg-simple.c @@ -85,12 +85,12 @@ "a\\\\b", LQ_ENC RQ_ENC, LQ RQ } }, /* locale_quoting_style */ - { { "`'", "`\\0001\\0'", 9, "`simple'", "` \\t\\n\\'\"\\033?""?/\\\\'", - "`a:b'", "`a\\\\b'", "`" LQ_ENC RQ_ENC "'", "`" LQ RQ "'" }, - { "`'", "`\\0001\\0'", 9, "`simple'", "` \\t\\n\\'\"\\033?""?/\\\\'", - "`a:b'", "`a\\\\b'", "`" LQ_ENC RQ_ENC "'", "`" LQ RQ "'" }, - { "`'", "`\\0001\\0'", 9, "`simple'", "` \\t\\n\\'\"\\033?""?/\\\\'", - "`a\\:b'", "`a\\\\b'", "`" LQ_ENC RQ_ENC "'", "`" LQ RQ "'" } }, + { { "''", "'\\0001\\0'", 9, "'simple'", "' \\t\\n\\'\"\\033?""?/\\\\'", + "'a:b'", "'a\\\\b'", "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, + { "''", "'\\0001\\0'", 9, "'simple'", "' \\t\\n\\'\"\\033?""?/\\\\'", + "'a:b'", "'a\\\\b'", "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" }, + { "''", "'\\0001\\0'", 9, "'simple'", "' \\t\\n\\'\"\\033?""?/\\\\'", + "'a\\:b'", "'a\\\\b'", "'" LQ_ENC RQ_ENC "'", "'" LQ RQ "'" } }, /* clocale_quoting_style */ { { "\"\"", "\"\\0001\\0\"", 9, "\"simple\"",