fs-draft.git

@@ -94,7 +94,9 @@ def main():

 		os.path.join(dirs["source"],"content","correlatives.html.php"),

 		os.path.join(dirs["source"],"content","conjugation.html.php"),

 		os.path.join(dirs["source"],"content","infinite_verbforms.html.php"),

+		os.path.join(dirs["source"],"content","modal_verbs.html.php"),

 		os.path.join(dirs["source"],"content","tempora_and_modi.html.php"),

+		os.path.join(dirs["source"],"content","negation.html.php"),

 		os.path.join(dirs["source"],"content","declension.html.php"),

 		os.path.join(dirs["source"],"content","attributes.html.php"),

 		os.path.join(dirs["source"],"content","sentence_structure.html.php"),

@@ -9,7 +9,7 @@ clear: clean

 	@ rm --recursive --force build

 .PHONY: clear

-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

+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

 	@ echo -e '-- composing document ...'

 	@ mkdir --parents build

 	@ php source/content/draft.html.php > build/draft.html

@@ -5,7 +5,10 @@

  ?>

 <section class="section" id="adpositions">

 	<header>Adpositions</header>

-	<div class="note_error">This section is only a proposal yet; not part of the draft.</div>

+	<?php proposal(); ?>

+	<!--

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

+	  -->

 <?php

 	$table = new class_table

 	(

@@ -6,14 +6,15 @@

  ?>

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

 	<header>Conjugation</header>

-	<div class="note_error">This section is only a proposal yet; not part of the draft.</div>

 	<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>

 <?php

 	compose

 	(

 		[

 			"infinite_verbforms",

+			"modal_verbs",

 			"tempora_and_modi",

+			"negation",

 		]

 	);

  ?>

@@ -6,7 +6,7 @@

  ?>

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

 	<header>Correlatives</header>

-	<div class="note_error">This section is only a proposal yet; not part of the draft.</div>

+	<?php proposal(); ?>

 <?php

 	$mode = 2;

 	switch ($mode)

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

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

 	<header>Infinite Verbforms</header>

-	<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>

+	<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>

 	<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>

 	<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>

 </section>

@@ -0,0 +1,25 @@

+<section class="subsection" id="modal_verbs">

+	<header>Modal verbs</header>

+	<?php proposal(); ?>

+	<p>The following verbs are modal verbs in Folksprak:</p>

+	<ul>

+<?php

+	$entries =

+	[

+		["original" => ["mute"], "translated" => ["to must"]],

+		["original" => ["kane"], "translated" => ["to can"]],

+		["original" => ["vile"], "translated" => ["to will"]],

+		["original" => ["skale"], "translated" => ["to shall"]],

+		["original" => ["darfe"], "translated" => ["to be allowed to"]],

+	];

+	foreach ($entries as $entry)

+	{

+ ?>

+		<li><?php echo(call_user_func(_bar("word"), $entry)); ?></li>

+<?php

+	}

+ ?>

+	</ul>

+	<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>

+</section>

+

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

+<section class="subsection" id="negation">

+	<header>Negation</header>

+	<?php proposal(); ?>

+	<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>

+	<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>

+	<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>

+	<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>

+</section>

+

@@ -9,7 +9,6 @@ function convert_genus($genus) {return [0 => "common", 1 => "masculine", 2 => "f

  ?>

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

 	<header>Personal Pronouns</header>

-	<div class="note_error">This section is only a proposal yet; not part of the draft.</div>

 <?php

 	$table = new class_table

 	(

@@ -62,6 +61,6 @@ function convert_genus($genus) {return [0 => "common", 1 => "masculine", 2 => "f

 	);

 	$table->generate();

  ?>

-	<p>For the flected and otherwise related forms of the personal pronouns see the section <a href="#grammar/declension">Declension</a>.</p>

+	<p>For the flected and otherwise related forms of the personal pronouns see the section <a href="#declension">Declension</a>.</p>

 </section>

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

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

 	<header>Tempora and Modi</header>

+	<?php proposal(); ?>

 	<p>The following table lists the timeforms found in Folksprak and how they are built in the <span class="grammarterm">indicative</span> mode.</p>

 <?php

 $table = new class_table

@@ -57,8 +58,8 @@ $table = new class_table

 );

 $table->generate();

 ?>

-	<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>

-	<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>

+	<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>

+	<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>

 	<span class="todo">conjunctive</span>

 </section>

@@ -6,7 +6,7 @@

  ?>

 <section class="section" id="word_functions">

 	<header>Word Functions</header>

-	<div class="note_error">This section is only a proposal yet; not part of the draft.</div>

+	<?php proposal(); ?>

 <?php

 	$table = new class_table

 	(

@@ -117,23 +117,23 @@

 	{

 		"type": "x5",

 		"positive_absolute": {

-			"fs": ["heg"],

+			"fs": ["hög"],

 			"en": ["right"]

 		},

 		"positive_relative": {

-			"fs": ["heg (lut)"],

+			"fs": ["hög (lut)"],

 			"en": ["right from"]

 		},

 		"positive_attributive": {

-			"fs": ["heg arend"],

+			"fs": ["hög arend"],

 			"en": ["right"]

 		},

 		"directive_absolute": {

-			"fs": ["to heg"],

+			"fs": ["to hög"],

 			"en": ["to the right"]

 		},

 		"directive_relative": {

-			"fs": ["to heg (lut)"],

+			"fs": ["to hög (lut)"],

 			"en": ["to the right of"]

 		}

 	},

@@ -24,28 +24,28 @@

 		"numerus": 1,

 		"persona": 3,

 		"genus": 0,

-		"fs": ["han"],

+		"fs": ["hen"],

 		"en": []

 	},

 	{

 		"numerus": 1,

 		"persona": 3,

 		"genus": 1,

-		"fs": ["hin"],

+		"fs": ["hi"],

 		"en": ["he"]

 	},

 	{

 		"numerus": 1,

 		"persona": 3,

 		"genus": 2,

-		"fs": ["hun"],

+		"fs": ["hu"],

 		"en": ["she"]

 	},

 	{

 		"numerus": 1,

 		"persona": 3,

 		"genus": 3,

-		"fs": ["hat"],

+		"fs": ["het"],

 		"en": ["it"]

 	},

 	{

@@ -166,8 +166,8 @@

 	},

 	{

 		"type": "tap/flap",

-		"ipa": "/x/",

-		"latin": "'X'/'x' or 'H'/'h'?",

+		"ipa": "/x/ ?",

+		"latin": "'X'/'x' or 'H'/'h' or 'Q'/'q' or 'C'/'c' ?",

 		"runic": null,

 		"remark": null,

 		"examples": {

@@ -194,7 +194,7 @@

 		"remark": null,

 		"examples": {

 			"fs": "'gr_i_d'",

-			"en": "'b_ee_f'"

+			"en": "'n_ee_dle'"

 		}

 	},

 	{

@@ -205,7 +205,7 @@

 		"remark": "only a few variations of English have that sound; it is somehow similar to the vowel in 'air'",

 		"examples": {

 			"fs": "'st_e_d'",

-			"en": "~ '_ai_r'"

+			"en": "~ 'b_e_t'"

 		}

 	},

 	{

@@ -226,8 +226,8 @@

 		"runic": "'ᛟ'",

 		"remark": null,

 		"examples": {

-			"fs": "'_o_ld'",

-			"en": "~ '_o_scar'"

+			"fs": "'f_o_gel'",

+			"en": "~ 'f_o_x'"

 		}

 	},

 	{

@@ -238,7 +238,7 @@

 		"remark": null,

 		"examples": {

 			"fs": "'bl_u_'",

-			"en": "'cr_u_cial'"

+			"en": "'c_oo_l'"

 		}

 	},

 	{

@@ -248,8 +248,8 @@

 		"runic": "'ᛟᛇ'",

 		"remark": "similar to vowels used in words like 'earl', 'worry', 'hurt'",

 		"examples": {

-			"fs": "'sk_ö_n'",

-			"en": "~ '_ea_rly'"

+			"fs": "'sk_oy_n'",

+			"en": "~ 't_u_rn'"

 		}

 	},

 	{

@@ -259,7 +259,7 @@

 		"runic": "'ᚢᛇ'",

 		"remark": "hardly any variation of English has that sound, but it can be learned easily by interpolating between /u/ and /i/",

 		"examples": {

-			"fs": "'s_ü_d'",

+			"fs": "'s_uy_d'",

 			"en": null

 		}

 	}

@@ -36,7 +36,7 @@

 		"description": "For expressing an action in the future",

 		"remark": "implicit",

 		"example": {

-			"original": "Ek skal skriva.",

+			"original": "Ek skal skrive.",

 			"translations": {

 				"en": ["I will write.", "I am going to write."],

 				"de": ["Ich werde schreiben."],

@@ -46,8 +46,15 @@ class class_contentnode

 		if (this.id != null)

 		{

 			let selector = ("#" + this.id + " > header");

+			let text = path.map(x => (x+1).toString()).join(".") + " " + this.title;

 			let dom_header = document.querySelector(selector);

-			dom_header.textContent = path.map(x => (x+1).toString()).join(".") + " " + this.title;

+			dom_header.textContent = "";

+			let dom_link = document.createElement("a");

+			dom_link.classList.add("jumplabel");

+			dom_link.setAttribute("href", "#" + this.id);

+			dom_link.textContent = text;

+			// dom_link.textContent = " #";

+			dom_header.appendChild(dom_link);

 		}

 		this.children.forEach((child, index) => child.adjust(path.concat([index])));

 	}

@@ -61,5 +61,12 @@

 			}

 		);

 	}

+	

+	function proposal()

+	{

+ ?>

+		<div class="note_error">This section is only a proposal yet; not part of the draft.</div>

+<?php

+	}

  ?>

@@ -37,12 +37,26 @@ table.datatable

 a

 {

-	color: @color-x1;

 	text-decoration: none;

 	font-weight: bold;

 	/*

 	font-family: monospace;

 	 */

+	

+	&:not(.jumplabel)

+	{

+		color: @color-x1;

+	}

+	

+	&.jumplabel

+	{

+		color: inherit;

+		

+		&:hover

+		{

+			color: @color-x1;

+		}

+	}

 }

 .note