akr	2008-09-06 20:11:21 +0900 (Sat, 06 Sep 2008)

  New Revision: 19188

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19188

  Log:
    * transcode.c (econv_description): show ECONV_HTML_TEXT_ENCODER and
      ECONV_HTML_ATTR_ENCODER.

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19187)
+++ ChangeLog	(revision 19188)
@@ -1,3 +1,8 @@
+Sat Sep  6 20:10:48 2008  Tanaka Akira  <akr@f...>
+
+	* transcode.c (econv_description): show ECONV_HTML_TEXT_ENCODER and
+	  ECONV_HTML_ATTR_ENCODER.
+
 Sat Sep  6 20:06:09 2008  Tanaka Akira  <akr@f...>
 
 	* transcode.c (rb_econv_binmode): check actual transcoders.
Index: transcode.c
===================================================================
--- transcode.c	(revision 19187)
+++ transcode.c	(revision 19188)
@@ -1790,13 +1790,15 @@
 
     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 @@
             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) {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/