diff --git a/Config.hs b/Config.hs index d3b325fdc..b671eacb0 100644 --- a/Config.hs +++ b/Config.hs @@ -15,6 +15,7 @@ configFile = "languages.csv" -- | Information about a language data LangInfo = LangInfo { langCode :: String -- ^ 3-letter ISO 639-2/B code + , langName :: String -- ^ language name , langDir :: String -- ^ directory name , langFunctor :: Maybe String -- ^ functor (not used) , langUnlexer :: Maybe String -- ^ decoding for postprocessing linearizations @@ -44,15 +45,16 @@ loadLangsFrom configFile = do then die $ "Invalid entry in " ++ configFile ++ ": " ++ s else return $ LangInfo { langCode = bits !! 0 - , langDir = bits !! 1 - , langFunctor = maybeBit bits 2 - , langUnlexer = maybeBit bits 3 - , langPresent = boolBit bits 4 False - , langAll = boolBit bits 5 True - , langTry = boolBit bits 6 True - , langSymbolic = boolBit bits 7 True - , langCompatibility = boolBit bits 8 False - , langSynopsis = boolBit bits 9 False + , langName = bits !! 1 + , langDir = bits !! 2 + , langFunctor = maybeBit bits 3 + , langUnlexer = maybeBit bits 4 + , langPresent = boolBit bits 5 False + , langAll = boolBit bits 6 True + , langTry = boolBit bits 7 True + , langSymbolic = boolBit bits 8 True + , langCompatibility = boolBit bits 9 False + , langSynopsis = boolBit bits 10 False } -- | Separate a string on a character diff --git a/Make.sh b/Make.sh index ce73171c4..bfc2d66f9 100755 --- a/Make.sh +++ b/Make.sh @@ -6,11 +6,11 @@ set -e # Get languages from config -langs=$(tail -n +2 languages.csv | awk -F ',' '{ if ($6 != "n") { print $1 } }') -langs_present=$(tail -n +2 languages.csv | awk -F ',' '{ if ($5 == "y") { print $1 } }') -langs_try=$(tail -n +2 languages.csv | awk -F ',' '{ if ($7 != "n") { print $1 } }') -langs_symbolic=$(tail -n +2 languages.csv | awk -F ',' '{ if ($8 != "n") { print $1 } }') -langs_compat=$(tail -n +2 languages.csv | awk -F ',' '{ if ($9 == "y") { print $1 } }') +langs=$(tail -n +2 languages.csv | awk -F ',' '{ if ($7 != "n") { print $1 } }') +langs_present=$(tail -n +2 languages.csv | awk -F ',' '{ if ($6 == "y") { print $1 } }') +langs_try=$(tail -n +2 languages.csv | awk -F ',' '{ if ($8 != "n") { print $1 } }') +langs_symbolic=$(tail -n +2 languages.csv | awk -F ',' '{ if ($9 != "n") { print $1 } }') +langs_compat=$(tail -n +2 languages.csv | awk -F ',' '{ if ($10 == "y") { print $1 } }') # Modules to compile for each language modules_langs="All Symbol Compatibility" diff --git a/README.md b/README.md index 7d784ae19..489dbdbd1 100644 --- a/README.md +++ b/README.md @@ -34,6 +34,7 @@ This file should be kept up-to-date and all build methods should read this confi | Column | Description | Default | |:--------------|:-----------------------------------------|:-------:| | Code | e.g. `Eng` | - | +| Name | language name in English, e.g. `English` | - | | Directory | folder name under `src`, e.g. `english` | - | | Functor | (not used) | - | | Unlexer | (not used) | - | diff --git a/languages.csv b/languages.csv index 4cddceaf7..0bc0de3b0 100644 --- a/languages.csv +++ b/languages.csv @@ -1,45 +1,45 @@ -Code,Directory,Functor,Unlexer,Present,All,Try,Symbolic,Compatibility,Synopsis -Afr,afrikaans,,,,,,n,,y -Amh,amharic,,,,,n,n,,n -Ara,arabic,,,,,,y,,y -Bul,bulgarian,,,y,,,,,y -Cat,catalan,Romance,,y,,,,y,y -Chi,chinese,,,,,,,,y -Dan,danish,Scand,,y,,,,,y -Dut,dutch,,,y,,,,,y -Eng,english,,,y,,,,y,y -Est,estonian,,,,,,,,y -Eus,basque,,,,,,,,y -Fin,finnish,,,y,,,,y,y -Fre,french,Romance,,y,,,,y,y -Ger,german,,,,,,,,y -Grc,ancient_greek,,,y,,n,n,,n -Gre,greek,,,,,,,,y -Heb,hebrew,,,,,n,n,,n -Hin,hindi,Hindustani,to_devanagari,y,,,,,y -Hun,hungarian,,,y,n,n,n,,n -Ice,icelandic,,,,,,n,,y -Ina,interlingua,,,y,,n,n,,n -Ita,italian,Romance,,y,,,,y,y -Jpn,japanese,,,,,,,,y -Lat,latin,,,y,,n,n,,n -Lav,latvian,,,,,,,y,y -Mlt,maltese,,,,,,,,y -Mon,mongolian,,,,,,n,,y -Nep,nepali,,,,,,n,,y -Nno,nynorsk,,,y,,,,,y -Nor,norwegian,Scand,,y,,,,,y -Pes,persian,,,,,,,,y -Pnb,punjabi,,,y,,,,,y -Pol,polish,,,,,,,,y -Por,portuguese,Romance,,y,,,,y,y -Ron,romanian,,,y,,,,,y -Rus,russian,,,y,,,,,y -Snd,sindhi,,,,,,,,y -Spa,spanish,Romance,,y,,,,y,y -Swa,swahili,,,,n,n,n,y,n -Swe,swedish,Scand,,y,,,,y,y -Tel,telugu,,,y,n,n,n,,n -Tha,thai,,to_thai,,,,,,y -Tur,turkish,,,,,n,n,,n -Urd,urdu,Hindustani,,,,,,,y +Code,Name,Directory,Functor,Unlexer,Present,All,Try,Symbolic,Compatibility,Synopsis +Afr,Afrikaans,afrikaans,,,,,,n,,y +Amh,Amharic,amharic,,,,,n,n,,n +Ara,Arabic,arabic,,,,,,y,,y +Bul,Bulgarian,bulgarian,,,y,,,,,y +Cat,Catalan,catalan,Romance,,y,,,,y,y +Chi,Chinese (simplified),chinese,,,,,,,,y +Dan,Danish,danish,Scand,,y,,,,,y +Dut,Dutch,dutch,,,y,,,,,y +Eng,English,english,,,y,,,,y,y +Est,Estonian,estonian,,,,,,,,y +Eus,Basque,basque,,,,,,,,y +Fin,Finnish,finnish,,,y,,,,y,y +Fre,French,french,Romance,,y,,,,y,y +Ger,German,german,,,,,,,,y +Grc,Ancient Greek,ancient_greek,,,y,,n,n,,n +Gre,Greek,greek,,,,,,,,y +Heb,Hebrew,hebrew,,,,,n,n,,n +Hin,Hindi,hindi,Hindustani,to_devanagari,y,,,,,y +Hun,Hungarian,hungarian,,,y,n,n,n,,n +Ice,Icelandic,icelandic,,,,,,n,,y +Ina,Interlingua,interlingua,,,y,,n,n,,n +Ita,Italian,italian,Romance,,y,,,,y,y +Jpn,Japanese,japanese,,,,,,,,y +Lat,Latin,latin,,,y,,n,n,,n +Lav,Latvian,latvian,,,,,,,y,y +Mlt,Maltese,maltese,,,,,,,,y +Mon,Mongolian,mongolian,,,,,,n,,y +Nep,Nepali,nepali,,,,,,n,,y +Nno,Norwegian (nynorsk),nynorsk,,,y,,,,,y +Nor,Norwegian (bokmål),norwegian,Scand,,y,,,,,y +Pes,Persian,persian,,,,,,,,y +Pnb,Punjabi,punjabi,,,y,,,,,y +Pol,Polish,polish,,,,,,,,y +Por,Portuguese,portuguese,Romance,,y,,,,y,y +Ron,Pomanian,romanian,,,y,,,,,y +Rus,Russian,russian,,,y,,,,,y +Snd,Sindhi,sindhi,,,,,,,,y +Spa,Spanish,spanish,Romance,,y,,,,y,y +Swa,Swahili,swahili,,,,n,n,n,y,n +Swe,Swedish,swedish,Scand,,y,,,,y,y +Tel,Telugu,telugu,,,y,n,n,n,,n +Tha,Thai,thai,,to_thai,,,,,,y +Tur,Turkish,turkish,,,,,n,n,,n +Urd,Urdu,urdu,Hindustani,,,,,,,y