two changes to charset handling issues: check for charset in

mm_cfg.VERBATIM_ENCODING list and do not call html_quote if it is
found.  The list should contain charsets that use multibyte encodings
where 0x26 may not represented the & character.  Add option for
default charset (None == us-ascii).

Fix bug in format_article that added <pre> tags to the message body
*before* writing the text version.  The fix isn't very clean, but it
is functional and quick.  Generate the HTML body and store it as
html_body attribute.  Use this in preference to body attribute when
writing html output.

1 files changed, 16 insertions, 0 deletions

diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index b70bbe81e..036da76f3 100644
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -117,6 +117,22 @@ GZIP_ARCHIVE_TXT_FILES = 0
 # in the archives too.
 ARCHIVER_OBSCURES_EMAILADDRS = 0
 
+# Pipermail assumes that messages bodies contain US-ASCII text.
+# Change this option to define a different character set to be used as
+# the default character set for the archive.  The term "character set"
+# is used in MIME to refer to a method of converting a sequence of
+# octets into a sequence of characters.  If you change the default
+# charset, you might need to add it to VERBATIM_ENCODING below.
+DEFAULT_CHARSET = None
+
+# Most character set encodings require special HTML entity characters
+# to be quoted, otherwise they won't look right in the Pipermail
+# archives.  However some character sets must not quote these
+# characters so that they can be rendered properly in the browsers.
+# The primary issue is multi-byte encodings where the octet 0x26 does
+# not always represent the & character.  This variable contains a list
+# of such characters sets which are not HTML-quoted in the archives.
+VERBATIM_ENCODING = ['iso-2022-jp']
 
 
 #####