From d9d2b907d1174c4ce64dbec1456d24f561531268 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Tue, 7 Apr 2020 21:09:01 +0200
Subject: [PATCH] (Kor) Small fixes in comma versions of Conj opers

---
 src/korean/ConjunctionKor.gf |  19 ++++++++++++++++++-
 src/korean/ParamKor.gf       | Bin 3199 -> 3234 bytes
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/korean/ConjunctionKor.gf b/src/korean/ConjunctionKor.gf
index 6d81e0d49..42952fd8c 100644
--- a/src/korean/ConjunctionKor.gf
+++ b/src/korean/ConjunctionKor.gf
@@ -63,7 +63,8 @@ oper
 
   conjSScomma : Conj -> ConjSS -> SS = \co,ss -> {
     s = co.s1
-      ++ glue (ss.firstSS ! co.c) co.s2
+      ++ ss.firstSS ! co.c
+      ++ co.s2
       ++ ss.s
     } ;
 
@@ -151,6 +152,22 @@ lin
 oper
   mkFirstNP : ResKor.NounPhrase -> ConjType => Str = \np ->
     \\conj => glue (np.s ! Bare) (conjTable ! NStar ! conj) ;
+    -- Versions with commas, no repeated conjunctions
 
+  baseNPcomma : NP -> NP -> ListNP = \x,y -> y ** {
+    firstNP = \\conj => x.s ! Bare ++ BIND ++ "," ;
+    } ;
+
+  consNPcomma : NP -> ListNP -> ListNP = \x,xs -> xs ** {
+    firstNP = \\conj =>
+      x.s ! Bare ++ BIND ++ "," ++ xs.firstNP ! conj ;
+    } ;
+
+  conjNPcomma : Conj -> ListNP -> NP = \co,xs -> xs ** {
+    s = \\nf => co.s1
+             ++ xs.firstNP ! co.c
+             ++ co.s2
+             ++ xs.s ! nf
+    } ;
 
 }
diff --git a/src/korean/ParamKor.gf b/src/korean/ParamKor.gf
index 7967a265cdc161a85ba20cbff93a10b6ffe101fa..b1811c199686610bba567d1de4d2d2ce4b8df94d 100644
GIT binary patch
delta 58
zcmew_u}E@57Q3!ra7kj3oq~dbt(}6Bj*@~kmx6+Vf{k;2Zf>GZ7_#K6%?mb{uyeBl
E0PcAZvH$=8

delta 23
ecmZ1^`Cno~7CTqGoq~dbt(}6B&gSXt+^hgtHwHxj