fs-draft.git

@@ -2,14 +2,17 @@

 	<header>Adpositions</header>

 	{{call::_proposal.html.tpl}}

 	<!--

-	<p>The following list gives an overview over prepositions:</p>

+	<li>The following list gives an overview over prepositions:</li>

 	  -->

 	{{fold:adpositions.words:situation_id:type_id/reference_id}}

- 	<p><?php echo(format_correlation("type_sentence")(["flk" => ["Ek skal varte foran."], "eng" => ["I will wait in front."]])); ?></p>

- 	<p><?php echo(format_correlation("type_sentence")(["flk" => ["Du mut blive bakan."], "eng" => ["You must stay in the back."]])); ?></p>

- 	<p><?php echo(format_correlation("type_sentence")(["flk" => ["Han sta nedan de brüg."], "eng" => ["He stands under the bridge."]])); ?></p>

- 	<p><?php echo(format_correlation("type_sentence")(["flk" => ["Hun flüg uvan de volker."], "eng" => ["She flies above the clouds."]])); ?></p>

- 	<p><?php echo(format_correlation("type_sentence")(["flk" => ["Vi kan gae in de timer."], "eng" => ["We can go into the room."]])); ?></p>

- 	<p><?php echo(format_correlation("type_sentence")(["flk" => ["Je skal löpe ut de hus."], "eng" => ["You shall run out of the house."]])); ?></p>

+	<p>Some examples:</p>

+	<ul>

+		<li>{{fsdraft_format_correlation:section-adpositions.examples.0:type_sentence}}</li>

+		<li>{{fsdraft_format_correlation:section-adpositions.examples.1:type_sentence}}</li>

+		<li>{{fsdraft_format_correlation:section-adpositions.examples.2:type_sentence}}</li>

+		<li>{{fsdraft_format_correlation:section-adpositions.examples.3:type_sentence}}</li>

+		<li>{{fsdraft_format_correlation:section-adpositions.examples.4:type_sentence}}</li>

+		<li>{{fsdraft_format_correlation:section-adpositions.examples.5:type_sentence}}</li>

+	</ul>

 </section>

@@ -1,14 +1,7 @@

 <section class="section" id="attributes">

 	<header>Attributes</header>

-<?php

-	compose

-	(

-		[

-			"comparation",

-			"adjectives",

-			"adverbs",

-		]

-	);

- ?>

+	{{call::comparation.html.tpl}}

+	{{call::adjectives.html.tpl}}

+	{{call::adverbs.html.tpl}}

 </section>

@@ -2,7 +2,7 @@

 	<header>Cases</header>

 	<p>Regular nouns can appear in two cases: <span class="grammarterm">nominative</span> and <span class="grammarterm">genitive</span>.</p>

 	<p>The base form of a noun is the nominative, which does not receive any marker.</p>

-	<p>The genitive is formed by appending the suffix <?php echo(mark("-(e)s", ["type_word", "lang_flk"])); ?> to the word, e.g. <?php echo(format_correlation("type_word")(["flk" => ["dages"], "eng" => ["days"]])); ?>. The marker for the plural has to be applied first, e.g. <?php echo(format_correlation("type_word")(["flk" => ["dager(e)s"], "eng" => ["days'"]])); ?>.</p>

+	<p>The genitive is formed by appending the suffix <?php echo(mark("-(e)s", ["type_word", "lang_flk"])); ?> to the word, e.g. {{fsdraft_format_correlation:section-cases.example1:type_word}}. The marker for the plural has to be applied first, e.g. {{fsdraft_format_correlation:section-cases.example2:type_word}}.</p>

 	<p></p>

 </section>

@@ -7,16 +7,9 @@

 <section class="section" id="conjugation">

 	<header>Conjugation</header>

 	<p>In Folksprak verbs are not conjugated for different participants (<span class="grammarterm">personae</span>), number of actors (<span class="grammarterm">numeri</span>) or grammatical genders (<span class="grammarterm">genera</span>).</p>

-<?php

-	compose

-	(

-		[

-			"infinite_verbforms",

-			"modal_verbs",

-			"tempora_and_modi",

-			"negation",

-		]

-	);

- ?>

+	{{call::infinite_verbforms.html.tpl}}

+	{{call::modal_verbs.html.tpl}}

+	{{call::tempora_and_modi.html.tpl}}

+	{{call::negation.html.tpl}}

 </section>

@@ -1,15 +1,8 @@

 <section class="section" id="declension">

 	<header>Declension</header>

-<?php

-	compose

-	(

-		[

-			"numeri",

-			"cases",

-			"definiteness",

-		]

-	);

- ?>

+	{{call::numeri.html.tpl}}

+	{{call::cases.html.tpl}}

+	{{call::definiteness.html.tpl}}

 <p>The following table summarizes the information of this section:</p>

 <?php

 	$data_common = read_json("source/data/common.json");

@@ -140,5 +133,5 @@

 		]

 	)->generate();

  ?>

-<p><?php echo(format_correlation("type_sentence")(["flk" => ["Vi kan seje de huses vindöger"], "eng" => ["We can see the houses windows."]])); ?></p></section>

+<p>{{fsdraft_format_correlation:section-declension.example:type_sentence}}</p></section>

@@ -1,7 +1,7 @@

 <section class="subsection" id="definiteness">

 	<header>Definiteness</header>

-	<p>The undefinite aspect of a singular noun is formed by using the article <?php echo(mark("en", ["type_word", "lang_flk"])); ?>, e.g. <?php echo(format_correlation("type_word")(["flk" => ["en dag"], "eng" => ["a day"]])); ?>. Undefinite plural nouns don't have an article, e.g. <?php echo(format_correlation("type_word")(["flk" => ["dager"], "eng" => ["days"]])); ?>.</p>

-	<p>The definite aspect of both singular and plural nouns is formed by using the article <?php echo(mark("de", ["type_word", "lang_flk"])); ?>, e.g. <?php echo(format_correlation("type_word")(["flk" => ["de dag"], "eng" => ["the day"]])); ?>.</p>

+	<p>The undefinite aspect of a singular noun is formed by using the article <?php echo(mark("en", ["type_word", "lang_flk"])); ?>, e.g. {{fsdraft_format_correlation:section-definiteness.example1:type_word}}. Undefinite plural nouns don't have an article, e.g. {{fsdraft_format_correlation:section-definiteness.example2:type_word}}.</p>

+	<p>The definite aspect of both singular and plural nouns is formed by using the article <?php echo(mark("de", ["type_word", "lang_flk"])); ?>, e.g. {{fsdraft_format_correlation:section-definiteness.example3:type_word}}.</p>

 	<span class="todo">abstract aspect like in "sand is dry"</span>

 </section>

@@ -25,8 +25,8 @@

 			{{call::introduction.html.tpl}}

 			{{call::basics.html.tpl}}

 			{{call::vocabulary.html.tpl}}

-			[[call::grammar.html.tpl]]

-			[[call::examples.html.tpl]]

+			{{call::grammar.html.tpl}}

+			{{call::examples.html.tpl}}

 		</div>

 	</body>

 </html>

@@ -1,15 +1,8 @@

 <section class="chapter" id="grammar">

 	<header>Grammar</header>

-<?php

-	compose

-	(

-		[

-			"conjugation",

-			"declension",

-			"attributes",

-			"sentence_structure",

-		]

-	);

- ?>

+	{{call::conjugation.html.tpl}}

+	{{call::declension.html.tpl}}

+	{{call::attributes.html.tpl}}

+	{{call::sentence_structure.html.tpl}}

 </section>

@@ -1,6 +1,6 @@

 <section class="subsection" id="numeri">

 	<header>Count</header>

 	<?php proposal(); ?>

-	<p>The plural of a noun is formed by appending the syllable <?php echo(mark("-er", ["type_word", "lang_flk"])); ?>, e.g. <?php echo(format_correlation("type_word")(["flk" => ["dager"], "eng" => ["days"]])); ?>.</p>

+	<p>The plural of a noun is formed by appending the syllable <?php echo(mark("-er", ["type_word", "lang_flk"])); ?>, e.g. {{fsdraft_format_correlation:section-numeri.example:type_word}}.</p>

 </section>

@@ -13,7 +13,7 @@

 	</div>

 	<div class="note note_information">

 		<span class="note_content">

-			<p>A reflexive genitive can be formed by inserting the word <?php echo(mark("egen", ["word", "lang_flk"])); ?> (<?php echo(mark("own", ["type_word", "lang_en"])); ?>), for example <?php echo(format_correlation("type_sentence")(["flk" => ["Han (A) hav givt to ham (B) hans egen buk."], "eng" => ["He (A) has given (to) him (B) his own book."]])); ?> (A's book was given to B).</p>

+			<p>A reflexive genitive can be formed by inserting the word <?php echo(mark("egen", ["word", "lang_flk"])); ?> (<?php echo(mark("own", ["type_word", "lang_en"])); ?>), for example {{fsdraft_format_correlation:section-personal_pronouns.example:type_sentence}} (A's book was given to B).</p>

 		</span>

 	</div>

 	<div class="note note_reasoning">

@@ -1,9 +1,9 @@

 <section class="chapter" id="vocabulary">

 	<header>Vocabulary</header>

-	[[call::principles.html.tpl]]

+	{{call::principles.html.tpl}}

 	{{call::pronouns.html.tpl}}

 	{{call::adpositions.html.tpl}}

-	[[call::word_functions.html.tpl]]

+	{{call::word_functions.html.tpl}}

 	{{call::dictionary.html.tpl}}

 </section>

@@ -0,0 +1,28 @@

+{

+	"examples": [

+		{

+			"flk": ["Ek skal varte foran."],

+			"eng": ["I will wait in front."]

+		},

+		{

+			"flk": ["Du mut blive bakan."],

+			"eng": ["You must stay in the back."]

+		},

+		{

+			"flk": ["Han sta nedan de brüg."],

+			"eng": ["He stands under the bridge."]

+		},

+		{

+			"flk": ["Hun flüg uvan de volker."],

+			"eng": ["She flies above the clouds."]

+		},

+		{

+			"flk": ["Vi kan gae in de timer."],

+			"eng": ["We can go into the room."]

+		},

+		{

+			"flk": ["Je skal löpe ut de hus."],

+			"eng": ["You shall run out of the house."]

+		}

+	]

+}

@@ -0,0 +1,10 @@

+{

+	"example1": {

+		"flk": ["dages"],

+		"eng": ["days"]

+	},

+	"example2": {

+		"flk": ["dager(e)s"],

+		"eng": ["days"]

+	}

+}

@@ -0,0 +1,6 @@

+{

+	"example": {

+		"flk": ["Vi kan seje de huses vindöger"],

+		"eng": ["We can see the houses windows."]

+	}

+}

@@ -0,0 +1,14 @@

+{

+	"example1": {

+		"flk": ["en dag"],

+		"eng": ["a day"]

+	},

+	"example2": {

+		"flk": ["dager"],

+		"eng": ["days"]

+	},

+	"example3": {

+		"flk": ["de dag"],

+		"eng": ["the day"]

+	}

+}

@@ -0,0 +1,6 @@

+{

+	"example": {

+		"flk": ["dager"],

+		"eng": ["days"]

+	}

+}

@@ -0,0 +1,6 @@

+{

+	"example": {

+		"flk": ["Han (A) hav givt to ham (B) hans egen buk."],

+		"eng": ["He (A) has given (to) him (B) his own book."]

+	}

+}

@@ -0,0 +1,4 @@

+#!/usr/bin/env sh

+

+cp -ruv /opt/vorlage/* tools/vorlage/

+

@@ -0,0 +1,113 @@

+"use strict";

+exports.__esModule = true;

+

+const configuration = {

+	"replace_fs_umlauts": false,

+	"target": "eng",

+};

+

+

+/**

+ * @author kcf

+ */

+function mark(

+	core,

+	classes

+) {

+	if (configuration["replace_fs_umlauts"]) {

+		if ((classes.indexOf("lang_fs") >= 0) && (classes.indexOf("letter") < 0)) {

+			core = (

+				core

+				.replace(new RegExp("ö", "g"), "oy")

+				.replace(new RegExp("ü", "g"), "uy")

+			);

+		}

+	}

+	return ('<span class="' + classes.join(" ") + '">' + core + '</span>');

+}

+

+/**

+ * @author kcf

+ */

+function format_single(

+	type,

+	language

+) {

+	return (

+		function (piece) {

+			return mark(piece, [type, "lang_" + language]);

+		}

+	);

+}

+

+

+/**

+ * @author kcf

+ */

+function format_list(

+	type,

+	language

+) {

+	return (

+		function (pieces) {

+			return (

+				(pieces.length <= 0)

+				? "?"

+				: pieces.map(format_single(type, language)).join(", ")

+			);

+		}

+	);

+}

+

+

+/**

+ * @author kcf

+ */

+function format_correlation(

+	type,

+	language_from = "flk",

+	language_to = null

+) {

+	if (language_to === null) language_to = configuration["target"];

+	return (

+		function (source) {

+			let output = "";

+			output += format_list(type, language_from)(source[language_from]);

+			output += " ~ ";

+			output += format_list(type, language_to)(source[language_to]);

+			return output;

+		}

+	);

+}

+

+

+/**

+ * @author kcf

+ */

+function definieren() {

+	return {

+		"name": "fsdraft",

+		"befehle": [

+			{

+				"name": "fsdraft_mark",

+				"funktion": function (args) {

+					let classes = rags;

+					return function (wert) {

+						return mark(wert, classes);

+					};

+				}

+			},

+			{

+				"name": "fsdraft_format_correlation",

+				"funktion": function (args) {

+					let type = args.shift();

+					return function (wert) {

+						return format_correlation(type)(wert);

+					};

+				}

+			},

+		],

+	};

+}

+exports.definieren = definieren;

+

@@ -6,5 +6,6 @@ nodejs ${path}/vorlage.js \

 	--modul=${path}/erweiterungen/base64 \

 	--modul=${path}/erweiterungen/html \

 	--modul=${path}/erweiterungen/fold \

+	--modul=${path}/erweiterungen/fsdraft \

 	$@

@@ -719,7 +719,7 @@ var mod_kern;

                                 break;

                             }

                             default: {

-                                var nachricht = ("-- unbekannter Modifikator \"" + teil + "\"");

+                                var nachricht = ("-- unbekannter Modifikator \"" + art + "\"");

                                 console.warn(nachricht + "\n");

                             }

                         }