mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	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
This commit is contained in:
		
							parent
							
								
									7430c46af6
								
							
						
					
					
						commit
						b84ebdcb05
					
				
					 3 changed files with 4 additions and 36 deletions
				
			
		|  | @ -189,7 +189,7 @@ module REXML | |||
| 		end | ||||
| 
 | ||||
| 		def to_s | ||||
| 			"<!NOTATION #@name #@middle #@rest>" | ||||
| 			"<!NOTATION #@name '#@middle #@rest'>" | ||||
| 		end | ||||
| 
 | ||||
| 		def write( output, indent=-1 ) | ||||
|  |  | |||
|  | @ -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' | ||||
|  |  | |||
|  | @ -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 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 ser
						ser