fs-draft.git

es wird!
Parent e66a984
Christian Fraß

Christian Fraß commited on 2018-08-22 09:58:07
Zeige 26 geänderte Dateien mit 168 Einfügungen und 93 Löschungen.

source/content/meta.html.tpl
Zeige Datei @ 7721cdf
source/content/basics.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -1,5 +1,5 @@
1 1 
 <section class="chapter" id="basics">
2 2 
 	<header>Basics</header>
3 
-	[[call::phonology_and_orthography.html.tpl]]
3 
+	{{call::phonology_and_orthography.html.tpl}}
4 4 
 </section>
5 5
source/content/cases.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -2,7 +2,7 @@
2 2 
 	<header>Cases</header>
3 3 
 	<p>Regular nouns can appear in two cases: <span class="grammarterm">nominative</span> and <span class="grammarterm">genitive</span>.</p>
4 4 
 	<p>The base form of a noun is the nominative, which does not receive any marker.</p>
5 
-	<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>
5 
+	<p>The genitive is formed by appending the suffix <span class="type_word lang_flk">-(e)s</span> 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>
6 6 
 	<p></p>
7 7 
 </section>
8 8
source/content/correlatives.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -4,7 +4,7 @@
4 4 
 	{{fold:correlatives.words:domain_id:type_id}}
5 5 
 	<div class="note note_information">
6 6 
 		<span class="note_content">
7 
-			<p>Some of these words are very unlikely to ever get used (e.g. [[show:correlative_example|mark:type_word:lang_flk]]). Nevertheless they exist and are listed for completeness.</p>
7 
+			<p>Some of these words are very unlikely to ever get used (e.g. <span class="type_word lang_flk">ni slag</span>). Nevertheless they exist and are listed for completeness.</p>
8 8 
 		</span>
9 9 
 	</div>
10 10 
 </section>
source/content/definiteness.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -1,7 +1,7 @@
1 1 
 <section class="subsection" id="definiteness">
2 2 
 	<header>Definiteness</header>
3 
-	<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>
4 
-	<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>
3 
+	<p>The undefinite aspect of a singular noun is formed by using the article <span class="type_word lang_flk">en</span>, 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>
4 
+	<p>The definite aspect of both singular and plural nouns is formed by using the article <span class="type_word lang_flk">de</span>, e.g. {{fsdraft_format_correlation:section-definiteness.example3:type_word}}.</p>
5 5 
 	<span class="todo">abstract aspect like in "sand is dry"</span>
6 6 
 </section>
7 7
source/content/draft.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -2,11 +2,7 @@
2 2 
 <html>
3 3 
 	<head>
4 4 
 		<title>Folksprak -- Draft</title>
5 
-		<meta charset="utf-8"/>
6 
-		<meta name="author" content="Fenris Wolf"/>
7 
-		<meta name="description" content="draft for the constructed germanic zonal auxlang 'Folksprak'"/>
8 
-		<meta name="language" content="english"/>
9 
-		<meta name="keywords" content="language,germanic,constructed"/>
5 
+		{{call::_meta.html.tpl}}
10 6 
 		<link rel="shortcut icon" type="image/png" href="favicon.png"/>
11 7 
 		<link rel="stylesheet" type="text/css" href="draft.css"/>
12 8 
 		<script type="text/javascript" src="draft.js"></script>
source/content/example_texts-paragraph.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -0,0 +1,3 @@
1 
+<p>
2 
+		{{show:|escape:html}}
3 
+</p>
source/content/example_texts.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -1,24 +1,8 @@
1 
-<?php
2 
-	$data = read_json("source/data/texts.json");
3 
- ?>
4 1 
 <section class="section" id="example_texts">
5 2 
 	<header>Texts</header>
6 
-<?php
7 
-	$id = "de_grot_diktator";
8 
-	$dataset = $data[$id];
9 
- ?>
10 
-	<section class="subsection" id="<?php echo($id); ?>">
11 
-		<header><?php echo($dataset["title"]); ?></header>
12 
-<?php
13 
-	echo
14 
-	(
15 
-		mark
16 
-		(
17 
-			implode("", array_map(function ($paragraph) {return ("<p>${paragraph}</p>");}, $dataset["paragraphs"])),
18 
-			["type_text", "lang_flk"]
19 
-		)
20 
-	);
21 
- ?>
3 
+	<section class="subsection" id="de_grot_diktator">
4 
+		<header>{{show:texts.de_grot_diktator.title}}</header>
5 
+		<span class="type_text lang_flk">{{list:texts.de_grot_diktator.paragraphs:example_texts-paragraph.html.tpl}}</span>
22 6 
 		<p>An attempt to translate the final speech from the famous Charlie Chaplin movie "The great dictator" (with some passages inspired by the German translation); the English original can be listened to <a href="https://www.youtube.com/watch?v=ibVpDhW6kDQ">on youtube</a>; or in case you'd like to hear a more heart-wrenching version: <a href="https://www.youtube.com/watch?v=Gaq62VCcnew">accompanied by "Hans Zimmer - Time"</a>.</p>
23 7 
 		<!--
24 8 
 		<a href="https://www.youtube.com/watch?v=Gaq62VCcnew">With "Hans Zimmer -- Time"</a>
source/content/examples.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -1,13 +1,6 @@
1 1 
 <section class="chapter" id="examples">
2 2 
 	<header>Examples</header>
3 
-<?php
4 
-	compose
5 
-	(
6 
-		[
7 
-			"example_sentences",
8 
-			"example_texts",
9 
-		]
10 
-	);
11 
- ?>
3 
+	{{call::example_sentences.html.tpl}}
4 
+	{{call::example_texts.html.tpl}}
12 5 
 </section>
13 6
source/content/infinite_verbforms.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -1,8 +1,8 @@
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 <?php echo(mark("-e", ["type_word", "lang_flk"])); ?> to the verb stem, e.g. <?php echo(format_correlation("type_word")(["flk" => ["skrive"], "eng" => ["to write"]])); ?>. In some cases it is mandatory to mark the infinitive with the special particle <?php echo(mark("tu", ["type_word", "lang_flk"])); ?> in order to form the <span class="grammarterm">extended intfinitive</span>, e.g.: <?php echo(format_correlation("type_sentence")(["flk" => ["Han hop tu finde en svart sten."], "eng" => ["He hopes to find a black stone."]])); ?>.</p>
3 
+	<p>The <span class="grammarterm">infinitive</span> is formed by appending <span class="type_word lang_flk">-e</span> to the verb stem, e.g. {{fsdraft_format_correlation:section-infinite_verbforms.example1:type_word}}. In some cases it is mandatory to mark the infinitive with the special particle <span class="type_word lang_flk">tu</span> in order to form the <span class="grammarterm">extended intfinitive</span>, e.g.: {{fsdraft_format_correlation:section-infinite_verbforms.example2:type_sentence}}.</p>
4 4 
 	<span class="todo">Specify cases for extended infinitive</span>
5 
-	<p>The <span class="grammarterm">active participle</span> is formed by appending <?php echo(mark("-end", ["type_word", "lang_flk"])); ?> to the verb stem, e.g. <?php echo(format_correlation("type_word")(["flk" => ["skrivend"], "eng" => ["writing"]])); ?>.</p>
6 
-	<p>The <span class="grammarterm">passive participle</span> is formed by appending <?php echo(mark("-et", ["type_word", "lang_flk"])); ?> to the verb stem, e.g. <?php echo(format_correlation("type_word")(["flk" => ["skrivet"], "eng" => ["written"]])); ?>. If pronouncable, the <?php echo(mark("e", ["type_letter", "lang_flk"])); ?> in the ending can be omitted, e.g. <?php echo(mark("skrivt", ["type_word", "lang_flk"])); ?>.</p>
5 
+	<p>The <span class="grammarterm">active participle</span> is formed by appending <span class="type_word lang_flk">-end</span> to the verb stem, e.g. {{fsdraft_format_correlation:section-infinite_verbforms.example3:type_word}}.</p>
6 
+	<p>The <span class="grammarterm">passive participle</span> is formed by appending <span class="type_word lang_flk">-et</span> to the verb stem, e.g. {{fsdraft_format_correlation:section-infinite_verbforms.example4:type_word}}. If pronouncable, the <span class="type_letter lang_flk">e</span> in the ending can be omitted, e.g. <span class="type_word lang_flk">skrivt</span>.</p>
7 7 
 </section>
8 8
source/content/modal_verbs-list.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -0,0 +1,2 @@
1 
+<li>{{fsdraft_format_correlation::type_word}}</li>
2 
+
source/content/modal_verbs.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -1,27 +1,9 @@
1 1 
 <section class="subsection" id="modal_verbs">
2 2 
 	<header>Modal verbs</header>
3 
-	<?php proposal(); ?>
3 
+	{{call::_proposal.html.tpl}}
4 4 
 	<p>The following verbs are modal verbs in Folksprak:</p>
5 
-	<ul>
6 
-<?php
7 
-	$entries =
8 
-	[
9 
-		["flk" => ["mute"], "eng" => ["to must"]],
10 
-		["flk" => ["kane"], "eng" => ["to can"]],
11 
-		["flk" => ["vile"], "eng" => ["to will"]],
12 
-		["flk" => ["skale"], "eng" => ["to shall"]],
13 
-		// ["flk" => ["darfe"], "eng" => ["to be allowed to"]],
14 
-		["flk" => ["vöre"], "eng" => ["(to have the contingent readiness to do something)"]],
15 
-	];
16 
-	foreach ($entries as $entry)
17 
-	{
18 
- ?>
19 
-		<li><?php echo(format_correlation("type_word")($entry)); ?></li>
20 
-<?php
21 
-	}
22 
- ?>
23 
-	</ul>
24 
-	<p>Modal verbs in contrast to normal verbs never take an extended infinitive as object, e.g. <?php echo(format_correlation("type_sentence")(["flk" => ["Vi hop tu finde vater har."], "eng" => ["We hope to find water here."]])); ?>, but <?php echo(format_correlation("type_sentence")(["flk" => ["Vi kan finde vater har."], "eng" => ["We can find water here."]])); ?></p>
25 
-	<p>The special modal verb <?php echo(mark("vöre", ["type_word", "lang_flk"])); ?> is used for expressing the subjunctive.</p>
5 
+	<ul>{{list:section-modal_verbs.list:modal_verbs-list.html.tpl}}</ul>
6 
+	<p>Modal verbs in contrast to normal verbs never take an extended infinitive as object, e.g. {{fsdraft_format_correlation:section-modal_verbs.example1:type_sentence}}, but {{fsdraft_format_correlation:section-modal_verbs.example2:type_sentence}}</p>
7 
+	<p>The special modal verb <span class="type_word lang_flk">vöre</span> is used for expressing the subjunctive.</p>
26 8 
 </section>
27 9
source/content/negation.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -1,9 +1,9 @@
1 1 
 <section class="subsection" id="negation">
2 2 
 	<header>Negation</header>
3 
-	<?php proposal(); ?>
4 
-	<p>In order to negate the meaning of a predicate, one shall place the word <?php echo(mark("nit", ["type_word", "lang_flk"])); ?> after the flected verb part of the predicate. Example: <?php echo(format_correlation("type_sentence")(["flk" => ["Di sej nit."], "eng" => ["They don't see."]])); ?></p>
5 
-	<p>If the verb takes a direct object it is allowed to place the object before the <?php echo(mark("nit", ["type_word", "lang_flk"])); ?>. Example: <?php echo(format_correlation("type_sentence")(["flk" => ["Di sej us nit."], "eng" => ["They don't see us."]])); ?></p>
6 
-	<p>Negations can also be expressed implicitly by using negative correlatives. Example: <?php echo(format_correlation("type_sentence")(["flk" => ["Di sej ing tid."], "eng" => ["They never see."]])); ?></p>
7 
-	<p>Doubled negations (both explicit and implicit ones) cancel each other out. Example: <?php echo(format_correlation("type_sentence")(["flk" => ["Di sej nit ing tid."], "eng" => ["They never don't see.", "They always see."]])); ?></p>
3 
+	{{call::_proposal.html.tpl}}
4 
+	<p>In order to negate the meaning of a predicate, one shall place the word <span class="type_word lang_flk">nit</span> after the flected verb part of the predicate. Example: {{fsdraft_format_correlation:section-negation.examples.0:type_sentence}}</p>
5 
+	<p>If the verb takes a direct object it is allowed to place the object before the <span class="type_word lang_flk">nit</span>. Example: {{fsdraft_format_correlation:section-negation.examples.1:type_sentence}}</p>
6 
+	<p>Negations can also be expressed implicitly by using negative correlatives. Example: {{fsdraft_format_correlation:section-negation.examples.2:type_sentence}}</p>
7 
+	<p>Doubled negations (both explicit and implicit ones) cancel each other out. Example: {{fsdraft_format_correlation:section-negation.examples.3:type_sentence}}</p>
8 8 
 </section>
9 9
source/content/numeri.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -1,6 +1,6 @@
1 1 
 <section class="subsection" id="numeri">
2 2 
 	<header>Count</header>
3 
-	<?php proposal(); ?>
4 
-	<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>
3 
+	{{call::_proposal.html.tpl}}
4 
+	<p>The plural of a noun is formed by appending the syllable <span class="type_word lang_flk">-er</span>, e.g. {{fsdraft_format_correlation:section-numeri.example:type_word}}.</p>
5 5 
 </section>
6 6
source/content/personal_pronouns.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -3,17 +3,17 @@
3 3 
  	{{fold:personal_pronouns.words:count_id/person_id/gender_id:type_id/case_id}}
4 4 
 	<div class="note note_information">
5 5 
 		<span class="note_content">
6 
-			<p>Since the word <?php echo(mark("man", ["type_word", "lang_flk"])); ?> simply means <?php echo(mark("human being", ["type_word", "lang_en"])); ?>, it can be understood as an implicit way to express an abstract actor; similar words like <?php echo(mark("lüd", ["type_word", "lang_flk"])); ?> (<?php echo(mark("people", ["type_word", "lang_en"])); ?>) or <?php echo(mark("di", ["type_word", "lang_flk"])); ?> can be used as well.</p>
6 
+			<p>Since the word <span class="type_word lang_flk">man</span> simply means <span class="type_word lang_en">human being</span>, it can be understood as an implicit way to express an abstract actor; similar words like <span class="type_word lang_flk">lüd</span> (<span class="type_word lang_en">people</span>) or <span class="type_word lang_flk">di</span> can be used as well.</p>
7 7 
 		</span>
8 8 
 	</div>
9 9 
 	<div class="note note_information">
10 10 
 		<span class="note_content">
11 
-			<p>The honorific salutation is expressed by the plural form <?php echo(mark("je", ["type_word", "lang_flk"])); ?>; however it should be avoided in usual speech in favor of the singular form <?php echo(mark("du", ["type_word", "lang_flk"])); ?>.</p>
11 
+			<p>The honorific salutation is expressed by the plural form <span class="type_word lang_flk">je</span>; however it should be avoided in usual speech in favor of the singular form <span class="type_word lang_flk">du</span>.</p>
12 12 
 		</span>
13 13 
 	</div>
14 14 
 	<div class="note note_information">
15 15 
 		<span class="note_content">
16 
-			<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>
16 
+			<p>A reflexive genitive can be formed by inserting the word <span class="word lang_flk">egen</span> (<span class="type_word lang_en">own</span>), for example {{fsdraft_format_correlation:section-personal_pronouns.example:type_sentence}} (A's book was given to B).</p>
17 17 
 		</span>
18 18 
 	</div>
19 19 
 	<div class="note note_reasoning">
... ... 
@@ -21,7 +21,7 @@
21 21 
 		<label class="note_label note_label_show" for="note_02">show</label>
22 22 
 		<label class="note_label note_label_hide" for="note_02">hide</label>
23 23 
 		<span class="note_content">
24 
-			<p>When finding appropriate personal pronouns, the most intricate cases were the 3rd person singular and the 2nd person plural; both turned out to be very diverse among the modern Germanic languages. While for the 2nd person plural we could find a sufficient satisfying solution after a while, the 3rd person singular kept defying. In the end we came to the settlement to use a Swedish-like solution including the pronoun <?php echo(mark("hen", ["type_word", "lang_flk"])); ?>, which is not bound to any sexus so that it can be used for actors in general.</p>
24 
+			<p>When finding appropriate personal pronouns, the most intricate cases were the 3rd person singular and the 2nd person plural; both turned out to be very diverse among the modern Germanic languages. While for the 2nd person plural we could find a sufficient satisfying solution after a while, the 3rd person singular kept defying. In the end we came to the settlement to use a Swedish-like solution including the pronoun <span class="type_word lang_flk">hen</span>, which is not bound to any sexus so that it can be used for actors in general.</p>
25 25 
 		</span>
26 26 
 	</div>
27 27 
 </section>
source/content/phonology_and_orthography.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -87,7 +87,7 @@
87 87 
  ?>
88 88 
  	<div class="note note_information">
89 89 
 		<span class="note_content">
90 
-	 		<p>It is permitted to pronounce the sounds a little differently, for example <?php echo(mark("v", ["type_letter", "lang_flk"])); ?> as <span class="ipa">ʋ</span> or <?php echo(mark("s", ["type_letter", "lang_flk"])); ?> as <span class="ipa">z</span>, whilst the sounds from the table above are the default.</p>
90 
+	 		<p>It is permitted to pronounce the sounds a little differently, for example <span class="type_letter lang_flk">v</span> as <span class="ipa">ʋ</span> or <span class="type_letter lang_flk">s</span> as <span class="ipa">z</span>, whilst the sounds from the table above are the default.</p>
91 91 
 		</span>
92 92 
  	</div>
93 93 
 	<div class="note note_warning">
... ... 
@@ -100,7 +100,7 @@
100 100 
 		<label class="note_label note_label_show" for="note_00">show</label>
101 101 
 		<label class="note_label note_label_hide" for="note_00">hide</label>
102 102 
 		<span class="note_content">
103 
-			<p>We have discussed many times whether to include a <span class="ipa">x</span>-like sound. On one hand, without it, some words were not easy to derive (e.g. the Proto Germanic <?php echo(mark("nahts", ["type_word", "lang_pg"])); ?> (English: <?php echo(mark("night", ["type_word", "lang_en"])); ?>)). On the other hand we found that the sound is very disconcerting to those, who don't have it in the phonology of their mother tongue. Eventually we have decided to exclude it from the draft, since it seemed to be too much of a trouble maker; finding words was not that much of an issue in the end.</p>
103 
+			<p>We have discussed many times whether to include a <span class="ipa">x</span>-like sound. On one hand, without it, some words were not easy to derive (e.g. the Proto Germanic <span class="type_word lang_gem">nahts</span> (English: <span class="type_word lang_eng">night</span>)). On the other hand we found that the sound is very disconcerting to those, who don't have it in the phonology of their mother tongue. Eventually we have decided to exclude it from the draft, since it seemed to be too much of a trouble maker; finding words was not that much of an issue in the end.</p>
104 104 
 		</span>
105 105 
 	</div>
106 106 
 	<div class="note note_reasoning">
... ... 
@@ -108,8 +108,8 @@
108 108 
 		<label class="note_label note_label_show" for="note_01">show</label>
109 109 
 		<label class="note_label note_label_hide" for="note_01">hide</label>
110 110 
 		<span class="note_content">
111 
-			<p>The letters <?php echo(mark("ö", ["type_letter", "lang_flk"])); ?> and <?php echo(mark("ü", ["type_letter", "lang_flk"])); ?> were not included inconsiderately. Effectively every Germanic language has an <span class="ipa">ø</span>-like sound in its phonology, but the main reason for the inclusion of these sounds was that altering the vowels of affected words to "near" vowels (e.g. <span class="ipa">i</span> &larr; <span class="ipa">y</span> &rarr; <span class="ipa">u</span>) most of the times resulted in disconcerting and unsatisfying creations. However the modern Germanic languages often feature vowel shifts throughout their natural evolution; some switching to the one and some switching to the other. Therefore we felt it was more convenient to have these sounds as compromises and connectors between the languages.</p>
112 
-			<p>We also struggled to find proper written representations of these sounds. One possibility was to use the IPA-like symbols <?php echo(mark("ø", ["type_letter", "lang_flk"])); ?> and <?php echo(mark("y", ["type_letter", "lang_flk"])); ?>, like e.g. Norwegian does. Unfortunatelly this had taken away the possibility to have the alternative writings <?php echo(mark("oy", ["type_letter", "lang_flk"])); ?> and <?php echo(mark("uy", ["type_letter", "lang_flk"])); ?>, which we considered important, since not everybody can easily type non-standard Latin letters. So we arranged to use diaeresis, like German and Swedish does.</p>
111 
+			<p>The letters <span class="type_letter lang_flk">ö</span> and <span class="type_letter lang_flk">ü</span> were not included inconsiderately. Effectively every Germanic language has an <span class="ipa">ø</span>-like sound in its phonology, but the main reason for the inclusion of these sounds was that altering the vowels of affected words to "near" vowels (e.g. <span class="ipa">i</span> &larr; <span class="ipa">y</span> &rarr; <span class="ipa">u</span>) most of the times resulted in disconcerting and unsatisfying creations. However the modern Germanic languages often feature vowel shifts throughout their natural evolution; some switching to the one and some switching to the other. Therefore we felt it was more convenient to have these sounds as compromises and connectors between the languages.</p>
112 
+			<p>We also struggled to find proper written representations of these sounds. One possibility was to use the IPA-like symbols <span class="type_letter lang_flk">ø</span> and <span class="type_letter lang_flk">y</span>, like e.g. Norwegian does. Unfortunatelly this had taken away the possibility to have the alternative writings <span class="type_letter lang_flk">oy</span> and <span class="type_letter lang_flk">uy</span>, which we considered important, since not everybody can easily type non-standard Latin letters. So we arranged to use diaeresis, like German and Swedish does.</p>
113 113 
 		</span>
114 114 
 	</div>
115 115 
 </section>
source/content/tempora_and_modi.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -1,6 +1,6 @@
1 1 
 <section class="subsection" id="tempora_and_modi">
2 2 
 	<header>Timeforms and modes</header>
3 
-	<?php proposal(); ?>
3 
+	{{call::_proposal.html.tpl}}
4 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
... ... 
@@ -55,13 +55,13 @@
55 55 
 ?>
56 56 
 	<p>These forms can be combined straightforward to form complex timeforms:</p>
57 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>
58 
+		<li>{{fsdraft_format_correlation:section-tempora_and_modi.examples_complex.0:type_sentence}}</li>
59 
+		<li>{{fsdraft_format_correlation:section-tempora_and_modi.examples_complex.1:type_sentence}}</li>
60 60 
 		<!--
61 
-		<li><?php echo(format_correlation("type_sentence")(["flk" => ["Ek hav skalt skrive."], "eng" => ["I was going to write."]])); ?></li>
61 
+		<li>{{fsdraft_format_correlation:section-tempora_and_modi.examples_complex_inactive.0:type_sentence}}</li>
62 62 
 		  -->
63 63 
 	</ul>
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>
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>
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 <span class="type_word lang_flk">du</span> or <span class="type_word lang_flk">je</span>) in order to specify or emphasize the numerus. Examples: <span class="type_sentence lang_flk">skriv!</span>, <span class="type_sentence lang_flk">skriv, je!</span>.</p>
65 
+	<p>There are two ways to form the <span class="grammarterm">subjunctive</span>. One is to use the special modal verb <span class="type_word lang_flk">vöre</span> which can be understood as a wrapper for regular verbs. The other possibility is to use the adverbial particle <span class="type_word lang_flk">maglik</span>. Both can be applied to the indicative forms, e.g.: {{fsdraft_format_correlation:section-tempora_and_modi.example_subjunctive:type_sentence}}</p>
66 66 
 </section>
67 67
source/content/word_functions-list.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -0,0 +1 @@
1 
+<li>{{fsdraft_format_correlation::type_word}}</li>
source/content/word_functions.html.tpl
Zeige Datei @ 7721cdf
... ... 
@@ -6,7 +6,7 @@
6 6 
  ?>
7 7 
 <section class="section" id="word_functions">
8 8 
 	<header>Word Functions</header>
9 
-	<?php proposal(); ?>
9 
+	{{call::_proposal.html.tpl}}
10 10 
 <?php
11 11 
 	$table = new class_table
12 12 
 	(
... ... 
@@ -94,11 +94,7 @@
94 94 
  ?>
95 95 
 <p>
96 96 
 	Some complex examples:
97 
-	<ul>
98 
-		<li><?php echo(format_correlation("word")(["flk" => ["unmanlikhed"], "eng" => ["inhumanity"]])); ?></li>
99 
-		<li><?php echo(format_correlation("word")(["flk" => ["seberenung"], "eng" => ["visualization"]])); ?></li>
100 
-		<li><?php echo(format_correlation("word")(["flk" => ["kraftigenar"], "eng" => ["fortifier"]])); ?></li>
101 
-	</ul>
97 
+	<ul>{{list:section-word_functions.examples:word_functions-list.html.tpl}}</ul>
102 98 
 </p>
103 99 
 </section>
104 100
source/datsection-infinite_verbforms.json
Zeige Datei @ 7721cdf
... ... 
@@ -0,0 +1,18 @@
1 
+{
2 
+	"example1": {
3 
+		"flk": ["skrive"],
4 
+		"eng": ["to write"]
5 
+	},
6 
+	"example2": {
7 
+		"flk": ["Han hop tu finde en svart sten."],
8 
+		"eng": ["He hopes to find a black stone."]
9 
+	},
10 
+	"example3": {
11 
+		"flk": ["skrivend"],
12 
+		"eng": ["writing"]
13 
+	},
14 
+	"example4": {
15 
+		"flk": ["skrivet"],
16 
+		"eng": ["written"]
17 
+	}
18 
+}
source/datsection-modal_verbs.json
Zeige Datei @ 7721cdf
... ... 
@@ -0,0 +1,40 @@
1 
+{
2 
+	"list": [
3 
+		{
4 
+			"flk": ["mute"],
5 
+			"eng": ["must"]
6 
+		},
7 
+		{
8 
+			"flk": ["kane"],
9 
+			"eng": ["can"]
10 
+		},
11 
+		{
12 
+			"flk": ["vile"],
13 
+			"eng": ["will"]
14 
+		},
15 
+		{
16 
+			"flk": ["skale"],
17 
+			"eng": ["shall"]
18 
+		},
19 
+		{
20 
+			"flk": ["vöre"],
21 
+			"eng": ["(to have the contingent readiness to do something)"]
22 
+		}
23 
+	],
24 
+	"list_inactive": [
25 
+		{
26 
+			"flk": ["darfe"],
27 
+			"eng": ["to be allowed to"]
28 
+		}
29 
+	],
30 
+	"example1": {
31 
+		"flk": ["Vi hop tu finde vater har."],
32 
+		"eng": ["We hope to find water here."]
33 
+	},
34 
+	"example2": {
35 
+		"flk": ["Vi kan finde vater har."],
36 
+		"eng": ["We can find water here."]
37 
+	}
38 
+}
39 
+
40 
+
source/datsection-negation.json
Zeige Datei @ 7721cdf
... ... 
@@ -0,0 +1,21 @@
1 
+{
2 
+	"examples": [
3 
+		{
4 
+			"flk": ["Di sej nit."],
5 
+			"eng": ["They don't see."]
6 
+		},
7 
+		{
8 
+			"flk": ["Di sej us nit."],
9 
+			"eng": ["They don't see us."]
10 
+		},
11 
+		{
12 
+			"flk": ["Di sej ing tid."],
13 
+			"eng": ["They never see."]
14 
+		},
15 
+		{
16 
+			"flk": ["Di sej nit ing tid."],
17 
+			"eng": ["They never don't see.", "They always see."]
18 
+		}
19 
+	]
20 
+}
21 
+
source/datsection-tempora_and_modi.json
Zeige Datei @ 7721cdf
... ... 
@@ -0,0 +1,22 @@
1 
+{
2 
+	"examples_complex": [
3 
+		{
4 
+			"flk": ["Ek havde skrivt."],
5 
+			"eng": ["I had written."]
6 
+		},
7 
+		{
8 
+			"flk": ["Ek skal have skrivt."],
9 
+			"eng": ["I will have written."]
10 
+		}
11 
+	],
12 
+	"examples_complex_inactive": [
13 
+		{
14 
+			"flk": ["Ek hav skalt skrive."],
15 
+			"eng": ["I was going to write."]
16 
+		}
17 
+	],
18 
+	"example_subjunctive": {
19 
+		"flk": ["Ek vör have skrivt."],
20 
+		"eng": ["I would have written."]
21 
+	}
22 
+}
source/datsection-word_functions.json
Zeige Datei @ 7721cdf
... ... 
@@ -0,0 +1,16 @@
1 
+{
2 
+	"examples": [
3 
+		{
4 
+			"flk": ["unmanlikhed"],
5 
+			"eng": ["inhumanity"]
6 
+		},
7 
+		{
8 
+			"flk": ["seberenung"],
9 
+			"eng": ["visualization"]
10 
+		},
11 
+		{
12 
+			"flk": ["kraftigenar"],
13 
+			"eng": ["fortifier"]
14 
+		}
15 
+	]
16 
+}
source/style/common.less
Zeige Datei @ 7721cdf
... ... 
@@ -292,8 +292,8 @@ a
292 292
293 293 
 .type_text
294 294 
 {
295 
-	&:before {content: "„";}
296 
-	&:after {content: "“";}
295 
+	// &:before {content: "„";}
296 
+	// &:after {content: "“";}
297 297
298 298 
 	&.lang_flk
299 299 
 	{
tools/project.json
Zeige Datei @ 7721cdf
... ... 
@@ -25,7 +25,8 @@
25 25 
 						"source/logic/server/settings.php",
26 26 
 						"source/logic/server/table.php",
27 27 
 						"source/logic/server/sql.php",
28 
-						"source/content/meta.html.tpl",
28 
+						"source/content/_meta.html.tpl",
29 
+						"source/content/_proposal.html.tpl",
29 30 
 						"source/content/introduction.html.tpl",
30 31 
 						"source/content/preface.html.tpl",
31 32 
 						"source/content/key_parameters.html.tpl",
32 33