2 files changed, 6 insertions, 4 deletions
diff --git a/src/compiler/GF/Grammar/Binary.hs b/src/compiler/GF/Grammar/Binary.hs
index 6641b5718..0e897aa00 100644
--- a/src/compiler/GF/Grammar/Binary.hs
+++ b/src/compiler/GF/Grammar/Binary.hs
@@ -17,6 +17,7 @@ import Data.Binary
 --import Control.Monad
 import qualified Data.Map as Map
 import qualified Data.ByteString.Char8 as BS
+import Text.PrettyPrint (render)
 
 import GF.Data.Operations
 import GF.Infra.Ident
@@ -24,9 +25,10 @@ import GF.Infra.Option
 import GF.Grammar.Grammar
 
 import PGF() -- Binary instances
+import PGF.Data(ppLit)
 
 -- Please change this every time when the GFO format is changed
-gfoVersion = "GF02"
+gfoVersion = "GF03"
 
 instance Binary Ident where
   put id = put (ident2bs id)
@@ -91,7 +93,7 @@ instance Binary ModuleStatus where
 instance Binary Options where
   put = put . optionsGFO
   get = do opts <- get
-           case parseModuleOptions ["--" ++ flag ++ "=" ++ value | (flag,value) <- opts] of
+           case parseModuleOptions ["--" ++ flag ++ "=" ++ render (ppLit value) | (flag,value) <- opts] of
              Ok  x   -> return x
              Bad msg -> fail msg
 
diff --git a/src/compiler/GF/Grammar/Printer.hs b/src/compiler/GF/Grammar/Printer.hs
index dba08ce44..e15e6e4d3 100644
--- a/src/compiler/GF/Grammar/Printer.hs
+++ b/src/compiler/GF/Grammar/Printer.hs
@@ -29,7 +29,7 @@ import GF.Infra.Option
 import GF.Grammar.Values
 import GF.Grammar.Grammar
 
-import PGF.Data (ppMeta)
+import PGF.Data (ppMeta, ppLit)
 import PGF.Printer (ppFId, ppFunId, ppSeqId, ppSeq)
 
 import Text.PrettyPrint
@@ -87,7 +87,7 @@ ppModule q (mn, ModInfo mtype mstat opts exts with opens _ _ mseqs jments) =
 
 ppOptions opts = 
   text "flags" $$
-  nest 2 (vcat [text option <+> equals <+> str value <+> semi | (option,value) <- optionsGFO opts])
+  nest 2 (vcat [text option <+> equals <+> ppLit value <+> semi | (option,value) <- optionsGFO opts])
 
 ppJudgement q (id, AbsCat pcont ) =
   text "cat" <+> ppIdent id <+>