From 58bde1fdcc5a89f2037a6ccdfe3219d8f6ff4dc6 Mon Sep 17 00:00:00 2001 From: Alec Deitloff Date: Sun, 21 Feb 2021 16:02:53 -0800 Subject: [PATCH] =?UTF-8?q?Include=20=E8=A9=A6=E5=90=88=20in=20the=20expor?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- "data/counter-components/\346\210\246.tsx" | 167 ++++++++++++++++- .../\350\251\246\345\220\210.tsx" | 171 ++++++++++++++++++ data/counters.ts | 62 ++++++- data/items.ts | 35 ++++ sql/study_pack_contents.sql | 3 + .../counter-collections/counter-ids.data.ts | 1 + .../standard-collections.data.ts | 3 +- 7 files changed, 437 insertions(+), 5 deletions(-) create mode 100644 "data/counter-components/\350\251\246\345\220\210.tsx" diff --git "a/data/counter-components/\346\210\246.tsx" "b/data/counter-components/\346\210\246.tsx" index d7fd4e77..f9f7d444 100644 --- "a/data/counter-components/\346\210\246.tsx" +++ "b/data/counter-components/\346\210\246.tsx" @@ -3,6 +3,8 @@ // Modifications will be lost if they are made manually and not through the database. import React from "react"; +import CounterDisplay from "@jyosuushi/ui/data-components/CounterDisplay"; +import IntrasiteLink from "@jyosuushi/ui/data-components/IntrasiteLink"; export function CounterNotes(): React.ReactElement { return ( @@ -41,8 +43,11 @@ export function CounterNotes(): React.ReactElement { is used beyond counting battles, however. This counter is also (frequently) used to count games and matches in sports, or competitions. In this usage, it is very similar{" "} - (though not entirely interchangeable), with the counter 試合. - Overall,{" "} + (though not entirely interchangeable), with the counter{" "} + + + + . Overall,{" "} 戦( せん @@ -150,7 +155,11 @@ export function ExternalLink0(): React.ReactElement { return ( <> Masters thesis that focuses on the establishment of new counters, in - particular 店 and 試合. Has a lengthy comparison of{" "} + particular 店 and{" "} + + + + . Has a lengthy comparison of{" "} 試合( しあい @@ -167,6 +176,96 @@ export function ExternalLink0(): React.ReactElement { ); } +export function Disambiguation試合(): React.ReactElement { + return ( + <> +

+ Both{" "} + + 試合( + しあい + ) + + 　and{" "} + + 戦( + せん + ) + {" "} + can be used to count sports matches/sports games. For the prototypical + sports, such as baseball or basketball, these can be used + interchangeably. However, some sport matches cannot be counted with{" "} + + 試合( + しあい + ) + + , most noteably racing competitions, board game matches (such as Go or + Shogi), and sports where individual compete without direct opponents + (such as figure skating). + + + 5 + + {" "} + On the other hand,{" "} + + 戦( + せん + ) + {" "} + is able to be used for most games and matches, but not all; games that + are performed without the purpose of declaring a winner/loser (such as + exhibition matches or practice games) would use{" "} + + 試合( + しあい + ) + {" "} + instead. + + + 6 + + +

+

+ Additionally, though it does not reflect a difference in meaning between + the two counters,{" "} + + 戦( + せん + ) + {" "} + is used ordinally ( + + 第１戦( + だいいっせん + ) + + ,{" "} + + ３戦目( + さんせんめ + ) + + ) significantly more than{" "} + + 試合( + しあい + ) + + . + + + 7 + + +

+ + ); +} + export function Footnote1(): React.ReactElement { return (
  • @@ -248,3 +347,65 @@ export function Footnote4(): React.ReactElement {
    • ); } + +export function Footnote5(): React.ReactElement { + return ( +
  • + + 近現代日本語における新たな助数詞の成立と定着 + + : + 「-試合」は〚囲碁・将棋〛（「対局」）や〚相撲〛（「取組」）、〚競馬〛〚F1〛（「レース」）など、その勝負を「試合」以外の名詞で指示する競技には用いることができない。また、「互いに相手に対して何かをする」という意味と馴染まない〚フィギュアスケート〛のような競技には用いにくい。(p. + 105) + + ↩ + +
    • + ); +} + +export function Footnote6(): React.ReactElement { + return ( +
  • + + 近現代日本語における新たな助数詞の成立と定着 + + : + 「-戦」は、文脈上、勝敗を決することを目的としないことが含意されると用いにくくなる。(p. + 105) + + ↩ + +
    • + ); +} + +export function Footnote7(): React.ReactElement { + return ( +
  • + + 近現代日本語における新たな助数詞の成立と定着 + + : 〔表 + 5-1〕から「-試合」は数量を表す際に、「-戦」は順序を表す際によく用いられていることがわかる。しかし、このような差異は + 2 + つの助数詞の使用傾向の一端を表すものではあるが、意味的な違いを表すものではないと考えられる。 + (p. 91-92) + + ↩ + +
    • + ); +} diff --git "a/data/counter-components/\350\251\246\345\220\210.tsx" "b/data/counter-components/\350\251\246\345\220\210.tsx" new file mode 100644 index 00000000..9e54ce6d --- /dev/null +++ "b/data/counter-components/\350\251\246\345\220\210.tsx" @@ -0,0 +1,171 @@ +// DO NOT HAND-MODIFY THIS FILE!! +// This file was built using `yarn db:export` from the SQLite database. +// Modifications will be lost if they are made manually and not through the database. + +import React from "react"; +import CounterDisplay from "@jyosuushi/ui/data-components/CounterDisplay"; + +export function ExternalLink0(): React.ReactElement { + return ( + <> + Masters thesis that focuses on the establishment of new counters, in + particular 店 and{" "} + + + + . + + ); +} + +export function Disambiguation戦(): React.ReactElement { + return ( + <> +

    + Both{" "} + + 試合( + しあい + ) + + 　and{" "} + + 戦( + せん + ) + {" "} + can be used to count sports matches/sports games. For the prototypical + sports, such as baseball or basketball, these can be used + interchangeably. However, some sport matches cannot be counted with{" "} + + 試合( + しあい + ) + + , most noteably racing competitions, board game matches (such as Go or + Shogi), and sports where individual compete without direct opponents + (such as figure skating). + + + 1 + + {" "} + On the other hand,{" "} + + 戦( + せん + ) + {" "} + is able to be used for most games and matches, but not all; games that + are performed without the purpose of declaring a winner/loser (such as + exhibition matches or practice games) would use{" "} + + 試合( + しあい + ) + {" "} + instead. + + + 2 + + +

    +

    + Additionally, though it does not reflect a difference in meaning between + the two counters,{" "} + + 戦( + せん + ) + {" "} + is used ordinally ( + + 第１戦( + だいいっせん + ) + + ,{" "} + + ３戦目( + さんせんめ + ) + + ) significantly more than{" "} + + 試合( + しあい + ) + + . + + + 3 + + +

    + + ); +} + +export function Footnote1(): React.ReactElement { + return ( +
  • + + 近現代日本語における新たな助数詞の成立と定着 + + : + 「-試合」は〚囲碁・将棋〛（「対局」）や〚相撲〛（「取組」）、〚競馬〛〚F1〛（「レース」）など、その勝負を「試合」以外の名詞で指示する競技には用いることができない。また、「互いに相手に対して何かをする」という意味と馴染まない〚フィギュアスケート〛のような競技には用いにくい。(p. + 105) + + ↩ + +
    • + ); +} + +export function Footnote2(): React.ReactElement { + return ( +
  • + + 近現代日本語における新たな助数詞の成立と定着 + + : + 「-戦」は、文脈上、勝敗を決することを目的としないことが含意されると用いにくくなる。(p. + 105) + + ↩ + +
    • + ); +} + +export function Footnote3(): React.ReactElement { + return ( +
  • + + 近現代日本語における新たな助数詞の成立と定着 + + : 〔表 + 5-1〕から「-試合」は数量を表す際に、「-戦」は順序を表す際によく用いられていることがわかる。しかし、このような差異は + 2 + つの助数詞の使用傾向の一端を表すものではあるが、意味的な違いを表すものではないと考えられる。 + (p. 91-92) + + ↩ + +
    • + ); +} diff --git a/data/counters.ts b/data/counters.ts index a4571f69..de324434 100644 --- a/data/counters.ts +++ b/data/counters.ts @@ -32,6 +32,7 @@ import * as 校Components from "@data/counter-components/校"; import * as 歳Components from "@data/counter-components/歳"; import * as 缶Components from "@data/counter-components/缶"; import * as 羽Components from "@data/counter-components/羽"; +import * as 試合Components from "@data/counter-components/試合"; import * as 階Components from "@data/counter-components/階"; import * as 頭Components from "@data/counter-components/頭"; @@ -842,7 +843,12 @@ export const COUNTER_年: Counter = { export const COUNTER_戦: Counter = { counterId: "戦", - disambiguations: [], + disambiguations: [ + { + distinction: 戦Components.Disambiguation試合, + otherCounterId: "試合", + }, + ], englishName: "battles", externalLinks: [ { @@ -858,6 +864,9 @@ export const COUNTER_戦: Counter = { 戦Components.Footnote2, 戦Components.Footnote3, 戦Components.Footnote4, + 戦Components.Footnote5, + 戦Components.Footnote6, + 戦Components.Footnote7, ], irregulars: {}, kanji: { @@ -1654,6 +1663,56 @@ export const COUNTER_色: Counter = { ], }; +export const COUNTER_試合: Counter = { + counterId: "試合", + disambiguations: [ + { + distinction: 試合Components.Disambiguation戦, + otherCounterId: "戦", + }, + ], + englishName: "games", + externalLinks: [ + { + description: 試合Components.ExternalLink0, + displayText: "近現代日本語における新たな助数詞の成立と定着", + language: ExternalLinkLanguage.Japanese, + siteName: "筑波大学", + url: "http://hdl.handle.net/2241/00128666", + }, + ], + footnotes: [ + 試合Components.Footnote1, + 試合Components.Footnote2, + 試合Components.Footnote3, + ], + irregulars: {}, + kanji: { + additionalKanji: [], + primaryKanji: "試合", + }, + leadIn: null, + notes: null, + readings: [ + { + counterId: "試合", + kana: "しあい", + kangoConjugationOptions: { + allowsKuFor9: false, + allowsKyuuFor9: true, + allowsNanaFor7: true, + allowsShiFor4: false, + allowsShichiFor7: false, + allowsYoFor4: false, + allowsYonFor4: true, + }, + readingId: "しあい", + wagoStyle: null, + wordOrigin: WordOrigin.Chinese, + }, + ], +}; + export const COUNTER_語: Counter = { counterId: "語", disambiguations: [], @@ -1903,6 +1962,7 @@ export const COUNTERS_LOOKUP: { [counterId: string]: Counter } = { 缶: COUNTER_缶, 羽: COUNTER_羽, 色: COUNTER_色, + 試合: COUNTER_試合, 語: COUNTER_語, 足: COUNTER_足, 軒: COUNTER_軒, diff --git a/data/items.ts b/data/items.ts index f81fce1e..8505179a 100644 --- a/data/items.ts +++ b/data/items.ts @@ -160,6 +160,10 @@ const ITEM_BARN: Item = { const ITEM_BASEBALL_GAME: Item = { counters: [ + { + counterId: "試合", + relevance: CounterItemRelevance.Unknown, + }, { counterId: "戦", relevance: CounterItemRelevance.Unknown, @@ -884,6 +888,20 @@ const ITEM_FUR_PELT: Item = { minQuantity: 1, }; +const ITEM_GAME: Item = { + counters: [ + { + counterId: "試合", + relevance: CounterItemRelevance.Unknown, + }, + ], + englishPlural: "games", + englishSingular: "game", + itemId: "game", + maxQuantity: 100, + minQuantity: 1, +}; + const ITEM_GLASS_OF_MILK: Item = { counters: [ { @@ -1196,6 +1214,20 @@ const ITEM_MAN: Item = { minQuantity: 1, }; +const ITEM_MATCH_SPORTS_: Item = { + counters: [ + { + counterId: "試合", + relevance: CounterItemRelevance.Unknown, + }, + ], + englishPlural: "matches", + englishSingular: "match", + itemId: "match (sports)", + maxQuantity: 100, + minQuantity: 1, +}; + const ITEM_MEETING: Item = { counters: [ { @@ -2349,6 +2381,7 @@ export const ITEMS_LOOKUP: { [itemId: string]: Item } = { "fire extinguisher": ITEM_FIRE_EXTINGUISHER, "floor (building)": ITEM_FLOOR_BUILDING_, "fur pelt": ITEM_FUR_PELT, + game: ITEM_GAME, "glass of milk": ITEM_GLASS_OF_MILK, "glass of water": ITEM_GLASS_OF_WATER, gorilla: ITEM_GORILLA, @@ -2371,6 +2404,7 @@ export const ITEMS_LOOKUP: { [itemId: string]: Item } = { location: ITEM_LOCATION, magazine: ITEM_MAGAZINE, man: ITEM_MAN, + "match (sports)": ITEM_MATCH_SPORTS_, meeting: ITEM_MEETING, melody: ITEM_MELODY, microwave: ITEM_MICROWAVE, @@ -2581,6 +2615,7 @@ export const ITEMS_FROM_COUNTER: { ], 羽: [ITEM_CHICKEN, ITEM_PENGUIN, ITEM_RABBIT, ITEM_ORIGAMI_CRANE, ITEM_BAT], 色: [ITEM_TINT, ITEM_HUE, ITEM_COLOUR], + 試合: [ITEM_BASEBALL_GAME, ITEM_GAME, ITEM_MATCH_SPORTS_], 語: [ITEM_WORD, ITEM_PROVERB, ITEM_SAYING, ITEM_KEYWORD, ITEM_IDIOM], 足: [ITEM_PAIR_OF_SHOES, ITEM_PAIR_OF_SANDALS, ITEM_PAIR_OF_SOCKS], 軒: [ diff --git a/sql/study_pack_contents.sql b/sql/study_pack_contents.sql index 92969c3e..31be472d 100644 --- a/sql/study_pack_contents.sql +++ b/sql/study_pack_contents.sql @@ -165,4 +165,7 @@ VALUES('n5', '杯', '2021-02-15 00:30:33'); INSERT INTO "study_pack_contents" (pack_id, counter_id, date_added) VALUES('essential', '杯', '2021-02-15 00:30:33'); +INSERT INTO + "study_pack_contents" (pack_id, counter_id, date_added) +VALUES('common', '試合', '2021-02-20 05:08:05'); COMMIT; \ No newline at end of file diff --git a/src/server/modules/counter-collections/counter-ids.data.ts b/src/server/modules/counter-collections/counter-ids.data.ts index a6295acf..4900be2b 100644 --- a/src/server/modules/counter-collections/counter-ids.data.ts +++ b/src/server/modules/counter-collections/counter-ids.data.ts @@ -37,6 +37,7 @@ export const COUNTER_IDS: ReadonlySet = new Set([ "缶", "羽", "色", + "試合", "語", "足", "軒", diff --git a/src/server/modules/counter-collections/standard-collections.data.ts b/src/server/modules/counter-collections/standard-collections.data.ts index a58578be..7f5c4654 100644 --- a/src/server/modules/counter-collections/standard-collections.data.ts +++ b/src/server/modules/counter-collections/standard-collections.data.ts @@ -31,12 +31,13 @@ const STUDY_PACK_COMMON: StandardCounterCollection = { "組", "缶", "色", + "試合", "語", "足", "軒", "週", ], - dateLastUpdated: 1608918939000, + dateLastUpdated: 1613797685000, description: "Building off of the Essential collection, these are counters that you’re likely to run into with a fair bit of frequency as you dive deeper into Japanese and handle more complex situations.", id: "common",