Unicode: add 0xfe0f codepoint as a zero-width

cronvel · Aug 3, 2022 · 5264f09 · 5264f09
1 parent a386f15
commit 5264f09
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,10 @@
 
+v0.17.3
+-------
+
+Unicode: add 0xfe0f codepoint as a zero-width
+
+
 v0.17.2
 -------
 

diff --git a/browser/string-kit.js b/browser/string-kit.js
@@ -3911,6 +3911,13 @@ unicode.codePointWidth = code => {
 		return 2 ;
 	}
 
+	if (
+		unicode.isEmojiModifierCodePoint( code ) ||
+		unicode.isZeroWidthDiacriticCodePoint( code )
+	) {
+		return 0 ;
+	}
+
 	return 1 ;
 } ;
 
@@ -3970,9 +3977,11 @@ unicode.isEmojiCodePoint = code =>
 	( 0x1f300 <= code && code <= 0x1f3fa ) ||
 	( 0x1f400 <= code && code <= 0x1faff ) ;
 
-// Emoji modifier (Fitzpatrick): https://en.wikipedia.org/wiki/Miscellaneous_Symbols_and_Pictographs#Emoji_modifiers
+// Emoji modifier
 unicode.isEmojiModifier = char => unicode.isEmojiModifierCodePoint( char.codePointAt( 0 ) ) ;
-unicode.isEmojiModifierCodePoint = code => 0x1f3fb <= code && code <= 0x1f3ff ;
+unicode.isEmojiModifierCodePoint = code =>
+	( 0x1f3fb <= code && code <= 0x1f3ff ) ||	// (Fitzpatrick): https://en.wikipedia.org/wiki/Miscellaneous_Symbols_and_Pictographs#Emoji_modifiers
+	code === 0xfe0f ;	// VARIATION SELECTOR-16 [VS16] {emoji variation selector}
 
 
 },{"./unicode-emoji-width-ranges.json":15}],17:[function(require,module,exports){

diff --git a/browser/string-kit.min.js b/browser/string-kit.min.js
diff --git a/lib/unicode.js b/lib/unicode.js
@@ -272,6 +272,13 @@ unicode.codePointWidth = code => {
 		return 2 ;
 	}
 
+	if (
+		unicode.isEmojiModifierCodePoint( code ) ||
+		unicode.isZeroWidthDiacriticCodePoint( code )
+	) {
+		return 0 ;
+	}
+
 	return 1 ;
 } ;
 
@@ -331,7 +338,9 @@ unicode.isEmojiCodePoint = code =>
 	( 0x1f300 <= code && code <= 0x1f3fa ) ||
 	( 0x1f400 <= code && code <= 0x1faff ) ;
 
-// Emoji modifier (Fitzpatrick): https://en.wikipedia.org/wiki/Miscellaneous_Symbols_and_Pictographs#Emoji_modifiers
+// Emoji modifier
 unicode.isEmojiModifier = char => unicode.isEmojiModifierCodePoint( char.codePointAt( 0 ) ) ;
-unicode.isEmojiModifierCodePoint = code => 0x1f3fb <= code && code <= 0x1f3ff ;
+unicode.isEmojiModifierCodePoint = code =>
+	( 0x1f3fb <= code && code <= 0x1f3ff ) ||	// (Fitzpatrick): https://en.wikipedia.org/wiki/Miscellaneous_Symbols_and_Pictographs#Emoji_modifiers
+	code === 0xfe0f ;	// VARIATION SELECTOR-16 [VS16] {emoji variation selector}
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "string-kit",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "engines": {
     "node": ">=14.15.0"
   },

diff --git a/test/unicode-test.js b/test/unicode-test.js
@@ -225,6 +225,10 @@ describe( "Unicode" , () => {
 		expect( string.unicode.width( 'aé@à' ) ).to.be( 4 ) ;
 		expect( string.unicode.width( 'aé＠à' ) ).to.be( 5 ) ;
 		expect( string.unicode.width( 'aé汉字à' ) ).to.be( 7 ) ;
+
+		expect( string.unicode.width( '😀️' ) ).to.be( 2 ) ;
+		expect( string.unicode.width( '♥' ) ).to.be( 1 ) ;
+		expect( string.unicode.width( '♥️' ) ).to.be( 1 ) ;
 	} ) ;
 
 	it( ".charWidth() should the width of a single character" , () => {