diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-25 05:57:55 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-25 05:57:55 +0000 |
| commit | fdfe34322eee9ebe101007218ad8f6ce7ea3bd75 (patch) | |
| tree | 60c133aa8e8d3a6e2a8b00fd307922b5d3c7b965 | |
| parent | 1abde2b5f67da3535c05351b0734e7e56ec0bc15 (diff) | |
merge revision(s) 66536:
Import REXML 3.1.9
It restores removed REXML::Parsers::BaseParser::UNQME_STR.
Because it's used by kramdown.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@66542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/rexml/parsers/baseparser.rb | 4 | ||||
| -rw-r--r-- | lib/rexml/rexml.gemspec | 1 | ||||
| -rw-r--r-- | lib/rexml/rexml.rb | 2 |
4 files changed, 7 insertions, 2 deletions
@@ -480,7 +480,7 @@ sufficient information, see the ChangeLog file or Redmine [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] diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb index de337a74d5..39e9ec3fb1 100644 --- a/lib/rexml/parsers/baseparser.rb +++ b/lib/rexml/parsers/baseparser.rb @@ -37,6 +37,10 @@ module REXML 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})+" diff --git a/lib/rexml/rexml.gemspec b/lib/rexml/rexml.gemspec index 8362ca3c3a..6fe7e635f1 100644 --- a/lib/rexml/rexml.gemspec +++ b/lib/rexml/rexml.gemspec @@ -21,6 +21,7 @@ Gem::Specification.new do |spec| ".travis.yml", "Gemfile", "LICENSE.txt", + "NEWS.md", "README.md", "Rakefile", "lib/rexml/attlistdecl.rb", diff --git a/lib/rexml/rexml.rb b/lib/rexml/rexml.rb index 654f54799f..7851c78bf5 100644 --- a/lib/rexml/rexml.rb +++ b/lib/rexml/rexml.rb @@ -24,7 +24,7 @@ module REXML COPYRIGHT = "Copyright © 2001-2008 Sean Russell <ser@germane-software.com>" DATE = "2008/019" - VERSION = "3.1.8" + VERSION = "3.1.9" REVISION = "" Copyright = COPYRIGHT |