Browse code

personal pronouns and infinitive

Christian Fraß authored on21/05/2016 18:25:14
Showing18 changed files
... ...
@@ -94,7 +94,9 @@ def main():
94 94
 		os.path.join(dirs["source"],"content","correlatives.html.php"),
95 95
 		os.path.join(dirs["source"],"content","conjugation.html.php"),
96 96
 		os.path.join(dirs["source"],"content","infinite_verbforms.html.php"),
97
+		os.path.join(dirs["source"],"content","modal_verbs.html.php"),
97 98
 		os.path.join(dirs["source"],"content","tempora_and_modi.html.php"),
99
+		os.path.join(dirs["source"],"content","negation.html.php"),
98 100
 		os.path.join(dirs["source"],"content","declension.html.php"),
99 101
 		os.path.join(dirs["source"],"content","attributes.html.php"),
100 102
 		os.path.join(dirs["source"],"content","sentence_structure.html.php"),
... ...
@@ -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/tempora_and_modi.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/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
13 13
 	@ echo -e '-- composing document ...'
14 14
 	@ mkdir --parents build
15 15
 	@ php source/content/draft.html.php > build/draft.html
... ...
@@ -5,7 +5,10 @@
5 5
  ?>
6 6
 <section class="section" id="adpositions">
7 7
 	<header>Adpositions</header>
8
-	<div class="note_error">This section is only a proposal yet; not part of the draft.</div>
8
+	<?php proposal(); ?>
9
+	<!--
10
+	<p>The following list gives an overview over prepositions:</p>
11
+	  -->
9 12
 <?php
10 13
 	$table = new class_table
11 14
 	(
... ...
@@ -6,14 +6,15 @@
6 6
  ?>
7 7
 <section class="section" id="conjugation">
8 8
 	<header>Conjugation</header>
9
-	<div class="note_error">This section is only a proposal yet; not part of the draft.</div>
10 9
 	<p>In Folksprak verbs are not conjugated for different <span class="grammarterm">personae</span> (participants), <span class="grammarterm">numeri</span> (number of actors) or <span class="grammarterm">genera</span> (grammatical genders).</p>
11 10
 <?php
12 11
 	compose
13 12
 	(
14 13
 		[
15 14
 			"infinite_verbforms",
15
+			"modal_verbs",
16 16
 			"tempora_and_modi",
17
+			"negation",
17 18
 		]
18 19
 	);
19 20
  ?>
... ...
@@ -6,7 +6,7 @@
6 6
  ?>
7 7
 <section class="subsection" id="correlatives">
8 8
 	<header>Correlatives</header>
9
-	<div class="note_error">This section is only a proposal yet; not part of the draft.</div>
9
+	<?php proposal(); ?>
10 10
 <?php
11 11
 	$mode = 2;
12 12
 	switch ($mode)
... ...
@@ -1,6 +1,6 @@
1 1
 <section class="subsection" id="infinite_verbforms">
2 2
 	<header>Infinite Verbforms</header>
3
-	<p>The <span class="grammarterm">infinitive</span> is formed by appending <span class="word lang_fs">-a</span> to the verb stem, e.g. <span class="word lang_fs">skriva</span> ~ <span class="word lang_en">to write</span>.</p>
3
+	<p>The <span class="grammarterm">infinitive</span> is formed by appending <span class="word lang_fs">-e</span> to the verb stem, e.g. <span class="word lang_fs">skrive</span> ~ <span class="word lang_en">to write</span>. In some cases it is mandatory to mark the infinitive with the special particle <span class="word lang_fs">tu</span> in order to form the <span class="grammarterm">extended intfinitive<span>, e.g.: <span class="sentence lang_fs">Hi hop tu finde en svart sten.</span> ~ <span class="sentence lang_en">He hopes to find a black stone.</span>.</p>
4 4
 	<p>The <span class="grammarterm">active participle</span> is formed by appending <span class="word lang_fs">-end</span> to the verb stem, e.g. <span class="word lang_fs">skrivend</span> ~ <span class="word lang_en">writing</span>.</p>
5 5
 	<p>The <span class="grammarterm">passive participle</span> is formed by appending <span class="word lang_fs">-et</span> to the verb stem, e.g. <span class="word lang_fs">skrivet</span> ~ <span class="word lang_en">written</span>. If pronouncable, the <span class="word lang_fs">e</span> in the ending can be omitted, e.g. <span class="word lang_fs">skrivt</span>.</p>
6 6
 </section>
7 7
new file mode 100644
... ...
@@ -0,0 +1,25 @@
1
+<section class="subsection" id="modal_verbs">
2
+	<header>Modal verbs</header>
3
+	<?php proposal(); ?>
4
+	<p>The following verbs are modal verbs in Folksprak:</p>
5
+	<ul>
6
+<?php
7
+	$entries =
8
+	[
9
+		["original" => ["mute"], "translated" => ["to must"]],
10
+		["original" => ["kane"], "translated" => ["to can"]],
11
+		["original" => ["vile"], "translated" => ["to will"]],
12
+		["original" => ["skale"], "translated" => ["to shall"]],
13
+		["original" => ["darfe"], "translated" => ["to be allowed to"]],
14
+	];
15
+	foreach ($entries as $entry)
16
+	{
17
+ ?>
18
+		<li><?php echo(call_user_func(_bar("word"), $entry)); ?></li>
19
+<?php
20
+	}
21
+ ?>
22
+	</ul>
23
+	<p>Modal verbs in contrast to normal verbs never take an extended infinitive as object, e.g. <?php echo(call_user_func(_bar("sentence"), ["original" => ["Vi hop tu finde vater har."], "translated" => ["We hope to find water here."]])); ?>, but <?php echo(call_user_func(_bar("sentence"), ["original" => ["Vi kan finde vater har."], "translated" => ["We can find water here."]])); ?></p>
24
+</section>
25
+
0 26
new file mode 100644
... ...
@@ -0,0 +1,9 @@
1
+<section class="subsection" id="negation">
2
+	<header>Negation</header>
3
+	<?php proposal(); ?>
4
+	<p>In order to negate the meaning of a verb, one places the word <span class="word lang_fs">nit</span> after the verb. Example: <?php echo(call_user_func(_bar("sentence"), ["original" => ["Di se nit."], "translated" => ["They don't see."]])); ?></p>
5
+	<p>If the verb takes a direct object it is allowed to place the object before the <span class="word lang_fs">nit</span>. Example: <?php echo(call_user_func(_bar("sentence"), ["original" => ["Di se us nit."], "translated" => ["They don't see us."]])); ?></p>
6
+	<p>Negations can also be expressed implicitly by using negative correlatives. Example: <?php echo(call_user_func(_bar("sentence"), ["original" => ["Di se ing tid."], "translated" => ["They never see."]])); ?></p>
7
+	<p>Doubled negations (both explicit and implicit ones) cancel each other out. Example: <?php echo(call_user_func(_bar("sentence"), ["original" => ["Di se nit ing tid."], "translated" => ["They never don't see.", "They always see."]])); ?></p>
8
+</section>
9
+
... ...
@@ -9,7 +9,6 @@ function convert_genus($genus) {return [0 => "common", 1 => "masculine", 2 => "f
9 9
  ?>
10 10
 <section class="subsection" id="personal_pronouns">
11 11
 	<header>Personal Pronouns</header>
12
-	<div class="note_error">This section is only a proposal yet; not part of the draft.</div>
13 12
 <?php
14 13
 	$table = new class_table
15 14
 	(
... ...
@@ -62,6 +61,6 @@ function convert_genus($genus) {return [0 => "common", 1 => "masculine", 2 => "f
62 61
 	);
63 62
 	$table->generate();
64 63
  ?>
65
-	<p>For the flected and otherwise related forms of the personal pronouns see the section <a href="#grammar/declension">Declension</a>.</p>
64
+	<p>For the flected and otherwise related forms of the personal pronouns see the section <a href="#declension">Declension</a>.</p>
66 65
 </section>
67 66
 
... ...
@@ -1,5 +1,6 @@
1 1
 <section class="subsection" id="tempora_and_modi">
2 2
 	<header>Tempora and Modi</header>
3
+	<?php proposal(); ?>
3 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>
4 5
 <?php
5 6
 $table = new class_table
... ...
@@ -57,8 +58,8 @@ $table = new class_table
57 58
 );
58 59
 $table->generate();
59 60
 ?>
60
-	<p>Since these forms are built with auxiliary verbs, they can be combined straightforward to form complex expressions. For example <span class="sentence lang_fs">ek skal hava skrivt.</span> means <span class="sentence lang_en">i will have written.</span> and <span class="sentence lang_fs">ek hav skalt skriva.</span> means sth. like <span class="sentence lang_en">i was going to write.</span>.</p>
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">je</span>) in order to specify or emphasize the numerus. Examples: <span class="sentence lang_fs">skriv!</span>, <span class="sentence lang_fs">skriv, je!</span>.</p>
61
+	<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
+	<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>
62 63
 	<span class="todo">conjunctive</span>
63 64
 </section>
64 65
 
... ...
@@ -6,7 +6,7 @@
6 6
  ?>
7 7
 <section class="section" id="word_functions">
8 8
 	<header>Word Functions</header>
9
-	<div class="note_error">This section is only a proposal yet; not part of the draft.</div>
9
+	<?php proposal(); ?>
10 10
 <?php
11 11
 	$table = new class_table
12 12
 	(
... ...
@@ -117,23 +117,23 @@
117 117
 	{
118 118
 		"type": "x5",
119 119
 		"positive_absolute": {
120
-			"fs": ["heg"],
120
+			"fs": ["hög"],
121 121
 			"en": ["right"]
122 122
 		},
123 123
 		"positive_relative": {
124
-			"fs": ["heg (lut)"],
124
+			"fs": ["hög (lut)"],
125 125
 			"en": ["right from"]
126 126
 		},
127 127
 		"positive_attributive": {
128
-			"fs": ["heg arend"],
128
+			"fs": ["hög arend"],
129 129
 			"en": ["right"]
130 130
 		},
131 131
 		"directive_absolute": {
132
-			"fs": ["to heg"],
132
+			"fs": ["to hög"],
133 133
 			"en": ["to the right"]
134 134
 		},
135 135
 		"directive_relative": {
136
-			"fs": ["to heg (lut)"],
136
+			"fs": ["to hög (lut)"],
137 137
 			"en": ["to the right of"]
138 138
 		}
139 139
 	},
... ...
@@ -24,28 +24,28 @@
24 24
 		"numerus": 1,
25 25
 		"persona": 3,
26 26
 		"genus": 0,
27
-		"fs": ["han"],
27
+		"fs": ["hen"],
28 28
 		"en": []
29 29
 	},
30 30
 	{
31 31
 		"numerus": 1,
32 32
 		"persona": 3,
33 33
 		"genus": 1,
34
-		"fs": ["hin"],
34
+		"fs": ["hi"],
35 35
 		"en": ["he"]
36 36
 	},
37 37
 	{
38 38
 		"numerus": 1,
39 39
 		"persona": 3,
40 40
 		"genus": 2,
41
-		"fs": ["hun"],
41
+		"fs": ["hu"],
42 42
 		"en": ["she"]
43 43
 	},
44 44
 	{
45 45
 		"numerus": 1,
46 46
 		"persona": 3,
47 47
 		"genus": 3,
48
-		"fs": ["hat"],
48
+		"fs": ["het"],
49 49
 		"en": ["it"]
50 50
 	},
51 51
 	{
... ...
@@ -166,8 +166,8 @@
166 166
 	},
167 167
 	{
168 168
 		"type": "tap/flap",
169
-		"ipa": "/x/",
170
-		"latin": "'X'/'x' or 'H'/'h'?",
169
+		"ipa": "/x/ ?",
170
+		"latin": "'X'/'x' or 'H'/'h' or 'Q'/'q' or 'C'/'c' ?",
171 171
 		"runic": null,
172 172
 		"remark": null,
173 173
 		"examples": {
... ...
@@ -194,7 +194,7 @@
194 194
 		"remark": null,
195 195
 		"examples": {
196 196
 			"fs": "'gr_i_d'",
197
-			"en": "'b_ee_f'"
197
+			"en": "'n_ee_dle'"
198 198
 		}
199 199
 	},
200 200
 	{
... ...
@@ -205,7 +205,7 @@
205 205
 		"remark": "only a few variations of English have that sound; it is somehow similar to the vowel in 'air'",
206 206
 		"examples": {
207 207
 			"fs": "'st_e_d'",
208
-			"en": "~ '_ai_r'"
208
+			"en": "~ 'b_e_t'"
209 209
 		}
210 210
 	},
211 211
 	{
... ...
@@ -226,8 +226,8 @@
226 226
 		"runic": "'ᛟ'",
227 227
 		"remark": null,
228 228
 		"examples": {
229
-			"fs": "'_o_ld'",
230
-			"en": "~ '_o_scar'"
229
+			"fs": "'f_o_gel'",
230
+			"en": "~ 'f_o_x'"
231 231
 		}
232 232
 	},
233 233
 	{
... ...
@@ -238,7 +238,7 @@
238 238
 		"remark": null,
239 239
 		"examples": {
240 240
 			"fs": "'bl_u_'",
241
-			"en": "'cr_u_cial'"
241
+			"en": "'c_oo_l'"
242 242
 		}
243 243
 	},
244 244
 	{
... ...
@@ -248,8 +248,8 @@
248 248
 		"runic": "'ᛟᛇ'",
249 249
 		"remark": "similar to vowels used in words like 'earl', 'worry', 'hurt'",
250 250
 		"examples": {
251
-			"fs": "'sk_ö_n'",
252
-			"en": "~ '_ea_rly'"
251
+			"fs": "'sk_oy_n'",
252
+			"en": "~ 't_u_rn'"
253 253
 		}
254 254
 	},
255 255
 	{
... ...
@@ -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_ü_d'",
262
+			"fs": "'s_uy_d'",
263 263
 			"en": null
264 264
 		}
265 265
 	}
... ...
@@ -36,7 +36,7 @@
36 36
 		"description": "For expressing an action in the future",
37 37
 		"remark": "implicit",
38 38
 		"example": {
39
-			"original": "Ek skal skriva.",
39
+			"original": "Ek skal skrive.",
40 40
 			"translations": {
41 41
 				"en": ["I will write.", "I am going to write."],
42 42
 				"de": ["Ich werde schreiben."],
... ...
@@ -46,8 +46,15 @@ class class_contentnode
46 46
 		if (this.id != null)
47 47
 		{
48 48
 			let selector = ("#" + this.id + " > header");
49
+			let text = path.map(x => (x+1).toString()).join(".") + " " + this.title;
49 50
 			let dom_header = document.querySelector(selector);
50
-			dom_header.textContent = path.map(x => (x+1).toString()).join(".") + " " + this.title;
51
+			dom_header.textContent = "";
52
+			let dom_link = document.createElement("a");
53
+			dom_link.classList.add("jumplabel");
54
+			dom_link.setAttribute("href", "#" + this.id);
55
+			dom_link.textContent = text;
56
+			// dom_link.textContent = " #";
57
+			dom_header.appendChild(dom_link);
51 58
 		}
52 59
 		this.children.forEach((child, index) => child.adjust(path.concat([index])));
53 60
 	}
... ...
@@ -60,6 +60,13 @@
60 60
 				return $output;
61 61
 			}
62 62
 		);
63
-	}	
63
+	}
64
+	
65
+	function proposal()
66
+	{
67
+ ?>
68
+		<div class="note_error">This section is only a proposal yet; not part of the draft.</div>
69
+<?php
70
+	}
64 71
  ?>
65 72
 
... ...
@@ -37,12 +37,26 @@ table.datatable
37 37
 
38 38
 a
39 39
 {
40
-	color: @color-x1;
41 40
 	text-decoration: none;
42 41
 	font-weight: bold;
43 42
 	/*
44 43
 	font-family: monospace;
45 44
 	 */
45
+	
46
+	&:not(.jumplabel)
47
+	{
48
+		color: @color-x1;
49
+	}
50
+	
51
+	&.jumplabel
52
+	{
53
+		color: inherit;
54
+		
55
+		&:hover
56
+		{
57
+			color: @color-x1;
58
+		}
59
+	}
46 60
 }
47 61
 
48 62
 .note