diff options
| author | aarne <aarne@cs.chalmers.se> | 2005-12-22 16:46:38 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2005-12-22 16:46:38 +0000 |
| commit | 14f70e478d75050b8dde84a1d79c70e9a471c56b (patch) | |
| tree | 33d63a8ec9a010178ef4cd34c955e335d79acd8d | |
| parent | b4fe6336af75dbb4e29b27b383f9552497042353 (diff) | |
version number, encoding
| -rw-r--r-- | src/GF.hs | 5 | ||||
| -rw-r--r-- | src/GF/Shell/HelpFile.hs | 8 | ||||
| -rw-r--r-- | src/GF/System/NoSignal.hs | 6 | ||||
| -rw-r--r-- | src/HelpFile | 7 | ||||
| -rw-r--r-- | src/configure.ac | 2 |
5 files changed, 22 insertions, 6 deletions
@@ -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, diff --git a/src/GF/Shell/HelpFile.hs b/src/GF/Shell/HelpFile.hs index db8b81a29..2b5d4ac26 100644 --- a/src/GF/Shell/HelpFile.hs +++ b/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." ++ []
\ No newline at end of file diff --git a/src/GF/System/NoSignal.hs b/src/GF/System/NoSignal.hs index 3c2fc6e29..bc0a9fc40 100644 --- a/src/GF/System/NoSignal.hs +++ b/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 diff --git a/src/HelpFile b/src/HelpFile index b4ebef76c..531f2d9ab 100644 --- a/src/HelpFile +++ b/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. diff --git a/src/configure.ac b/src/configure.ac index bfab7aebf..a845d7b6a 100644 --- a/src/configure.ac +++ b/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) |