Improved unicode output.

src/GF/Shell/Commands.hs

@@ -414,7 +414,7 @@ displaySStateJavaX isNew env state = unlines $ tagXML "gfedit" $ concat [
   opts   = addOptions (optsSState state)   -- state opts override 
               (addOption (markLin mark) (globalOptions env))
   lin (n,gr) = (n, map uni $ linearizeState noWrap opts gr zipper) where
-                  uni = optEncodeUTF8 gr . mkUnicode
+                  uni = {- optEncodeUTF8 gr . -} mkUnicode
   exp    = prprTree $ loc2tree zipper
   zipper = stateSState state
   linAll = map lin lgrs

src/GF/Shell/JGF.hs

@@ -56,5 +56,5 @@ initEditMsgJavaX env = encodeUTF8 $ unlines $ tagXML "gfinit" $
   concat [tagAttrXML "language" ("file",file) [prLanguage lang] |
            (file,lang) <- zip (allGrammarFileNames env) (allLanguages env)]
 
-initAndEditMsgJavaX isNew env state = 
+initAndEditMsgJavaX isNew env state = encodeUTF8 $ 
   initEditMsgJavaX env ++++ displaySStateJavaX isNew env state