diff --git a/composer.json b/composer.json index 462633f..442dcfc 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "yusurko/caluta7", "type": "project", - "version": "0.2.0", + "version": "0.3.0", "require": { "league/commonmark": "^2.8", "symfony/yaml": "^7.0", diff --git a/index.php b/index.php index 0f3710f..1ad838a 100644 --- a/index.php +++ b/index.php @@ -24,6 +24,7 @@ if ($pl->getError() !== false) { --fg-main: #e8eef2; --bg-main: #121821; --bg-alt: #313840; + --border: #999999; } body { background-color: var(--bg-main); @@ -61,6 +62,15 @@ if ($pl->getError() !== false) { text-align: center; font-size: 85%; } + + table { + border-collapse: collapse; + } + + table > * > tr > th, table > * > tr > td { + border: 1px solid var(--border); + padding: 4px; + } diff --git a/pages/dict.md b/pages/dict.md index 5edf779..d8bb2b8 100644 --- a/pages/dict.md +++ b/pages/dict.md @@ -2,6 +2,8 @@ Jytky Kalpy: Lemeryj (r9: dictionary for the language of Jytlynd) +For pronunciation see [Pronunciation#Jytky Kalpy](/ipa) + * **-ady** / part. / nominalizer (for words of HkM origin) * **-s** / part. / suffix for genitive * **-tza** / part. / suffix for past @@ -16,6 +18,8 @@ Jytky Kalpy: Lemeryj * **cjat** / n. / chat, conversation * **cjawcjynky** / a. / Kyawcenni * **cjendy** / n. / estrogen +* **cjyklin** / n. / chicken +* **cjym** / n. / chimp * **cjyry** / n. / cherry * **dœd** / a., n. / dead * **em** / v. / to be @@ -29,11 +33,15 @@ Jytky Kalpy: Lemeryj * **galutky** / a. / Calutan * **gryvary** / n. / script, alphabet * **gryvy** / v. / to grief, vandalize +* **gyatt** / n. / goat * **hynd** / n. / dog * **i** / pp. / in * **iglisy** / n. / north +* **iglisky** / a. / northern +* **italky** / a. / Italian * **je** / p. / I * **jotky** / a. / Jutish (of Jotlond) +* **juropky** / a. / European; democratic * **jytky** / a. / Jutish (of Jytlynd) * **kalpy** / n. / tongue, language * **kedo** / c. / but @@ -43,11 +51,17 @@ Jytky Kalpy: Lemeryj * **lemy** / n. / word * **lynd** / a. / land, territory * **man** / n. / man, male +* **motyn** / n. / sheep * **nym** / n. / name * **oj** / p. / it * **oksygyn** / n. / oxygen * **pastynagy** / n. / carrot +* **peanat** / n. / peanut * **pergwan** / v. / to forget (used at past tense) +* **prata** / v. / to talk +* **pratady** / n. / discourse, -logy +* **purtzel** / n. / pig +* **py** / n. / pig * **pyjpa** / n. / paper * **pyk** / n. / pickaxe * **som** / a. / some @@ -57,10 +71,12 @@ Jytky Kalpy: Lemeryj * **tzurgy** / n. / sword * **tzyjar** / n. / animal (also as insult) * **urd** / n. / earth, dirt +* **urdky** / a. / terrestrial, earthly * **urds?eply** / n. / potato * **ust** / n. / house * **vatry** / a. / bad, gross, not aight * **vy** / c. / why +* **wœk** / n. / cow * **yky** / v. / to go * **yvyly** / a. / evil, silly * **zajady** / n. / cut diff --git a/pages/ipa.md b/pages/ipa.md new file mode 100644 index 0000000..5c56817 --- /dev/null +++ b/pages/ipa.md @@ -0,0 +1,34 @@ +Pronunciation + +## Jytky Kalpy + +| Letter | IPA | Notes | +|-----|-----|-------| +| a | /a/ | | +| b | /b/ | | +| cj | /tʃ/ | | +| d | /d/ | not pronounced in -nd coda | +| e | /ɛ/ | | +| f | /f/ | | +| g | /g/ | pronounced /ŋ/ sometimes in coda | +| h | /h/ | | +| i | /i/ | | +| j | /j/ | | +| k | /k/ | | +| l | /l/ | | +| m | /m/ | | +| n | /n/ | pronounced /ŋ/ at word end | +| nj | /ɲ/ | | +| o | /o/ | | +| œ | /ʌ/ | | +| p | /p/ | | +| r | /r/ | | +| s | /s/ | | +| sj | /ʃ/ | | +| t | /t/ | | +| tz | /ts/ | | +| u | /ʉ/ | | +| v | /v/ | | +| w | /w/ | | +| y | /e/ | | +| z | /z/ | | \ No newline at end of file diff --git a/src/PageLoader.php b/src/PageLoader.php index 90d57d3..c31314d 100644 --- a/src/PageLoader.php +++ b/src/PageLoader.php @@ -3,7 +3,10 @@ namespace Yusurko\Caluta7; use Symfony\Component\Yaml\Yaml; -use League\CommonMark\CommonMarkConverter; +use League\CommonMark\MarkdownConverter; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension; +use League\CommonMark\Extension\Table\TableExtension; define('PAGES_PATH', dirname(__DIR__) . '/pages'); @@ -84,7 +87,13 @@ class PageLoader { public function getHtml() { if (!$this->raw_content) return false; - $md = new CommonMarkConverter(); + + // todo config + $mdEnv = new Environment([]); + $mdEnv->addExtension(new CommonMarkCoreExtension()); + $mdEnv->addExtension(new TableExtension()); + + $md = new MarkdownConverter($mdEnv); $content = $md->convert($this->raw_content); return "
$content
"; }