Try to fix encoding probs by converting to utf8

This commit is contained in:
John J. Camilleri
2013-09-03 09:02:29 +02:00
parent d6e3bcc875
commit 6df8bd62d3
6 changed files with 87 additions and 79 deletions

View File

@@ -1,6 +1,9 @@
-- (c) 2009 Laurette Pretorius Sr & Jr and Ansu Berg under LGPL
concrete FoodsAfr of Foods = open Prelude, Predef in{
flags coding=utf8;
lincat
Comment = {s: Str} ;
Kind = {s: Number => Str} ;
@@ -54,13 +57,13 @@ concrete FoodsAfr of Foods = open Prelude, Predef in{
declAdj_e : Str -> {s : AdjAP=> Str} = \x -> mkAdj (x + "e") x;
declAdj_g : Str -> {s : AdjAP=> Str} = \w ->
let v = init w
in mkAdj (v + "<EFBFBD>") w ;
in mkAdj (v + "ë") w ;
declAdj_oog : Str -> {s : AdjAP=> Str} = \w ->
let v = init w
in
let i = init v
in mkAdj (i + "<EFBFBD>") w ;
in mkAdj (i + "ë") w ;
regAdj : Str -> {s : AdjAP=> Str} = \x -> mkAdj x x;

View File

@@ -4,7 +4,7 @@
concrete FoodsIce of Foods = open Prelude in {
--flags coding=utf8;
flags coding=utf8;
lincat
Comment = SS ;
@@ -14,22 +14,22 @@ concrete FoodsIce of Foods = open Prelude in {
lin
Pred item quality = ss (item.s ++ copula item.n ++ quality.s ! item.g ! item.n ! Ind) ;
This, That = det Sg "<EFBFBD>essi" "<EFBFBD>essi" "<EFBFBD>etta" ;
These, Those = det Pl "<EFBFBD>essir" "<EFBFBD>essar" "<EFBFBD>essi" ;
This, That = det Sg "þessi" "þessi" "þetta" ;
These, Those = det Pl "þessir" "þessar" "þessi" ;
Mod quality kind = { s = \\n => quality.s ! kind.g ! n ! Def ++ kind.s ! n ; g = kind.g } ;
Wine = noun "v<EFBFBD>n" "v<EFBFBD>n" Neutr ;
Wine = noun "vín" "vín" Neutr ;
Cheese = noun "ostur" "ostar" Masc ;
Fish = noun "fiskur" "fiskar" Masc ;
-- the word "pizza" is more commonly used in Iceland, but "flatbaka" is the Icelandic word for it
Pizza = noun "flatbaka" "flatb<EFBFBD>kur" Fem ;
Very qual = {s = \\g,n,defOrInd => "mj<EFBFBD>g" ++ qual.s ! g ! n ! defOrInd } ;
Pizza = noun "flatbaka" "flatbökur" Fem ;
Very qual = {s = \\g,n,defOrInd => "mjög" ++ qual.s ! g ! n ! defOrInd } ;
Fresh = regAdj "ferskur" ;
Warm = regAdj "heitur" ;
Boring = regAdj "lei<EFBFBD>inlegur" ;
Boring = regAdj "leiðinlegur" ;
-- the order of the given adj forms is: mSg fSg nSg mPl fPl nPl mSgDef f/nSgDef _PlDef
Italian = adjective "<EFBFBD>talskur" "<EFBFBD>t<EFBFBD>lsk" "<EFBFBD>talskt" "<EFBFBD>talskir" "<EFBFBD>talskar" "<EFBFBD>t<EFBFBD>lsk" "<EFBFBD>talski" "<EFBFBD>talska" "<EFBFBD>talsku" ;
Expensive = adjective "d<EFBFBD>r" "d<EFBFBD>r" "d<EFBFBD>rt" "d<EFBFBD>rir" "d<EFBFBD>rar" "d<EFBFBD>r" "d<EFBFBD>ri" "d<EFBFBD>ra" "d<EFBFBD>ru" ;
Delicious = adjective "lj<EFBFBD>ffengur" "lj<EFBFBD>ffeng" "lj<EFBFBD>ffengt" "lj<EFBFBD>ffengir" "lj<EFBFBD>ffengar" "lj<EFBFBD>ffeng" "lj<EFBFBD>ffengi" "lj<EFBFBD>ffenga" "lj<EFBFBD>ffengu" ;
Italian = adjective "ítalskur" "ítölsk" "ítalskt" "ítalskir" "ítalskar" "ítölsk" "ítalski" "ítalska" "ítalsku" ;
Expensive = adjective "dýr" "dýr" "dýrt" "dýrir" "dýrar" "dýr" "dýri" "dýra" "dýru" ;
Delicious = adjective "ljúffengur" "ljúffeng" "ljúffengt" "ljúffengir" "ljúffengar" "ljúffeng" "ljúffengi" "ljúffenga" "ljúffengu" ;
param
Number = Sg | Pl ;

View File

@@ -1,6 +1,8 @@
-- (c) 2009 Rami Shashati under LGPL
concrete FoodsPor of Foods = open Prelude in {
flags coding=utf8;
lincat
Comment = {s : Str} ;
Quality = {s : Gender => Number => Str} ;
@@ -73,5 +75,5 @@ concrete FoodsPor of Foods = open Prelude in {
regNoun : Str -> Gender -> KindT =
\carro,gen -> noun carro (carro + "s") gen ;
copula : Number => Str = table {Sg => "<EFBFBD>" ; Pl => "s<EFBFBD>o"} ;
copula : Number => Str = table {Sg => "é" ; Pl => "são"} ;
}

View File

@@ -2,6 +2,7 @@
instance LexFoodsFin of LexFoods =
open SyntaxFin, ParadigmsFin in {
flags coding=utf8;
oper
wine_N = mkN "viini" ;
pizza_N = mkN "pizza" ;
@@ -9,12 +10,12 @@ instance LexFoodsFin of LexFoods =
fish_N = mkN "kala" ;
fresh_A = mkA "tuore" ;
warm_A = mkA
(mkN "l<EFBFBD>mmin" "l<EFBFBD>mpim<EFBFBD>n" "l<EFBFBD>mmint<EFBFBD>" "l<EFBFBD>mpim<EFBFBD>n<EFBFBD>" "l<EFBFBD>mpim<EFBFBD><EFBFBD>n"
"l<EFBFBD>mpimin<EFBFBD>" "l<EFBFBD>mpimi<EFBFBD>" "l<EFBFBD>mpimien" "l<EFBFBD>mpimiss<EFBFBD>" "l<EFBFBD>mpimiin"
(mkN "lämmin" "lämpimän" "lämmintä" "lämpimänä" "lämpimään"
"lämpiminä" "lämpimiä" "lämpimien" "lämpimissä" "lämpimiin"
)
"l<EFBFBD>mpim<EFBFBD>mpi" "l<EFBFBD>mpimin" ;
"lämpimämpi" "lämpimin" ;
italian_A = mkA "italialainen" ;
expensive_A = mkA "kallis" ;
delicious_A = mkA "herkullinen" ;
boring_A = mkA "tyls<EFBFBD>" ;
boring_A = mkA "tylsä" ;
}

View File

@@ -2,15 +2,16 @@
instance LexFoodsGer of LexFoods =
open SyntaxGer, ParadigmsGer in {
flags coding=utf8;
oper
wine_N = mkN "Wein" ;
pizza_N = mkN "Pizza" "Pizzen" feminine ;
cheese_N = mkN "K<EFBFBD>se" "K<EFBFBD>se" masculine ;
cheese_N = mkN "Käse" "Käse" masculine ;
fish_N = mkN "Fisch" ;
fresh_A = mkA "frisch" ;
warm_A = mkA "warm" "w<EFBFBD>rmer" "w<EFBFBD>rmste" ;
warm_A = mkA "warm" "wärmer" "wärmste" ;
italian_A = mkA "italienisch" ;
expensive_A = mkA "teuer" ;
delicious_A = mkA "k<EFBFBD>stlich" ;
delicious_A = mkA "köstlich" ;
boring_A = mkA "langweilig" ;
}

View File

@@ -2,15 +2,16 @@
instance LexFoodsSwe of LexFoods =
open SyntaxSwe, ParadigmsSwe in {
flags coding=utf8;
oper
wine_N = mkN "vin" "vinet" "viner" "vinerna" ;
pizza_N = mkN "pizza" ;
cheese_N = mkN "ost" ;
fish_N = mkN "fisk" ;
fresh_A = mkA "f<EFBFBD>rsk" ;
fresh_A = mkA "färsk" ;
warm_A = mkA "varm" ;
italian_A = mkA "italiensk" ;
expensive_A = mkA "dyr" ;
delicious_A = mkA "l<EFBFBD>cker" ;
boring_A = mkA "tr<EFBFBD>kig" ;
delicious_A = mkA "läcker" ;
boring_A = mkA "tråkig" ;
}