Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The character width table has been updated to match Unicode 9.0 * bb/unicode-9.0: unicode_width.h: update the width tables to Unicode 9.0 update_unicode.sh: remove the plane filter update_unicode.sh: automatically download newer definition files update_unicode.sh: pin the uniset repo to a known good commit update_unicode.sh: remove an unnecessary subshell level update_unicode.sh: move it into contrib/update-unicode
- Loading branch information
Showing
6 changed files
with
163 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -203,7 +203,6 @@ | |
/config.mak.autogen | ||
/config.mak.append | ||
/configure | ||
/unicode | ||
/tags | ||
/TAGS | ||
/cscope* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
uniset/ | ||
UnicodeData.txt | ||
EastAsianWidth.txt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
TL;DR: Run update_unicode.sh after the publication of a new Unicode | ||
standard and commit the resulting unicode_widths.h file. | ||
|
||
The long version | ||
================ | ||
|
||
The Git source code ships the file unicode_widths.h which contains | ||
tables of zero and double width Unicode code points, respectively. | ||
These tables are generated using update_unicode.sh in this directory. | ||
update_unicode.sh itself uses a third-party tool, uniset, to query two | ||
Unicode data files for the interesting code points. | ||
|
||
On first run, update_unicode.sh clones uniset from Github and builds it. | ||
This requires a current-ish version of autoconf (2.69 works per December | ||
2016). | ||
|
||
On each run, update_unicode.sh checks whether more recent Unicode data | ||
files are available from the Unicode consortium, and rebuilds the header | ||
unicode_widths.h with the new data. The new header can then be | ||
committed. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
#!/bin/sh | ||
#See http://www.unicode.org/reports/tr44/ | ||
# | ||
#Me Enclosing_Mark an enclosing combining mark | ||
#Mn Nonspacing_Mark a nonspacing combining mark (zero advance width) | ||
#Cf Format a format control character | ||
# | ||
cd "$(dirname "$0")" | ||
UNICODEWIDTH_H=$(git rev-parse --show-toplevel)/unicode_width.h | ||
|
||
wget -N http://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt \ | ||
http://www.unicode.org/Public/UCD/latest/ucd/EastAsianWidth.txt && | ||
if ! test -d uniset; then | ||
git clone https://github.com/depp/uniset.git && | ||
( cd uniset && git checkout 4b186196dd ) | ||
fi && | ||
( | ||
cd uniset && | ||
if ! test -x uniset; then | ||
autoreconf -i && | ||
./configure --enable-warnings=-Werror CFLAGS='-O0 -ggdb' | ||
fi && | ||
make | ||
) && | ||
UNICODE_DIR=. && export UNICODE_DIR && | ||
cat >$UNICODEWIDTH_H <<-EOF | ||
static const struct interval zero_width[] = { | ||
$(uniset/uniset --32 cat:Me,Mn,Cf + U+1160..U+11FF - U+00AD) | ||
}; | ||
static const struct interval double_width[] = { | ||
$(uniset/uniset --32 eaw:F,W) | ||
}; | ||
EOF |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.