From da14355f22e195515fafebedc4d6e8264e4bccec Mon Sep 17 00:00:00 2001 From: /dev/urandom Date: Wed, 2 Dec 2020 21:43:51 +0300 Subject: [PATCH] whoops --- pages/tokipona/index.md | 2 ++ pages/tokipona/personal_style.md | 49 +++++++++++++++++++++++++++++++ pages/tokipona/riichi_mahjong.md | 3 ++ static/style.css.h | 2 -- static/tokipona/mahjong_wall.gif | Bin 0 -> 4356 bytes static/website_banner_alt.gif | Bin 0 -> 1415 bytes tpl/default.tpl | 3 +- 7 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 pages/tokipona/personal_style.md create mode 100644 static/tokipona/mahjong_wall.gif create mode 100644 static/website_banner_alt.gif diff --git a/pages/tokipona/index.md b/pages/tokipona/index.md index d16e9ce..eb00f38 100644 --- a/pages/tokipona/index.md +++ b/pages/tokipona/index.md @@ -125,6 +125,8 @@ language's 120 word dictionary. * * [musi Soki (rules of shogi) (wip)](shogi.html) +* [lipu nasin pi musi Lisi Masan (Riichi Mahjong) (WIP)](riichi_mahjong.html) + * ["insa pi supa lape" -- an original sitelen pona font](supalape.html) * [ante toki tawa musi pi sitelen tawa (video game translations)](game_patches.html) diff --git a/pages/tokipona/personal_style.md b/pages/tokipona/personal_style.md new file mode 100644 index 0000000..f5685cd --- /dev/null +++ b/pages/tokipona/personal_style.md @@ -0,0 +1,49 @@ +% toki pona personal style +% /dev/urandom +% november 2020 + +Different people have different ideas about how toki pona is supposed to work. +Given the language's intentionally minimalist grammar and vocabulary, that's to +be expected. Here's a list of my personal preferences and phrases that I use +commonly. + +* In sentences that only have "mi" or "sina" as a subject, but several + predicates (verbs or adjectives that would otherwise be separated by "li", I + separate the sentence into two: + + > mi pali. mi moku. - I work and eat. + +* I try to avoid using "en" anywhere other than the subject, but tolerate using + it in phrases that follow "pi". + +* When I use "kepeken" as a verb ("to use") instead of a preposition ("using, + with the help of"), I include the object marker "e" the same way I would with + other verbs. + +* I may insert commas as pauses to differentiate between ambiguious phrases or + to help in reading possibly confusing sentences. For example: + + > mi pana e tomo tawa sina. - I give your car. + + > mi pana e tomo, tawa sina. - I give you a house. + + > mi pana e tomo tawa, tawa sina. - I give a car to you. + +* I insert commas after "la" in all circumstances: + + > ken la, mi ken pali. - Maybe I can work. + + > tomo pali li open la, mi ken pali. - If the office is open, I can work. + +* I use "open" and "pini" as pre-verbs meaning "begin (doing smth)" "finish/stop + (doing something)". + +* When a numeral is used as a number, I usually write it with Arabic numerals. + If it's an ordinal number, the word "nanpa" may be represented with a number + sign (`#`). + +* I don't use "pi" before "nanpa" if it's followed by an ordinal number. + +* I use "pu" as all possible parts of speech, not just as a verb. + +[Back to top page](index.html) diff --git a/pages/tokipona/riichi_mahjong.md b/pages/tokipona/riichi_mahjong.md index 7e7f0f4..8b7f033 100644 --- a/pages/tokipona/riichi_mahjong.md +++ b/pages/tokipona/riichi_mahjong.md @@ -230,6 +230,9 @@ sina lukin e supa musi tan sewi la, nasin pi ijo musi li sama nasin palisa pi il ||||||||||||||||| ``` +![sitelen ni li pana lukin e sona ni: jan seme li kama jo e ijo musi seme lon +tenpo seme? ijo seme li lon sinpin moli?](mahjong_wall.gif) + jan musi ale li pali e ijo sama, kepeken nasin nanpa sama, lon tenpo tu. ni li pini la, jan musi ale li kama jo e ijo musi wan tan sinpin kepeken nasin nanpa sama. diff --git a/static/style.css.h b/static/style.css.h index 95cd8c7..d0b9c7d 100644 --- a/static/style.css.h +++ b/static/style.css.h @@ -2,7 +2,6 @@ #define C_PAGEBG #221f31 #define C_HEADERBG #221f31 -#define C_HEADERBGHALF rgba(34,31,49,0.5) #define C_BODYBG #fefefe #define C_FOOTERBG #050403 @@ -287,7 +286,6 @@ HASH(#itime-progress) { } .header_text { - background: C_HEADERBGHALF; padding-inline: 2em; } .content { diff --git a/static/tokipona/mahjong_wall.gif b/static/tokipona/mahjong_wall.gif new file mode 100644 index 0000000000000000000000000000000000000000..d37fd147ad1f8a81b636add6cf1025ec480d66a6 GIT binary patch literal 4356 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 LoMMZI0}%WN8fn6~ literal 0 HcmV?d00001 diff --git a/tpl/default.tpl b/tpl/default.tpl index a67a79c..5e1955e 100644 --- a/tpl/default.tpl +++ b/tpl/default.tpl @@ -9,8 +9,9 @@ - + +