Mercurial > public > mercurial-scm > hg
diff mercurial/encoding.py @ 12866:eddc20306ab6 stable
encoding: default ambiguous character to narrow
The current implementation of colwidth was treating 'A'mbiguous
characters as wide, which was incorrect in a non-East Asian context.
As per http://unicode.org/reports/tr11/#Recommendations, we should
instead default to 'narrow' if we don't know better. As character
width is dependent on the particular font used and we have no idea
what fonts are in use, this recommendation applies.
This introduces HGENCODINGAMBIGUOUS to get the old behavior back.
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 27 Oct 2010 15:35:21 -0500 |
| parents | 614f0d8724ab |
| children | 7cc4263e07a9 |
line wrap: on
line diff
--- a/mercurial/encoding.py Tue Oct 26 12:18:39 2010 +0200 +++ b/mercurial/encoding.py Wed Oct 27 15:35:21 2010 -0500 @@ -87,11 +87,17 @@ except LookupError, k: raise error.Abort("%s, please check your locale settings" % k) +# How to treat ambiguous-width characters. Set to 'wide' to treat as wide. +ambiguous = os.environ.get("HGENCODINGAMBIGUOUS", "narrow") + def colwidth(s): "Find the column width of a UTF-8 string for display" d = s.decode(encoding, 'replace') if hasattr(unicodedata, 'east_asian_width'): + wide = "WF" + if ambiguous == "wide": + wide = "WFA" w = unicodedata.east_asian_width - return sum([w(c) in 'WFA' and 2 or 1 for c in d]) + return sum([w(c) in wide and 2 or 1 for c in d]) return len(d)