fs-draft.git

@@ -81,13 +81,20 @@ def main():

 		os.path.join(dirs["source"],"data","correlatives.json"),

 	]

-	parts_logic = [

+	parts_logic_server = [

 		os.path.join(dirs["source"],"logic","server","misc.php"),

 		os.path.join(dirs["source"],"logic","server","data.php"),

 		os.path.join(dirs["source"],"logic","server","settings.php"),

 		os.path.join(dirs["source"],"logic","server","table.php"),

 	]

+	parts_logic_client = [

+		os.path.join(dirs["source"],"logic","client","tools.js"),

+		os.path.join(dirs["source"],"logic","client","table.js"),

+		os.path.join(dirs["source"],"logic","client","toc.js"),

+		os.path.join(dirs["source"],"logic","client","main.js"),

+	]

+	

 	parts_structure = [

 		os.path.join(dirs["source"],"structure","draft.html.php"),

 		os.path.join(dirs["source"],"structure","meta.html.php"),

@@ -101,6 +108,8 @@ def main():

 		os.path.join(dirs["source"],"structure","personal_pronouns.html.php"),

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

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

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

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

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

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

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

@@ -160,10 +169,10 @@ def main():

 	rules.append(

 		class_rule(

 			os.path.join(dirs["build"],"draft.html"),

-			parts_data + parts_logic + parts_structure,

+			parts_data + parts_logic_server + parts_structure,

 			[

 				class_command_log({

-					"message": "compiling document ..."

+					"message": "composing document ..."

 				}),

 				class_command_directory_create({

 					"path": dirs["build"],

@@ -178,16 +187,16 @@ def main():

 	rules.append(

 		class_rule(

 			os.path.join(dirs["build"],"draft.js"),

-			[os.path.join(dirs["source"],"logic","client","draft.js")],

+			parts_logic_client,

 			[

 				class_command_log({

-					"message": "copying client-logic ..."

+					"message": "composing client-logic ..."

 				}),

 				class_command_directory_create({

 					"path": dirs["build"],

 				}),

-				class_command_file_copy({

-					"path-from": os.path.join(dirs["source"],"logic","client","draft.js"),

+				class_command_file_concat({

+					"paths-from": parts_logic_client,

 					"path-to": os.path.join(dirs["build"],"draft.js"),

 				}),

 			]

@@ -9,15 +9,15 @@ 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/logic/server/misc.php source/logic/server/data.php source/logic/server/settings.php source/logic/server/table.php source/structure/draft.html.php source/structure/meta.html.php source/structure/introduction.html.php source/structure/preface.html.php source/structure/key_parameters.html.php source/structure/toc.html.php source/structure/basics.html.php source/structure/phonology_and_orthography.html.php source/structure/grammar.html.php source/structure/personal_pronouns.html.php source/structure/correlatives.html.php source/structure/conjugation.html.php source/structure/declension.html.php source/structure/attributes.html.php source/structure/sentence_structure.html.php source/structure/vocabulary.html.php source/structure/principles.html.php source/structure/word_functions.html.php source/structure/adpositions.html.php source/structure/pronouns.html.php source/structure/dictionary.html.php

-	@ echo -e '-- compiling document ...'

+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/logic/server/misc.php source/logic/server/data.php source/logic/server/settings.php source/logic/server/table.php source/structure/draft.html.php source/structure/meta.html.php source/structure/introduction.html.php source/structure/preface.html.php source/structure/key_parameters.html.php source/structure/toc.html.php source/structure/basics.html.php source/structure/phonology_and_orthography.html.php source/structure/grammar.html.php source/structure/personal_pronouns.html.php source/structure/correlatives.html.php source/structure/conjugation.html.php source/structure/infinite_verbforms.html.php source/structure/tempora_and_modi.html.php source/structure/declension.html.php source/structure/attributes.html.php source/structure/sentence_structure.html.php source/structure/vocabulary.html.php source/structure/principles.html.php source/structure/word_functions.html.php source/structure/adpositions.html.php source/structure/pronouns.html.php source/structure/dictionary.html.php

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

 	@ mkdir --parents build

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

-build/draft.js: source/logic/client/draft.js

-	@ echo -e '-- copying client-logic ...'

+build/draft.js: source/logic/client/tools.js source/logic/client/table.js source/logic/client/toc.js source/logic/client/main.js

+	@ echo -e '-- composing client-logic ...'

 	@ mkdir --parents build

-	@ cp --recursive source/logic/client/draft.js build/draft.js

+	@ cat source/logic/client/tools.js source/logic/client/table.js source/logic/client/toc.js source/logic/client/main.js > build/draft.js

 build/logo.svg: source/media/logo.svg

 	@ echo -e '-- copying logo ...'

@@ -164,6 +164,17 @@

 			"en": null

 		}

 	},

+	{

+		"type": "tap/flap",

+		"ipa": "x",

+		"latin": "X/x or H/h ?",

+		"runic": null,

+		"remark": null,

+		"examples": {

+			"fs": "na_x_t",

+			"en": null

+		}

+	},

 	{

 		"type": "halfvowel",

 		"ipa": "j",

@@ -0,0 +1,36 @@

+"use strict";

+

+function add_tooltips()

+{

+	for (let dom_node of document.querySelectorAll(".word_fs"))

+	{

+		let url = "http://folksprak.org/munin.php?query=translation_fs_" + dom_node.textContent + "_en";

+		load_file

+		(

+			url,

+			function (error, content)

+			{

+				try

+				{

+					let object = JSON.parse(content);

+					dom_node.setAttribute("title", object.map(entry => entry.to.stem).join(", "));

+				}

+				catch (exception)

+				{

+					console.warn("couldn't parse ", content);

+				}

+			}

+		)

+	}

+}

+

+function main()

+{

+	let contentnode = class_contentnode.read();

+	document.querySelector("#toc").appendChild(contentnode.generate());

+	contentnode.adjust();

+	// add_tooltips();

+}

+

+document.addEventListener("DOMContentLoaded", function (event) {main();});

+

@@ -1,47 +1,5 @@

 "use strict";

-function load_file(url, usage)

-{

-	let request = new XMLHttpRequest();

-	request.open("GET", url, true);

-	request.send(null);

-	request.onreadystatechange = function ()

-	{

-		usage(null, request.responseText);

-	};

-}

-

-function add_tooltips()

-{

-	for (let dom_node of document.querySelectorAll(".word_fs"))

-	{

-		let url = "http://folksprak.org/munin.php?query=translation_fs_" + dom_node.textContent + "_en";

-		load_file

-		(

-			url,

-			function (error, content)

-			{

-				try

-				{

-					let object = JSON.parse(content);

-					dom_node.setAttribute("title", object.map(entry => entry.to.stem).join(", "));

-				}

-				catch (exception)

-				{

-					console.warn("couldn't parse ", content);

-				}

-			}

-		)

-	}

-}

-

-function convert_to_list(structure)

-{

-	let list = [];

-	for (let index = 0; index < structure.length; index += 1) list.push(structure[index]);

-	return list;

-}

-

 class class_contentnode

 {

 	constructor(id, title, children)

@@ -83,6 +41,17 @@ class class_contentnode

 		return dom_fragment;

 	}

+	adjust(path = [])

+	{

+		if (this.id != null)

+		{

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

+			let dom_header = document.querySelector(selector);

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

+		}

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

+	}

+	

 	static read(dom_context = document, classes = ["chapter","section","subsection"], id = null, title = null)

 	{

 		return (

@@ -110,11 +79,3 @@ class class_contentnode

 	}

 }

-function main()

-{

-	document.querySelector("#toc").appendChild(class_contentnode.read().generate());

-	// add_tooltips();

-}

-

-document.addEventListener("DOMContentLoaded", function (event) {main();});

-

@@ -0,0 +1,20 @@

+"use strict";

+

+function load_file(url, usage)

+{

+	let request = new XMLHttpRequest();

+	request.open("GET", url, true);

+	request.send(null);

+	request.onreadystatechange = function ()

+	{

+		usage(null, request.responseText);

+	};

+}

+

+function convert_to_list(structure)

+{

+	let list = [];

+	for (let index = 0; index < structure.length; index += 1) list.push(structure[index]);

+	return list;

+}

+

@@ -1,4 +1,15 @@

 <?php

+	function compose($names)

+	{

+		array_map(

+			function ($name)

+			{

+				include("source/structure/" . $name . ".html.php");

+			},

+			$names

+		);

+	}

+	

 	function mark($core, $classes)

 	{

 		return ('<span class="' . implode(" ", $classes) . '">' . $core . '</span>');

@@ -3,8 +3,9 @@

 	include_once("source/logic/server/table.php");

 	include_once("source/logic/server/misc.php");

  ?>

-<section class="section" id="vocabulary/adpositions">

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

 	$table = new class_table

 	(

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

-<section class="section" id="grammar/attributes">

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

 	<header>Attributes</header>

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

 </section>

@@ -1,11 +1,8 @@

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

 	<header>Basics</header>

 <?php

-	array_map(

-		function ($name)

-		{

-			include("source/structure/" . $name . ".html.php");

-		},

+	compose

+	(

 		[

 			"phonology_and_orthography",

 		]

@@ -4,77 +4,18 @@

 	include_once("source/logic/server/data.php");

 	include_once("source/logic/server/misc.php");

  ?>

-<section class="section" id="grammar/conjugation">

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

-	<section class="subsection" id="conjugation/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">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 speakable 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>

-	<section class="subsection" id="conjugation/tempora">

-		<header>Tempora and Modi</header>

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

+	compose

 	(

 		[

-			new class_column

-			(

-				"Name",

-				function ($row)

-				{

-					return ["name" => $row["name"], "remark" => $row["remark"]];

-				},

-				function ($value)

-				{

-					$output = $value["name"];

-					if ($value["remark"] != null)

-					{

-						$output .= (" " . "(" . $value["remark"] . ")");

-					}

-					return $output;

-				}

-			),

-			new class_column

-			(

-				"Description",

-				function ($row)

-				{

-					return $row["description"];

-				}

-			),

-			new class_column

-			(

-				"Scheme",

-				function ($row)

-				{

-					return $row["scheme"];

-				},

-				function ($value)

-				{

-					return format($value, ["word", "lang_fs"]);

-				}

-			),

-			new class_column

-			(

-				"Example",

-				function ($row)

-				{

-					global $configuration;

-					return ["original" => [$row["example"]["original"]], "translated" => $row["example"]["translations"][$configuration["target"]]];

-				},

-				_bar("sentence")

-			),

-		],

-		array_slice(read_json("source/data/timeforms.json"), 0, 3)

+			"infinite_verbforms",

+			"tempora_and_modi",

+		]

 	);

-	$table->generate();

  ?>

-		<p>Since these forms are built with auxiliary verbs, they can be combined straight forward 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>

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

-	</section>

 </section>

@@ -3,8 +3,9 @@

 	include_once("source/logic/server/table.php");

 	include_once("source/logic/server/misc.php");

  ?>

-<section class="subsection" id="vocabulary/pronouns/correlatives">

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

 	/*

 	function foobar($value)

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

-<section class="section" id="grammar/declension">

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

 	<header>Declension</header>

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

 </section>

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

-<section class="section" id="vocabulary/dictionary">

+<section class="section" id="dictionary">

 	<header>Dictionary</header>

 	See <a href="http://folksprak.org/?target=dictionary">Munin-Dictionary</a>

 </section>

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

 <!DOCTYPE HTML>

 <?php include_once("source/logic/server/settings.php"); ?>

+<?php include_once("source/logic/server/misc.php"); ?>

 <html>

 	<head>

 		<title>Folksprak -- Draft</title>

@@ -20,11 +21,8 @@

 			titlepage

 			  -->

 <?php

-	array_map(

-		function ($name)

-		{

-			include("source/structure/" . $name . ".html.php");

-		},

+	compose

+	(

 		[

 			"introduction",

 			"basics",

@@ -1,11 +1,8 @@

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

 	<header>Grammar</header>

 <?php

-	array_map(

-		function ($name)

-		{

-			include("source/structure/" . $name . ".html.php");

-		},

+	compose

+	(

 		[

 			"conjugation",

 			"declension",

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

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

+

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

-<section class="chapter pseudo hidden" id="introduction">

+<?php include_once("source/logic/server/misc.php"); ?>

+<section class="chapter hidden" id="introduction">

 	<header>Introduction</header>

-	<?php include("source/structure/preface.html.php"); ?>

-	<?php include("source/structure/key_parameters.html.php"); ?>

-	<?php include("source/structure/toc.html.php"); ?>

+<?php

+	compose

+	(

+		[

+			"toc",

+			"preface",

+			"key_parameters",

+		]

+	);

+ ?>

 </section>

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

-<section class="section pseudo" id="introduction/key_parameters">

+<section class="section" id="key_parameters">

 	<header>Basic Points</header>

 	<p>Folksprak shall be constructed as a language that is:</p>

 	<ol>

@@ -7,8 +7,9 @@ function convert_persona($persona) {return [0 => "impersonal", 1 => "1st person"

 function convert_numerus($numerus) {return [0 => null, 1 => "singular", 2 => "plural"][$numerus];}

 function convert_genus($genus) {return [0 => "common", 1 => "masculine", 2 => "feminine", 3 => "neuter"][$genus];}

  ?>

-<section class="subsection" id="vocabulary/pronouns/personal_pronouns">

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

 	(

@@ -4,7 +4,7 @@

 	include_once("source/logic/server/table.php");

 	include_once("source/logic/server/misc.php");

  ?>

-<section class="section" id="basics/phonology_and_orthography">

+<section class="section" id="phonology_and_orthography">

 	<header>Phonology and Orthography</header>

 	<!--

 	<p>Folksprak uses the following characters as letters:</pa>

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

-<section class="section pseudo" id="introduction/preface">

+<section class="section" id="preface">

 	<header>Preface</header>

 	<p>Folksprak is the name of a project that aims to construct an inter-Germanic zonal auxiliary language, which means a language that can be easily understood by any speaker of a Germanic language (a group numbering over 465 million native speakers with an additional 300 to 900 million speaking English as a second language) without ever having learned it.</p>

 	<p>Folksprak is not meant to be designed by any one individual, but rather a collective work created by all interested parties; so you're welcome to participate.</p>

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

-<section class="section" id="vocabulary/principles">

+<section class="section" id="principles">

 	<header>Principles</header>

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

 </section>

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

-<section class="section" id="vocabulary/pronouns">

+<section class="section" id="pronouns">

 	<header>Pronouns</header>

-	<?php include("source/structure/personal_pronouns.html.php"); ?>

-	<?php include("source/structure/correlatives.html.php"); ?>

+<?php

+	compose

+	(

+		[

+			"personal_pronouns",

+			"correlatives",

+		]

+	);

+ ?>

 </section>

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

-<section class="section" id="grammar/sentence_structure">

+<section class="section" id="sentence_structure">

 	<header>Sentence Structure</header>

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

 </section>

@@ -0,0 +1,64 @@

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

+	<header>Tempora and Modi</header>

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

+(

+	[

+		new class_column

+		(

+			"Name",

+			function ($row)

+			{

+				return ["name" => $row["name"], "remark" => $row["remark"]];

+			},

+			function ($value)

+			{

+				$output = $value["name"];

+				if ($value["remark"] != null)

+				{

+					$output .= (" " . "(" . $value["remark"] . ")");

+				}

+				return $output;

+			}

+		),

+		new class_column

+		(

+			"Description",

+			function ($row)

+			{

+				return $row["description"];

+			}

+		),

+		new class_column

+		(

+			"Scheme",

+			function ($row)

+			{

+				return $row["scheme"];

+			},

+			function ($value)

+			{

+				return format($value, ["word", "lang_fs"]);

+			}

+		),

+		new class_column

+		(

+			"Example",

+			function ($row)

+			{

+				global $configuration;

+				return ["original" => [$row["example"]["original"]], "translated" => $row["example"]["translations"][$configuration["target"]]];

+			},

+			_bar("sentence")

+		),

+	],

+	array_slice(read_json("source/data/timeforms.json"), 0, 3)

+);

+$table->generate();

+?>

+	<p>Since these forms are built with auxiliary verbs, they can be combined straight forward 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>

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

+</section>

+

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

-<section class="section pseudo" id="introduction/toc">

+<section class="section pseudo" id="toc">

 	<header>Table of Contents</header>

 	<div id="toc">

 	</div>

@@ -1,11 +1,8 @@

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

 	<header>Vocabulary</header>

 <?php

-	array_map(

-		function ($name)

-		{

-			include("source/structure/" . $name . ".html.php");

-		},

+	compose

+	(

 		[

 			"principles",

 			"pronouns",

@@ -4,8 +4,9 @@

 	include_once("source/logic/server/data.php");

 	include_once("source/logic/server/table.php");

  ?>

-<section class="section" id="vocabulary/word_functions">

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

 	$table = new class_table

 	(

@@ -54,7 +54,7 @@ a

 .note_information

 {

 	&:extend(.note);

-	background-color: hsv(120, 40%, (0.8 * hsvvalue(@color-bg)) + (0.2 * 50%));

+	background-color: hsv(240, 40%, (0.8 * hsvvalue(@color-bg)) + (0.2 * 50%));

 	&:before {font-weight: bold; content: "[i] ";}

 }