Christian Fraß authored on05/08/2018 20:00:22
Showing1 changed files
... ...
@@ -1,7 +1,7 @@
1 1
 <section class="subsection" id="tempora_and_modi">
2
-	<header>Tempora and Modi</header>
2
+	<header>Timeforms and modes</header>
3 3
 	<?php proposal(); ?>
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
+	<p>The following table lists the basic timeforms found in Folksprak and how they are built in the <span class="grammarterm">indicative</span> mode.</p>
5 5
 <?php
6 6
 (new class_table
7 7
 (
... ...
@@ -43,7 +43,7 @@
43 43
 	],
44 44
 	sql_condense
45 45
 	(
46
-		array_slice(read_json("source/data/timeforms.json"), 0, 3),
46
+		array_slice(read_json("source/data/timeforms.json"), 0, 4),
47 47
 		["name","remark","example"],
48 48
 		["name_","example_"],
49 49
 		[
... ...
@@ -53,8 +53,15 @@
53 53
 	)
54 54
 ))->generate();
55 55
 ?>
56
-	<p>Since these forms are built with auxiliary verbs, they can be combined straightforward to form complex expressions, e.g. <?php echo(format_correlation("type_sentence")(["flk" => ["Ek skal have skrivt."], "eng" => ["I will have written."]])); ?><!-- or <?php echo(format_correlation("type_sentence")(["flk" => ["Ek hav skalt skrive."], "eng" => ["I was going to write."]])); ?> -->.</p>
56
+	<p>These forms can be combined straightforward to form complex timeforms:</p>
57
+	<ul>
58
+		<li><?php echo(format_correlation("type_sentence")(["flk" => ["Ek havde skrivt."], "eng" => ["I had written."]])); ?></li>
59
+		<li><?php echo(format_correlation("type_sentence")(["flk" => ["Ek skal have skrivt."], "eng" => ["I will have written."]])); ?></li>
60
+		<!--
61
+		<li><?php echo(format_correlation("type_sentence")(["flk" => ["Ek hav skalt skrive."], "eng" => ["I was going to write."]])); ?></li>
62
+		  -->
63
+	</ul>
57 64
 	<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 <?php echo(mark("du", ["type_word", "lang_flk"])); ?> or <?php echo(mark("je", ["type_word", "lang_flk"])); ?>) in order to specify or emphasize the numerus. Examples: <?php echo(mark("skriv!", ["type_sentence", "lang_flk"])); ?>, <?php echo(mark("skriv, je!", ["type_sentence", "lang_flk"])); ?>.</p>
58
-	<p>There are two ways to the <span class="grammarterm">subjunctive</span>. One is to use the special modal verb <?php echo(mark("vöre", ["type_word", "lang_flk"])); ?> which can be understood as a wrapper for regular verbs. The other possibility is to use the adverbial particle <?php echo(mark("maglik", ["type_word", "lang_flk"])); ?>.</p>
65
+	<p>There are two ways to form the <span class="grammarterm">subjunctive</span>. One is to use the special modal verb <?php echo(mark("vöre", ["type_word", "lang_flk"])); ?> which can be understood as a wrapper for regular verbs. The other possibility is to use the adverbial particle <?php echo(mark("maglik", ["type_word", "lang_flk"])); ?>. Both can be applied to the indicative forms, e.g.: <?php echo(format_correlation("type_sentence")(["flk" => ["Ek vör have skrivt."], "eng" => ["I would have written."]])); ?></p>
59 66
 </section>
60 67
 
Browse code

fs -> flk

Christian Fraß authored on27/07/2017 00:19:14
Showing1 changed files
... ...
@@ -31,7 +31,7 @@
31 31
 			"scheme",
32 32
 			function ($value)
33 33
 			{
34
-				return format($value, ["type_word", "lang_fs"]);
34
+				return format($value, ["type_word", "lang_flk"]);
35 35
 			}
36 36
 		),
37 37
 		new class_column
... ...
@@ -54,7 +54,7 @@
54 54
 ))->generate();
55 55
 ?>
56 56
 	<p>Since these forms are built with auxiliary verbs, they can be combined straightforward to form complex expressions, e.g. <?php echo(format_correlation("type_sentence")(["flk" => ["Ek skal have skrivt."], "eng" => ["I will have written."]])); ?><!-- or <?php echo(format_correlation("type_sentence")(["flk" => ["Ek hav skalt skrive."], "eng" => ["I was going to write."]])); ?> -->.</p>
57
-	<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 <?php echo(mark("du", ["type_word", "lang_fs"])); ?> or <?php echo(mark("je", ["type_word", "lang_fs"])); ?>) in order to specify or emphasize the numerus. Examples: <?php echo(mark("skriv!", ["type_sentence", "lang_fs"])); ?>, <?php echo(mark("skriv, je!", ["type_sentence", "lang_fs"])); ?>.</p>
58
-	<p>There are two ways to the <span class="grammarterm">subjunctive</span>. One is to use the special modal verb <?php echo(mark("vöre", ["type_word", "lang_fs"])); ?> which can be understood as a wrapper for regular verbs. The other possibility is to use the adverbial particle <?php echo(mark("maglik", ["type_word", "lang_fs"])); ?>.</p>
57
+	<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 <?php echo(mark("du", ["type_word", "lang_flk"])); ?> or <?php echo(mark("je", ["type_word", "lang_flk"])); ?>) in order to specify or emphasize the numerus. Examples: <?php echo(mark("skriv!", ["type_sentence", "lang_flk"])); ?>, <?php echo(mark("skriv, je!", ["type_sentence", "lang_flk"])); ?>.</p>
58
+	<p>There are two ways to the <span class="grammarterm">subjunctive</span>. One is to use the special modal verb <?php echo(mark("vöre", ["type_word", "lang_flk"])); ?> which can be understood as a wrapper for regular verbs. The other possibility is to use the adverbial particle <?php echo(mark("maglik", ["type_word", "lang_flk"])); ?>.</p>
59 59
 </section>
60 60
 
Christian Fraß authored on02/07/2017 19:51:20
Showing0 changed files
Browse code

update

Christian Fraß authored on17/04/2017 03:54:52
Showing1 changed files
... ...
@@ -53,7 +53,7 @@
53 53
 	)
54 54
 ))->generate();
55 55
 ?>
56
-	<p>Since these forms are built with auxiliary verbs, they can be combined straightforward to form complex expressions, e.g. <?php echo(format_correlation("type_sentence")(["fs" => ["Ek skal have skrivt."], "en" => ["I will have written."]])); ?><!-- or <?php echo(format_correlation("type_sentence")(["fs" => ["Ek hav skalt skrive."], "en" => ["I was going to write."]])); ?> -->.</p>
56
+	<p>Since these forms are built with auxiliary verbs, they can be combined straightforward to form complex expressions, e.g. <?php echo(format_correlation("type_sentence")(["flk" => ["Ek skal have skrivt."], "eng" => ["I will have written."]])); ?><!-- or <?php echo(format_correlation("type_sentence")(["flk" => ["Ek hav skalt skrive."], "eng" => ["I was going to write."]])); ?> -->.</p>
57 57
 	<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 <?php echo(mark("du", ["type_word", "lang_fs"])); ?> or <?php echo(mark("je", ["type_word", "lang_fs"])); ?>) in order to specify or emphasize the numerus. Examples: <?php echo(mark("skriv!", ["type_sentence", "lang_fs"])); ?>, <?php echo(mark("skriv, je!", ["type_sentence", "lang_fs"])); ?>.</p>
58 58
 	<span class="todo">conjunctive</span>
59 59
 </section>
Browse code

intermediate

Christian Fraß authored on13/04/2017 19:26:23
Showing1 changed files
... ...
@@ -55,6 +55,6 @@
55 55
 ?>
56 56
 	<p>Since these forms are built with auxiliary verbs, they can be combined straightforward to form complex expressions, e.g. <?php echo(format_correlation("type_sentence")(["fs" => ["Ek skal have skrivt."], "en" => ["I will have written."]])); ?><!-- or <?php echo(format_correlation("type_sentence")(["fs" => ["Ek hav skalt skrive."], "en" => ["I was going to write."]])); ?> -->.</p>
57 57
 	<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 <?php echo(mark("du", ["type_word", "lang_fs"])); ?> or <?php echo(mark("je", ["type_word", "lang_fs"])); ?>) in order to specify or emphasize the numerus. Examples: <?php echo(mark("skriv!", ["type_sentence", "lang_fs"])); ?>, <?php echo(mark("skriv, je!", ["type_sentence", "lang_fs"])); ?>.</p>
58
-	<span class="todo">conjunctive</span>
58
+	<p>There are two ways to the <span class="grammarterm">subjunctive</span>. One is to use the special modal verb <?php echo(mark("vöre", ["type_word", "lang_fs"])); ?> which can be understood as a wrapper for regular verbs. The other possibility is to use the adverbial particle <?php echo(mark("maglik", ["type_word", "lang_fs"])); ?>.</p>
59 59
 </section>
60 60
 
Browse code

added transition-data and table

Christian Fraß authored on27/11/2016 17:30:26
Showing1 changed files
... ...
@@ -31,14 +31,14 @@
31 31
 			"scheme",
32 32
 			function ($value)
33 33
 			{
34
-				return format($value, ["word", "lang_fs"]);
34
+				return format($value, ["type_word", "lang_fs"]);
35 35
 			}
36 36
 		),
37 37
 		new class_column
38 38
 		(
39 39
 			"Example",
40 40
 			"example_",
41
-			_bar("sentence")
41
+			_bar("type_sentence")
42 42
 		),
43 43
 	],
44 44
 	sql_condense
... ...
@@ -53,8 +53,8 @@
53 53
 	)
54 54
 ))->generate();
55 55
 ?>
56
-	<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>
57
-	<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>
56
+	<p>Since these forms are built with auxiliary verbs, they can be combined straightforward to form complex expressions, e.g. <?php echo(format_correlation("type_sentence")(["fs" => ["Ek skal have skrivt."], "en" => ["I will have written."]])); ?><!-- or <?php echo(format_correlation("type_sentence")(["fs" => ["Ek hav skalt skrive."], "en" => ["I was going to write."]])); ?> -->.</p>
57
+	<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 <?php echo(mark("du", ["type_word", "lang_fs"])); ?> or <?php echo(mark("je", ["type_word", "lang_fs"])); ?>) in order to specify or emphasize the numerus. Examples: <?php echo(mark("skriv!", ["type_sentence", "lang_fs"])); ?>, <?php echo(mark("skriv, je!", ["type_sentence", "lang_fs"])); ?>.</p>
58 58
 	<span class="todo">conjunctive</span>
59 59
 </section>
60 60
 
Browse code

minor changes

Christian Fraß authored on09/08/2016 01:45:31
Showing1 changed files
... ...
@@ -54,7 +54,7 @@
54 54
 ))->generate();
55 55
 ?>
56 56
 	<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>
57
-	<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>
57
+	<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>
58 58
 	<span class="todo">conjunctive</span>
59 59
 </section>
60 60
 
Browse code

repaired tables in content

Christian Fraß authored on08/08/2016 21:50:25
Showing1 changed files
... ...
@@ -9,10 +9,7 @@
9 9
 		new class_column
10 10
 		(
11 11
 			"Name",
12
-			function ($row)
13
-			{
14
-				return ["name" => $row["name"], "remark" => $row["remark"]];
15
-			},
12
+			"name_",
16 13
 			function ($value)
17 14
 			{
18 15
 				$output = $value["name"];
... ...
@@ -26,18 +23,12 @@
26 23
 		new class_column
27 24
 		(
28 25
 			"Description",
29
-			function ($row)
30
-			{
31
-				return $row["description"];
32
-			}
26
+			"description"
33 27
 		),
34 28
 		new class_column
35 29
 		(
36 30
 			"Scheme",
37
-			function ($row)
38
-			{
39
-				return $row["scheme"];
40
-			},
31
+			"scheme",
41 32
 			function ($value)
42 33
 			{
43 34
 				return format($value, ["word", "lang_fs"]);
... ...
@@ -46,15 +37,20 @@
46 37
 		new class_column
47 38
 		(
48 39
 			"Example",
49
-			function ($row)
50
-			{
51
-				global $configuration;
52
-				return ["original" => [$row["example"]["original"]], "translated" => $row["example"]["translations"][$configuration["target"]]];
53
-			},
40
+			"example_",
54 41
 			_bar("sentence")
55 42
 		),
56 43
 	],
57
-	array_slice(read_json("source/data/timeforms.json"), 0, 3)
44
+	sql_condense
45
+	(
46
+		array_slice(read_json("source/data/timeforms.json"), 0, 3),
47
+		["name","remark","example"],
48
+		["name_","example_"],
49
+		[
50
+			"name_" => function ($row) {return ["name" => $row["name"], "remark" => $row["remark"]];},
51
+			"example_" => function ($row) {global $configuration; return ["original" => [$row["example"]["original"]], "translated" => $row["example"]["translations"][$configuration["target"]]];},
52
+		]
53
+	)
58 54
 ))->generate();
59 55
 ?>
60 56
 	<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>
Browse code

added some drafts and an example text

Christian Fraß authored on05/06/2016 19:05:53
Showing1 changed files
... ...
@@ -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>
Browse code

personal pronouns and infinitive

Christian Fraß authored on21/05/2016 18:25:14
Showing1 changed files
... ...
@@ -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
 
Browse code

renamed structure to content

Christian Fraß authored on15/05/2016 20:38:28
Showing1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,64 @@
1
+<section class="subsection" id="tempora_and_modi">
2
+	<header>Tempora and Modi</header>
3
+	<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
+<?php
5
+$table = new class_table
6
+(
7
+	[
8
+		new class_column
9
+		(
10
+			"Name",
11
+			function ($row)
12
+			{
13
+				return ["name" => $row["name"], "remark" => $row["remark"]];
14
+			},
15
+			function ($value)
16
+			{
17
+				$output = $value["name"];
18
+				if ($value["remark"] != null)
19
+				{
20
+					$output .= (" " . "(" . $value["remark"] . ")");
21
+				}
22
+				return $output;
23
+			}
24
+		),
25
+		new class_column
26
+		(
27
+			"Description",
28
+			function ($row)
29
+			{
30
+				return $row["description"];
31
+			}
32
+		),
33
+		new class_column
34
+		(
35
+			"Scheme",
36
+			function ($row)
37
+			{
38
+				return $row["scheme"];
39
+			},
40
+			function ($value)
41
+			{
42
+				return format($value, ["word", "lang_fs"]);
43
+			}
44
+		),
45
+		new class_column
46
+		(
47
+			"Example",
48
+			function ($row)
49
+			{
50
+				global $configuration;
51
+				return ["original" => [$row["example"]["original"]], "translated" => $row["example"]["translations"][$configuration["target"]]];
52
+			},
53
+			_bar("sentence")
54
+		),
55
+	],
56
+	array_slice(read_json("source/data/timeforms.json"), 0, 3)
57
+);
58
+$table->generate();
59
+?>
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>
62
+	<span class="todo">conjunctive</span>
63
+</section>
64
+