Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,14 @@ var Encoding = {
} else if (c === 0x30F7) {
results[results.length] = 0x308F;
c = 0x309B;
// 「ヰ゛」 => 「ゐ」 + 「゛」
} else if (c === 0x30F8) {
results[results.length] = 0x3090;
c = 0x309B;
// 「ヱ゛」 => 「ゑ」 + 「゛」
} else if (c === 0x30F9) {
results[results.length] = 0x3091;
c = 0x309B;
// 「ヲ゛」 => 「を」 + 「゛」
} else if (c === 0x30FA) {
results[results.length] = 0x3092;
Expand Down Expand Up @@ -397,9 +405,13 @@ var Encoding = {
c = data[i++];
if (c >= 0x3041 && c <= 0x3096) {
if ((c === 0x308F || // 「わ」 + 「゛」 => 「ワ゛」
c === 0x3090 || // 「ゐ」 + 「゛」 => 「ヰ゛」
c === 0x3091 || // 「ゑ」 + 「゛」 => 「ヱ゛」
c === 0x3092) && // 「を」 + 「゛」 => 「ヲ゛」
i < len && data[i] === 0x309B) {
c = c === 0x308F ? 0x30F7 : 0x30FA;
c = c === 0x308F ? 0x30F7 :
c === 0x3090 ? 0x30F8 :
c === 0x3091 ? 0x30F9 : 0x30FA;
i++;
} else {
c += 0x0060;
Expand Down
18 changes: 18 additions & 0 deletions tests/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1517,6 +1517,24 @@ describe('encoding', function() {
});
});

it('toHiraganaCase/toKatakanaCase wa-row voiced kana', function() {
// 'ヷヸヹヺ' (U+30F7 - U+30FA) <=> base hiragana + voiced mark (U+309B)
var katakana = 'ヷヸヹヺ';
var hiragana = 'わ゛ゐ゛ゑ゛を゛';

assert.equal(encoding.toHiraganaCase(katakana), hiragana);
assert.equal(encoding.toKatakanaCase(hiragana), katakana);

assert.deepEqual(
encoding.toHiraganaCase(encoding.stringToCode(katakana)),
encoding.stringToCode(hiragana)
);
assert.deepEqual(
encoding.toKatakanaCase(encoding.stringToCode(hiragana)),
encoding.stringToCode(katakana)
);
});

it('toHankanaCase', function() {
zenkanas.forEach(function(zenkana, i) {
var expect = hankanas[i];
Expand Down