From d13f71a27e1fc3a2da6160c8dbfb6f2467ce185f Mon Sep 17 00:00:00 2001
From: hallgren <hallgren@chalmers.se>
Date: Tue, 15 May 2012 13:11:32 +0000
Subject: [PATCH] Integrate Japanese

* Update Setup.hs to build Japanese by default.
* News item about Japanese on the home page.
* Add Japanese to the supported RGL imports in the grammar editor (gfse).
---
 Setup.hs               | 3 ++-
 index.html             | 4 +++-
 src/www/gfse/editor.js | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index db1c7bbd4..0454b36e7 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -205,6 +205,7 @@ langsCoding = [
   (("german",   "Ger"),""),
   (("interlingua","Ina"),""),
   (("italian",  "Ita"),""),
+  (("japanese", "Jap"),""),
   (("latin",    "Lat"),""),
   (("latvian",    "Lav"),""),
   (("norwegian","Nor"),""),
@@ -233,7 +234,7 @@ langsLang = langs `except` ["Amh","Ara","Lat","Tur"]
 langsAPI  = langsLang `except` ["Ina"]
 
 -- languages for which to compile Symbolic
-langsSymbolic  = langsAPI -- `except` ["Rus"]
+langsSymbolic  = langsAPI `except` ["Jap"]
 
 -- languages for which to run demo test
 langsDemo = langsLang `except` ["Ara","Hin","Ina","Lav","Tha"]
diff --git a/index.html b/index.html
index 72b46865e..7613accf2 100644
--- a/index.html
+++ b/index.html
@@ -60,9 +60,11 @@ March 2012
 <div class=news2>
 
 <dl>
+<dt>2012-05-07: New resource grammar language: Japanese.
+    See <a href="lib/doc/synopsis.html">library synopsis</a>.
 <dt>2012-03-23: There will be a
   <a href="gf-tutorial-icfp-2012/">GF tutorial at ICFP 2012</a>
-  in Copenhagen
+  in Copenhagen.
 <dt>2012-03-03: <strong>GF 3.3.3 released!</strong>
     <a href="download/release-3.3.3.html">Release notes</a>.
 <dt>2012-02-24: New resource grammar languages: Hindi, Sindhi.
diff --git a/src/www/gfse/editor.js b/src/www/gfse/editor.js
index 1d78e8f7f..21e11b1cd 100644
--- a/src/www/gfse/editor.js
+++ b/src/www/gfse/editor.js
@@ -430,7 +430,7 @@ function lang1(name) {
     return ws.length==1 ? lang(name.substr(0,3),name) : lang(ws[0],ws[1]);
 }
 var languages =
-    map(lang1,"Amharic Arabic Bulgarian Catalan Danish Dutch English Finnish French German Hindi Ina/Interlingua Italian Latin Norwegian Polish Ron/Romanian Russian Spanish Swedish Thai Turkish Urdu".split(" "));
+    map(lang1,"Amharic Arabic Bulgarian Catalan Danish Dutch English Finnish French German Hindi Ina/Interlingua Italian Japanese Latin Norwegian Polish Ron/Romanian Russian Spanish Swedish Thai Turkish Urdu".split(" "));
 languages.push(lang("Other","Other"));
 
 var langname={};