From b84ebdcb0597511207c4768e97ce313e0b9d4dbf Mon Sep 17 00:00:00 2001
From: ser <ser@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 16 Feb 2004 21:42:10 +0000
Subject: Fixed Issue7: DocType with external IDs was not being quoted.
 SHIFT_JIS now merely includes Shift-JIS

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rexml/doctype.rb             |  2 +-
 lib/rexml/encodings/SHIFT_JIS.rb | 34 +---------------------------------
 lib/rexml/rexml.rb               |  4 ++--
 3 files changed, 4 insertions(+), 36 deletions(-)

(limited to 'lib/rexml')

diff --git a/lib/rexml/doctype.rb b/lib/rexml/doctype.rb
index 506952312a..d69de214b1 100644
--- a/lib/rexml/doctype.rb
+++ b/lib/rexml/doctype.rb
@@ -189,7 +189,7 @@ module REXML
 		end
 
 		def to_s
-			"<!NOTATION #@name #@middle #@rest>"
+			"<!NOTATION #@name '#@middle #@rest'>"
 		end
 
 		def write( output, indent=-1 )
diff --git a/lib/rexml/encodings/SHIFT_JIS.rb b/lib/rexml/encodings/SHIFT_JIS.rb
index 27e4569403..6e8f759373 100644
--- a/lib/rexml/encodings/SHIFT_JIS.rb
+++ b/lib/rexml/encodings/SHIFT_JIS.rb
@@ -1,33 +1 @@
-begin
-	require 'uconv'
-
-	module REXML
-		module Encoding
-			def to_shift_jis content
-				Uconv::u8tosjis(content)
-			end
-
-			def from_shift_jis(str)
-				Uconv::sjistou8(str)
-			end
-		end
-	end
-rescue LoadError
-  begin
-	require 'iconv'
-	module REXML
-		module Encoding
-			def from_shift_jis(str)
-				return Iconv::iconv("utf-8", "shift_jis", str).join('')
-			end
-
-			def to_shift_jis content
-				return Iconv::iconv("shift_jis", "utf-8", content).join('')
-			end
-		end
-	end
-  rescue LoadError
-	raise "uconv or iconv is required for Japanese encoding support."
-  end
-
-end
+require 'rexml/encodings/Shift-JIS'
diff --git a/lib/rexml/rexml.rb b/lib/rexml/rexml.rb
index e955fa8fa5..5ff9075425 100644
--- a/lib/rexml/rexml.rb
+++ b/lib/rexml/rexml.rb
@@ -21,6 +21,6 @@
 # A tutorial is available in docs/tutorial.html
 module REXML
 	Copyright = "Copyright #{Time.now.year} Sean Russell <ser@germane-software.com>"
-	Date = "+2004/044"
-	Version = "2.7.4"
+	Date = "+2004/047"
+	Version = "2.7.4.1"
 end
-- 
cgit v1.2.3