Skip to content
Permalink
Browse files

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
  • Loading branch information...
nurse committed Apr 13, 2019
1 parent c5f1c9e commit 69ec39363eb64fd492af9fee3a7d0188f11542df
7 NEWS
@@ -272,8 +272,11 @@ sufficient information, see the ChangeLog file or Redmine

[Regexp/String]

* Update Unicode version and Emoji version from 11.0.0 to 12.0.0.
[Feature #15321]
* Update Unicode version to 12.1.0, adding support for
U+32FF SQUARE ERA NAME REIWA [Feature #15195]

* Update Unicode version and Emoji version from 11.0.0 to
12.0.0. [Feature #15321]

* Update Unicode version from 10.0.0 to 11.0.0. [Feature #14802]

@@ -15,9 +15,9 @@ mflags = $(MFLAGS)
gnumake_recursive =
enable_shared = $(ENABLE_SHARED:no=)

UNICODE_VERSION = 12.0.0
UNICODE_VERSION = 12.1.0
UNICODE_EMOJI_VERSION = 12.0
UNICODE_BETA = NO
UNICODE_BETA = YES

### set the following environment variable or uncomment the line if
### the Unicode data files should be updated completely on every update ('make up',...).
@@ -3,14 +3,14 @@

#if defined ONIG_UNICODE_VERSION_STRING && !( \
ONIG_UNICODE_VERSION_MAJOR == 12 && \
ONIG_UNICODE_VERSION_MINOR == 0 && \
ONIG_UNICODE_VERSION_MINOR == 1 && \
ONIG_UNICODE_VERSION_TEENY == 0 && \
1)
# error ONIG_UNICODE_VERSION_STRING mismatch
#endif
#define ONIG_UNICODE_VERSION_STRING "12.0.0"
#define ONIG_UNICODE_VERSION_STRING "12.1.0"
#define ONIG_UNICODE_VERSION_MAJOR 12
#define ONIG_UNICODE_VERSION_MINOR 0
#define ONIG_UNICODE_VERSION_MINOR 1
#define ONIG_UNICODE_VERSION_TEENY 0

static const CaseFold_11_Type CaseFold_11_Table[] = {
Oops, something went wrong.

0 comments on commit 69ec393

Please sign in to comment.
You can’t perform that action at this time.