diff --git a/build/gen-hanzi-data/generate.ts b/build/gen-hanzi-data/generate.ts index a80dcbafc46c94a07db7973c5a9793e0053d312e..31704f6bbb52b0986b60f0dd1e7d030b6192efe9 100644 --- a/build/gen-hanzi-data/generate.ts +++ b/build/gen-hanzi-data/generate.ts @@ -44,7 +44,7 @@ export async function generate (config: Config): Promise<void> { } // the underscore ensures that Anki media checks dón't think the file // is unused - const out = join(generatingDir, `_hd${char}.js`) + const out = join(generatingDir, `_cd${char}.js`) generated.push(generateForHanzi(char, out)) } } diff --git a/build/gen-hanzi-data/pools/traditional/hanyu-jiaocheng-2a-trad.txt b/build/gen-hanzi-data/pools/traditional/hanyu-jiaocheng-2a-trad.txt index b717d997a87907f82f16c4846438c182420713dc..c08113617830948e2097c725a453f30c323fd15e 100644 --- a/build/gen-hanzi-data/pools/traditional/hanyu-jiaocheng-2a-trad.txt +++ b/build/gen-hanzi-data/pools/traditional/hanyu-jiaocheng-2a-trad.txt @@ -252,6 +252,7 @@ 滑 滿 漂 +演 灸 炎 炤 @@ -321,7 +322,6 @@ 結 經 練 -縯 績 織 纔 @@ -349,7 +349,6 @@ 葉 著 葫 -蔴 薯 藥 蘆 @@ -469,6 +468,7 @@ 高 魚 鴨 +麻 麼 點 鼕 diff --git a/build/gen-hanzi-data/radical-overrides.ts b/build/gen-hanzi-data/radical-overrides.ts new file mode 100644 index 0000000000000000000000000000000000000000..ab2633d38c5b1df06c6f49308a0b2e397a4612bc --- /dev/null +++ b/build/gen-hanzi-data/radical-overrides.ts @@ -0,0 +1,7 @@ +/** + * Maps characters to a radical where data from cnchar is incorrect. + */ +export const radicalOverrides = new Map<string, string>() +radicalOverrides.set("现", "⺩") // 王 +radicalOverrides.set("現", "⺩") // 王 +radicalOverrides.set("棒", "木") diff --git a/build/gen-hanzi-data/radical.ts b/build/gen-hanzi-data/radical.ts index baf1acc81e8a59fb04ddd7e0c4664974791115b6..85260a94eb08f770925b6c6ce7afa3870e154bed 100644 --- a/build/gen-hanzi-data/radical.ts +++ b/build/gen-hanzi-data/radical.ts @@ -4,6 +4,7 @@ import cncharRadical from 'cnchar-radical' import cncharTrad from 'cnchar-trad' import { isKangxiOrCjkRadical } from './blocks/index' import { queryPatchedHanziWriterData } from './patched-hanzi-writer' +import { radicalOverrides } from './radical-overrides' cnchar.use(cncharOrder, cncharRadical, cncharTrad) @@ -107,7 +108,11 @@ export function isInlineRadical (char: string): boolean { export async function queryRadicalInfo (char: string): Promise<RadicalInfo> { let radical: string - if (isInlineRadical(char)) { + + const override = radicalOverrides.get(char) + if (override !== undefined) { + radical = override + } else if (isInlineRadical(char)) { // already a radical, the radical is the same char radical = char } else { diff --git a/package.json b/package.json index 8a61c777a45d370de7c6b212d8d8ab8202accb41..e5bb6819e68742a7ed39989b19638b5710900070 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "kartenaale-card-templates", - "version": "5.0.6", + "version": "5.0.7", "description": "HTML and data for Anki cards", "repository": "https://gitlab.phaidra.org/kartenaale/card-templates", "author": "Philipp Stadler <hello@phstadler.com>", diff --git a/src/components/hanzi-data/index.ts b/src/components/hanzi-data/index.ts index eeaee842a134cdfce4fff2dd2504bb7dab750ed0..7312284c73d3a124aa6526ff341fc0216752db68 100644 --- a/src/components/hanzi-data/index.ts +++ b/src/components/hanzi-data/index.ts @@ -30,7 +30,7 @@ export async function getHanziData ( throw new Error(`Can only get data for single chars, got: ${char}`) } - const data = (await getDataUnsafe({ path: `hanzi-data/_hd${char}.js`, key: char })) as Readonly<HanziData> + const data = (await getDataUnsafe({ path: `hanzi-data/_cd${char}.js`, key: char })) as Readonly<HanziData> if (kind === GetHanziDataKind.TRADITIONAL && data.trad !== undefined) { // data in the cache is read-only => make a fresh copy with trad overrides return { diff --git a/src/components/hanzi-data/lut.ts b/src/components/hanzi-data/lut.ts index 2bd174e0a25fce338e92acb5fbc4295734216f31..ad238fe52354f0001197d5bf76cfca3ccfe6a797 100644 --- a/src/components/hanzi-data/lut.ts +++ b/src/components/hanzi-data/lut.ts @@ -709,7 +709,7 @@ defineRadical( ['疒'], { radicalMeaningDe: 'Krankheit, (Radikal des Zeichens bing)', - radicalMeaningZh: 'nè, chuáng, bìng zì páng' + radicalMeaningZh: 'nè' } ) defineRadical( @@ -995,7 +995,7 @@ defineRadical( ) defineRadical( ['酉'], - { radicalMeaningDe: 'Amphore, 10. Erdzweig', radicalMeaningZh: 'yǒu' } + { radicalMeaningDe: 'Wein, Alkohol', radicalMeaningZh: 'yǒu' } ) defineRadical( ['豕'],