langs option to Make.hs ; utf8 exception in linearization from the coding flag in grammar

1 files changed, 9 insertions, 2 deletions

diff --git a/src-3.0/GF/Grammar/AppPredefined.hs b/src-3.0/GF/Grammar/AppPredefined.hs
index 452050ac8..cfb6baf1d 100644
--- a/src-3.0/GF/Grammar/AppPredefined.hs
+++ b/src-3.0/GF/Grammar/AppPredefined.hs
@@ -106,10 +106,17 @@ appPredefined t = case t of
   _ -> retb t
                   ---- should really check the absence of arg variables
  where
-   retb t = return (t,True)  -- no further computing needed
-   retf t = return (t,False) -- must be computed further
+   retb t = return (retc t,True)  -- no further computing needed
+   retf t = return (retc t,False) -- must be computed further
+   retc t = case t of
+     K [] -> t
+     K s  -> foldr1 C (map K (words s))
+     _    -> t
    norm t = case t of
      Empty -> K []
+     C u v -> case (norm u,norm v) of
+       (K x,K y) -> K (x +++ y)
+       _ -> t
      _ -> t
    fi = fromInteger