fs-draft.git

added some drafts and an example text
Parent 8d9ecf0
Christian Fraß

Christian Fraß commited on 2016-06-05 19:05:53
Zeige 16 geänderte Dateien mit 207 Einfügungen und 17 Löschungen.

genmake.py
Zeige Datei @ b3c1b9b
... ... 
@@ -98,6 +98,9 @@ def main():
98 98 
 		os.path.join(dirs["source"],"content","tempora_and_modi.html.php"),
99 99 
 		os.path.join(dirs["source"],"content","negation.html.php"),
100 100 
 		os.path.join(dirs["source"],"content","declension.html.php"),
101 
+		os.path.join(dirs["source"],"content","numeri.html.php"),
102 
+		os.path.join(dirs["source"],"content","cases.html.php"),
103 
+		os.path.join(dirs["source"],"content","definiteness.html.php"),
101 104 
 		os.path.join(dirs["source"],"content","attributes.html.php"),
102 105 
 		os.path.join(dirs["source"],"content","sentence_structure.html.php"),
103 106 
 		os.path.join(dirs["source"],"content","vocabulary.html.php"),
... ... 
@@ -106,6 +109,9 @@ def main():
106 109 
 		os.path.join(dirs["source"],"content","adpositions.html.php"),
107 110 
 		os.path.join(dirs["source"],"content","pronouns.html.php"),
108 111 
 		os.path.join(dirs["source"],"content","dictionary.html.php"),
112 
+		os.path.join(dirs["source"],"content","examples.html.php"),
113 
+		os.path.join(dirs["source"],"content","example_sentences.html.php"),
114 
+		os.path.join(dirs["source"],"content","example_texts.html.php"),
109 115 
 	]
110 116
111 117 
 	parts_data = [
makefile
Zeige Datei @ b3c1b9b
... ... 
@@ -9,7 +9,7 @@ clear: clean
9 9 
 	@ rm --recursive --force build
10 10 
 .PHONY: clear
11 11
12 
-build/draft.html: source/data/phonology_and_orthography.json source/data/personal_pronouns.json source/data/word_functions.json source/data/timeforms.json source/data/adpositions.json source/data/correlatives.json source/data/x.json source/logic/server/misc.php source/logic/server/data.php source/logic/server/settings.php source/logic/server/table.php source/logic/server/sql.php source/content/draft.html.php source/content/meta.html.php source/content/introduction.html.php source/content/preface.html.php source/content/key_parameters.html.php source/content/toc.html.php source/content/basics.html.php source/content/phonology_and_orthography.html.php source/content/grammar.html.php source/content/personal_pronouns.html.php source/content/correlatives.html.php source/content/conjugation.html.php source/content/infinite_verbforms.html.php source/content/modal_verbs.html.php source/content/tempora_and_modi.html.php source/content/negation.html.php source/content/declension.html.php source/content/attributes.html.php source/content/sentence_structure.html.php source/content/vocabulary.html.php source/content/principles.html.php source/content/word_functions.html.php source/content/adpositions.html.php source/content/pronouns.html.php source/content/dictionary.html.php
12 
+build/draft.html: source/data/phonology_and_orthography.json source/data/personal_pronouns.json source/data/word_functions.json source/data/timeforms.json source/data/adpositions.json source/data/correlatives.json source/data/x.json source/logic/server/misc.php source/logic/server/data.php source/logic/server/settings.php source/logic/server/table.php source/logic/server/sql.php source/content/draft.html.php source/content/meta.html.php source/content/introduction.html.php source/content/preface.html.php source/content/key_parameters.html.php source/content/toc.html.php source/content/basics.html.php source/content/phonology_and_orthography.html.php source/content/grammar.html.php source/content/personal_pronouns.html.php source/content/correlatives.html.php source/content/conjugation.html.php source/content/infinite_verbforms.html.php source/content/modal_verbs.html.php source/content/tempora_and_modi.html.php source/content/negation.html.php source/content/declension.html.php source/content/numeri.html.php source/content/cases.html.php source/content/definiteness.html.php source/content/attributes.html.php source/content/sentence_structure.html.php source/content/vocabulary.html.php source/content/principles.html.php source/content/word_functions.html.php source/content/adpositions.html.php source/content/pronouns.html.php source/content/dictionary.html.php source/content/examples.html.php source/content/example_sentences.html.php source/content/example_texts.html.php
13 13 
 	@ echo -e '-- composing document ...'
14 14 
 	@ mkdir --parents build
15 15 
 	@ php source/content/draft.html.php > build/draft.html
source/content/cases.html.php
Zeige Datei @ b3c1b9b
... ... 
@@ -0,0 +1,7 @@
1 
+<section class="subsection" id="cases">
2 
+	<header>Cases</header>
3 
+	<?php proposal(); ?>
4 
+	<p>The base form of noun is the <span class="grammarterm">nominative</span>
5 
+	<p>Regular nouns can appear in two cases: <span class="grammarterm">nominative</span> and <span class="grammarterm">genitive</span>. The nominative doesn't receive any marker while the genitive is formed by appending the suffix <span class="word lang_fs">-(e)s</span> to the word, e.g. <span class="word lang_fs">huses</span> ~ <span class="word lang_en">houses</span>. The marker for the plural has to be applied first, e.g. <span class="word lang_fs">huser(e)s</span> ~ <span class="word lang_en">the houses'</span>.</p>
6 
+</section>
7 
+
source/content/correlatives.html.php
Zeige Datei @ b3c1b9b
... ... 
@@ -8,7 +8,7 @@
8 8 
 	<header>Correlatives</header>
9 9 
 	<?php proposal(); ?>
10 10 
 <?php
11 
-	$mode = 2;
11 
+	$mode = 0;
12 12 
 	switch ($mode)
13 13 
 	{
14 14 
 		case 0:
source/content/declension.html.php
Zeige Datei @ b3c1b9b
... ... 
@@ -1,5 +1,83 @@
1 1 
 <section class="section" id="declension">
2 2 
 	<header>Declension</header>
3 
-	<span class="todo">all</span>
3 
+<?php
4 
+	compose
5 
+	(
6 
+		[
7 
+			"numeri",
8 
+			"cases",
9 
+			"definiteness",
10 
+		]
11 
+	);
12 
+ ?>
13 
+<p>The following table summarizes the information of this section:</p>
14 
+<?php
15 
+$data = [
16 
+	[
17 
+		"nominative",
18 
+		["original" => ["en dag"], "translated" => ["a day"]],
19 
+		["original" => ["de dag"], "translated" => ["the day"]],
20 
+		["original" => ["dager"], "translated" => ["days"]],
21 
+		["original" => ["de dager"], "translated" => ["the days"]],
22 
+	],
23 
+	[
24 
+		"accusative",
25 
+		["original" => ["en dag"], "translated" => ["a day"]],
26 
+		["original" => ["de dag"], "translated" => ["the day"]],
27 
+		["original" => ["dager"], "translated" => ["days"]],
28 
+		["original" => ["de dager"], "translated" => ["the days"]],
29 
+	],
30 
+	[
31 
+		"dative",
32 
+		["original" => ["to en dag"], "translated" => ["(to) a day"]],
33 
+		["original" => ["to de dag"], "translated" => ["(to) the day"]],
34 
+		["original" => ["to dager"], "translated" => ["(to) days"]],
35 
+		["original" => ["to de dager"], "translated" => ["(to) the days"]],
36 
+	],
37 
+	[
38 
+		"genitive",
39 
+		["original" => ["en dag(e)s","av en dag"], "translated" => ["a days","of a day"]],
40 
+		["original" => ["de dag(e)s","av de dag"], "translated" => ["the days","of the day"]],
41 
+		["original" => ["dager(e)s","av dager"], "translated" => ["days'","of days"]],
42 
+		["original" => ["de dager(e)s","av de dager"], "translated" => ["the days'","of the days"]],
43 
+	],
44 
+];
45 
+(new class_table
46 
+(
47 
+	[
48 
+		new class_column
49 
+		(
50 
+			"Case",
51 
+			function ($row) {return $row[0];}
52 
+		),
53 
+		new class_column
54 
+		(
55 
+			"singular indefinite",
56 
+			function ($row) {return $row[1];},
57 
+			_bar("word")
58 
+		),
59 
+		new class_column
60 
+		(
61 
+			"singular definite",
62 
+			function ($row) {return $row[2];},
63 
+			_bar("word")
64 
+		),
65 
+		new class_column
66 
+		(
67 
+			"plural indefinite",
68 
+			function ($row) {return $row[3];},
69 
+			_bar("word")
70 
+		),
71 
+		new class_column
72 
+		(
73 
+			"plural definite",
74 
+			function ($row) {return $row[4];},
75 
+			_bar("word")
76 
+		),
77 
+	],
78 
+	$data
79 
+))->generate();
80 
+?>
81 
+<p><span class="sentence lang_fs">Vi kön see de huses vindöger.</span> ~ <span class="sentence lang_en">We can see the houses' windows.</span></p>
4 82 
 </section>
5 83
source/content/definiteness.html.php
Zeige Datei @ b3c1b9b
... ... 
@@ -0,0 +1,7 @@
1 
+<section class="subsection" id="definiteness">
2 
+	<header>Definiteness</header>
3 
+	<?php proposal(); ?>
4 
+	<p>The undefinite aspect of a singular noun is formed by using the article <span class="word lang_fs">en</span>, e.g. <span class="word lang_fs">en hus</span> ~ <span class="word lang_en">a house</span>. Undefinite plural nouns don't have an article, e.g. <span class="word lang_fs">huser</span> ~ <span class="word lang_en">houses</span>.</p>
5 
+	<p>The definite aspect of both singular and plural nouns is formed by using the article <span class="word lang_fs">de</span>, e.g. <span class="word lang_fs">de hus</span> ~ <span class="word lang_en">the house</span>.</p>
6 
+</section>
7 
+
source/content/draft.html.php
Zeige Datei @ b3c1b9b
... ... 
@@ -28,6 +28,7 @@
28 28 
 			"basics",
29 29 
 			"vocabulary",
30 30 
 			"grammar",
31 
+			"examples",
31 32 
 		]
32 33 
 	);
33 34 
  ?>
source/content/example_sentences.html.php
Zeige Datei @ b3c1b9b
... ... 
@@ -0,0 +1,5 @@
1 
+<section class="section" id="example_sentences">
2 
+	<header>Sentences</header>
3 
+	<span class="todo">all</span>
4 
+</section>
5 
+
source/content/example_texts.html.php
Zeige Datei @ b3c1b9b
... ... 
@@ -0,0 +1,20 @@
1 
+<section class="section" id="example_texts">
2 
+	<header>Texts</header>
3 
+	<section class="subsection pseudo" id="de_grot_diktator">
4 
+		<header>De grot diktator</header>
5 
+		<span class="text lang_fs">
6 
+			<p>Ek bet fur fargivung, dok ek ik vil nit are de verlds herskar — ek ar nit solk en man. Ek vil nit beherske odar neddrüke et man, insted ek vil helpe de maner alvar on alvan: De judisk, de hejdisk, de fargig, de vit, …. Vi al skal helpe en de ander fur at vi kön leve in en beder verld. Vi vil nit hate odar farakte us. Dis verld hav plats fur al maner on ur erd ar so rik, at vi al kön spise nok. De levrid kön are so fri on skön; dok vi hav farlatet de veg.</p>
7 
+			<p>Gridhed hav sükent de maners seler on hav fült de verld med hatrid; het hav ledet us to elend on blutsketrid. Vi hav utvikelt raskhed, dok ur gester stan stil. Vi lat makiner verke fur us; ur vished hav makt us hokmudig on ur klughed hard on unfrendlik; vi denk altu mang on föl altu lit. Dok mer den makiner vi treng manlikhed; mer den klughed vi treng frendlikhed on gudhed. An dis egenheder, ur levrid ar frükridig on al ding ar lost.</p>
8 
+			<p>Med de helprid av flütoger on de radio vi ar narer en to de ander den et tid ruk. Maner treng enhed on en alver arend bruderlikhed fur bruke dis utfindunger gud. Selv no mang tused in der verld kön höre min stem, mang tusend fartvivelt verer, kviner on smal kinder — ofarunger av en sistem, vilk kvel on fang unskuldig maner. Ek rup to al, vilk kön hör mig no: Fartvivel nit! De elend skal versvinde, van de gridhed versvind on de biterhed av maner, vilk frük de forskritrid av manskap. Maners hatrid skal versvinde on diktarorer skal döe. Dan de kraft, vilk di hav takt fra de folk, skal kome bak to de folk. Selv ef mang blud ar sketet: Tu kampe fur de frihed ar en gud sak.</p>
9 
+			<p>Kemparer: Kemp nit fur tiraner, maner, vilk farakt je on mak je to sklaver, vilk vertskat nit jer levrid, vilk seg to je, vat jir skal make, true on föle! Di [drill] je, föd je, behandel je lik kanon-födung. Kemp nit fur dis fardervt maner — makin-maner med makin-hövder on makin-herter! Jir ar nit makiner, jir ar nit direr, jir ar maner. Lat de manlikhed blive in jer herter! Jir skal nit hate; bar de unlivt hat, de unlivt on de fardervt.</p>
10 
+			<p>Kemperar: Kemp nit fur de sklavskap! Kemp fur de frihed! Ine de 17. avsnidung av de hajlig Lukas ar skrivt: ‚God ar in al maner.‘ Nit bar in en grup av maner, insted in al maner, in je! Jir, de folk, hav de kraft; de kraft fur tu bue vapener, dok ok de kraft fur tu sprede gladhed. Jir, de folk, hav de kraft fur tu make dis levrid fri on skön, fur tu make dis levrid en vunderfült sak. Darfur: In de nenung av folkherskrid: Lat us bruke dis kraft! Lat us verde en! Lat us kempe fur en nü verld, fur en gud verld, vilk giv magrid tu verke to de maner, vilk giv to de jung en eftertid on to de old sikerhed. Ok de tiraner hav truent dis to us fur tu foe de vold, dok di hav lügt. Di mak nit sant dir luvung, di ing tid vil. Tiraner frien bar dim selv, dok de folk skal blive sklaver.</p>
11 
+			<p>Lat us no kempe fur tu upfüle dis luvung. Lat us kempe fur tu make de verld fri, fur tu uvervinde landmarker, gridhed, hatrid on de nittillatung. Lat us kempe fur en verld med farstanrid, en verld, var vetskap on forskritrid skal lede to al mans gladhed.</p>
12 
+			<p>Kemparer: In de nenung av folkherskrid: Lat us al verde en!</p>
13 
+		</span>
14 
+		<!--
15 
+		<a href="https://www.youtube.com/watch?v=ibVpDhW6kDQ">No music</a>
16 
+		<a href="https://www.youtube.com/watch?v=Gaq62VCcnew">With "Hans Zimmer -- Time"</a>
17 
+		  -->
18 
+	</section>
19 
+</section>
20 
+
source/content/examples.html.php
Zeige Datei @ b3c1b9b
... ... 
@@ -0,0 +1,13 @@
1 
+<section class="chapter" id="examples">
2 
+	<header>Examples</header>
3 
+<?php
4 
+	compose
5 
+	(
6 
+		[
7 
+			"example_sentences",
8 
+			"example_texts",
9 
+		]
10 
+	);
11 
+ ?>
12 
+</section>
13 
+
source/content/modal_verbs.html.php
Zeige Datei @ b3c1b9b
... ... 
@@ -7,7 +7,7 @@
7 7 
 	$entries =
8 8 
 	[
9 9 
 		["original" => ["mute"], "translated" => ["to must"]],
10 
-		["original" => ["kane"], "translated" => ["to can"]],
10 
+		["original" => ["köne"], "translated" => ["to can"]],
11 11 
 		["original" => ["vile"], "translated" => ["to will"]],
12 12 
 		["original" => ["skale"], "translated" => ["to shall"]],
13 13 
 		["original" => ["darfe"], "translated" => ["to be allowed to"]],
source/content/numeri.html.php
Zeige Datei @ b3c1b9b
... ... 
@@ -0,0 +1,6 @@
1 
+<section class="subsection" id="numeri">
2 
+	<header>Numeri</header>
3 
+	<?php proposal(); ?>
4 
+	<p>The plural of a noun is formed by appending the syllable <span class="word lang_fs">-er</span>, e.g. <span class="word lang_fs">huser</span> ~ <span class="word lang_en">houses</span>.</p>
5 
+</section>
6 
+
source/content/tempora_and_modi.html.php
Zeige Datei @ b3c1b9b
... ... 
@@ -3,7 +3,7 @@
3 3 
 	<?php proposal(); ?>
4 4 
 	<p>The following table lists the timeforms found in Folksprak and how they are built in the <span class="grammarterm">indicative</span> mode.</p>
5 5 
 <?php
6 
-$table = new class_table
6 
+(new class_table
7 7 
 (
8 8 
 	[
9 9 
 		new class_column
... ... 
@@ -55,8 +55,7 @@ $table = new class_table
55 55 
 		),
56 56 
 	],
57 57 
 	array_slice(read_json("source/data/timeforms.json"), 0, 3)
58 
-);
59 
-$table->generate();
58 
+))->generate();
60 59 
 ?>
61 60 
 	<p>Since these forms are built with auxiliary verbs, they can be combined straightforward to form complex expressions, e.g. <?php echo(call_user_func(_bar("sentence"), ["original" => ["Ek skal have skrivt."], "translated" => ["I will have written."]])); ?><!-- or <?php echo(call_user_func(_bar("sentence"), ["original" => ["Ek hav skalt skrive."], "translated" => ["I was going to write."]])); ?> -->.</p>
62 61 
 	<p>The <span class="grammarterm">imperative</span> only exists in the present (with future meaning) for the 2nd person singular and plural. It is formed by using the bare stem of the verb, optionally followed by the personal pronoun (i.e. either <span class="word lang_fs">du</span> or <span class="word lang_fs">jer</span>) in order to specify or emphasize the numerus. Examples: <span class="sentence lang_fs">skriv!</span>, <span class="sentence lang_fs">skriv, jer!</span>.</p>
source/datphonology_and_orthography.json
Zeige Datei @ b3c1b9b
... ... 
@@ -248,7 +248,7 @@
248 248 
 		"runic": "'ᛟᛇ'",
249 249 
 		"remark": "similar to vowels used in words like 'earl', 'worry', 'hurt'",
250 250 
 		"examples": {
251 
-			"fs": "'sk_oy_n'",
251 
+			"fs": "'sk_ö_n'",
252 252 
 			"en": "~ 't_u_rn'"
253 253 
 		}
254 254 
 	},
... ... 
@@ -259,7 +259,7 @@
259 259 
 		"runic": "'ᚢᛇ'",
260 260 
 		"remark": "hardly any variation of English has that sound, but it can be learned easily by interpolating between /u/ and /i/",
261 261 
 		"examples": {
262 
-			"fs": "'s_uy_d'",
262 
+			"fs": "'s_ü_d'",
263 263 
 			"en": null
264 264 
 		}
265 265 
 	}
source/datword_functions.json
Zeige Datei @ b3c1b9b
... ... 
@@ -97,7 +97,7 @@
97 97 
 			}
98 98 
 		],
99 99 
 		"example": {
100 
-			"word": "hoyrt",
100 
+			"word": "hört",
101 101 
 			"translations": {
102 102 
 				"en": ["heard"]
103 103 
 			}
source/style/common.less
Zeige Datei @ b3c1b9b
... ... 
@@ -125,7 +125,9 @@ a
125 125 
 	font-weight: bold;
126 126 
 }
127 127
128 
-.lang_fs
128 
+.letter
129 
+{
130 
+	&.lang_fs
129 131 
 	{
130 132 
 		font-weight: bold;
131 133 
 		/*
... ... 
@@ -135,26 +137,46 @@ a
135 137 
 		 */
136 138 
 	}
137 139
138 
-.lang_de,
139 
-.lang_en,
140 
-.lang_is,
141 
-.lang_nb
140 
+	&.lang_de,
141 
+	&.lang_en,
142 
+	&.lang_is,
143 
+	&.lang_nb
142 144 
 	{
143 145 
 		font-style: italic;
144 146 
 	}
147 
+}
145 148
146 
-.letter
149 
+.word
147 150 
 {
151 
+	&.lang_fs
152 
+	{
153 
+		font-weight: bold;
154 
+		/*
155 
+		font-style: italic;
156 
+		font-size: 1.2em;
157 
+		font-family: runic;
158 
+		 */
148 159 
 	}
149 160
150 
-.word
161 
+	&.lang_de,
162 
+	&.lang_en,
163 
+	&.lang_is,
164 
+	&.lang_nb
151 165 
 	{
166 
+		font-style: italic;
167 
+	}
152 168 
 }
153 169
154 170 
 .sentence
155 171 
 {
156 172 
 	&.lang_fs
157 173 
 	{
174 
+		font-weight: bold;
175 
+		/*
176 
+		font-style: italic;
177 
+		font-size: 1.2em;
178 
+		font-family: runic;
179 
+		 */
158 180 
 		&:before {content: "\"";}
159 181 
 		&:after {content: "\"";}
160 182 
 	}
... ... 
@@ -164,11 +186,37 @@ a
164 186 
 	&.lang_is,
165 187 
 	&.lang_nb
166 188 
 	{
189 
+		font-style: italic;
167 190 
 		&:before {content: "\"";}
168 191 
 		&:after {content: "\"";}
169 192 
 	}
170 193 
 }
171 194
195 
+.text
196 
+{
197 
+	&.lang_fs
198 
+	{
199 
+		font-style: italic;
200 
+		/*
201 
+		font-weight: bold;
202 
+		font-size: 1.2em;
203 
+		font-family: runic;
204 
+		 */
205 
+		&:before {content: "„";}
206 
+		&:after {content: "“";}
207 
+	}
208 
+
209 
+	&.lang_de,
210 
+	&.lang_en,
211 
+	&.lang_is,
212 
+	&.lang_nb
213 
+	{
214 
+		font-style: italic;
215 
+		&:before {content: "„";}
216 
+		&:after {content: "“";}
217 
+	}
218 
+}
219 
+
172 220 
 .todo
173 221 
 {
174 222 
 	&:before
175 223