diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-06 11:11:21 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-06 11:11:21 +0000 |
| commit | ca3148059b2d4f1caed0b382c4fe7441cd221da8 (patch) | |
| tree | c78ff81dff8018494db3e4bfe1676c898ac0e64a | |
| parent | e4b70ffe43463e8723b692f1bebbdf17750be677 (diff) | |
| download | ruby-ca3148059b2d4f1caed0b382c4fe7441cd221da8.tar.gz | |
* transcode.c (econv_description): show ECONV_HTML_TEXT_ENCODER and
ECONV_HTML_ATTR_ENCODER.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | transcode.c | 14 |
2 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Sep 6 20:10:48 2008 Tanaka Akira <akr@fsij.org> + + * transcode.c (econv_description): show ECONV_HTML_TEXT_ENCODER and + ECONV_HTML_ATTR_ENCODER. + Sat Sep 6 20:06:09 2008 Tanaka Akira <akr@fsij.org> * transcode.c (rb_econv_binmode): check actual transcoders. diff --git a/transcode.c b/transcode.c index 6af3a238b5..505811a3bf 100644 --- a/transcode.c +++ b/transcode.c @@ -1790,13 +1790,15 @@ econv_description(const char *sname, const char *dname, int ecflags, VALUE mesg) if (ecflags & (ECONV_UNIVERSAL_NEWLINE_DECODER| ECONV_CRLF_NEWLINE_ENCODER| - ECONV_CR_NEWLINE_ENCODER)) { + ECONV_CR_NEWLINE_ENCODER| + ECONV_HTML_TEXT_ENCODER| + ECONV_HTML_ATTR_ENCODER)) { const char *pre = ""; if (has_description) rb_str_cat2(mesg, " with "); if (ecflags & ECONV_UNIVERSAL_NEWLINE_DECODER) { rb_str_cat2(mesg, pre); pre = ","; - rb_str_cat2(mesg, "Universal-newline"); + rb_str_cat2(mesg, "universal-newline"); } if (ecflags & ECONV_CRLF_NEWLINE_ENCODER) { rb_str_cat2(mesg, pre); pre = ","; @@ -1806,6 +1808,14 @@ econv_description(const char *sname, const char *dname, int ecflags, VALUE mesg) rb_str_cat2(mesg, pre); pre = ","; rb_str_cat2(mesg, "CR-newline"); } + if (ecflags & ECONV_HTML_TEXT_ENCODER) { + rb_str_cat2(mesg, pre); pre = ","; + rb_str_cat2(mesg, "HTML-text"); + } + if (ecflags & ECONV_HTML_ATTR_ENCODER) { + rb_str_cat2(mesg, pre); pre = ","; + rb_str_cat2(mesg, "HTML-attr"); + } has_description = 1; } if (!has_description) { |