Skip to content

Commit

Permalink
fix: conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Collection50 committed Aug 4, 2024
1 parent fc68c87 commit 21684f6
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 49 deletions.
3 changes: 0 additions & 3 deletions docs/src/pages/docs/api/canBe.en.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<<<<<<< HEAD
=======
---
title: canBe
---

>>>>>>> v2
# canBeChoseong

Check if a given character can be a choseong in Korean.
Expand Down
3 changes: 0 additions & 3 deletions docs/src/pages/docs/api/canBe.ko.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<<<<<<< HEAD
=======
---
title: canBe
---

>>>>>>> v2
# canBeChoseong

인자로 받은 문자가 초성으로 위치할 수 있는 문자인지 검사합니다.
Expand Down
13 changes: 4 additions & 9 deletions docs/src/pages/docs/api/getChoseong.en.mdx
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
<<<<<<< HEAD
# getChoseong

=======
---
title: getChoseong
---

# getChoseong
>>>>>>> v2

Extracts the Choseong from a Korean word. (Example: 사과 -> 'ㅅㄱ')

```typescript
function getChoseong(
// Korean string from which to extract the choseong
// Korean string from which to extract the choseong
word: string
): string;
```

## Examples

```tsx
getChoseong('사과') // 'ㅅㄱ'
getChoseong('리액트') // 'ㄹㅇㅌ'
getChoseong('띄어 쓰기') // 'ㄸㅇ ㅆㄱ'
getChoseong('사과'); // 'ㅅㄱ'
getChoseong('리액트'); // 'ㄹㅇㅌ'
getChoseong('띄어 쓰기'); // 'ㄸㅇ ㅆㄱ'
```
9 changes: 3 additions & 6 deletions docs/src/pages/docs/api/getChoseong.ko.mdx
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<<<<<<< HEAD
=======
---
title: getChoseong
---

>>>>>>> v2
# getChoseong

단어에서 초성을 추출합니다. (예: `사과` -> `'ㅅㄱ'`)
Expand All @@ -21,7 +18,7 @@ function getChoseong(
## Examples

```tsx
getChoseong('사과') // 'ㅅㄱ'
getChoseong('리액트') // 'ㄹㅇㅌ'
getChoseong('띄어 쓰기') // 'ㄸㅇ ㅆㄱ'
getChoseong('사과'); // 'ㅅㄱ'
getChoseong('리액트'); // 'ㄹㅇㅌ'
getChoseong('띄어 쓰기'); // 'ㄸㅇ ㅆㄱ'
```
14 changes: 6 additions & 8 deletions docs/src/pages/docs/api/hasBatchim.en.mdx
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
<<<<<<< HEAD
=======
---
title: hasBatchim
---

>>>>>>> v2
# hasBatchim

Checks if the last character of a Korean string has a batchim (jongseong).

```typescript
````typescript
hasBatchim(
str: string,
// checking for single batchim
str: string,
// checking for single batchim
options?: { single?: boolean }
): boolean


```typescript
hasBatchim('값') // true
hasBatchim('토') // false
hasBatchim('갑', { single: true }) // true
hasBatchim('값', { single: true }) // false
hasBatchim('토', { single: true }) // false
````
````
14 changes: 4 additions & 10 deletions docs/src/pages/docs/api/hasBatchim.ko.mdx
Original file line number Diff line number Diff line change
@@ -1,29 +1,23 @@
<<<<<<< HEAD
# hasBatchim

=======
---
title: hasBatchim
---

# hasBatchim
>>>>>>> v2

한글 문자열의 마지막 글자가 받침이 있는지 확인합니다.


```typescript
````typescript
hasBatchim(
str: string,
str: string,
// 홑받침 여부를 확인할지 여부
options?: { single?: boolean }
): boolean


```typescript
hasBatchim('값') // true
hasBatchim('토') // false
hasBatchim('갑', { single: true }) // true
hasBatchim('값', { single: true }) // false
hasBatchim('토', { single: true }) // false
````
````
10 changes: 0 additions & 10 deletions src/assemble.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import { disassemble } from './disassemble';
<<<<<<< HEAD
import { binaryAssemble } from './_internal/hangul';
=======
import { binaryAssembleHangul } from './_internal/hangul';
>>>>>>> v2

/**
* @name assemble
Expand All @@ -20,13 +16,7 @@ import { binaryAssembleHangul } from './_internal/hangul';
* assemble(['아버지가', ' ', '방에 ', '들어갑니다']) // 아버지가 방에 들어갑니다
* assemble(['ㅇ', 'ㅏ', 'ㅂ', 'ㅓ', 'ㅈ', 'ㅣ']) // 아버지
*/
<<<<<<< HEAD
export function assemble(words: string[]) {
const disassembled = disassemble(words.join('')).split('');
return disassembled.reduce(binaryAssemble);
=======
export function assembleHangul(words: string[]) {
const disassembled = disassemble(words.join('')).split('');
return disassembled.reduce(binaryAssembleHangul);
>>>>>>> v2
}

0 comments on commit 21684f6

Please sign in to comment.