liblouis · egli · Sep 1, 2014 · Jun 2, 2014 · Jun 2, 2014 · Sep 1, 2014
diff --git a/NEWS b/NEWS
@@ -16,6 +16,8 @@ liblouis NEWS -- history of user-visible changes.  	-*- org -*-
 - Fix for Norwegian where letsign is affecting some extra characters
   thanks to Lars Bjørndal
 - Much improved hyphenation for Norwegian thanks to Lars Bjørndal
+- Korean Grade 2 now includes support for reading English text using
+  grade 2. 
 
 * Noteworthy changes in release 2.5.4 (2014-3-3)
 This release contains nine months worth of braille table improvements

diff --git a/tables/ko-g1.ctb b/tables/ko-g1.ctb
@@ -3,21 +3,29 @@
 # Based on the braille contraction table in BRLTTY
 #
 # Copyright (C) 1995-2012 by The BRLTTY Team. 
+# Copyright (C) 2012 by Samuel Thibault <samuel.thibault@ens-lyon.org>
+# Copyright (C) 2012 by Mesar Hameed <mhameed@src.gnome.org>
+# Copyright (C) 2013 by Joseph Lee <joseph.lee22590@gmail.com>
+#
+# This file is part of liblouis.
 #
-# Samuel Thibault <samuel.thibault@ens-lyon.org>
+# liblouis is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
 #
+# liblouis is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with liblouis. If not, see
+# <http://www.gnu.org/licenses/>.
+
 # This is missing CHITUEUM*, CEONGCHIEUMSIOS, PANSIOS, YESIEUNG, RINHIEUH and
 # ARAEA for which I couldn't find documentation.  Please contact me to fix
 # anything, as this table was generated from a C program.
-#
-# Copyright (C) 2012 by Mesar Hameed <mhameed@src.gnome.org>
-# Copyright (C) 2013 by Joseph Lee <joseph.lee22590@gmail.com>
-#
-# liblouis comes with ABSOLUTELY NO WARRANTY.
-#
-# This is free software, placed under the terms of the
-# GNU General Public License, as published by the Free Software
-# Foundation.  Please see the file COPYING for details.
 
 # Globals:
 include ko.cti

diff --git a/tables/ko-g2.ctb b/tables/ko-g2.ctb
@@ -3,26 +3,33 @@
 # Based on the braille contraction table in BRLTTY
 #
 # Copyright (C) 1995-2012 by The BRLTTY Team. 
+# Copyright (C) 2012 by Samuel Thibault <samuel.thibault@ens-lyon.org>
+# Copyright (C) 2012 by Mesar Hameed <mhameed@src.gnome.org>
+# Copyright (C) 2013, 2014 by Joseph Lee <joseph.lee22590@gmail.com>
 #
-# Samuel Thibault <samuel.thibault@ens-lyon.org>
-#
-# This is missing CHITUEUM*, CEONGCHIEUMSIOS, PANSIOS, YESIEUNG, RINHIEUH and
-# ARAEA for which I couldn't find documentation.  Please contact me to fix
-# anything, as this table was generated from a C program.
+# This file is part of liblouis.
 #
-# Copyright (C) 2012 by Mesar Hameed <mhameed@src.gnome.org>
-# Copyright (C) 2013 by Joseph Lee <joseph.lee22590@gmail.com>
+# liblouis is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
 #
-# liblouis comes with ABSOLUTELY NO WARRANTY.
+# liblouis is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
 #
-# This is free software, placed under the terms of the
-# GNU General Public License, as published by the Free Software
-# Foundation.  Please see the file COPYING for details.
+# You should have received a copy of the GNU Lesser General Public
+# License along with liblouis. If not, see
+# <http://www.gnu.org/licenses/>.
 
+# This is missing CHITUEUM*, CEONGCHIEUMSIOS, PANSIOS, YESIEUNG, RINHIEUH and
+# ARAEA for which I couldn't find documentation.  Please contact me to fix
+# anything, as this table was generated from a C program.
 
 # Globals:
 include ko.cti Uncontracted Hangul, punctuation and symbols.
-
+include en-us-g2.ctb To display contracted English in Korean grade 2 mode. Contributed by a certain Mr. Hahn in U.S.
 
 # Common letter contractions:
 # Using "always" opcode in order for contraction to work correctly.

diff --git a/tables/ko.cti b/tables/ko.cti
@@ -3,20 +3,29 @@
 # Based on the braille contraction table in BRLTTY
 #
 # Copyright (C) 1995-2012 by The BRLTTY Team. 
-#
-# Copyright (C) 2012 Samuel Thibault <samuel.thibault@ens-lyon.org>
+# Copyright (C) 2012 by Samuel Thibault <samuel.thibault@ens-lyon.org>
 # Copyright (C) 2012 by Mesar Hameed <mhameed@src.gnome.org>
 # Copyright (C) 2013 by Joseph Lee <joseph.lee22590@gmail.com>
 #
+# This file is part of liblouis.
+#
+# liblouis is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# liblouis is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with liblouis. If not, see
+# <http://www.gnu.org/licenses/>.
+
 # This is missing CHITUEUM*, CEONGCHIEUMSIOS, PANSIOS, YESIEUNG, RINHIEUH and
 # ARAEA for which I couldn't find documentation.  Please contact me to fix
 # anything, as this table was generated from a C program.
-#
-# liblouis comes with ABSOLUTELY NO WARRANTY.
-#
-# This is free software, placed under the terms of the
-# GNU General Public License, as published by the Free Software
-# Foundation.  Please see the file COPYING for details.
 
 ## Comments:
 

diff --git a/tests/harness/Makefile.am b/tests/harness/Makefile.am
@@ -1,17 +1,18 @@
 harness_TESTS =					\
 	da-dk-g16-dictionary_harness.txt	\
-	da-dk-g18-dictionary_harness.txt 	\
+	da-dk-g18-dictionary_harness.txt	\
 	da-dk-g26-dictionary_harness.txt	\
 	da-dk-g28-dictionary_harness.txt	\
-	en-gb-g1_harness.txt			\
 	en-GB-g2_harness.txt			\
+	en-gb-g1_harness.txt			\
 	en-ueb-g2-dictionary_harness.txt	\
 	en-us-g2-dictionary_harness.txt		\
 	ethio-g1_harness.txt			\
 	hu-hu-comp8_harness.txt			\
-	hu-hu-g1_harness.txt			\
 	hu-hu-g1-hyph_harness.txt		\
+	hu-hu-g1_harness.txt			\
 	iu-ca-g1_harness.txt			\
+	ko-g2_harness.txt			\
 	letterDefTest_harness.txt		\
 	nocross_harness.txt			\
 	ta-ta-g1_harness.txt
@@ -47,5 +48,5 @@ endif
 check:
 	@true
 
-.PHONY: runall runAll
+.PHONY: runall runAll $(harness_TESTS)
 
diff --git a/tests/harness/ko-g2_harness.txt b/tests/harness/ko-g2_harness.txt
@@ -0,0 +1,29 @@
+{
+  "tables": [
+    "unicode.dis", 
+    "ko-g2.ctb"
+  ], 
+  "tests": [
+    {
+      "data": [
+        {
+          "comment": [
+            "Numbers followed by Korean words."
+          ], 
+          "input": "2000년", 
+          "output": "⠼⠃⠚⠚⠚ ⠉⠡"
+        }, 
+        {
+          "comment": [
+            "Korean mixed with English contractions"
+          ], 
+          "input": "unity", 
+          "output": "⠥⠝⠰⠽"
+        }
+      ], 
+      "flags": {
+        "outputUniBrl": true
+      }
+    }
+  ]
+}