From 020e681eece7359f1cfcda9871b600084507dbb1 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 7 Sep 2008 03:13:29 +0000 Subject: * include/ruby/encoding.h (ECONV_XML_ATTR_CONTENT_ENCODER): defined. (ECONV_STATEFUL_ENCODER_MASK): defined. (ECONV_XML_ATTR_QUOTE_ENCODER): defined. (ECONV_XML_ATTR_ENCODER): removed. * enc/trans/escape.trans (rb_escape_xml_attr_content): defined. (rb_escape_xml_attr_quote): defined. (rb_escape_xml_attr): removed. * io.c (NEED_WRITECONV): writeconv is required if supplemental converter is used. (make_writeconv): apply stateful encoder in writeconv. * transcode.c: follow the constant change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/encoding.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/ruby/encoding.h') diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index d78ef11dc1..eac7326a6d 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -269,7 +269,10 @@ void rb_econv_binmode(rb_econv_t *ec); #define ECONV_CRLF_NEWLINE_ENCODER 0x00001000 #define ECONV_CR_NEWLINE_ENCODER 0x00002000 #define ECONV_XML_TEXT_ENCODER 0x00004000 -#define ECONV_XML_ATTR_ENCODER 0x00008000 +#define ECONV_XML_ATTR_CONTENT_ENCODER 0x00008000 + +#define ECONV_STATEFUL_ENCODER_MASK 0x00f00000 +#define ECONV_XML_ATTR_QUOTE_ENCODER 0x00100000 /* end of flags for rb_econv_open */ -- cgit v1.2.3