From e6367832020dc381ed298917c535964035f41338 Mon Sep 17 00:00:00 2001 From: aarne Date: Thu, 26 Jun 2008 16:35:45 +0000 Subject: [PATCH] uniform encoding: gfo and pgf in UTF8, internal in unicode --- resource-1.4/Make.hs | 24 ++++++++++++------------ resource-1.4/bulgarian/AdjectiveBul.gf | 2 ++ resource-1.4/bulgarian/AdverbBul.gf | 2 ++ resource-1.4/bulgarian/Bulgarian.gf | 4 +++- resource-1.4/bulgarian/BulgarianAbs.gf | 4 +++- resource-1.4/bulgarian/CatBul.gf | 4 +++- resource-1.4/bulgarian/ConjunctionBul.gf | 2 ++ resource-1.4/bulgarian/ExtraBul.gf | 2 ++ resource-1.4/bulgarian/ExtraBulAbs.gf | 2 ++ resource-1.4/bulgarian/GrammarBul.gf | 2 ++ resource-1.4/bulgarian/IdiomBul.gf | 2 ++ resource-1.4/bulgarian/LangBul.gf | 2 ++ resource-1.4/bulgarian/LexiconBul.gf | 2 ++ resource-1.4/bulgarian/MorphoBul.gf | 4 +++- resource-1.4/bulgarian/MorphoFunsBul.gf | 4 +++- resource-1.4/bulgarian/NounBul.gf | 4 +++- resource-1.4/bulgarian/NumeralBul.gf | 2 ++ resource-1.4/bulgarian/ParadigmsBul.gf | 4 +++- resource-1.4/bulgarian/PhraseBul.gf | 2 ++ resource-1.4/bulgarian/QuestionBul.gf | 2 ++ resource-1.4/bulgarian/RelativeBul.gf | 2 ++ resource-1.4/bulgarian/ResBul.gf | 2 ++ resource-1.4/bulgarian/SentenceBul.gf | 2 ++ resource-1.4/bulgarian/StructuralBul.gf | 2 ++ resource-1.4/bulgarian/TextBul.gf | 2 ++ resource-1.4/bulgarian/VerbBul.gf | 2 ++ resource-1.4/demo/DemoRus.gf | 2 +- resource-1.4/mathematical/SymbolGer.gf | 6 +++--- resource-1.4/russian/ExtraRus.gf | 2 +- resource-1.4/russian/GrammarRus.gf | 2 +- resource-1.4/russian/IrregRus.gf | 2 +- resource-1.4/russian/NounRus.gf | 2 +- resource-1.4/russian/PhraseRus.gf | 1 + resource-1.4/russian/QuestionRus.gf | 2 +- resource-1.4/russian/Russian.gf | 2 +- 35 files changed, 80 insertions(+), 29 deletions(-) diff --git a/resource-1.4/Make.hs b/resource-1.4/Make.hs index 725000d3f..4bbab08cc 100644 --- a/resource-1.4/Make.hs +++ b/resource-1.4/Make.hs @@ -19,21 +19,21 @@ import System langsCoding = [ (("arabic", "Ara"),""), - (("bulgarian","Bul"),"from_cp1251,to_utf8"), - (("catalan", "Cat"),"to_utf8"), - (("danish", "Dan"),"to_utf8"), + (("bulgarian","Bul"),""), + (("catalan", "Cat"),""), + (("danish", "Dan"),""), (("english", "Eng"),""), - (("finnish", "Fin"),"to_utf8"), - (("french", "Fre"),"to_utf8"), - (("hindi", "Hin"),"to_devanagari,to_utf8"), - (("german", "Ger"),"to_utf8"), + (("finnish", "Fin"),""), + (("french", "Fre"),""), + (("hindi", "Hin"),"to_devanagari"), + (("german", "Ger"),""), (("interlingua","Ina"),""), - (("italian", "Ita"),"to_utf8"), - (("norwegian","Nor"),"to_utf8"), + (("italian", "Ita"),""), + (("norwegian","Nor"),""), (("russian", "Rus"),""), - (("spanish", "Spa"),"to_utf8"), - (("swedish", "Swe"),"to_utf8"), - (("thai", "Tha"),"to_thai,to_utf8") + (("spanish", "Spa"),""), + (("swedish", "Swe"),""), + (("thai", "Tha"),"to_thai") ] langs = map fst langsCoding diff --git a/resource-1.4/bulgarian/AdjectiveBul.gf b/resource-1.4/bulgarian/AdjectiveBul.gf index 2fecd1155..dfdf19763 100644 --- a/resource-1.4/bulgarian/AdjectiveBul.gf +++ b/resource-1.4/bulgarian/AdjectiveBul.gf @@ -1,4 +1,6 @@ concrete AdjectiveBul of Adjective = CatBul ** open ResBul, Prelude in { + flags coding=cp1251 ; + lin PositA a = { s = \\aform => a.s ! aform ; diff --git a/resource-1.4/bulgarian/AdverbBul.gf b/resource-1.4/bulgarian/AdverbBul.gf index 7210ea056..f886575aa 100644 --- a/resource-1.4/bulgarian/AdverbBul.gf +++ b/resource-1.4/bulgarian/AdverbBul.gf @@ -1,4 +1,6 @@ concrete AdverbBul of Adverb = CatBul ** open ResBul, Prelude in { + flags coding=cp1251 ; + lin PositAdvAdj a = {s = a.adv} ; ComparAdvAdj cadv a np = { diff --git a/resource-1.4/bulgarian/Bulgarian.gf b/resource-1.4/bulgarian/Bulgarian.gf index 7fa27a6dd..596cbfc82 100644 --- a/resource-1.4/bulgarian/Bulgarian.gf +++ b/resource-1.4/bulgarian/Bulgarian.gf @@ -3,4 +3,6 @@ concrete Bulgarian of BulgarianAbs = LangBul, ExtraBul - ** {} ; + ** { + flags coding=cp1251 ; +} ; diff --git a/resource-1.4/bulgarian/BulgarianAbs.gf b/resource-1.4/bulgarian/BulgarianAbs.gf index c14c7b0d6..83f17ad72 100644 --- a/resource-1.4/bulgarian/BulgarianAbs.gf +++ b/resource-1.4/bulgarian/BulgarianAbs.gf @@ -3,4 +3,6 @@ abstract BulgarianAbs = Lang, ExtraBulAbs - ** {} ; + ** { + flags coding=cp1251 ; +} ; diff --git a/resource-1.4/bulgarian/CatBul.gf b/resource-1.4/bulgarian/CatBul.gf index 1587aa535..257c4c0f2 100644 --- a/resource-1.4/bulgarian/CatBul.gf +++ b/resource-1.4/bulgarian/CatBul.gf @@ -1,4 +1,6 @@ -concrete CatBul of Cat = open ResBul, Prelude, (R = ParamX) in { +concrete CatBul of Cat = open ResBul, Prelude, (R = ParamX) in { + flags coding=cp1251 ; + flags optimize=all_subs ; diff --git a/resource-1.4/bulgarian/ConjunctionBul.gf b/resource-1.4/bulgarian/ConjunctionBul.gf index 8669e8dfd..23664cd1f 100644 --- a/resource-1.4/bulgarian/ConjunctionBul.gf +++ b/resource-1.4/bulgarian/ConjunctionBul.gf @@ -1,5 +1,7 @@ concrete ConjunctionBul of Conjunction = CatBul ** open ResBul, Coordination, Prelude in { + flags coding=cp1251 ; + flags optimize=all_subs ; diff --git a/resource-1.4/bulgarian/ExtraBul.gf b/resource-1.4/bulgarian/ExtraBul.gf index ebf4b9601..1e15a19de 100644 --- a/resource-1.4/bulgarian/ExtraBul.gf +++ b/resource-1.4/bulgarian/ExtraBul.gf @@ -1,5 +1,7 @@ concrete ExtraBul of ExtraBulAbs = CatBul ** open ResBul, Coordination, Prelude in { + flags coding=cp1251 ; + lin PossIndefPron p = { diff --git a/resource-1.4/bulgarian/ExtraBulAbs.gf b/resource-1.4/bulgarian/ExtraBulAbs.gf index 8e6fdeec4..fe57f33b1 100644 --- a/resource-1.4/bulgarian/ExtraBulAbs.gf +++ b/resource-1.4/bulgarian/ExtraBulAbs.gf @@ -1,4 +1,6 @@ abstract ExtraBulAbs = Extra ** { + flags coding=cp1251 ; + fun -- Feminine variants of pronouns (those in $Structural$ are diff --git a/resource-1.4/bulgarian/GrammarBul.gf b/resource-1.4/bulgarian/GrammarBul.gf index 7fb8791be..21e437b74 100644 --- a/resource-1.4/bulgarian/GrammarBul.gf +++ b/resource-1.4/bulgarian/GrammarBul.gf @@ -15,6 +15,8 @@ concrete GrammarBul of Grammar = StructuralBul, IdiomBul ** { + flags coding=cp1251 ; + flags startcat = Phr ; unlexer = text ; lexer = text ; diff --git a/resource-1.4/bulgarian/IdiomBul.gf b/resource-1.4/bulgarian/IdiomBul.gf index b99106810..40536ad2e 100644 --- a/resource-1.4/bulgarian/IdiomBul.gf +++ b/resource-1.4/bulgarian/IdiomBul.gf @@ -1,4 +1,6 @@ concrete IdiomBul of Idiom = CatBul ** open Prelude, ParadigmsBul, ResBul in { + flags coding=cp1251 ; + flags optimize=all_subs ; lin diff --git a/resource-1.4/bulgarian/LangBul.gf b/resource-1.4/bulgarian/LangBul.gf index 7dca04dee..dcfaacdc1 100644 --- a/resource-1.4/bulgarian/LangBul.gf +++ b/resource-1.4/bulgarian/LangBul.gf @@ -4,6 +4,8 @@ concrete LangBul of Lang = GrammarBul, LexiconBul ** { + flags coding=cp1251 ; + flags startcat = Phr ; unlexer = text ; lexer = text ; erasing = on ; coding = cp1251 ; diff --git a/resource-1.4/bulgarian/LexiconBul.gf b/resource-1.4/bulgarian/LexiconBul.gf index 56846f04a..5fce55c54 100644 --- a/resource-1.4/bulgarian/LexiconBul.gf +++ b/resource-1.4/bulgarian/LexiconBul.gf @@ -2,6 +2,8 @@ concrete LexiconBul of Lexicon = CatBul ** open ParadigmsBul, ResBul, Prelude in { + flags coding=cp1251 ; + flags optimize=values ; diff --git a/resource-1.4/bulgarian/MorphoBul.gf b/resource-1.4/bulgarian/MorphoBul.gf index ed1ad0c18..c8459d0f5 100644 --- a/resource-1.4/bulgarian/MorphoBul.gf +++ b/resource-1.4/bulgarian/MorphoBul.gf @@ -12,7 +12,9 @@ resource MorphoBul = ResBul ** open Predef, Prelude, CatBul - in { + in { + flags coding=cp1251 ; + flags optimize=all ; diff --git a/resource-1.4/bulgarian/MorphoFunsBul.gf b/resource-1.4/bulgarian/MorphoFunsBul.gf index 6483e7fb0..678479d8e 100644 --- a/resource-1.4/bulgarian/MorphoFunsBul.gf +++ b/resource-1.4/bulgarian/MorphoFunsBul.gf @@ -4,7 +4,9 @@ resource MorphoFunsBul = open Prelude, CatBul, MorphoBul - in { + in { + flags coding=cp1251 ; + oper --2 Adverbs diff --git a/resource-1.4/bulgarian/NounBul.gf b/resource-1.4/bulgarian/NounBul.gf index ae8bc4b60..8c939c31d 100644 --- a/resource-1.4/bulgarian/NounBul.gf +++ b/resource-1.4/bulgarian/NounBul.gf @@ -1,4 +1,6 @@ -concrete NounBul of Noun = CatBul ** open ResBul, Prelude in { +concrete NounBul of Noun = CatBul ** open ResBul, Prelude in { + flags coding=cp1251 ; + flags optimize=all_subs ; diff --git a/resource-1.4/bulgarian/NumeralBul.gf b/resource-1.4/bulgarian/NumeralBul.gf index d09573b6c..bf89fbe21 100644 --- a/resource-1.4/bulgarian/NumeralBul.gf +++ b/resource-1.4/bulgarian/NumeralBul.gf @@ -1,4 +1,6 @@ concrete NumeralBul of Numeral = CatBul ** open Prelude, ResBul in { + flags coding=cp1251 ; + lincat Digit = {s : DForm => CardOrd => Str} ; diff --git a/resource-1.4/bulgarian/ParadigmsBul.gf b/resource-1.4/bulgarian/ParadigmsBul.gf index 731386d3e..a22cc6fe9 100644 --- a/resource-1.4/bulgarian/ParadigmsBul.gf +++ b/resource-1.4/bulgarian/ParadigmsBul.gf @@ -3,7 +3,9 @@ resource ParadigmsBul = MorphoFunsBul ** open Prelude, MorphoBul, CatBul - in { + in { + flags coding=cp1251 ; + oper mkN001 : Str -> N ; mkN001 base = let v0 = base diff --git a/resource-1.4/bulgarian/PhraseBul.gf b/resource-1.4/bulgarian/PhraseBul.gf index fb2ab25fe..0d3524832 100644 --- a/resource-1.4/bulgarian/PhraseBul.gf +++ b/resource-1.4/bulgarian/PhraseBul.gf @@ -1,4 +1,6 @@ concrete PhraseBul of Phrase = CatBul ** open Prelude, ResBul in { + flags coding=cp1251 ; + lin PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ; diff --git a/resource-1.4/bulgarian/QuestionBul.gf b/resource-1.4/bulgarian/QuestionBul.gf index cadd1a2b2..1032e6b44 100644 --- a/resource-1.4/bulgarian/QuestionBul.gf +++ b/resource-1.4/bulgarian/QuestionBul.gf @@ -1,4 +1,6 @@ concrete QuestionBul of Question = CatBul ** open ResBul, Prelude in { + flags coding=cp1251 ; + flags optimize=all_subs ; diff --git a/resource-1.4/bulgarian/RelativeBul.gf b/resource-1.4/bulgarian/RelativeBul.gf index 4bdcd7faa..fefd03032 100644 --- a/resource-1.4/bulgarian/RelativeBul.gf +++ b/resource-1.4/bulgarian/RelativeBul.gf @@ -1,4 +1,6 @@ concrete RelativeBul of Relative = CatBul ** open ResBul in { + flags coding=cp1251 ; + flags optimize=all_subs ; diff --git a/resource-1.4/bulgarian/ResBul.gf b/resource-1.4/bulgarian/ResBul.gf index c49613678..795b9a746 100644 --- a/resource-1.4/bulgarian/ResBul.gf +++ b/resource-1.4/bulgarian/ResBul.gf @@ -8,6 +8,8 @@ -- patterns needed for $Lex$. resource ResBul = ParamX ** open Prelude in { + flags coding=cp1251 ; + flags optimize=all ; diff --git a/resource-1.4/bulgarian/SentenceBul.gf b/resource-1.4/bulgarian/SentenceBul.gf index 6a3a20873..36bbb7cf5 100644 --- a/resource-1.4/bulgarian/SentenceBul.gf +++ b/resource-1.4/bulgarian/SentenceBul.gf @@ -1,4 +1,6 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in { + flags coding=cp1251 ; + flags optimize=all_subs ; diff --git a/resource-1.4/bulgarian/StructuralBul.gf b/resource-1.4/bulgarian/StructuralBul.gf index c8e92365f..a3b8ec75c 100644 --- a/resource-1.4/bulgarian/StructuralBul.gf +++ b/resource-1.4/bulgarian/StructuralBul.gf @@ -1,5 +1,7 @@ concrete StructuralBul of Structural = CatBul ** open MorphoBul, ParadigmsBul, Prelude in { + flags coding=cp1251 ; + flags optimize=all ; diff --git a/resource-1.4/bulgarian/TextBul.gf b/resource-1.4/bulgarian/TextBul.gf index f3aa46909..21e624b8e 100644 --- a/resource-1.4/bulgarian/TextBul.gf +++ b/resource-1.4/bulgarian/TextBul.gf @@ -1,4 +1,6 @@ concrete TextBul of Text = CatBul ** { + flags coding=cp1251 ; + -- This will work for almost all languages except Spanish. diff --git a/resource-1.4/bulgarian/VerbBul.gf b/resource-1.4/bulgarian/VerbBul.gf index 3ad248a08..59d29deb2 100644 --- a/resource-1.4/bulgarian/VerbBul.gf +++ b/resource-1.4/bulgarian/VerbBul.gf @@ -1,4 +1,6 @@ concrete VerbBul of Verb = CatBul ** open Prelude, ResBul, ParadigmsBul in { + flags coding=cp1251 ; + flags optimize=all_subs ; diff --git a/resource-1.4/demo/DemoRus.gf b/resource-1.4/demo/DemoRus.gf index 3de795f38..83da10ca5 100644 --- a/resource-1.4/demo/DemoRus.gf +++ b/resource-1.4/demo/DemoRus.gf @@ -18,6 +18,6 @@ concrete DemoRus of Demo = LexiconRus ** { -flags startcat = Phr ; unlexer = text ; lexer = text ; +flags startcat = Phr ; unlexer = text ; lexer = text ; coding = utf8 ; } ; diff --git a/resource-1.4/mathematical/SymbolGer.gf b/resource-1.4/mathematical/SymbolGer.gf index 1240e2df1..38516d74a 100644 --- a/resource-1.4/mathematical/SymbolGer.gf +++ b/resource-1.4/mathematical/SymbolGer.gf @@ -4,7 +4,7 @@ lin SymbPN i = {s = \\c => i.s ; g = Neutr} ; --- c IntPN i = {s = \\c => i.s ; g = Neutr} ; --- c FloatPN i = {s = \\c => i.s ; g = Neutr} ; --- c - NumPN i = {s = \\c => i.s ; g = Neutr} ; --- c + NumPN i = {s = i.s ! Neutr ; g = Neutr} ; --- c CNIntNP cn i = { s = \\c => cn.s ! Weak ! Sg ! Nom ++ i.s ; @@ -17,14 +17,14 @@ lin isPron = False } ; CNNumNP cn i = { - s = \\c => artDef ! (GSg cn.g) ! c ++ cn.s ! Weak ! Sg ! Nom ++ i.s ; + s = \\c => artDef ! (GSg cn.g) ! c ++ cn.s ! Weak ! Sg ! Nom ++ i.s ! Neutr ! c ; a = agrP3 Sg ; isPron = False } ; SymbS sy = {s = \\_ => sy.s} ; - SymbNum n = {s = n.s ; n = Pl ; isNum = True} ; + SymbNum n = {s = \\_,_ => n.s ; n = Pl ; isNum = True} ; SymbOrd n = {s = \\_ => n.s ++ "."} ; diff --git a/resource-1.4/russian/ExtraRus.gf b/resource-1.4/russian/ExtraRus.gf index 5dff1e86a..d592b6e64 100644 --- a/resource-1.4/russian/ExtraRus.gf +++ b/resource-1.4/russian/ExtraRus.gf @@ -1,3 +1,3 @@ concrete ExtraRus of ExtraRusAbs = CatRus ** { - +flags coding=utf8 ; } diff --git a/resource-1.4/russian/GrammarRus.gf b/resource-1.4/russian/GrammarRus.gf index 31b505a3a..052d5204c 100644 --- a/resource-1.4/russian/GrammarRus.gf +++ b/resource-1.4/russian/GrammarRus.gf @@ -14,4 +14,4 @@ concrete GrammarRus of Grammar = TextX, StructuralRus, IdiomRus - ** { flags startcat = Phr ; unlexer = text ; lexer = text ;} ; + ** { flags startcat = Phr ; unlexer = text ; lexer = text ; coding=utf8 ;} ; diff --git a/resource-1.4/russian/IrregRus.gf b/resource-1.4/russian/IrregRus.gf index e4ebb7327..37e109b68 100644 --- a/resource-1.4/russian/IrregRus.gf +++ b/resource-1.4/russian/IrregRus.gf @@ -3,7 +3,7 @@ -- concrete IrregRus of IrregRusAbs = CatRus ** open ParadigmsRus in { -- ---flags optimize=values ; +flags optimize=values ; coding=utf8 ; -- -- lin -- awake_V = irregV "awake" "awoke" "awoken" ; diff --git a/resource-1.4/russian/NounRus.gf b/resource-1.4/russian/NounRus.gf index 7f4beb58c..683f54d07 100644 --- a/resource-1.4/russian/NounRus.gf +++ b/resource-1.4/russian/NounRus.gf @@ -2,7 +2,7 @@ concrete NounRus of Noun = CatRus ** open ResRus, Prelude, MorphoRus in { - flags optimize=all_subs ; + flags optimize=all_subs ; coding=utf8 ; lin DetCN kazhduj okhotnik = { diff --git a/resource-1.4/russian/PhraseRus.gf b/resource-1.4/russian/PhraseRus.gf index a3629b3e3..7a13e3c32 100644 --- a/resource-1.4/russian/PhraseRus.gf +++ b/resource-1.4/russian/PhraseRus.gf @@ -2,6 +2,7 @@ concrete PhraseRus of Phrase = CatRus ** open Prelude, ResRus in { + flags coding=utf8 ; lin PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ; diff --git a/resource-1.4/russian/QuestionRus.gf b/resource-1.4/russian/QuestionRus.gf index 46a33f4b8..28a9dfccd 100644 --- a/resource-1.4/russian/QuestionRus.gf +++ b/resource-1.4/russian/QuestionRus.gf @@ -2,7 +2,7 @@ concrete QuestionRus of Question = CatRus ** open ResRus, Prelude in { - flags optimize=all_subs ; + flags optimize=all_subs ; coding=utf8 ; lin diff --git a/resource-1.4/russian/Russian.gf b/resource-1.4/russian/Russian.gf index 8aa2679ec..b128c45d0 100644 --- a/resource-1.4/russian/Russian.gf +++ b/resource-1.4/russian/Russian.gf @@ -3,4 +3,4 @@ concrete Russian of RussianAbs = LangRus, ExtraRus - ** {} ; + ** {flags coding=utf8 ;} ;