naruse	2018-12-25 14:57:55 +0900 (Tue, 25 Dec 2018)

  New Revision: 66542

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66542

  Log:
    merge revision(s) 66536:
    
    Import REXML 3.1.9
    
    It restores removed REXML::Parsers::BaseParser::UNQME_STR.
    Because it's used by kramdown.

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/NEWS
    branches/ruby_2_6/lib/rexml/parsers/baseparser.rb
    branches/ruby_2_6/lib/rexml/rexml.gemspec
    branches/ruby_2_6/lib/rexml/rexml.rb
Index: ruby_2_6/lib/rexml/rexml.gemspec
===================================================================
--- ruby_2_6/lib/rexml/rexml.gemspec	(revision 66541)
+++ ruby_2_6/lib/rexml/rexml.gemspec	(revision 66542)
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec| https://github.com/ruby/ruby/blob/trunk/ruby_2_6/lib/rexml/rexml.gemspec#L21
     ".travis.yml",
     "Gemfile",
     "LICENSE.txt",
+    "NEWS.md",
     "README.md",
     "Rakefile",
     "lib/rexml/attlistdecl.rb",
Index: ruby_2_6/lib/rexml/rexml.rb
===================================================================
--- ruby_2_6/lib/rexml/rexml.rb	(revision 66541)
+++ ruby_2_6/lib/rexml/rexml.rb	(revision 66542)
@@ -24,7 +24,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/lib/rexml/rexml.rb#L24
 module REXML
   COPYRIGHT = "Copyright 息 2001-2008 Sean Russell <ser@g...>"
   DATE = "2008/019"
-  VERSION = "3.1.8"
+  VERSION = "3.1.9"
   REVISION = ""
 
   Copyright = COPYRIGHT
Index: ruby_2_6/lib/rexml/parsers/baseparser.rb
===================================================================
--- ruby_2_6/lib/rexml/parsers/baseparser.rb	(revision 66541)
+++ ruby_2_6/lib/rexml/parsers/baseparser.rb	(revision 66542)
@@ -37,6 +37,10 @@ module REXML https://github.com/ruby/ruby/blob/trunk/ruby_2_6/lib/rexml/parsers/baseparser.rb#L37
       QNAME_STR= "(?:(#{NCNAME_STR}):)?(#{NCNAME_STR})"
       QNAME = /(#{QNAME_STR})/
 
+      # Just for backward compatibility. For example, kramdown uses this.
+      # It's not used in REXML.
+      UNAME_STR= "(?:#{NCNAME_STR}:)?#{NCNAME_STR}"
+
       NAMECHAR = '[\-\w\.:]'
       NAME = "([\\w:]#{NAMECHAR}*)"
       NMTOKEN = "(?:#{NAMECHAR})+"
Index: ruby_2_6/NEWS
===================================================================
--- ruby_2_6/NEWS	(revision 66541)
+++ ruby_2_6/NEWS	(revision 66542)
@@ -480,7 +480,7 @@ sufficient information, see the ChangeLo https://github.com/ruby/ruby/blob/trunk/ruby_2_6/NEWS#L480
 
 [REXML]
 
-  * Upgrade to REXML 3.1.8.
+  * Upgrade to REXML 3.1.9.
     See https://github.com/ruby/rexml/blob/master/NEWS.md.
 
   [Improved some XPath implementations]
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 66541)
+++ ruby_2_6	(revision 66542)

Property changes on: ruby_2_6
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r66536

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