From ba639910078845c37641ccb2315095b4438cf0c8 Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 26 Jun 2008 19:41:25 +0000 Subject: [PATCH] fixed decodeUTF8 for pgf; removed old resources from darcs --- src/GF/Text/Transliterations.hs | 2 +- src/PGF.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/GF/Text/Transliterations.hs b/src/GF/Text/Transliterations.hs index 57237a1cf..19adf68fa 100644 --- a/src/GF/Text/Transliterations.hs +++ b/src/GF/Text/Transliterations.hs @@ -32,7 +32,7 @@ transliteration s = case s of characterTable :: Transliteration -> String characterTable = unlines . map prOne . Map.assocs . trans_from_unicode where - prOne (i,s) = unwords ["|", show i, "|", encodeUTF8 [toEnum i], "|", s, "|"] + prOne (i,s) = unwords ["|", show i, "|", [toEnum i], "|", s, "|"] data Transliteration = Trans { trans_to_unicode :: Map.Map String Int, diff --git a/src/PGF.hs b/src/PGF.hs index 8add3d1d8..33c17b81b 100644 --- a/src/PGF.hs +++ b/src/PGF.hs @@ -172,7 +172,7 @@ startCat :: PGF -> Category --------------------------------------------------- readPGF f = do - s <- readFile f + s <- readFile f >>= return . decodeUTF8 -- pgf is in UTF8, internal in unicode g <- parseGrammar s return $! toPGF g