fs-draft.git

@@ -72,16 +72,6 @@ def main():

 		"build": "build",

 	}

-	parts_data = [

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

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

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

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

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

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

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

-	]

-	

 	parts_logic_server = [

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

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

@@ -90,13 +80,6 @@ def main():

 		os.path.join(dirs["source"],"logic","server","sql.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"),

@@ -123,7 +106,25 @@ def main():

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

 	]

+	parts_data = [

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

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

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

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

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

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

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

+	]

+	

+	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_style = [

+		os.path.join(dirs["source"],"style","functions.less"),

 		os.path.join(dirs["source"],"style","theme.less"),

 		os.path.join(dirs["source"],"style","common.less"),

 		os.path.join(dirs["source"],"style","concrete.less"),

@@ -29,10 +29,10 @@ build/favicon.png: source/media/folksprak_16x16.png

 	@ mkdir --parents build

 	@ cp --recursive source/media/folksprak_16x16.png build/favicon.png

-build/draft.css: source/style/theme.less source/style/common.less source/style/concrete.less

+build/draft.css: source/style/functions.less source/style/theme.less source/style/common.less source/style/concrete.less

 	@ echo -e '-- compiling style ...'

 	@ mkdir --parents temp

-	@ cat source/style/theme.less source/style/common.less source/style/concrete.less > temp/draft.less

+	@ cat source/style/functions.less source/style/theme.less source/style/common.less source/style/concrete.less > temp/draft.less

 	@ mkdir --parents build

 	@ lessc temp/draft.less > build/draft.css

@@ -236,7 +236,8 @@

 		    "type_id":"demonstrative_far",

 		    "language":"en",

 		    "words":[

-

+				"that person",

+				"that one"

 		    ]

 		},

 		{

@@ -252,7 +253,8 @@

 		    "type_id":"demonstrative_near",

 		    "language":"en",

 		    "words":[

-

+				"this person",

+				"this one"

 		    ]

 		},

 		{

@@ -269,7 +271,8 @@

 		    "type_id":"universal",

 		    "language":"en",

 		    "words":[

-		        "everyone"

+		        "everyone",

+		        "everybody"

 		    ]

 		},

 		{

@@ -286,7 +289,8 @@

 		    "type_id":"undefined",

 		    "language":"en",

 		    "words":[

-		        "someone"

+		        "someone",

+		        "somebody"

 		    ]

 		},

 		{

@@ -303,7 +307,8 @@

 		    "type_id":"negative",

 		    "language":"en",

 		    "words":[

-		        "no one"

+		        "no one",

+		        "nobody"

 		    ]

 		},

 		{

@@ -404,7 +409,8 @@

 		    "type_id":"undefined",

 		    "language":"en",

 		    "words":[

-		        "something"

+		        "something",

+		        "anything"

 		    ]

 		},

 		{

@@ -438,7 +444,7 @@

 		    "type_id":"interrogative",

 		    "language":"en",

 		    "words":[

-

+				"whose"

 		    ]

 		},

 		{

@@ -455,7 +461,7 @@

 		    "type_id":"relative",

 		    "language":"en",

 		    "words":[

-

+				"whose"

 		    ]

 		},

 		{

@@ -471,7 +477,7 @@

 		    "type_id":"demonstrative_far",

 		    "language":"en",

 		    "words":[

-

+		    	"that one's"

 		    ]

 		},

 		{

@@ -487,7 +493,7 @@

 		    "type_id":"demonstrative_near",

 		    "language":"en",

 		    "words":[

-

+		    	"this one's"

 		    ]

 		},

 		{

@@ -504,7 +510,7 @@

 		    "type_id":"universal",

 		    "language":"en",

 		    "words":[

-

+		    	"everyone's"

 		    ]

 		},

 		{

@@ -521,7 +527,7 @@

 		    "type_id":"undefined",

 		    "language":"en",

 		    "words":[

-

+		    	"someone's"

 		    ]

 		},

 		{

@@ -538,7 +544,7 @@

 		    "type_id":"negative",

 		    "language":"en",

 		    "words":[

-

+		    	"no one's"

 		    ]

 		},

 		{

@@ -640,7 +646,9 @@

 		    "type_id":"undefined",

 		    "language":"en",

 		    "words":[

-		        "sometimes"

+		        "sometimes",

+		        "anytime",

+		        "ever"

 		    ]

 		},

 		{

@@ -36,17 +36,20 @@

 		}

 	}

-	function sql_rename($table_source, $column_from, $column_to)

+	function sql_project($table_source, $columns)

 	{

 		return (

 			array_map

 			(

-				function ($row_in) use (&$column_from,&$column_to)

+				function ($row_in) use (&$columns)

 				{

 					$row_out = [];

-					foreach ($row_in as $column => $value)

+					foreach ($row_in as $key_in => $value_in)

 					{

-						$row_out[($column == $column_from) ? $column_to : $column] = $row_in[$column];

+						if (array_search($key_in, $columns) !== false)

+						{

+							$row_out[$key_in] = $value_in;

+						}

 					}

 					return $row_out;

 				},

@@ -55,7 +58,7 @@

 		);

 	}

-	function sql_project($table_source, $columns)

+	function sql_delete($table_source, $columns)

 	{

 		return (

 			array_map

@@ -63,14 +66,32 @@

 				function ($row_in) use (&$columns)

 				{

 					$row_out = [];

-					array_map

-					(

-						function ($column) use (&$columns,&$row_in,&$row_out)

+					foreach ($row_in as $key_in => $value_in)

+					{

+						if (array_search($key_in, $columns) === false)

 						{

-							$row_out[$column] = $row_in[$column];

+							$row_out[$key_in] = $value_in;

+						}

+					}

+					return $row_out;

 				},

-						$columns

+				$table_source

+			)

 		);

+	}

+	

+	function sql_add($table_source, $columns, $assigners = [])

+	{

+		return (

+			array_map

+			(

+				function ($row_in) use (&$columns, &$assigners)

+				{

+					$row_out = $row_in;

+					foreach ($columns as $column)

+					{

+						$row_out[$column] = (array_key_exists($column, $assigners) ? $assigners[$column]($row_in) : null);

+					}

 					return $row_out;

 				},

 				$table_source

@@ -78,15 +99,18 @@

 		);

 	}

-	function sql_add($table_source, $column, $assigner)

+	function sql_rename($table_source, $column_from, $column_to)

 	{

 		return (

 			array_map

 			(

-				function ($row_in) use (&$column,&$assigner)

+				function ($row_in) use (&$column_from,&$column_to)

 				{

-					$row_out = $row_in;

-					$row_out[$column] = $assigner($row_in);

+					$row_out = [];

+					foreach ($row_in as $column => $value)

+					{

+						$row_out[($column == $column_from) ? $column_to : $column] = $row_in[$column];

+					}

 					return $row_out;

 				},

 				$table_source

@@ -100,79 +100,30 @@

 			global $configuration;

 			$database = read_json("source/data/x.json");

 			$data = $database["words"];

-			$data = (

-				/*

-				sql_project

-				(

-				 */

-					sql_select

-					(

-						sql_rename

-						(

-							sql_cross

-							(

-								$data,

-								$database["domains"]

-							),

-							"name",

-							"domain_name"

-						),

-						function ($row) {return ($row["id"] == $row["domain_id"]);}

-					)/*,

-					["domain_id", "name", "type_id", "language", "words"]

-				)

-				 */

-			);

-			$data = (

-				/*

-				sql_project

-				(

-				 */

-					sql_select

-					(

-						sql_rename

-						(

-							sql_cross

-							(

-								$data,

-								$database["types"]

-							),

-							"name",

-							"type_name"

-						),

-						function ($row) {return ($row["id"] == $row["type_id"]);}

-					)/*,

-					["domain_name", "name", "language", "words"]

-				)

-				 */

-			);

-			$data = (

-				sql_select

-				(

-					$data,

-					function ($row) {return ($row["language"] == "fs");}

-				)

-			);

-			$data = (

-				sql_add

-				(

-					$data,

-					"type_name/words",

-					function ($row)

+			

+			// get domain names

 			{

-						return ["key" => $row["type_id"], "value" => $row["words"]];

+				$data = sql_cross($data, $database["domains"]);

+				$data = sql_rename($data, "name", "domain_name");

+				$data = sql_select($data, function ($row) {return ($row["id"] == $row["domain_id"]);});

+				$data = sql_delete($data, ["id"]);

 			}

-				)

-			);

-			$data = (

-				sql_project

-				(

-					$data,

-					["domain_name", "type_name/words"]

-				)

-			);

-			$data = (

-				sql_group

+			

+			// get type names

+			{

+				$data = sql_cross($data, $database["types"]);

+				$data = sql_rename($data, "name", "type_name");

+				$data = sql_select($data, function ($row) {return ($row["id"] == $row["type_id"]);});

+				$data = sql_delete($data, ["id"]);

+			}

+			

+			// transform

+			{

+				$data = sql_select($data, function ($row) {global $configuration; return (($row["language"] == "fs") or ($row["language"] == $configuration["target"]));});

+				// $data = sql_group($data, "language");

+				$data = sql_add($data, ["type_name/words"], ["type_name/words" => function ($row) {return ["key" => $row["type_id"], "value" => [$row["language"] => $row["words"]]];}]);

+				$data = sql_project($data, ["domain_name", "type_name/words"]);

+				$data = sql_group

 				(

 					$data,

 					"domain_name",

@@ -180,25 +131,27 @@

 						"type_name/words" => function ($args)

 						{

 							$output = [];

-							array_map

-							(

-								function ($arg) use (&$output)

+							foreach ($args as $arg)

 							{

-									$output[$arg["key"]] = $arg["value"];

-								},

-								$args

-							);

+								if (! array_key_exists($arg["key"], $output)) $output[$arg["key"]] = [];

+								foreach ($arg["value"] as $key => $value)

+								{

+									$output[$arg["key"]][$key] = $value;

+								}

+							}

 							return $output;

 						},

 					]

-				)

 				);

+			}

+			

 			$table = new class_table

 			(

 				array_merge

 				(

 					[

 						new class_column("Domain", function ($row) {return $row["domain_name"];}),

+						// new class_column("type_name/words", function ($row) {return $row["type_name/words"];}, function ($value) {print_r($value);}),

 					],

 					array_map

 					(

@@ -208,12 +161,16 @@

 								new class_column

 								(

 									("Type: " . $type["name"]),

-									function ($row) use (&$type) {return $row["type_name/words"][$type["id"]];},

-									function ($value) {return _baz($value, "word", "fs");}

+									function ($row) use (&$type)

+									{

+										global $configuration;

+										return ["original" => $row["type_name/words"][$type["id"]]["fs"], "translated" => $row["type_name/words"][$type["id"]][$configuration["target"]]];

+									},

+									_bar("word")

 								)

 							);

 						},

-						$database["types"]

+						array_filter($database["types"], function ($type) {return ($type["id"] != "relative");})

 					)

 				),

 				$data

@@ -1,14 +1,17 @@

 table.datatable

 {

 	border-collapse: collapse;

+	/*

 	box-shadow: 4px 4px 4px black;

+	 */

 	& tr

 	{

 		& > th,

 		& > td

 		{

-			border: 1px solid hsv(hsvhue(@color-fg), hsvsaturation(@color-fg), (0.5 * hsvvalue(@color-fg)) + (0.5 * hsvvalue(@color-bg)));

+			.interpolate(hsvvalue(@color-fg), hsvvalue(@color-bg), 0.5);

+			border: 1px solid hsv(hsvhue(@color-fg), hsvsaturation(@color-fg), @result_interpolate);

 			/*

 			border: 1px solid @color-bg;

 			 */

@@ -0,0 +1,5 @@

+.interpolate(@x, @y, @t)

+{

+	@result_interpolate: (((1-@t) * @x) + (@t * @y));

+}

+

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

+/*

 @color-bg: hsv(120,  0%,100.0%);

 @color-fg: hsv(120,  0%,  0.0%);

+ */

-/*

 @color-bg: hsv(120,  0%, 12.5%);

 @color-fg: hsv(120,  0%, 75.0%);

- */

 @color-x1: hsv(120, 50%, 50.0%);

 @color-x2: hsv(120, 50%, 50.0%);