summaryrefslogtreecommitdiff
path: root/src/compiler/GF
diff options
context:
space:
mode:
Diffstat (limited to 'src/compiler/GF')
-rw-r--r--src/compiler/GF/Infra/BuildInfo.hs16
-rw-r--r--src/compiler/GF/Server.hs1
-rw-r--r--src/compiler/GF/Text/Transliterations.hs8
3 files changed, 9 insertions, 16 deletions
diff --git a/src/compiler/GF/Infra/BuildInfo.hs b/src/compiler/GF/Infra/BuildInfo.hs
index 9cf111831..f0230246b 100644
--- a/src/compiler/GF/Infra/BuildInfo.hs
+++ b/src/compiler/GF/Infra/BuildInfo.hs
@@ -2,11 +2,9 @@
module GF.Infra.BuildInfo where
import System.Info
import Data.Version(showVersion)
-import DarcsVersion_gf
{-# NOINLINE buildInfo #-}
buildInfo =
- {-details++"\n"++-}
"Built on "++os++"/"++arch
++" with "++compilerName++"-"++showVersion compilerVersion
++", flags:"
@@ -22,17 +20,3 @@ buildInfo =
#ifdef C_RUNTIME
++" c-runtime"
#endif
- where
- details = either (const no_info) info darcs_info
- no_info = "No detailed version info available"
- info (otag,olast,changes,whatsnew) =
- (case changes of
- 0 -> "No recorded changes"
- 1 -> "One recorded change"
- _ -> show changes++" recorded changes")++
- (case whatsnew of
- 0 -> ""
- 1 -> " + one file with unrecorded changes"
- _ -> " + "++show whatsnew++" files with unrecorded changes")++
- (maybe "" (" since "++) otag)++
- (maybe "" ("\nLast recorded change: "++) olast)
diff --git a/src/compiler/GF/Server.hs b/src/compiler/GF/Server.hs
index 1ca6f399d..c287e8001 100644
--- a/src/compiler/GF/Server.hs
+++ b/src/compiler/GF/Server.hs
@@ -3,6 +3,7 @@
module GF.Server(server) where
import Data.List(partition,stripPrefix,isInfixOf)
import qualified Data.Map as M
+import Control.Applicative -- for GHC<7.10
import Control.Monad(when)
import Control.Monad.State(StateT(..),get,gets,put)
import Control.Monad.Error(ErrorT(..),Error(..))
diff --git a/src/compiler/GF/Text/Transliterations.hs b/src/compiler/GF/Text/Transliterations.hs
index 7645fc158..9b1b6e151 100644
--- a/src/compiler/GF/Text/Transliterations.hs
+++ b/src/compiler/GF/Text/Transliterations.hs
@@ -39,6 +39,7 @@ allTransliterations = Map.fromList [
("amharic",transAmharic),
("ancientgreek", transAncientGreek),
("arabic", transArabic),
+ ("arabic_unvocalized", transArabicUnvoc),
("devanagari", transDevanagari),
("greek", transGreek),
("hebrew", transHebrew),
@@ -178,6 +179,13 @@ transArabic = mkTransliteration "Arabic" allTrans allCodes where
allCodes = [0x0621..0x062f] ++ [0x0630..0x063a] ++
[0x0641..0x064f] ++ [0x0650..0x0657] ++ [0x0671,0x061f]
+
+transArabicUnvoc :: Transliteration
+transArabicUnvoc = transArabic{
+ invisible_chars = ["a","u","i","v2","o","V+","V-","a:"],
+ printname = "unvocalized Arabic"
+ }
+
transPersian :: Transliteration
transPersian = (mkTransliteration "Persian/Farsi" allTrans allCodes)
{invisible_chars = ["a","u","i"]} where