mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
61fec2d310
Fixed a double-encoding bug. This was a regression, related
to ticket:48.
r1292@bean: ser | 2007-07-25 08:19:36 -0400
r1279@bean: ser | 2007-06-09 23:19:02 -0400
Fixes ticket:89 -- encoding CP-1252 was broken. ISO-8859-15 had the same
problem.
Also in this patch is a fix to merge.rb (unused, but it should at least
contain no errors), and a unit test for ticket:88.
r1293@bean: ser | 2007-07-25 08:19:37 -0400
r1281@bean: ser | 2007-07-24 11:08:48 -0400
Addresses ticket:85
This is a major rewrite of the XML formatting code. The XML writers have all
been extracted out of the classes and put into their own class containers.
This makes writing parsers easier, and cleaner.
There are three formatters, which correspond to the previous three XML writing
modes:
REXML::Formatters::Default
Prints the XML document exactly as it was parsed
REXML::Formatters::Pretty
Pretty prints the XML document, destroying whitespace in the document
REXML::Formatters::Transitive
Pretty prints the XML document, preserving whitespace
All of the write() functions have been deprecated (some are still used, but
these will also go away) except the write() function on Document, which is left
for convenience. To pretty print an XML document the canonical way:
formatter = REXML::Formatters::Pretty.new( 5 ) # indent by 5 spaces
formatter.write( document, output )
r1296@bean: ser | 2007-07-25 08:19:40 -0400
r1287@bean: ser | 2007-07-24 20:12:25 -0400
Applied patch from Jeff Barczewski. Note that this changes what the values of
the name and IDs are from the previous behavior -- the values no longer include
the quotes. This is the correct behavior, so I'm leaving it in, but it is not
backwards compatible. Also fixes the serializer so that it outputs the doctype
in a correct format (needed as a result of this change).
r1297@bean: ser | 2007-07-25 08:38:38 -0400
Version update
r1298@bean: ser | 2007-07-25 08:40:30 -0400
r1291@bean (orig r12517): ryan | 2007-06-11 20:38:57 -0400
Fixed typo in code. Fixes bug #10420
r1304@bean: ser | 2007-07-27 22:34:18 -0400
Whitespace changes only
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@12852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
80 lines
2 KiB
Ruby
80 lines
2 KiB
Ruby
require "rexml/child"
|
|
|
|
module REXML
|
|
##
|
|
# Represents an XML comment; that is, text between \<!-- ... -->
|
|
class Comment < Child
|
|
include Comparable
|
|
START = "<!--"
|
|
STOP = "-->"
|
|
|
|
# The content text
|
|
|
|
attr_accessor :string
|
|
|
|
##
|
|
# Constructor. The first argument can be one of three types:
|
|
# @param first If String, the contents of this comment are set to the
|
|
# argument. If Comment, the argument is duplicated. If
|
|
# Source, the argument is scanned for a comment.
|
|
# @param second If the first argument is a Source, this argument
|
|
# should be nil, not supplied, or a Parent to be set as the parent
|
|
# of this object
|
|
def initialize( first, second = nil )
|
|
#puts "IN COMMENT CONSTRUCTOR; SECOND IS #{second.type}"
|
|
super(second)
|
|
if first.kind_of? String
|
|
@string = first
|
|
elsif first.kind_of? Comment
|
|
@string = first.string
|
|
end
|
|
end
|
|
|
|
def clone
|
|
Comment.new self
|
|
end
|
|
|
|
# == DEPRECATED
|
|
# See REXML::Formatters
|
|
#
|
|
# output::
|
|
# Where to write the string
|
|
# indent::
|
|
# An integer. If -1, no indenting will be used; otherwise, the
|
|
# indentation will be this number of spaces, and children will be
|
|
# indented an additional amount.
|
|
# transitive::
|
|
# Ignored by this class. The contents of comments are never modified.
|
|
# ie_hack::
|
|
# Needed for conformity to the child API, but not used by this class.
|
|
def write( output, indent=-1, transitive=false, ie_hack=false )
|
|
Kernel.warn("Comment.write is deprecated. See REXML::Formatters")
|
|
indent( output, indent )
|
|
output << START
|
|
output << @string
|
|
output << STOP
|
|
end
|
|
|
|
alias :to_s :string
|
|
|
|
##
|
|
# Compares this Comment to another; the contents of the comment are used
|
|
# in the comparison.
|
|
def <=>(other)
|
|
other.to_s <=> @string
|
|
end
|
|
|
|
##
|
|
# Compares this Comment to another; the contents of the comment are used
|
|
# in the comparison.
|
|
def ==( other )
|
|
other.kind_of? Comment and
|
|
(other <=> self) == 0
|
|
end
|
|
|
|
def node_type
|
|
:comment
|
|
end
|
|
end
|
|
end
|
|
#vim:ts=2 sw=2 noexpandtab:
|