From 8acf0da717edc3cc47c44b13576139d10e6598bb Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Thu, 21 May 2020 14:52:54 +0200
Subject: [PATCH] (Kor) Add Style as a variable up to S. Utt chooses Polite.

If different politeness levels are wanted in applications, UttS can be overriden.
---
 src/korean/CatKor.gf      |   2 +-
 src/korean/ParamKor.gf    | Bin 3787 -> 3894 bytes
 src/korean/PhraseKor.gf   |   6 +++---
 src/korean/ResKor.gf      |   2 +-
 src/korean/SentenceKor.gf |   7 +++++--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/korean/CatKor.gf b/src/korean/CatKor.gf
index 17a66ac2..9f615449 100644
--- a/src/korean/CatKor.gf
+++ b/src/korean/CatKor.gf
@@ -8,7 +8,7 @@ concrete CatKor of Cat = CommonX ** open ResKor, Prelude in {
 -- Constructed in SentenceKor, and also in IdiomKor
 
     S  = ResKor.Sentence ;
-    QS = SS ; -- Questions not implemented yet
+    QS = {s : Style => Str}; -- Questions not implemented yet
     RS = ResKor.Sentence ;
     -- relative sentence. Tense and polarity fixed,
     -- but agreement may depend on the CN/NP it modifies.
diff --git a/src/korean/ParamKor.gf b/src/korean/ParamKor.gf
index 575db8b5cd61734fd28fe797c3552545ad33c5b0..bd852d3533c8a23cdf5970d8253b076487752e67 100644
GIT binary patch
delta 151
zcmX>tyG?Gx3GRAbT?Loaw8YY!5{2TD%A8b%(&E$<h0HvKl8jV^@{IhPRE6}S#N6D(
zB0UA?jKsY3RE3PxqEv;n{33<Ky!?`k)FOyRJuU@>oXosnupzbz0r@$ZC8-M55YaF<
h1zUwMH-v(K{9*-bE-r=5kGSVBu_=IcO|Ikf1pwf<GiU$+

delta 33
pcmdlccUpGC32uR$%)Br+1zUwMH-&)woXnEVwmi$2CcotK1pv;I3+n&?

diff --git a/src/korean/PhraseKor.gf b/src/korean/PhraseKor.gf
index aaa6a434..74c7ff15 100644
--- a/src/korean/PhraseKor.gf
+++ b/src/korean/PhraseKor.gf
@@ -3,8 +3,8 @@ concrete PhraseKor of Phrase = CatKor ** open Prelude, ResKor in {
   lin
     PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ;
 
-    UttS s = {s = s.s ! Statement} ;
-    UttQS qs = qs ;
+    UttS s = {s = s.s ! Statement linStyle} ;
+    UttQS qs = {s = qs.s ! linStyle} ;
     UttIAdv iadv = iadv ;
     UttAdv adv = adv ;
     UttInterj i = i ;
@@ -19,7 +19,7 @@ concrete PhraseKor of Phrase = CatKor ** open Prelude, ResKor in {
     UttVP vp = {s = linVP linVF vp} ;
     UttCN cn = {s = cn.rs ++ cn.s ! Bare} ;
     UttCard n = {s = n.s ! NK ! Indep} ;
-    UttAP ap = { s = ap.compar ++ ap.s ! VF Plain Pos} ;
+    UttAP ap = {s = ap.compar ++ ap.s ! VF Plain Pos} ;
 
     NoPConj = {s = []} ;
 --    PConjConj conj = {s = conj.s1 ++ conj.s2 ! …} ;
diff --git a/src/korean/ResKor.gf b/src/korean/ResKor.gf
index d4725780..588a2126 100644
--- a/src/korean/ResKor.gf
+++ b/src/korean/ResKor.gf
@@ -361,7 +361,7 @@ oper
            let vf = case cltyp of {
                       Subord   => VAttr p ;
                       WithConj => VStem p ;
-                      _        => VF Polite p } -- TODO: more tenses, politeness
+                      Statement st => VF st p } -- TODO: more tenses
             in np
             ++ vp.nObj -- an object, not copula complement
             ++ vp.adv
diff --git a/src/korean/SentenceKor.gf b/src/korean/SentenceKor.gf
index 59574a9f..9553d6f7 100644
--- a/src/korean/SentenceKor.gf
+++ b/src/korean/SentenceKor.gf
@@ -53,10 +53,13 @@ lin
     } ;
 
   -- : Temp -> Pol -> QCl -> QS ;
-  UseQCl t p cl = {s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! Statement} ;
+  UseQCl t p cl = {
+    s = \\st => t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! Statement st} ;
 
   -- : Temp -> Pol -> RCl -> RS ;
-  UseRCl t p rcl = {s = \\c => t.s ++ p.s ++ rcl.s ! t.t ! t.a ! p.p ! c} ;
+  UseRCl t p rcl = {
+    s = \\c => t.s ++ p.s ++ rcl.s ! t.t ! t.a ! p.p ! c
+    } ;
 
   -- AdvS : Adv -> S  -> S ;            -- then I will go home
   AdvS = advS "" ;