Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 修复 multiple 和 surname 一同使用的情景 #198

Merged
merged 3 commits into from
Mar 21, 2024
Merged

fix: 修复 multiple 和 surname 一同使用的情景 #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13a9e08
fix: 修复 multiple 和 surname 一同使用的情景
Mar 20, 2024
62fd375
fix: 修复 multiple 和 surname 同时使用的场景
Mar 20, 2024
57302c8
test: add test case for multiple with surname
Mar 21, 2024
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
18 changes: 13 additions & 5 deletions lib/core/pinyin/handle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,19 @@ type GetMultiplePinyin = (
const getMultiplePinyin: GetMultiplePinyin = (word, mode = 'normal') => {
const wordCode = word.charCodeAt(0);
const customMultpileDict = getCustomMultpileDict();
const pinyin =
customMultpileDict[wordCode] ||
(mode === 'surname' ? Surnames[word] : '') ||
DICT1[wordCode] ||
'';
let pinyin = DICT1[wordCode] || '';
if (customMultpileDict[wordCode]) {
pinyin = customMultpileDict[wordCode];
} else if (mode === 'surname') {
const surnamePinyin = Surnames[word];
if (surnamePinyin) {
pinyin = [
surnamePinyin,
pinyin.split(' ').filter(py => py !== surnamePinyin),
].join(' ');
}
}

if (pinyin) {
return pinyin.split(' ').map((value) => ({
origin: word,
Expand Down
12 changes: 11 additions & 1 deletion test/multiple.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,21 @@ describe('multiple', () => {

it('[multiple]multiple+surname同时使用', () => {
const result = pinyin('能', { mode: 'surname', multiple: true });
expect(result).to.be.equal('nài');
expect(result).to.be.equal('nài néng');
});

it('[multiple]multiple+surname同时使用,无surname', () => {
const result = pinyin('好', { mode: 'surname', multiple: true });
expect(result).to.be.equal('hǎo hào');
zh-lx marked this conversation as resolved.
Show resolved Hide resolved
});

it('[multiple]base', () => {
const result = pinyin('好', { multiple: true });
expect(result).to.be.equal('hǎo hào');
});

it('[multiple]multiple+surname同时使用,多音字优先使用姓氏读音', () => {
const result = pinyin('数学家华罗庚', { mode: 'surname', multiple: true });
expect(result).to.be.equal('shù xué jiā huà luó gēng');
});
});
Loading