version number, encoding

src/GF.hs

@@ -111,7 +111,10 @@ helpMsg = unlines [
   ]
 
 welcomeMsg = 
-  "Welcome to " ++ authorMsg ++++ welcomeArch ++ "\n\nType 'h' for help."
+  "Welcome to " ++ authorMsg ++++ 
+  "If the letters ä (a-umlaut) and ö (u-umlaut) look strange" ++
+  "\nin the above message, try 'h -coding'." ++
+  "\n\nType 'h' for help, and 'h [Command] for more detailed help."
 
 authorMsg = unlines [
  "Grammatical Framework, Version " ++ version,

src/GF/Shell/HelpFile.hs

@@ -561,7 +561,6 @@ txtHelpFile =
   "\n       Each of the flags can have the suffix _subs, which performs" ++
   "\n       common subexpression elimination after the main optimization." ++
   "\n       Thus, -optimize=all_subs is the most aggressive one." ++
-  "\n" ++
   "\n    -optimize=share        share common branches in tables" ++
   "\n    -optimize=parametrize  first try parametrize then do share with the rest" ++
   "\n    -optimize=values       represent tables as courses-of-values" ++
@@ -635,5 +634,10 @@ txtHelpFile =
   "\n    -unlexer=concat      remove all spaces" ++
   "\n    -unlexer=bind        like identity, but bind at \"&+\"" ++
   "\n" ++
-  "\n-- *: Commands and options marked with * are not yet implemented." ++
+  "\n-coding, Some grammars are in UTF-8, some in isolatin-1." ++
+  "\n    If the letters ä (a-umlaut) and ö (u-umlaut) look strange, either" ++
+  "\n    change your terminal to isolatin-1, or rewrite the grammar with" ++
+  "\n    'pg -utf8'." ++
+  "\n" ++
+  "\n-- *: Commands and options marked with * are not currently implemented." ++
   []

src/GF/System/NoSignal.hs

@@ -18,4 +18,8 @@ import Control.Exception (Exception)
 
 {-# NOINLINE runInterruptibly #-}
 runInterruptibly :: IO a -> IO (Either Exception a)
-runInterruptibly = fmap Right
+--runInterruptibly = fmap Right
+runInterruptibly a = 
+    p `catch` h
+  where p = a >>= \x -> return $! Right $! x
+        h e = return $ Left e

src/HelpFile

@@ -605,4 +605,9 @@ q, quit: q
     -unlexer=concat      remove all spaces
     -unlexer=bind        like identity, but bind at "&+"
 
--- *: Commands and options marked with * are not yet implemented.
+-coding, Some grammars are in UTF-8, some in isolatin-1.
+    If the letters ä (a-umlaut) and ö (u-umlaut) look strange, either
+    change your terminal to isolatin-1, or rewrite the grammar with
+    'pg -utf8'.
+
+-- *: Commands and options marked with * are not currently implemented.

src/configure.ac

@@ -1,6 +1,6 @@
 dnl Run autoconf to generate configure from this file
 
-AC_INIT([GF],[2.3],[aarne@cs.chalmers.se],[GF])
+AC_INIT([GF],[2.4],[aarne@cs.chalmers.se],[GF])
 
 AC_PREREQ(2.53)