renamed structure to content (77d8eec) - fs-draft.git

renamed structure to content

Christian Fraß commited on 2016-05-15 20:38:28
Zeige 33 geänderte Dateien mit 161 Einfügungen und 160 Löschungen.

.gitignore b07c243..cfbd511
build.xml a12dadb..184d9d0
export.sh 28d8fc5..0000000
genmake.py 5d11b54..f1512e8
makefile 79da415..efbb573
readme.txt 0000000..5e01cdf
source/structure/adpositions.html.php
source/structure/attributes.html.php
source/structure/basics.html.php
source/structure/conjugation.html.php
source/structure/correlatives.html.php
source/structure/declension.html.php
source/structure/dictionary.html.php
source/structure/draft.html.php a9f5ad0..957c914
source/structure/grammar.html.php
source/structure/infinite_verbforms.html.php
source/structure/introduction.html.php
source/structure/key_parameters.html.php
source/structure/meta.html.php
source/structure/personal_pronouns.html.php
source/structure/phonology_and_orthography.html.php 456ffb2..e3eef60
source/structure/preface.html.php
source/structure/principles.html.php
source/structure/pronouns.html.php
source/structure/sentence_structure.html.php ad843b6..981d312
source/structure/tempora_and_modi.html.php
source/structure/toc.html.php
source/structure/vocabulary.html.php
source/structure/word_functions.html.php
source/datadpositions.json 865df88..e553145
source/datpersonal_pronouns.json c449ce3..03cf5cc
source/datphonology_and_orthography.json baa06c1..5bdfcd1
source/logic/server/misc.php eda7e25..6ed1e49

.gitignore

@@ -1,6 +1,7 @@
 temp/
 build/
 trash/
+deploy.sh
 refactor.sed
 draft.tar.xz
 

build.xml

Zeige Datei @ 77d8eec

...	...	@@ -1,4 +1,6 @@
1	1	<project name="fs-draft" default="build">
	2	+ <property environment="env">
	3	+ </property>
2	4	<property name="dir.source" value="source">
3	5	</property>
4	6	<property name="dir.source.structure" value="${dir.source}/structure">

export.sh

Zeige Datei @ 1452c29

...	...	@@ -1,4 +0,0 @@
1		-#!/bin/bash
2		-
3		-tar --directory build --create --xz . --file draft.tar.xz
4		-

genmake.py

Zeige Datei @ 77d8eec

@@ -80,30 +80,30 @@ def main():
 		os.path.join(dirs["source"],"logic","server","sql.php"),
 	]
 	
-	parts_structure = [
-		os.path.join(dirs["source"],"structure","draft.html.php"),
-		os.path.join(dirs["source"],"structure","meta.html.php"),
-		os.path.join(dirs["source"],"structure","introduction.html.php"),
-		os.path.join(dirs["source"],"structure","preface.html.php"),
-		os.path.join(dirs["source"],"structure","key_parameters.html.php"),
-		os.path.join(dirs["source"],"structure","toc.html.php"),
-		os.path.join(dirs["source"],"structure","basics.html.php"),
-		os.path.join(dirs["source"],"structure","phonology_and_orthography.html.php"),
-		os.path.join(dirs["source"],"structure","grammar.html.php"),
-		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"),
-		os.path.join(dirs["source"],"structure","vocabulary.html.php"),
-		os.path.join(dirs["source"],"structure","principles.html.php"),
-		os.path.join(dirs["source"],"structure","word_functions.html.php"),
-		os.path.join(dirs["source"],"structure","adpositions.html.php"),
-		os.path.join(dirs["source"],"structure","pronouns.html.php"),
-		os.path.join(dirs["source"],"structure","dictionary.html.php"),
+	parts_content = [
+		os.path.join(dirs["source"],"content","draft.html.php"),
+		os.path.join(dirs["source"],"content","meta.html.php"),
+		os.path.join(dirs["source"],"content","introduction.html.php"),
+		os.path.join(dirs["source"],"content","preface.html.php"),
+		os.path.join(dirs["source"],"content","key_parameters.html.php"),
+		os.path.join(dirs["source"],"content","toc.html.php"),
+		os.path.join(dirs["source"],"content","basics.html.php"),
+		os.path.join(dirs["source"],"content","phonology_and_orthography.html.php"),
+		os.path.join(dirs["source"],"content","grammar.html.php"),
+		os.path.join(dirs["source"],"content","personal_pronouns.html.php"),
+		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","tempora_and_modi.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"),
+		os.path.join(dirs["source"],"content","vocabulary.html.php"),
+		os.path.join(dirs["source"],"content","principles.html.php"),
+		os.path.join(dirs["source"],"content","word_functions.html.php"),
+		os.path.join(dirs["source"],"content","adpositions.html.php"),
+		os.path.join(dirs["source"],"content","pronouns.html.php"),
+		os.path.join(dirs["source"],"content","dictionary.html.php"),
 	]
 	
 	parts_data = [
@@ -172,7 +172,7 @@ def main():
 	rules.append(
 		class_rule(
 			os.path.join(dirs["build"],"draft.html"),
-			parts_data + parts_logic_server + parts_structure,
+			parts_data + parts_logic_server + parts_content,
 			[
 				class_command_log({
 					"message": "composing document ..."
@@ -181,7 +181,7 @@ def main():
 					"path": dirs["build"],
 				}),
 				class_command_php_compile({
-					"path-from": os.path.join(dirs["source"],"structure","draft.html.php"),
+					"path-from": os.path.join(dirs["source"],"content","draft.html.php"),
 					"path-to": os.path.join(dirs["build"],"draft.html"),
 				}),
 			]

makefile

Zeige Datei @ 77d8eec

@@ -9,10 +9,10 @@ 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/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
+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
 	@ echo -e '-- composing document ...'
 	@ mkdir --parents build
-	@ php source/structure/draft.html.php > build/draft.html
+	@ php source/content/draft.html.php > build/draft.html
 
 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 ...'

readme.txt

Zeige Datei @ 77d8eec

...	...	@@ -0,0 +1 @@
	1	+In order to build the project, you need Apache Ant, a CLI php-interpreter and a LessCSS-compiler

source/structure/adpositions.html.php

Zeige Datei @ 77d8eec

source/structure/attributes.html.php

Zeige Datei @ 77d8eec

source/structure/basics.html.php

Zeige Datei @ 77d8eec

source/structure/conjugation.html.php

Zeige Datei @ 77d8eec

source/structure/correlatives.html.php

Zeige Datei @ 77d8eec

source/structure/declension.html.php

Zeige Datei @ 77d8eec

source/structure/dictionary.html.php

Zeige Datei @ 77d8eec

source/structure/draft.html.php

Zeige Datei @ 77d8eec

@@ -4,7 +4,7 @@
 <html>
 	<head>
 		<title>Folksprak -- Draft</title>
-		<?php include("source/structure/meta.html.php"); ?>
+		<?php include("source/content/meta.html.php"); ?>
 		<link rel="shortcut icon" type="image/png" href="favicon.png"/>
 		<link rel="stylesheet" type="text/css" href="draft.css"/>
 		<script type="text/javascript" src="draft.js"></script>

source/structure/grammar.html.php

Zeige Datei @ 77d8eec

source/structure/infinite_verbforms.html.php

Zeige Datei @ 77d8eec

source/structure/introduction.html.php

Zeige Datei @ 77d8eec

source/structure/key_parameters.html.php

Zeige Datei @ 77d8eec

source/structure/meta.html.php

Zeige Datei @ 77d8eec

source/structure/personal_pronouns.html.php

Zeige Datei @ 77d8eec

source/structure/phonology_and_orthography.html.php

Zeige Datei @ 77d8eec

@@ -25,7 +25,7 @@
 				},
 				function ($value)
 				{
-					return mark($value, ["ipa"]);
+					return format($value);
 				}
 			),
 			/*
@@ -47,7 +47,7 @@
 				},
 				function ($value)
 				{
-					return mark($value, ["letter", "lang_fs"]);
+					return format($value, ["letter", "lang_fs"]);
 				}
 			),
 			new class_column
@@ -59,7 +59,7 @@
 				},
 				function ($value)
 				{
-					return mark($value, ["letter", "lang_fs", "runic"]);
+					return format($value, ["letter", "lang_fs", "runic"]);
 				}
 			),
 			new class_column
@@ -71,7 +71,7 @@
 				},
 				function ($value)
 				{
-					return mark(format($value), ["word", "lang_fs"]);
+					return format($value, ["word", "lang_fs"]);
 				}
 			),
 			new class_column
@@ -83,7 +83,7 @@
 				},
 				function ($value) use (&$configuration)
 				{
-					return mark(format($value), ["word", "lang_" . $configuration["target"]]);
+					return format($value, ["word", "lang_" . $configuration["target"]]);
 				}
 			),
 			/*

source/structure/preface.html.php

Zeige Datei @ 77d8eec

source/structure/principles.html.php

Zeige Datei @ 77d8eec

source/structure/pronouns.html.php

Zeige Datei @ 77d8eec

source/structure/sentence_structure.html.php

Zeige Datei @ 77d8eec

...	...	@@ -1,4 +1,4 @@
1		-<section class="section" id="sentence_structure">
	1	+<section class="section" id="sentence_content">
2	2	<header>Sentence Structure</header>
3	3	<span class="todo">all</span>
4	4	</section>

source/structure/tempora_and_modi.html.php

Zeige Datei @ 77d8eec

source/structure/toc.html.php

Zeige Datei @ 77d8eec

source/structure/vocabulary.html.php

Zeige Datei @ 77d8eec

source/structure/word_functions.html.php

Zeige Datei @ 77d8eec

source/datadpositions.json

Zeige Datei @ 77d8eec

...	...	@@ -49,7 +49,7 @@
49	49	"type": "x2",
50	50	"positive_absolute": {
51	51	"fs": ["top"],
52		- "en": ["in front"]
	52	+ "en": ["on top"]
53	53	},
54	54	"positive_relative": {
55	55	"fs": ["top (lut)"],

source/datpersonal_pronouns.json

Zeige Datei @ 77d8eec

...	...	@@ -45,7 +45,7 @@
45	45	"numerus": 1,
46	46	"persona": 3,
47	47	"genus": 3,
48		- "fs": ["het"],
	48	+ "fs": ["hat"],
49	49	"en": ["it"]
50	50	},
51	51	{
...	...	@@ -66,7 +66,7 @@
66	66	"numerus": 2,
67	67	"persona": 2,
68	68	"genus": 0,
69		- "fs": ["je"],
	69	+ "fs": ["jer"],
70	70	"en": ["you (all)"]
71	71	},
72	72	{

source/datphonology_and_orthography.json

Zeige Datei @ 77d8eec

...	...	@@ -1,265 +1,265 @@
1	1	[
2	2	{
3	3	"type": "lateral approximant",
4		- "ipa": "l",
5		- "latin": "L/l",
6		- "runic": "ᛚ",
	4	+ "ipa": "/l/",
	5	+ "latin": "'L'/'l'",
	6	+ "runic": "'ᛚ'",
7	7	"remark": null,
8	8	"examples": {
9		- "fs": "_l_eva",
10		- "en": "_l_ima"
	9	+ "fs": "'_l_eva'",
	10	+ "en": "'_l_ima'"
11	11	}
12	12	},
13	13	{
14	14	"type": "nasal",
15		- "ipa": "m",
16		- "latin": "M/m",
17		- "runic": "ᛗ",
	15	+ "ipa": "/m/",
	16	+ "latin": "'M'/'m'",
	17	+ "runic": "'ᛗ'",
18	18	"remark": null,
19	19	"examples": {
20		- "fs": "_m_an",
21		- "en": "_m_ike"
	20	+ "fs": "'_m_an'",
	21	+ "en": "'_m_ike'"
22	22	}
23	23	},
24	24	{
25	25	"type": "nasal",
26		- "ipa": "n",
27		- "latin": "N/n",
28		- "runic": "ᚾ",
	26	+ "ipa": "/n/",
	27	+ "latin": "'N'/'n'",
	28	+ "runic": "'ᚾ'",
29	29	"remark": null,
30	30	"examples": {
31		- "fs": "_n_it",
32		- "en": "_n_ovember"
	31	+ "fs": "'_n_it'",
	32	+ "en": "'_n_ovember'"
33	33	}
34	34	},
35	35	{
36	36	"type": "nasal",
37		- "ipa": "ŋ",
38		- "latin": "Ng/ng",
39		- "runic": "ᛜ",
	37	+ "ipa": "/ŋ/",
	38	+ "latin": "'Ng'/'ng'",
	39	+ "runic": "'ᛜ'",
40	40	"remark": null,
41	41	"examples": {
42		- "fs": "la_ng_",
43		- "en": "ri_ng_"
	42	+ "fs": "'la_ng_'",
	43	+ "en": "'ri_ng_'"
44	44	}
45	45	},
46	46	{
47	47	"type": "plosive",
48		- "ipa": "g",
49		- "latin": "G/g",
50		- "runic": "ᚷ",
	48	+ "ipa": "/g/",
	49	+ "latin": "'G'/'g'",
	50	+ "runic": "'ᚷ'",
51	51	"remark": null,
52	52	"examples": {
53		- "fs": "_g_oa",
54		- "en": "_g_olf"
	53	+ "fs": "'_g_oa'",
	54	+ "en": "'_g_olf'"
55	55	}
56	56	},
57	57	{
58	58	"type": "plosive",
59		- "ipa": "k",
60		- "latin": "K/k",
61		- "runic": "ᚲ",
	59	+ "ipa": "/k/",
	60	+ "latin": "'K'/'k'",
	61	+ "runic": "'ᚲ'",
62	62	"remark": null,
63	63	"examples": {
64		- "fs": "_k_an",
65		- "en": "_k_ilo"
	64	+ "fs": "'_k_an'",
	65	+ "en": "'_k_ilo'"
66	66	}
67	67	},
68	68	{
69	69	"type": "plosive",
70		- "ipa": "b",
71		- "latin": "B/b",
72		- "runic": "ᛒ",
	70	+ "ipa": "/b/",
	71	+ "latin": "'B'/'b'",
	72	+ "runic": "'ᛒ'",
73	73	"remark": null,
74	74	"examples": {
75		- "fs": "_b_ua",
76		- "en": "_b_ravo"
	75	+ "fs": "'_b_ua'",
	76	+ "en": "'_b_ravo'"
77	77	}
78	78	},
79	79	{
80	80	"type": "plosive",
81		- "ipa": "p",
82		- "latin": "P/p",
83		- "runic": "ᛈ",
	81	+ "ipa": "/p/",
	82	+ "latin": "'P'/'p'",
	83	+ "runic": "'ᛈ'",
84	84	"remark": null,
85	85	"examples": {
86		- "fs": "di_p_",
87		- "en": "_p_apa"
	86	+ "fs": "'di_p_'",
	87	+ "en": "'_p_apa'"
88	88	}
89	89	},
90	90	{
91	91	"type": "plosive",
92		- "ipa": "d",
93		- "latin": "D/d",
94		- "runic": "ᛞ",
	92	+ "ipa": "/d/",
	93	+ "latin": "'D'/'d'",
	94	+ "runic": "'ᛞ'",
95	95	"remark": null,
96	96	"examples": {
97		- "fs": "_d_ag",
98		- "en": "_d_elta"
	97	+ "fs": "'_d_ag'",
	98	+ "en": "'_d_elta'"
99	99	}
100	100	},
101	101	{
102	102	"type": "plosive",
103		- "ipa": "t",
104		- "latin": "T/t",
105		- "runic": "ᛏ",
	103	+ "ipa": "/t/",
	104	+ "latin": "'T'/'t'",
	105	+ "runic": "'ᛏ'",
106	106	"remark": null,
107	107	"examples": {
108		- "fs": "_t_id",
109		- "en": "_t_ango"
	108	+ "fs": "'_t_id'",
	109	+ "en": "'_t_ango'"
110	110	}
111	111	},
112	112	{
113	113	"type": "fricative",
114		- "ipa": "v",
115		- "latin": "V/v",
116		- "runic": "ᚹ",
	114	+ "ipa": "/v/",
	115	+ "latin": "'V'/'v'",
	116	+ "runic": "'ᚹ'",
117	117	"remark": null,
118	118	"examples": {
119		- "fs": "_v_ind",
120		- "en": "_v_ictor"
	119	+ "fs": "'_v_ind'",
	120	+ "en": "'_v_ictor'"
121	121	}
122	122	},
123	123	{
124	124	"type": "fricative",
125		- "ipa": "f",
126		- "latin": "F/f",
127		- "runic": "ᚠ",
	125	+ "ipa": "/f/",
	126	+ "latin": "'F'/'f'",
	127	+ "runic": "'ᚠ'",
128	128	"remark": null,
129	129	"examples": {
130		- "fs": "_f_ut",
131		- "en": "_f_oxtrot"
	130	+ "fs": "'_f_ut'",
	131	+ "en": "'_f_oxtrot'"
132	132	}
133	133	},
134	134	{
135	135	"type": "fricative",
136		- "ipa": "s",
137		- "latin": "S/s",
138		- "runic": "ᛋ",
	136	+ "ipa": "/s/",
	137	+ "latin": "'S'/'s'",
	138	+ "runic": "'ᛋ'",
139	139	"remark": null,
140	140	"examples": {
141		- "fs": "_s_mal",
142		- "en": "_s_ierra"
	141	+ "fs": "'_s_mal'",
	142	+ "en": "'_s_ierra'"
143	143	}
144	144	},
145	145	{
146	146	"type": "fricative",
147		- "ipa": "h",
148		- "latin": "H/h",
149		- "runic": "ᚺ",
	147	+ "ipa": "/h/",
	148	+ "latin": "'H'/'h'",
	149	+ "runic": "'ᚺ'",
150	150	"remark": null,
151	151	"examples": {
152		- "fs": "_h_us",
153		- "en": "_h_otel"
	152	+ "fs": "'_h_us'",
	153	+ "en": "'_h_otel'"
154	154	}
155	155	},
156	156	{
157	157	"type": "tap/flap",
158		- "ipa": "ɾ",
159		- "latin": "R/r",
160		- "runic": "ᚱ",
	158	+ "ipa": "/ɾ/",
	159	+ "latin": "'R'/'r'",
	160	+ "runic": "'ᚱ'",
161	161	"remark": null,
162	162	"examples": {
163		- "fs": "_r_od",
	163	+ "fs": "'_r_od'",
164	164	"en": null
165	165	}
166	166	},
167	167	{
168	168	"type": "tap/flap",
169		- "ipa": "x",
170		- "latin": "X/x or H/h ?",
	169	+ "ipa": "/x/",
	170	+ "latin": "'X'/'x' or 'H'/'h'?",
171	171	"runic": null,
172	172	"remark": null,
173	173	"examples": {
174		- "fs": "na_x_t",
	174	+ "fs": "'na_x_t'",
175	175	"en": null
176	176	}
177	177	},
178	178	{
179	179	"type": "halfvowel",
180		- "ipa": "j",
181		- "latin": "J/j",
182		- "runic": "ᛃ",
	180	+ "ipa": "/j/",
	181	+ "latin": "'J'/'j'",
	182	+ "runic": "'ᛃ'",
183	183	"remark": null,
184	184	"examples": {
185		- "fs": "_j_ar",
186		- "en": "_y_ankee"
	185	+ "fs": "'_j_ar'",
	186	+ "en": "'_y_ankee'"
187	187	}
188	188	},
189	189	{
190	190	"type": "vowel",
191		- "ipa": "i",
192		- "latin": "I/i",
193		- "runic": "ᛁ",
	191	+ "ipa": "/i/",
	192	+ "latin": "'I'/'i'",
	193	+ "runic": "'ᛁ'",
194	194	"remark": null,
195	195	"examples": {
196		- "fs": "gr_i_d",
197		- "en": "b_ee_f"
	196	+ "fs": "'gr_i_d'",
	197	+ "en": "'b_ee_f'"
198	198	}
199	199	},
200	200	{
201	201	"type": "vowel",
202		- "ipa": "e",
203		- "latin": "E/e",
204		- "runic": "ᛖ",
	202	+ "ipa": "/e/",
	203	+ "latin": "'E'/'e'",
	204	+ "runic": "'ᛖ'",
205	205	"remark": "only a few variations of English have that sound; it is somehow similar to the vowel in 'air'",
206	206	"examples": {
207		- "fs": "st_e_d",
208		- "en": "~ _ai_r"
	207	+ "fs": "'st_e_d'",
	208	+ "en": "~ '_ai_r'"
209	209	}
210	210	},
211	211	{
212	212	"type": "vowel",
213		- "ipa": "a",
214		- "latin": "A/a",
215		- "runic": "ᚨ",
	213	+ "ipa": "/a/",
	214	+ "latin": "'A'/'a'",
	215	+ "runic": "'ᚨ'",
216	216	"remark": null,
217	217	"examples": {
218		- "fs": "f_a_der",
219		- "en": "~ b_a_th"
	218	+ "fs": "'f_a_der'",
	219	+ "en": "~ 'b_a_th'"
220	220	}
221	221	},
222	222	{
223	223	"type": "vowel",
224		- "ipa": "o",
225		- "latin": "O/o",
226		- "runic": "ᛟ",
	224	+ "ipa": "/o/",
	225	+ "latin": "'O'/'o'",
	226	+ "runic": "'ᛟ'",
227	227	"remark": null,
228	228	"examples": {
229		- "fs": "_o_ld",
230		- "en": "~ _o_scar"
	229	+ "fs": "'_o_ld'",
	230	+ "en": "~ '_o_scar'"
231	231	}
232	232	},
233	233	{
234	234	"type": "vowel",
235		- "ipa": "u",
236		- "latin": "U/u",
237		- "runic": "ᚢ",
	235	+ "ipa": "/u/",
	236	+ "latin": "'U'/'u'",
	237	+ "runic": "'ᚢ'",
238	238	"remark": null,
239	239	"examples": {
240		- "fs": "bl_u_",
241		- "en": "cr_u_cial"
	240	+ "fs": "'bl_u_'",
	241	+ "en": "'cr_u_cial'"
242	242	}
243	243	},
244	244	{
245	245	"type": "vowel",
246		- "ipa": "ø",
247		- "latin": "Oy/oy",
248		- "runic": "ᛟᛇ",
	246	+ "ipa": "/ø/",
	247	+ "latin": "'Ö'/'ö', alternatively 'Oy'/'oy'",
	248	+ "runic": "'ᛟᛇ'",
249	249	"remark": "similar to vowels used in words like 'earl', 'worry', 'hurt'",
250	250	"examples": {
251		- "fs": "sk_oy_n",
252		- "en": "~ _ea_rly"
	251	+ "fs": "'sk_ö_n'",
	252	+ "en": "~ '_ea_rly'"
253	253	}
254	254	},
255	255	{
256	256	"type": "vowel",
257		- "ipa": "y",
258		- "latin": "Uy/uy",
259		- "runic": "ᚢᛇ",
	257	+ "ipa": "/y/",
	258	+ "latin": "'Ü'/'ü', alternatively 'Uy'/'uy'",
	259	+ "runic": "'ᚢᛇ'",
260	260	"remark": "hardly any variation of English has that sound, but it can be learned easily by interpolating between /u/ and /i/",
261	261	"examples": {
262		- "fs": "s_uy_d",
	262	+ "fs": "'s_ü_d'",
263	263	"en": null
264	264	}
265	265	}

source/logic/server/misc.php

Zeige Datei @ 77d8eec

@@ -1,10 +1,11 @@
 <?php
 	function compose($names)
 	{
-		array_map(
+		array_map
+		(
 			function ($name)
 			{
-				include("source/structure/" . $name . ".html.php");
+				include("source/content/" . $name . ".html.php");
 			},
 			$names
 		);


...	...	@@ -1,6 +1,7 @@
1	1	temp/
2	2	build/
3	3	trash/
	4	+deploy.sh
4	5	refactor.sed
5	6	draft.tar.xz
6	7

...	...	@@ -80,30 +80,30 @@ def main():
80	80	os.path.join(dirs["source"],"logic","server","sql.php"),
81	81	]
82	82
83		- parts_structure = [
84		- os.path.join(dirs["source"],"structure","draft.html.php"),
85		- os.path.join(dirs["source"],"structure","meta.html.php"),
86		- os.path.join(dirs["source"],"structure","introduction.html.php"),
87		- os.path.join(dirs["source"],"structure","preface.html.php"),
88		- os.path.join(dirs["source"],"structure","key_parameters.html.php"),
89		- os.path.join(dirs["source"],"structure","toc.html.php"),
90		- os.path.join(dirs["source"],"structure","basics.html.php"),
91		- os.path.join(dirs["source"],"structure","phonology_and_orthography.html.php"),
92		- os.path.join(dirs["source"],"structure","grammar.html.php"),
93		- os.path.join(dirs["source"],"structure","personal_pronouns.html.php"),
94		- os.path.join(dirs["source"],"structure","correlatives.html.php"),
95		- os.path.join(dirs["source"],"structure","conjugation.html.php"),
96		- os.path.join(dirs["source"],"structure","infinite_verbforms.html.php"),
97		- os.path.join(dirs["source"],"structure","tempora_and_modi.html.php"),
98		- os.path.join(dirs["source"],"structure","declension.html.php"),
99		- os.path.join(dirs["source"],"structure","attributes.html.php"),
100		- os.path.join(dirs["source"],"structure","sentence_structure.html.php"),
101		- os.path.join(dirs["source"],"structure","vocabulary.html.php"),
102		- os.path.join(dirs["source"],"structure","principles.html.php"),
103		- os.path.join(dirs["source"],"structure","word_functions.html.php"),
104		- os.path.join(dirs["source"],"structure","adpositions.html.php"),
105		- os.path.join(dirs["source"],"structure","pronouns.html.php"),
106		- os.path.join(dirs["source"],"structure","dictionary.html.php"),
	83	+ parts_content = [
	84	+ os.path.join(dirs["source"],"content","draft.html.php"),
	85	+ os.path.join(dirs["source"],"content","meta.html.php"),
	86	+ os.path.join(dirs["source"],"content","introduction.html.php"),
	87	+ os.path.join(dirs["source"],"content","preface.html.php"),
	88	+ os.path.join(dirs["source"],"content","key_parameters.html.php"),
	89	+ os.path.join(dirs["source"],"content","toc.html.php"),
	90	+ os.path.join(dirs["source"],"content","basics.html.php"),
	91	+ os.path.join(dirs["source"],"content","phonology_and_orthography.html.php"),
	92	+ os.path.join(dirs["source"],"content","grammar.html.php"),
	93	+ os.path.join(dirs["source"],"content","personal_pronouns.html.php"),
	94	+ os.path.join(dirs["source"],"content","correlatives.html.php"),
	95	+ os.path.join(dirs["source"],"content","conjugation.html.php"),
	96	+ os.path.join(dirs["source"],"content","infinite_verbforms.html.php"),
	97	+ os.path.join(dirs["source"],"content","tempora_and_modi.html.php"),
	98	+ os.path.join(dirs["source"],"content","declension.html.php"),
	99	+ os.path.join(dirs["source"],"content","attributes.html.php"),
	100	+ os.path.join(dirs["source"],"content","sentence_structure.html.php"),
	101	+ os.path.join(dirs["source"],"content","vocabulary.html.php"),
	102	+ os.path.join(dirs["source"],"content","principles.html.php"),
	103	+ os.path.join(dirs["source"],"content","word_functions.html.php"),
	104	+ os.path.join(dirs["source"],"content","adpositions.html.php"),
	105	+ os.path.join(dirs["source"],"content","pronouns.html.php"),
	106	+ os.path.join(dirs["source"],"content","dictionary.html.php"),
107	107	]
108	108
109	109	parts_data = [
...	...	@@ -172,7 +172,7 @@ def main():
172	172	rules.append(
173	173	class_rule(
174	174	os.path.join(dirs["build"],"draft.html"),
175		- parts_data + parts_logic_server + parts_structure,
	175	+ parts_data + parts_logic_server + parts_content,
176	176	[
177	177	class_command_log({
178	178	"message": "composing document ..."
...	...	@@ -181,7 +181,7 @@ def main():
181	181	"path": dirs["build"],
182	182	}),
183	183	class_command_php_compile({
184		- "path-from": os.path.join(dirs["source"],"structure","draft.html.php"),
	184	+ "path-from": os.path.join(dirs["source"],"content","draft.html.php"),
185	185	"path-to": os.path.join(dirs["build"],"draft.html"),
186	186	}),
187	187	]

...	...	@@ -9,10 +9,10 @@ clear: clean
9	9	@ rm --recursive --force build
10	10	.PHONY: clear
11	11
12		-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/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
	12	+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
13	13	@ echo -e '-- composing document ...'
14	14	@ mkdir --parents build
15		- @ php source/structure/draft.html.php > build/draft.html
	15	+ @ php source/content/draft.html.php > build/draft.html
16	16
17	17	build/draft.js: source/logic/client/tools.js source/logic/client/table.js source/logic/client/toc.js source/logic/client/main.js
18	18	@ echo -e '-- composing client-logic ...'

...	...	@@ -4,7 +4,7 @@
4	4	<html>
5	5	<head>
6	6	<title>Folksprak -- Draft</title>
7		- <?php include("source/structure/meta.html.php"); ?>
	7	+ <?php include("source/content/meta.html.php"); ?>
8	8	<link rel="shortcut icon" type="image/png" href="favicon.png"/>
9	9	<link rel="stylesheet" type="text/css" href="draft.css"/>
10	10	<script type="text/javascript" src="draft.js"></script>

...	...	@@ -25,7 +25,7 @@
25	25	},
26	26	function ($value)
27	27	{
28		- return mark($value, ["ipa"]);
	28	+ return format($value);
29	29	}
30	30	),
31	31	/*
...	...	@@ -47,7 +47,7 @@
47	47	},
48	48	function ($value)
49	49	{
50		- return mark($value, ["letter", "lang_fs"]);
	50	+ return format($value, ["letter", "lang_fs"]);
51	51	}
52	52	),
53	53	new class_column
...	...	@@ -59,7 +59,7 @@
59	59	},
60	60	function ($value)
61	61	{
62		- return mark($value, ["letter", "lang_fs", "runic"]);
	62	+ return format($value, ["letter", "lang_fs", "runic"]);
63	63	}
64	64	),
65	65	new class_column
...	...	@@ -71,7 +71,7 @@
71	71	},
72	72	function ($value)
73	73	{
74		- return mark(format($value), ["word", "lang_fs"]);
	74	+ return format($value, ["word", "lang_fs"]);
75	75	}
76	76	),
77	77	new class_column
...	...	@@ -83,7 +83,7 @@
83	83	},
84	84	function ($value) use (&$configuration)
85	85	{
86		- return mark(format($value), ["word", "lang_" . $configuration["target"]]);
	86	+ return format($value, ["word", "lang_" . $configuration["target"]]);
87	87	}
88	88	),
89	89	/*

...	...	@@ -1,10 +1,11 @@
1	1	<?php
2	2	function compose($names)
3	3	{
4		- array_map(
	4	+ array_map
	5	+ (
5	6	function ($name)
6	7	{
7		- include("source/structure/" . $name . ".html.php");
	8	+ include("source/content/" . $name . ".html.php");
8	9	},
9	10	$names
10	11	);
11	12