diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-13 15:01:39 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-04-13 15:01:39 +0000 |
commit | 69ec39363eb64fd492af9fee3a7d0188f11542df (patch) | |
tree | e9d9562adb4ec2153b4a366f0359ade2846440bb /template | |
parent | c5f1c9e222864fc1858d48463802bb383d1ff1aa (diff) |
merge revision(s) 67439,67441,67453,67476: [Backport #15740]
change lib/unicode_normalize/tables.rb to single item per line to make diffs shorter
* template/unicode_norm_gen.tmpl: Change formatting of output to produce only a
single item (or range) for each line to make future diffs shorter and easier
to understand and check.
* lib/unicode_normalize/tables.rb: output of the above
update to Unicode Version 12.1.0 (beta)
Unicode Version 12.1.0 adds one single character, U+32FF SQUARE ERA NAME REIWA,
for the new Japanese era starting on May 1st. 12.1.0 will be finalized only on
May 7th, so we go with the beta version because further changes in the data we
need are highly unlikely, and we want to make sure Ruby is ready for the new era.
* common.mk: change UNICODE_VERSION to 12.1.0, UNICODE_BETA to YES
* enc/unicode/12.1.0, enc/unicode/12.1.0/casefold.h, enc/unicode/12.1.0/name2ctype.h:
add directory and generated data files for new version
* lib/unicode_normalize/tables.rb: update for new character
* test/ruby/test_regexp.rb: add test for character property age=12.1
* test/test_unicode_normalize.rb: add test for NFKC decomposition of new character
This (mostly) completes issue #15195.
remove Unicode 12.0.0 related directory and generated files
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'template')
-rw-r--r-- | template/unicode_norm_gen.tmpl | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/template/unicode_norm_gen.tmpl b/template/unicode_norm_gen.tmpl index f83fc2d0cd..c0044dddbc 100644 --- a/template/unicode_norm_gen.tmpl +++ b/template/unicode_norm_gen.tmpl @@ -42,7 +42,7 @@ end class Array def to_UTF8() collect {|c| c.to_UTF8}.join('') end - def each_regexp_chars(n = 8) # converts an array of Integers to character ranges + def each_regexp_chars(n = 1) # converts an array of Integers to character ranges sort.inject([]) do |ranges, value| if ranges.last and ranges.last[1]+1>=value ranges.last[1] = value @@ -193,28 +193,28 @@ module UnicodeNormalize # :nodoc: "<%end%>]" class_table = { -% combining_class.each_slice(8) do |slice| - <% slice.each do |key, value|%> "<%=key.to_UTF8%>"=><%=value%><%=%>,<% end%> +% combining_class.each do |key, value| + "<%=key.to_UTF8%>"=><%=value%><%=%>, % end } class_table.default = 0 CLASS_TABLE = class_table.freeze DECOMPOSITION_TABLE = { -% decomposition_table.each_slice(8) do |slice| - <% slice.each do |key, value|%> "<%=key.to_UTF8%>"=>"<%=value.to_UTF8%>"<%=%>,<% end%> +% decomposition_table.each do |key, value| + "<%=key.to_UTF8%>"=>"<%=value.to_UTF8%>"<%=%>, % end }.freeze KOMPATIBLE_TABLE = { -% kompatible_table.each_slice(8) do |slice| - <% slice.each do |key, value|%> "<%=key.to_UTF8%>"=>"<%=value.to_UTF8%>"<%=%>,<% end%> +% kompatible_table.each do |key, value| + "<%=key.to_UTF8%>"=>"<%=value.to_UTF8%>"<%=%>, % end }.freeze COMPOSITION_TABLE = { -% composition_table.each_slice(8) do |slice| - <% slice.each do |key, value|%> "<%=key.to_UTF8%>"=>"<%=value.to_UTF8%>"<%=%>,<% end%> +% composition_table.each do |key, value| + "<%=key.to_UTF8%>"=>"<%=value.to_UTF8%>"<%=%>, % end }.freeze end |