diff --git a/.github/workflows/gen-json-spec.yml b/.github/workflows/gen-json-spec.yml index 6e50553..409b51c 100644 --- a/.github/workflows/gen-json-spec.yml +++ b/.github/workflows/gen-json-spec.yml @@ -1,10 +1,12 @@ # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs -name: Generate JSON language specification +name: Generate spec and alphabetize source on: push: branches: ['main'] + pull_request: + branches: ['main'] workflow_dispatch: jobs: @@ -14,19 +16,19 @@ jobs: contents: write steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 with: ref: ${{ github.head_ref }} - name: Setup Node.js - uses: actions/setup-node@v4 + uses: actions/setup-node@v7 with: node-version: node - run: bash run-scripts.sh - name: Generate JSON language specification and test + name: Generate JSON spec and alphabetize Markdown source - name: Add & Commit uses: EndBug/add-and-commit@v9.1.4 with: - add: rawspec + add: rawspec Vocabulary default_author: github_actions fetch: true - message: actions—generate JSON langspec + message: actions—generate JSON spec and alphabetize MD source diff --git a/Vocabulary/Adjectives.md b/Vocabulary/Adjectives.md index 75e7271..47a22b7 100644 --- a/Vocabulary/Adjectives.md +++ b/Vocabulary/Adjectives.md @@ -1,61 +1,61 @@ # Adjectives | Spelling | English Equivalent | Implication / Definition / Used as | -|----------|--------------------|--------------------------------| -| mi | cute | | -| wusita | good | | -| disita | bad | | -| nen | not | | -| toransu | different, other | | -| somo | sleepy | | -| sekiso | sexy, fuckable | | -| deja | active | | -| gara | all | | -| coko | some | | +|----------|--------------------|------------------------------------| +| anoman | angry | | | boro | any | | -| gurati | free (price), autonomous, non-interfered-with | negative freedom | -| lifeta | liberated | positive freedom | -| jala | able, capable of | | -| mire | mid, average | | -| misu | liquid, fluid | | -| ten | solid, rigid | | -| lufi | gaseous | | +| caki | fast | | +| cangi | long (time) | | +| ciki | short (size) | | +| cikihason | quiet, soft | | | cinda | new | | -| gunda | old | | | cindajin | modern | | -| gundajin | ancient | | | cingun | physically light | | | cingunem | psychologically light | | -| qongun | physically heavy | | -| qongunem | psychologically heavy | | -| anoman | angry | | -| teto | large (size) | | -| ciki | short (size) | | -| kanacin | sad | | -| tanocin | happy | | -| cangi | long (time) | | +| coko | some | | +| dakun | black, dark | | | dangi | short (time) | | -| tenza | tall (height) | | +| deja | active | | +| disita | bad | | +| gara | all | | +| garatempu | eternal, everlasting, permanent | | +| gunda | old | | +| gundajin | ancient | | +| gurati | free (price), autonomous, non-interfered-with | negative freedom | +| hepin | scary | | +| jala | able, capable of | | +| kanacin | sad | | +| kanpekon | perfect, complete | | | kenki | short (height) | | -| suci | intelligent | | -| mimi | adorable | | -| dakun | black, dark | | +| kuso | exciting | | | lajito | white, light, bright | | -| miremire | gray | | +| lifeta | liberated | positive freedom | +| lufi | gaseous | | +| mani | slow | | | mayu | very, extremely | | -| suranto | same | | -| kuso | exciting | | -| kanpekon | perfect, complete | | +| mi | cute | | +| mimi | adorable | | +| mire | mid, average | | +| miremire | gray | | +| misu | liquid, fluid | | +| nen | not | | +| nidu | necessary | | +| qongun | physically heavy | | +| qongunem | psychologically heavy | | +| redu | sufficient | | +| sekiso | sexy, fuckable | | | senakanpekon | continuous | | | senakanpekonfe | discrete | | -| wanoka | most | | +| somo | sleepy | | +| suci | intelligent | | +| suranto | same | | +| tanocin | happy | | +| ten | solid, rigid | | +| tenza | tall (height) | | +| teto | large (size) | | +| tetohason | loud | | +| toransu | different, other | | | wanofe | least | | +| wanoka | most | | | wanore | only | | -| nidu | necessary | | -| redu | sufficient | | -| cikihason | quiet, soft | | -| tetohason | loud | | -| garatempu | eternal, everlasting, permanent | | -| mani | slow | | -| caki | fast | | -| hepin | scary | | +| wusita | good | | diff --git a/Vocabulary/Adverbs.md b/Vocabulary/Adverbs.md index 5adfd29..f01603b 100644 --- a/Vocabulary/Adverbs.md +++ b/Vocabulary/Adverbs.md @@ -3,33 +3,33 @@ ## Miscellaneous adverbs | Spelling | English Equivalent | Implication / Definition / Used as | -|----------|--------------------|--------------------------------| -| nen | no | logical negation | +|----------|--------------------|------------------------------------| | con | soon | | | huba | overly | | -| mayu | very, extremely | | -| sun | why | interrogative question of cause | -| tun | because | statement of cause | +| mayu | very, extremely | | +| nen | no | logical negation | | saci | how | interrogative question of methodology | +| sun | why | interrogative question of cause | | taci | | description of methodology | -| wuroga | WLOG (without loss of generality) | | +| tun | because | statement of cause | +| wuroga | WLOG (without loss of generality) | | ## Temporal adverbs (-hi is the termination for a temporal adverb) | Spelling | English Equivalent | Implication / Definition / Used as | -|----------|--------------------|--------------------------------| -| tahi | now | | +|----------|--------------------|------------------------------------| | kahi | then | | | sohi | when | | +| tahi | now | | ## Demonstrative adverbs (-wa is the termination for a demonstrative adverb) | Spelling | English Equivalent | Implication / Definition / Used as | -|----------|--------------------|--------------------------------| -| tawa | here | | +|----------|--------------------|------------------------------------| | kawa | there | | -| sowa | where | | \ No newline at end of file +| sowa | where | | +| tawa | here | | diff --git a/Vocabulary/Conjunctions.md b/Vocabulary/Conjunctions.md index 1dc467e..1d21d41 100644 --- a/Vocabulary/Conjunctions.md +++ b/Vocabulary/Conjunctions.md @@ -2,10 +2,10 @@ | Spelling | English Equivalent | Implication / Definition / Used as | |----------|--------------------|------------------------------------| -| pum | and | logical conjunction | -| ron | or | logical disjunction | | no | but | logical implication | +| pum | and | logical conjunction | | pumfe | nand | opposite of logical conjunction | +| ron | or | logical disjunction | | ronfe | nor | opposite of logical disjunction | -| xon | xor | exclusive logical disjunction | | sumasu | in order to | | +| xon | xor | exclusive logical disjunction | diff --git a/Vocabulary/Interjections.md b/Vocabulary/Interjections.md index 5f61a46..6888248 100644 --- a/Vocabulary/Interjections.md +++ b/Vocabulary/Interjections.md @@ -2,12 +2,12 @@ | Spelling | English Equivalent | Implication / Definition / Used as | |----------|--------------------|------------------------------------| -| sim | yes | | -| nen | no | | +| biwe | thanks | | | henlo | hello | | -| na | hi | | +| hihi | laughter | | +| ke | ok | confirmation, acknowledgement | | konba | goodbye | | | mi | cute | | -| ke | ok | confirmation, acknowledgement | -| biwe | thanks | | -| hihi | laughter | | \ No newline at end of file +| na | hi | | +| nen | no | | +| sim | yes | | diff --git a/Vocabulary/Nouns.md b/Vocabulary/Nouns.md index cba32e6..09a8b0d 100644 --- a/Vocabulary/Nouns.md +++ b/Vocabulary/Nouns.md @@ -1,166 +1,165 @@ # Nouns | Spelling | English Equivalent | Implication / Definition / Used as | -|----------|--------------------|--------------------------------| -| kase | cat | | -| hun | dog | | -| luma | person | | -| mawa | kiss | | -| lanmi | food | | -| topi | god, deity | | -| wantu | number | | -| cosi | choice, vote | | -| falo | speech, discussion, chat | | -| linwa | language | | -| keso | cheese | | -| sekiso | sex, act of fucking | | -| lumaba | friend | | -| deja | action | | -| gade | guess | | -| tempu | time | | -| cikondu | second | | -| minedu | minute | | -| haweru | hour | | -| dawu | day | | -| natu | night | | -| murinu | morning | | -| ebeninku | evening | | -| monadu | month | | -| siconu | season | | -| waru | year | | -| diwaru | decade | | -| huwaru | century | | -| newaru | millenium | | -| nem | mind | | -| pen | movement | | -| nepen | feeling | | -| gurati | non-intervention | free (price), without cost | -| lifeta | (positive) freedom | liberation, liberty | -| kumi | trans(gender)ness | | -| jala | ability | | -| mire | half, middle | | -| misu | liquid | | -| lufi | gas | | -| ten | solid | | -| kin | thing | | -| meta | measurment | | -| core | desire | | -| jore | need | | -| lonki | field of knowledge/study | | -| tori | kindness, love | | -| toba | word | | +|----------|--------------------|------------------------------------| | bencun | book | | -| gucun | story | | | bengu | storybook | | +| bese-X | base-X | | +| bulohaji | comfort, safety, euphoria | | +| caca | brush | | +| caja | adventure, journey | | +| canwa | result | | +| capa | shape | | +| capalonki | geometry | | +| capanem | form, style | | +| capasero | circle | | +| capaterolonki | trigonometry | | +| capa-X | X-sided polygon | | | cikaran | physical strength | | | cikaranem | mental strength | | -| canwa | result | | -| wucan | victory | | +| cikiwanoka | minimum | | +| cikondu | second | | +| conaro | space (mathematical) | | +| conarokanpekon | field (mathematical) | | +| core | desire | | +| cosi | choice, vote | | +| dawu | day | | +| deja | action | | +| dena | point (mathematical) | | | dican | defeat | | -| bulohaji | comfort, safety, euphoria | | +| dikinem | worry, concern | | +| diwaru | decade | | +| ebeninku | evening | | +| falo | speech, discussion, chat | | +| fero | set | | +| ferocapa | group (mathematical) | | +| ferociki | subset | | +| fono | wind | | +| funocapasero | chord | | +| gade | guess | | +| gano | simple | | +| goca | land, country, nation | | +| golon | goal, target | | +| gucun | story | | +| gurati | non-intervention | free (price), without cost | | hason | sound | | | hasontoba | pronunciation | | -| miku | idol | | -| qanzi | paper | | | -| muna | egg | | -| suntu | dumbass, idiot | | -| caja | adventure, journey | | -| goca | land, country, nation | | -| lumakapa | sibling | | +| haweru | hour | | +| hira | hearing | | +| huda | answer | | +| hun | dog | | +| huwaru | century | | +| ikiko | life | | +| ikikokin | lifeform, creature, living thing | | +| jala | ability | | +| jicuha | art | | +| jore | need | | +| kacapatero | cosine function | | +| kaji | decoration | | +| kase | cat | | | kawapi | water | | -| picanam | picture, image | | -| tobacun | dictionary | | -| molumaba | enemy | | -| wantulonki | mathematics | | +| keso | cheese | | +| kin | thing | | +| kokacapatero | secant function | | +| kosacapatero | cosecant function | | +| kotacapatero | cotangent function | | +| kukin | question | | +| kumi | trans(gender)ness | | | kumo | change | | +| kumociki | derivative (mathematical) | | +| kumolonki | calculus | | | kumopen | speed | | -| gano | simple | | +| lanmi | food | | +| leba | name | | +| lifeta | (positive) freedom | liberation, liberty | +| linwa | language | | +| logo | logarithm function | | +| lonki | field of knowledge/study | | | lonkicanwa | theorem | | | lonkigade | conjecture | | | lonkigadeciki | lemma | | -| tobapere | claim | | -| tobaperena | converse | | -| tobaperene | inverse | | -| tobaperenu | contrapositive | | -| dena | point (mathematical) | | -| sena | line (mathematical) | | -| sonara | plane (mathematical) | | -| conaro | space (mathematical) | | -| conarokanpekon | field (mathematical) | | +| lufi | gas | | +| luma | person | | +| lumaba | friend | | +| lumakapa | sibling | | +| matuco | matrix | | +| mawa | kiss | | +| meta | measurment | | +| miku | idol | | +| minedu | minute | | +| mire | half, middle | | | mireconarokanpekon | ring (mathematical) | | | mirekanpekon | rng (mathematical) | | -| pacuwano | injection (mathematical) | | +| mirekin | part, portion | | +| mirekukin | prompt | | +| mirekumociki | partial derivative | | +| misu | liquid | | +| modoni | setting, mode | | +| molumaba | enemy | | +| monadu | month | | +| muna | egg | | +| murinu | morning | | +| natu | night | | +| nem | mind | | +| nemlonki | logic | | +| nemlonkife | contradiction | | +| nepen | feeling | | +| newaru | millenium | | +| pacu | function | | | pacuduwo | bijection | | | pacufe | surjection | | -| capa | shape | | -| capa-X | X-sided polygon | | -| X-capa | X-dimensional shape | | -| X-capa-Y | X-dimensional shape with Y X-1 dimensional faces | For example, 3-capa-6 is a cube. | -| fero | set | | -| ferociki | subset | | -| ferocapa | group (mathematical) | | -| wantuwanora | identity (number) | | -| matuco | matrix | | -| penfero | transformation (mathematical) | | -| peca | exponent | | -| bese-X | base-X | | -| wantukumi | variable | | -| pacu | function | | -| wantukumilonki | algebra | | -| capalonki | geometry | | -| kumolonki | calculus | | -| wantuwantulonki | number theory | | -| capaterolonki | trigonometry | | -| wantukanpekon | integer | | -| wantumirekanpekon | rational number | | -| wantupacugano | algebraic number | | | pacugano | polynomial | | | pacuganora | analytic function | | -| wantufe | negative number | | -| kumociki | derivative (mathematical) | | -| poraciki | integral | | -| mirekumociki | partial derivative | | -| penciki | limit (mathematical) | | -| sacapatero | sine function | | -| kacapatero | cosine function | | -| tacapatero | tangent function | | -| kotacapatero | cotangent function | | -| kokacapatero | secant function | | -| kosacapatero | cosecant function | | -| logo | logarithm function | | -| cikiwanoka | minimum | | -| tetowanoka | maximum | | +| pacukomi | arrow | | +| pacuwano | injection (mathematical) | | +| patolen | pot, bowl | | +| peca | exponent | | | pecakin | exponential function | | -| capasero | circle | | -| funocapasero | chord | | -| kukin | question | | -| huda | answer | | -| nemlonki | logic | | -| nemlonkife | contradiction | | -| modoni | setting, mode | | -| sevo | server (digital) | | -| tawakin | location | | -| leba | name | | -| mirekukin | prompt | | +| pen | movement | | +| penciki | limit (mathematical) | | +| penfero | transformation (mathematical) | | +| picanam | picture, image | | +| poraciki | integral | | +| qanzi | paper | | | qinakin | information | | -| mirekin | part, portion | | +| sacapatero | sine function | | | segan | world | | -| tesura | adventure | | -| ikiko | life | | +| sekiso | sex, act of fucking | | +| sena | line (mathematical) | | | seta | death | | -| ikikokin | lifeform, creature, living thing | | -| pacukomi | arrow | | -| vico | vision | | -| hira | hearing | | -| toritorikin | guard, guardian | | -| fono | wind | | -| caca | brush | | -| golon | goal, target | | -| jicuha | art | | -| kaji | decoration | | -| patolen | pot, bowl | | +| sevo | server (digital) | | +| siconu | season | | +| sonara | plane (mathematical) | | | sorosoro | repeat | | | suka | parent | | -| capanem | form, style | | -| dikinem | worry, concern | | - +| suntu | dumbass, idiot | | +| tacapatero | tangent function | | +| tawakin | location | | +| tempu | time | | +| ten | solid | | +| tesura | adventure | | +| tetowanoka | maximum | | +| toba | word | | +| tobacun | dictionary | | +| tobapere | claim | | +| tobaperena | converse | | +| tobaperene | inverse | | +| tobaperenu | contrapositive | | +| topi | god, deity | | +| tori | kindness, love | | +| toritorikin | guard, guardian | | +| vico | vision | | +| wantu | number | | +| wantufe | negative number | | +| wantukanpekon | integer | | +| wantukumi | variable | | +| wantukumilonki | algebra | | +| wantulonki | mathematics | | +| wantumirekanpekon | rational number | | +| wantupacugano | algebraic number | | +| wantuwanora | identity (number) | | +| wantuwantulonki | number theory | | +| waru | year | | +| wucan | victory | | +| X-capa | X-dimensional shape | | +| X-capa-Y | X-dimensional shape with Y X-1 dimensional faces | For example, 3-capa-6 is a cube. | diff --git a/Vocabulary/Numbers.md b/Vocabulary/Numbers.md index 272b44b..8930ef4 100644 --- a/Vocabulary/Numbers.md +++ b/Vocabulary/Numbers.md @@ -2,95 +2,95 @@ | Spelling | Hindu-Arabic Numeral | |----------|----------------------| -| **X-fe** | negative X | -| **sero** | 0 | -| **wano** | 1 | -| **duwo** | 2 | -| **tero** | 3 | -| **karo** | 4 | -| **bimo** | 5 | -| **cido** | 6 | -| **sebo** | 7 | -| **wonto** | 8 | -| **ninto** | 9 | -| **dinko** | 10 | -| dunko | 20 | -| tenko | 30 | -| kanko | 40 | -| binko | 50 | -| cinko | 60 | -| senko | 70 | -| wonko | 80 | -| ninko | 90 | -| **hundo** | 100 | -| dundo | 200 | -| tendo | 300 | -| kando | 400 | -| bindo | 500 | -| cindo | 600 | -| sendo | 700 | -| wondo | 800 | -| nindo | 900 | -| **neko** | 1000 | -| duko | 2000 | -| teko | 3000 | -| keko | 4000 | -| biko | 5000 | -| ciko | 6000 | -| seko | 7000 | -| woko | 8000 | -| niko | 9000 | -| diko | 10'000 | -| dudiko | 20'000 | -| tediko | 30'000 | -| kadiko | 40'000 | -| bidiko | 50'000 | -| cidiko | 60'000 | -| sediko | 70'000 | -| wodiko | 80'000 | -| nidiko | 90'000 | -| huko | 100'000 | -| duhuko | 200'000 | -| tehuko | 300'000 | -| kahuko | 400'000 | -| bihuko | 500'000 | -| cihuko | 600'000 | -| sehuko | 700'000 | -| wohuko | 800'000 | -| nihuko | 900'000 | -| **ranolono** | 1'000'000, one million | -| dunolono | 2'000'000 | -| tenolono | 3'000'000 | -| kenolono | 4'000'000 | -| binolono | 5'000'000 | -| cinolono | 6'000'000 | -| senolono | 7'000'000 | -| wonolono | 8'000'000 | -| ninolono | 9'000'000 | -| dinolono | 10'000'000, ten million | -| dudinolono | 20'000'000 | -| tedinolono | 30'000'000 | -| kadinolono | 40'000'000 | -| bidinolono | 50'000'000 | -| cidinolono | 60'000'000 | -| sedinolono | 70'000'000 | -| wodinolono | 80'000'000 | -| nidinolono | 90'000'000 | -| hunolono | 100'000'000, one hundred million | -| duhunolono | 200'000'000 | -| tehunolono | 300'000'000 | -| kahunolono | 400'000'000 | -| bihunolono | 500'000'000 | -| cihunolono | 600'000'000 | -| sehunolono | 700'000'000 | -| wohunolono | 800'000'000 | -| nihunolono | 900'000'000 | -| **ruwolono** | 1'000'000'000, one billion | -| **rerolono** | 1'000'000'000'000, one trillion | -| **rarolono** | 1'000'000'000'000'000, one quadrillion | -| **rimolono** | 1'000'000'000'000'000'000, one quintillion | -| **ridolono** | 1'000'000'000'000'000'000'000, one sextillion | -| **rebolono** | 1'000'000'000'000'000'000'000'000, one septillion | -| **rontolono** | 1'000'000'000'000'000'000'000'000'000, one octillion | -| **rintolono** | 1'000'000'000'000'000'000'000'000'000'000, one nonillion | -| **rinkolono** | 1'000'000'000'000'000'000'000'000'000'000'000, one decillion | +| bidiko | 50'000 | | +| bidinolono | 50'000'000 | | +| bihuko | 500'000 | | +| bihunolono | 500'000'000 | | +| biko | 5000 | | +| bimo | 5 | | +| bindo | 500 | | +| binko | 50 | | +| binolono | 5'000'000 | | +| cidiko | 60'000 | | +| cidinolono | 60'000'000 | | +| cido | 6 | | +| cihuko | 600'000 | | +| cihunolono | 600'000'000 | | +| ciko | 6000 | | +| cindo | 600 | | +| cinko | 60 | | +| cinolono | 6'000'000 | | +| diko | 10'000 | | +| dinko | 10 | | +| dinolono | 10'000'000, ten million | | +| dudiko | 20'000 | | +| dudinolono | 20'000'000 | | +| duhuko | 200'000 | | +| duhunolono | 200'000'000 | | +| duko | 2000 | | +| dundo | 200 | | +| dunko | 20 | | +| dunolono | 2'000'000 | | +| duwo | 2 | | +| huko | 100'000 | | +| hundo | 100 | | +| hunolono | 100'000'000, one hundred million | | +| kadiko | 40'000 | | +| kadinolono | 40'000'000 | | +| kahuko | 400'000 | | +| kahunolono | 400'000'000 | | +| kando | 400 | | +| kanko | 40 | | +| karo | 4 | | +| keko | 4000 | | +| kenolono | 4'000'000 | | +| neko | 1000 | | +| nidiko | 90'000 | | +| nidinolono | 90'000'000 | | +| nihuko | 900'000 | | +| nihunolono | 900'000'000 | | +| niko | 9000 | | +| nindo | 900 | | +| ninko | 90 | | +| ninolono | 9'000'000 | | +| ninto | 9 | | +| ranolono | 1'000'000, one million | | +| rarolono | 1'000'000'000'000'000, one quadrillion | | +| rebolono | 1'000'000'000'000'000'000'000'000, one septillion | | +| rerolono | 1'000'000'000'000, one trillion | | +| ridolono | 1'000'000'000'000'000'000'000, one sextillion | | +| rimolono | 1'000'000'000'000'000'000, one quintillion | | +| rinkolono | 1'000'000'000'000'000'000'000'000'000'000'000, one decillion | | +| rintolono | 1'000'000'000'000'000'000'000'000'000'000, one nonillion | | +| rontolono | 1'000'000'000'000'000'000'000'000'000, one octillion | | +| ruwolono | 1'000'000'000, one billion | | +| sebo | 7 | | +| sediko | 70'000 | | +| sedinolono | 70'000'000 | | +| sehuko | 700'000 | | +| sehunolono | 700'000'000 | | +| seko | 7000 | | +| sendo | 700 | | +| senko | 70 | | +| senolono | 7'000'000 | | +| sero | 0 | | +| tediko | 30'000 | | +| tedinolono | 30'000'000 | | +| tehuko | 300'000 | | +| tehunolono | 300'000'000 | | +| teko | 3000 | | +| tendo | 300 | | +| tenko | 30 | | +| tenolono | 3'000'000 | | +| tero | 3 | | +| wano | 1 | | +| wodiko | 80'000 | | +| wodinolono | 80'000'000 | | +| wohuko | 800'000 | | +| wohunolono | 800'000'000 | | +| woko | 8000 | | +| wondo | 800 | | +| wonko | 80 | | +| wonolono | 8'000'000 | | +| wonto | 8 | | +| X-fe | negative X | | diff --git a/Vocabulary/Prefixes.md b/Vocabulary/Prefixes.md index 9633ca3..ec7c378 100644 --- a/Vocabulary/Prefixes.md +++ b/Vocabulary/Prefixes.md @@ -2,13 +2,13 @@ | Spelling | Translation (English) | Implication / Definition / Used as | |----------|-----------------------|------------------------------------| -| mire- | semi- | semi | -| gara- | all-/every- | all/every | -| coko- | some- | some | | boro- | any- | any | -| ni- | non- | negation, other than | -| mo- | | inversion, contrary meaning | -| wu- | | positive connotation | -| di- | | negative connotation | +| coko- | some- | some | | deja- | -doing | the doing of | +| di- | | negative connotation | +| gara- | all-/every- | all/every | +| mire- | semi- | semi | +| mo- | | inversion, contrary meaning | +| ni- | non- | negation, other than | | soro- | re- | repetition of an action | +| wu- | | positive connotation | diff --git a/Vocabulary/Prepositions.md b/Vocabulary/Prepositions.md index a47c27f..34975b4 100644 --- a/Vocabulary/Prepositions.md +++ b/Vocabulary/Prepositions.md @@ -2,18 +2,18 @@ | Spelling | Translation (English) | Implication / Definition / Used as | |----------|-----------------------|------------------------------------| -| ra | in | is part of, contained or located in | -| para | for | | +| bi | by | in context of "I walked by the blahaj store." | +| caba | behind | | | de | of | | -| no | but | | +| faba | in front of | | | gon | on | | | huba | over | | -| wuba | under | | -| faba | in front of | | -| caba | behind | | -| tamba | next to | | -| taba | near | | | kaba | far | | -| taro | with | | +| no | but | | +| para | for | | +| ra | in | is part of, contained or located in | | se | to | in context of "9 to 5" or "I walked to the blahaj store." | -| bi | by | in context of "I walked by the blahaj store." | +| taba | near | | +| tamba | next to | | +| taro | with | | +| wuba | under | | diff --git a/Vocabulary/Pronouns.md b/Vocabulary/Pronouns.md index f32ec3b..16c0da5 100644 --- a/Vocabulary/Pronouns.md +++ b/Vocabulary/Pronouns.md @@ -3,51 +3,52 @@ ## Personal Pronouns *All of the following pronouns when used without any suffix are singular. They become plural with the "sa" suffix (ie. Li = I, Lisa = We)* + | Spelling | English Equivalent | Implication / Definition / Used as | |----------|--------------------|------------------------------------| -| li | I | animate, unspecified, 1st person | -| mida | you [singular] | animate, unspecified, 2nd person | | da | they [singular] | animate, unspecified, 3rd person | -| dase | she | animate, feminine, 3rd person | -| dake | | animate, fem-leaning, 3rd person | +| daci | he | animate, masculine, 3rd person | | daka | they [singular] | animate, androgynous, 3rd person | +| dake | | animate, fem-leaning, 3rd person | | daki | | animate, masc-leaning, 3rd person | -| daci | he | animate, masculine, 3rd person | +| dase | she | animate, feminine, 3rd person | +| li | I | animate, unspecified, 1st person | +| mida | you [singular] | animate, unspecified, 2nd person | ## Indefinite Pronouns | Spelling | English Equivalent | Implication / Definition / Used as | |----------|--------------------|------------------------------------| -| reda | itself/herself/etc. | reflexive pronoun, referencing to the thing(s) already mentioned in the sentence | -| toransu | other/another | | -| gara | all/every | | -| coko | some | | | boro | any | | +| coko | some | | +| gara | all/every | | | mire | half | | +| reda | itself/herself/etc. | reflexive pronoun, referencing to the thing(s) already mentioned in the sentence | +| toransu | other/another | | ## Demonstrative Pronouns (Close to speaker) | Spelling | English Equivalent | Implication / Definition / Used as | |----------|--------------------|------------------------------------| -| tano | this + n. | | +| talo | such | "this kind of" | | tani | this + adj. | | +| tano | this + n. | | | tatu | as such, so | "this way", "in this manner" | -| talo | such | "this kind of" | ## Demonstrative Pronouns (Far from speaker) | Spelling (far from speaker) | English Equivalent | Implication / Definition / Used as | |-----------------------------|--------------------|------------------------------------| -| kano | that + n. | -| kani | that + adj. | -| katu | as such, so | "that way", "in that manner" | | kalo | such | "that kind of" | +| kani | that + adj. | | +| kano | that + n. | | +| katu | as such, so | "that way", "in that manner" | ## Demonstrative Pronouns (Interrogative form) | Spelling (interrogative form) | English Equivalent | Implication / Definition / Used as | -|-----------------------------|--------------------|------------------------------------| -| sono | what | -| soni | which | -| sotu | how | "which way", "in which manner" | +|-------------------------------|--------------------|------------------------------------| | solo | | "what kind of" | +| soni | which | | +| sono | what | | +| sotu | how | "which way", "in which manner" | diff --git a/Vocabulary/Suffixes.md b/Vocabulary/Suffixes.md index 379f823..ac81005 100644 --- a/Vocabulary/Suffixes.md +++ b/Vocabulary/Suffixes.md @@ -4,49 +4,48 @@ | Spelling | English Equivalent | Implication / Definition / Used as | |----------|--------------------|------------------------------------| -| -lu | -er , -ist | defines an agent noun | -| -sa | -s, -es | indicates plurality | -| -ri | -ery | establishes a place/event | +| -bani | -th | for numbers, indicates ordinality | +| -ci | | establishes masculine characteristics/gender | | -dufen | -ifier, -inator | refers to an entity or construct that performs a specific action or function | +| -falo | -speak, -talk | indicates manner or characteristic of speech | | -fe | "against" , "in opposition to" | connotes opposition | -| -se | | establishes feminine characteristics/gender | -| -ke | | establishes fem-leaning characteristics/gender | | -ka | | establishes androgynous characteristics/gender | +| -ke | | establishes fem-leaning characteristics/gender | | -ki | | establishes masc-leaning characteristics/gender | -| -ci | | establishes masculine characteristics/gender | -| -pa | -'s | marks word as possessive | | -lonki | -ology, -graphy, -nomy, -ics | refers to a field of knowledge/study | -| -falo | -speak, -talk | indicates manner or characteristic of speech | -| -bani | -th | for numbers, indicates ordinality | -| -ra | -like, -ern | converts to adjective | +| -lu | -er , -ist | defines an agent noun | +| -pa | -'s | marks word as possessive | | -para | N/A | indicates that word is a loanword | +| -ra | -like, -ern | converts to adjective | +| -ri | -ery | establishes a place/event | +| -sa | -s, -es | indicates plurality | +| -se | | establishes feminine characteristics/gender | ## Temporal verb suffixes | Spelling | English Equivalent | Implication / Definition / Used as | |----------|--------------------|------------------------------------| | -da | -ed | refers to the past tense form of a verb | -| -ne | | refers to the present tense form of a verb | -| -lo | "will", "shall" | refers to the future tense form of a verb | | -ja | "yet", "so far" | refers to that a verb is in progress or incomplete | +| -lo | "will", "shall" | refers to the future tense form of a verb | +| -ne | | refers to the present tense form of a verb | | -zi | | implies indefinite action of verb without defined beginning or end | ## Other verb suffixes | Spelling | English Equivalent | Implication / Definition / Used as | |----------|--------------------|------------------------------------| -| -ku | | establishes verb as uncertain/questioning | +| -cu | | denotes conversion to passive form ("I love you" -> "I am loved by you") | | -do | "should", "ought to" | establishes verb as imperative | +| -ku | | establishes verb as uncertain/questioning | | -kuka | "please" | establishes verb as politely questioning/requesting | -| -napo | from | | | -lani | to | | -| -cu | | denotes conversion to passive form ("I love you" -> "I am loved by you") | - +| -napo | from | | ## Adjective suffixes | Spelling | English Equivalent | Implication / Definition / Used as | |----------|--------------------|------------------------------------| | -jala | -able , -ible , "capable of" | denotes ability or capacity | -| -wan | -est | denotes superlative adjectives | | -kin | | denotes conversion to noun | +| -wan | -est | denotes superlative adjectives | diff --git a/Vocabulary/Verbs.md b/Vocabulary/Verbs.md index 4aa8ea7..7499ccd 100644 --- a/Vocabulary/Verbs.md +++ b/Vocabulary/Verbs.md @@ -1,92 +1,92 @@ # Verbs | Spelling (nonextended — original) | English Equivalent | Implication / Definition / Used as | -|-----------------------------------|--------------------|--------------------------------| -| mawa | kiss | | +|-----------------------------------|--------------------|------------------------------------| +| bacini | to walk | | +| betini | to lead | | | binta | eat | | -| sanu | be | | -| tenco | have | | -| somo | sleep | | +| bolini | to roll | | +| bujini | to bend | | +| cikihasonbacini | to sneak | | +| cini | to leave/go | | +| cinini | to kick | | +| cipan | to divide, to split | | +| ciwaci | to shoot | | +| core | want | | | cosi | choose, vote | | -| falo | speak, say, tell | | -| toransu | differ | | -| mahen | make, create | | -| sekiso | have sex, fuck | | +| dawini | to lie down | | | deja | do, act | | +| dejanem | to try, to attempt | | +| dejapora | to advance | | +| domovini | to drop | | +| endini | to stop | | +| falo | speak, say, tell | | +| ficini | to swim | | +| fitini | to strike/punch | | +| fonopen | to blow | | +| gabini | to give/release | | | gade | guess | | -| nem | think | | -| pen | move | | -| nepen | feel | | | gurati | induce negative freedom, reduce cost to none | | -| lifeta | induce positive freedom | | -| jala | can, be able to | | -| meta | measure | | -| core | want | | -| jore | need | | -| pora | to add, to increase | | -| mina | to subtract, to decrease, to remove | | -| mulipa | to multiply | | -| cipan | to divide, to split | | -| nepetori | to love, to feel love towards | | -| muvini | to move | | | halini | to start | | -| mirendini | to pause/rest | | -| mirehalini | to continue | | -| endini | to stop | | +| henlona | welcome, to welcome | | +| hiranaki | to hear | | | hitini | to arrive/come | | -| cini | to leave/go | | -| tenini | to stand/rise | | -| palini | to fall | | -| rumpini | to sit | | -| dawini | to lie down | | -| bujini | to bend | | -| bacini | to walk | | +| holini | to carry/hold/bear | | | hurini | to run | | +| jala | can, be able to | | +| jore | need | | +| kamuvini | to push | | | kanini | to jump | | -| risini | to climb | | -| lubini | to slide | | -| qipini | to fly | | -| ficini | to swim | | -| bolini | to roll | | | karini | to drive | | -| kamuvini | to push | | -| tamuvini | to pull | | -| upimovini | to lift | | -| domovini | to drop | | | kawufini | to throw | | -| tawufini | to catch | | -| holini | to carry/hold/bear | | -| nykini | to take/grab | | -| gabini | to give/release | | +| kopori | to copy | | +| kukinkumi | QED / it is proven | | | kuvini | to drag | | -| cinini | to kick | | -| fitini | to strike/punch | | +| lajitoki | to glow | | +| lifeta | induce positive freedom | | +| lubini | to slide | | +| mahen | make, create | | +| mawa | kiss | | +| meta | measure | | +| mina | to subtract, to decrease, to remove | | +| mirehalini | to continue | | +| mirendini | to pause/rest | | +| mulipa | to multiply | | +| muvini | to move | | +| naki | to sense | | +| nem | think | | +| nemtori | to care, to care about | | +| nepen | feel | | +| nepetori | to love, to feel love towards | | +| nykini | to take/grab | | +| palini | to fall | | | panini | to flip/do a flip | | -| velorini | to follow | | -| betini | to lead | | -| xasini | to resist | | -| repa | let | | -| kukinkumi | QED / it is proven | | +| pen | move | | +| pora | to add, to increase | | | qina | to know | | +| qipini | to fly | | +| repa | let | | +| risini | to climb | | +| rumpini | to sit | | +| sanu | be | | +| sekiso | have sex, fuck | | +| seni | to use | | +| setaku | to kill (unintentionally or unknown) | | +| setaso | to kill (intentionally) | | | simjala | to accept | | -| henlona | welcome, to welcome | | -| dejapora | to advance | | +| somo | sleep | | | sorini | to find | | +| sorosoro | to repeat | | +| tamuvini | to pull | | +| tawufini | to catch | | +| tenco | have | | +| tenini | to stand/rise | | | tesura | to adventure | | -| setaso | to kill (intentionally) | | -| setaku | to kill (unintentionally or unknown) | | -| ciwaci | to shoot | | -| cikihasonbacini | to sneak | | -| naki | to sense | | -| viconaki | to see | | -| hiranaki | to hear | | +| tetoni | to grow, to expand | | +| toransu | differ | | | toritori | to guard | | -| kopori | to copy | | +| upimovini | to lift | | +| velorini | to follow | | +| viconaki | to see | | | vineri | to reflect | | -| fonopen | to blow | | -| seni | to use | | -| nemtori | to care, to care about | | -| sorosoro | to repeat | | -| tetoni | to grow, to expand | | -| lajitoki | to glow | | -| dejanem | to try, to attempt | | +| xasini | to resist | | diff --git a/rawspec/0-catted.json b/rawspec/0-catted.json index 6c2e3ec..96c44ee 100644 --- a/rawspec/0-catted.json +++ b/rawspec/0-catted.json @@ -381,6 +381,12 @@ "impl": null, "obscurism": null }, + { + "word": "mayu", + "meaning": "very, extremely", + "impl": null, + "obscurism": null + }, { "word": "nen", "meaning": "no", @@ -410,6 +416,12 @@ "meaning": "because", "impl": "statement of cause", "obscurism": "tun'" + }, + { + "word": "wuroga", + "meaning": "WLOG (without loss of generality)", + "impl": null, + "obscurism": null } ] }, diff --git a/rawspec/0-complete.json b/rawspec/0-complete.json index 81a7233..53403cc 100644 --- a/rawspec/0-complete.json +++ b/rawspec/0-complete.json @@ -1784,6 +1784,13 @@ "type": "adjective", "obscurism": null }, + { + "word": "mayu", + "meaning": "very, extremely", + "impl": null, + "type": "adverb", + "obscurism": null + }, { "word": "meta", "meaning": "measurment", @@ -3506,6 +3513,13 @@ "type": "noun", "obscurism": null }, + { + "word": "wuroga", + "meaning": "WLOG (without loss of generality)", + "impl": null, + "type": "adverb", + "obscurism": null + }, { "word": "wusita", "meaning": "good", diff --git a/rawspec/1-stats.json b/rawspec/1-stats.json new file mode 100644 index 0000000..e609666 --- /dev/null +++ b/rawspec/1-stats.json @@ -0,0 +1,4 @@ +{ + "totalEntries": 510, + "lastUpdated": "2026-08-08T19:41:46.856Z" +} \ No newline at end of file diff --git a/rawspec/README.md b/rawspec/README.md index 378a091..b837e4a 100644 --- a/rawspec/README.md +++ b/rawspec/README.md @@ -4,16 +4,15 @@ This is the raw data for every word in the language. ## Rules -- Do not manually edit these files. Use the `../scripting/index.ts` script to modify them. -- Do not add extra commits to update these files; GitHub Actions will automatically update the rawspec after merging into `main`. - -Any faulty changes will be overwritten after merge. +- Do not manually edit these files. Use the `/scripting/index.ts` script to modify them. +- The script will be run by GitHub Actions on every push and pull request to `main`. +- Any user changes will be overwritten. ## Schemas -See `../scripting/types.ts` for file schemas. +See `/scripting/types.ts` for file schemas. -The complete langspec is simply an array of `Entry` objects; that is to say, when imported or parsed, it resolves to a value of type `Entry[]`. +The complete langspec `0-complete.json` is simply an alphabetized array of `Entry` objects; that is to say, when imported or parsed, it resolves to a value of type `Entry[]`. All the other files (e.g. `nouns.json`, `verbs.json`, etc.) consist of arrays of `Section` objects. If the file has subheaders (Level 2 Markdown headings) then this is used for each `Section.title`. Otherwise, the `Section.title` is `null`, and all entries are kept in the one untitled section. diff --git a/rawspec/adverbs.json b/rawspec/adverbs.json index be02726..6592eb2 100644 --- a/rawspec/adverbs.json +++ b/rawspec/adverbs.json @@ -20,6 +20,12 @@ "impl": null, "obscurism": null }, + { + "word": "mayu", + "meaning": "very, extremely", + "impl": null, + "obscurism": null + }, { "word": "nen", "meaning": "no", @@ -49,6 +55,12 @@ "meaning": "because", "impl": "statement of cause", "obscurism": "tun'" + }, + { + "word": "wuroga", + "meaning": "WLOG (without loss of generality)", + "impl": null, + "obscurism": null } ] }, diff --git a/scripting/index.ts b/scripting/index.ts index 136de4b..06a4067 100644 --- a/scripting/index.ts +++ b/scripting/index.ts @@ -14,6 +14,8 @@ const TargetDirectory = join( 'rawspec' ); +const StatsFile = join(TargetDirectory, '1-stats.json'); + function parseTableRow(row: string): string[] { return row .slice(1, -1) @@ -47,15 +49,37 @@ const Files = await readdir(SourceDirectory); const CompleteDictionaryStack: FullEntry[] = []; const CattedBigSectionStack: BigSection[] = []; +const h1Matcher = /^# .+$/i; const h2Matcher = /^## .+$/i; -const tableRowMatcher = /^\| [^|]* \|( [^|]* \|)+$/i; +const tableSeparatorMatcher = /^\|[-\|]+\|$/i; +const tableRowMatcher = /^\| [^|]* \|( [^|]* \|| \|)+$/i; for (const file of Files) { const content = await readFile(join(SourceDirectory, file), 'utf-8'); const unfilteredRows = content.split('\n').map(v => v.trim()); - const rows = unfilteredRows.filter( - v => tableRowMatcher.test(v) || h2Matcher.test(v) - ); + + const nonDataRows = new Map(); + const rows: string[] = []; + + let previousRow = unfilteredRows[0]; + for (const row of unfilteredRows) { + if ( + row.length === 0 || + h1Matcher.test(row) || + tableSeparatorMatcher.test(row) + ) + continue; + + if (tableRowMatcher.test(row)) rows.push(row); + else if (h2Matcher.test(row)) { + rows.push(row); + previousRow = row; + } else nonDataRows.set(previousRow, row); + } + + // const rows = unfilteredRows.filter( + // v => tableRowMatcher.test(v) || h2Matcher.test(v) + // ); const type = (() => { const asdf = file.toLowerCase().replace(/s\.md$/, ''); @@ -95,11 +119,14 @@ for (const file of Files) { .split('|') .map(v => v.trim()); - // no using !v because it will throw an error if v is an empty string - if (parsedRow.some(v => v === null || v === undefined)) - throw new Error( - `Invalid row (at row ${unfilteredRows.indexOf(row)} of ${file}): ${row}` - ); + // What the hell is this for? + /** + // no using !v because it will throw an error if v is an empty string + if (parsedRow.some(v => v === null || v === undefined)) + throw new Error( + `Invalid row (at row ${unfilteredRows.indexOf(row)} of ${file}): ${row}` + ); + */ if (justStartedNewSection) { headers = parsedRow; @@ -141,6 +168,36 @@ for (const file of Files) { ) } satisfies Section); + await writeFile( + join(SourceDirectory, file), + unfilteredRows[0] + + '\n\n' + + (nonDataRows.has(unfilteredRows[0]) + ? nonDataRows.get(unfilteredRows[0]) + '\n\n' + : '') + + sectionStack + .map(section => { + let sectionString = ''; + if (section.title) { + const subtitleRow = `## ${section.title}`; + sectionString += subtitleRow + '\n\n'; + if (nonDataRows.has(subtitleRow)) + sectionString += nonDataRows.get(subtitleRow) + '\n\n'; + } + sectionString += `| ${section.headers.join(' | ')} |\n`; + sectionString += `|${section.headers.map(header => '--' + '-'.repeat(header.length)).join('|')}|\n`; + sectionString += section.entries + .map( + entry => + `| ${entry.word} | ${entry.meaning ?? ''} | ${entry.impl ?? ''} |` + ) + .join('\n'); + return sectionString; + }) + .join('\n\n') + + '\n' + ); + const targetFile = join( TargetDirectory, file.toLowerCase().replace(/\.md$/, '.json') @@ -176,3 +233,16 @@ await writeFile( JSON.stringify(CattedBigSectionStack, null, '\t'), 'utf-8' ); + +await writeFile( + StatsFile, + JSON.stringify( + { + totalEntries: CompleteDictionaryStack.length, + lastUpdated: new Date().toISOString() + }, + null, + '\t' + ), + 'utf-8' +);