From 3244927cc77dee0869335757e29030bdd269560c Mon Sep 17 00:00:00 2001 From: "Dylan R. E. Moonfire" Date: Tue, 9 May 2017 20:37:15 -0500 Subject: [PATCH] Formatting to make it easier to get into the website. --- bin/create-dictionary-markdown | 3 ++- src/grammar/formality.markdown | 15 +++++-------- src/grammar/numbers.markdown | 40 ++++++++++++++++++---------------- src/grammar/syllables.markdown | 11 ++++------ 4 files changed, 32 insertions(+), 37 deletions(-) diff --git a/bin/create-dictionary-markdown b/bin/create-dictionary-markdown index 2374d91..6c5ba64 100755 --- a/bin/create-dictionary-markdown +++ b/bin/create-dictionary-markdown @@ -79,7 +79,7 @@ for my $s (sort(glob("$DICT_DIR/*"))) print STDERR "Processing: $bs ($w entries)\n"; print $DICT "# $bs\n\n"; - print $SYB "---\ntitle: Miwāfu Dictionary - $bs\n---\n\n# $bs\n\n"; + print $SYB "---\ntitle: Miwāfu Dictionary - $bs\nbreadcrumbTitle: $bs\n---\n\n# $bs\n\n"; # Go through each of these entries. for $w (@w) @@ -157,6 +157,7 @@ sub process_word my %def_pos = (); my @def_list = (); + s@^\#+\s+@@; $word = $_; $defs{$word} = \%def_pos unless defined $defs{$word}; $defs{$word}{$pos} = \@def_list unless defined $defs{$word}{$pos}; diff --git a/src/grammar/formality.markdown b/src/grammar/formality.markdown index 86ab1d5..1f5e721 100644 --- a/src/grammar/formality.markdown +++ b/src/grammar/formality.markdown @@ -4,8 +4,7 @@ title: Formality In Miwāfu, there is a relatively complex system of formality while speaking and writing. Reverence and respect are both critical to the society and it is reflected in their speech. -Modes -================================ +# Modes There are four modes of formality in the language. For this discussion, the following terms will be used. @@ -14,18 +13,15 @@ There are four modes of formality in the language. For this discussion, the foll 3. Informal: Speaking informally. 4. Rude: Speaking with the intent to insult or demean. -Verbosity -================================ +# Verbosity When speaking reverently, in general, the language becomes more verbose and formalized. On the other hand, speaking rudely also includes verbosity while the other two modes (polite and informal) are typically more terse. -Explicit Particles -================================ +# Explicit Particles When speaking reverently, [particles](particles.markdown) are not excluded, including sentence and phrase order particles. -Adverbs and Adjectives -================================ +# Adverbs and Adjectives When speaking formally, frequently the speaker uses more adjectives and adverbs while describing their actions. So, while informally someone may say: @@ -51,8 +47,7 @@ You can speak as an equal. Even with this, it is not uncommon to still include one or two additional phrases in a sentence to acknowledge the difference, but it is a not-so-subtle request to "speed it up." -"Great" ----------------- +# "Great" One of the most common additional phrases when reverntly speaking to a superior is the use of `fechi` which means great. This is always used with the full name of the person being spoken to with the clan name first. diff --git a/src/grammar/numbers.markdown b/src/grammar/numbers.markdown index e2a21d9..2747dcb 100644 --- a/src/grammar/numbers.markdown +++ b/src/grammar/numbers.markdown @@ -38,41 +38,43 @@ The end of a numerical sequence is either a pause between words or `nwe`. Scales ================================ -With large numbers, over four digits, the typical convention is to write them out with a space or letter between each group of three. +With large numbers, over five digits, the typical convention is to write them out with a space or letter between each group of four. The gruoping is from left to right. The space is not required. - we parechi moku - [numeral] 123 45 + we parechimo ku + [numeral] 1234 5 -To simplify numbers, `do` is used to indicate three zeros. +To simplify numbers, `do` is used to indicate four zeros. padochi - 1 000 2 - 10,002 + pa do chi + 1 0000 2 + 100,002 In addition to `do`, there are additional scale syllables used for large numbers. -Zeros | Description | Syllable -----: | :------- | :------- - 1 | Ten | mya - 2 | Hundred | pyu - 3 | Thousand | do - 6 | Million | kya - 9 | Billion | jyo - 12 | Trillion | shyo +Zeros | Description | Syllable +----: | :------- | :------- + 1 | Ten | mya + 2 | Hundred | pyu + 3 | Thousand | nyu + 4 | 10 Thousand | do + 8 | 10 Million | kya + 12 | 10 Billion | jyo + 16 | 10 Trillion | shyo Like `do`, these can easily be combined together to indicate more zeros. pa jyo re pa dododo re - 1 000000000 2 - 10,000,000,002 + 1 000000000000 2 + 10,000,000,000,002 These can be combined together: pa doshyo - 1 [thousand] [trillion] - 1 quadrillion - 1,000,000,000,000,000 + 1 0000 00000000000000000000 + 1 septillion + 1e24 To do numbers like the English phrase "one thousand and one", see *Mathematics* below. diff --git a/src/grammar/syllables.markdown b/src/grammar/syllables.markdown index f304333..ea0872a 100644 --- a/src/grammar/syllables.markdown +++ b/src/grammar/syllables.markdown @@ -4,10 +4,9 @@ title: Syllables The basic units of Miwāfu are syllables. These are represented as a single glyph in the written language and spoken as a single unit. They are also the basis of the penultimate accent on the final word of a phrase. -Syllable Chart -============== +# Syllable Chart - | w | r | m | p | b | h | n | d | t | z | s | g | k | f +* | w | r | m | p | b | h | n | d | t | z | s | g | k | f --- | --- | --- | --- | --- | --- | --- | --- | --- | ---- | --- | ---- | --- | --- | --- a | wa | ra | ma | pa | ba | ha | na | da | ta | za | sa | ga | ka | fa e | we | re | me | pe | be | he | ne | de | te | ze | se | ge | ke | fe @@ -19,8 +18,7 @@ yo | | ryo | myo | pyo | byo | hyo | nyo | | chyo | jyo | shyo | gyo | yu | | ryu | myu | pyu | byu | hyu | nyu | | chyu | jyu | shyu | gyu | kyu | | | | | | | | n | | | | | | | -Penultimate Accents -=================== +# Penultimate Accents For the penultimate (second to the last) syllable of the final word in a phrase, there is an accent which identifies the gender. This gender can be literal (as with most creatures) or representative of scope. @@ -34,7 +32,6 @@ While "n" can be a syllable on its own, it is never used in the penultimate loca When listed in dictionaries and word lists, accents are in the above order (masculine, neuter, female). -Design Notes -============ +# Design Notes The primary reason that "n" cannot be accented is technical. It is very difficult to find a font that handles macron accents over vowels correctly, but almost impossible to find one that handles acute, grave, and macro accents on "n".