summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gf-book/examples/chapter2/FoodIta.gf2
-rw-r--r--gf-book/examples/chapter3/ResIta.gf2
-rw-r--r--gf-book/examples/chapter5/LexFoodsFin.gf12
-rw-r--r--gf-book/examples/chapter5/LexFoodsGer.gf8
-rw-r--r--gf-book/examples/chapter5/LexFoodsSwe.gf6
-rw-r--r--gf-book/examples/chapter7/QueryFin.gf2
-rw-r--r--gf-book/examples/chapter9/ResIta.gf6
-rw-r--r--testsuite/canonical/grammars/LexFoodsFin.gf8
8 files changed, 23 insertions, 23 deletions
diff --git a/gf-book/examples/chapter2/FoodIta.gf b/gf-book/examples/chapter2/FoodIta.gf
index 466104432..a50925dcf 100644
--- a/gf-book/examples/chapter2/FoodIta.gf
+++ b/gf-book/examples/chapter2/FoodIta.gf
@@ -2,7 +2,7 @@ concrete FoodIta of Food = {
lincat
Comment, Item, Kind, Quality = Str ;
lin
- Pred item quality = item ++ "è" ++ quality ;
+ Pred item quality = item ++ "è" ++ quality ;
This kind = "questo" ++ kind ;
That kind = "quel" ++ kind ;
Mod quality kind = kind ++ quality ;
diff --git a/gf-book/examples/chapter3/ResIta.gf b/gf-book/examples/chapter3/ResIta.gf
index 17809c498..77188198c 100644
--- a/gf-book/examples/chapter3/ResIta.gf
+++ b/gf-book/examples/chapter3/ResIta.gf
@@ -32,5 +32,5 @@ resource ResIta = open Prelude in {
in
adjective nero (ner+"a") (ner+"i") (ner+"e") ;
copula : Number => Str =
- table {Sg => "è" ; Pl => "sono"} ;
+ table {Sg => "è" ; Pl => "sono"} ;
}
diff --git a/gf-book/examples/chapter5/LexFoodsFin.gf b/gf-book/examples/chapter5/LexFoodsFin.gf
index 4cf26511a..1f8dfd030 100644
--- a/gf-book/examples/chapter5/LexFoodsFin.gf
+++ b/gf-book/examples/chapter5/LexFoodsFin.gf
@@ -8,13 +8,13 @@ instance LexFoodsFin of LexFoods =
cheese_N = mkN "juusto" ;
fish_N = mkN "kala" ;
fresh_A = mkA "tuore" ;
- warm_A = mkA
- (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ämpimämpi" "lämpimin" ;
+ warm_A = mkA
+ (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ämpimämpi" "lämpimin" ;
italian_A = mkA "italialainen" ;
expensive_A = mkA "kallis" ;
delicious_A = mkA "herkullinen" ;
- boring_A = mkA "tylsä" ;
+ boring_A = mkA "tylsä" ;
}
diff --git a/gf-book/examples/chapter5/LexFoodsGer.gf b/gf-book/examples/chapter5/LexFoodsGer.gf
index a420e22d3..a1791172a 100644
--- a/gf-book/examples/chapter5/LexFoodsGer.gf
+++ b/gf-book/examples/chapter5/LexFoodsGer.gf
@@ -1,16 +1,16 @@
-- (c) 2009 Aarne Ranta under LGPL
-instance LexFoodsGer of LexFoods =
+instance LexFoodsGer of LexFoods =
open SyntaxGer, ParadigmsGer in {
oper
wine_N = mkN "Wein" ;
pizza_N = mkN "Pizza" "Pizzen" feminine ;
- cheese_N = mkN "Käse" "Käse" masculine ;
+ cheese_N = mkN "Käse" "Käse" masculine ;
fish_N = mkN "Fisch" ;
fresh_A = mkA "frisch" ;
- warm_A = mkA "warm" "wärmer" "wärmste" ;
+ warm_A = mkA "warm" "wärmer" "wärmste" ;
italian_A = mkA "italienisch" ;
expensive_A = mkA "teuer" ;
- delicious_A = mkA "köstlich" ;
+ delicious_A = mkA "köstlich" ;
boring_A = mkA "langweilig" ;
}
diff --git a/gf-book/examples/chapter5/LexFoodsSwe.gf b/gf-book/examples/chapter5/LexFoodsSwe.gf
index 72e7e3e86..e9cac00d8 100644
--- a/gf-book/examples/chapter5/LexFoodsSwe.gf
+++ b/gf-book/examples/chapter5/LexFoodsSwe.gf
@@ -7,10 +7,10 @@ instance LexFoodsSwe of LexFoods =
pizza_N = mkN "pizza" ;
cheese_N = mkN "ost" ;
fish_N = mkN "fisk" ;
- fresh_A = mkA "färsk" ;
+ fresh_A = mkA "färsk" ;
warm_A = mkA "varm" ;
italian_A = mkA "italiensk" ;
expensive_A = mkA "dyr" ;
- delicious_A = mkA "läcker" ;
- boring_A = mkA "tråkig" ;
+ delicious_A = mkA "läcker" ;
+ boring_A = mkA "tråkig" ;
}
diff --git a/gf-book/examples/chapter7/QueryFin.gf b/gf-book/examples/chapter7/QueryFin.gf
index b3461e34a..03490ae88 100644
--- a/gf-book/examples/chapter7/QueryFin.gf
+++ b/gf-book/examples/chapter7/QueryFin.gf
@@ -6,7 +6,7 @@ concrete QueryFin of Query = {
Odd = pred "pariton" ;
Prime = pred "alkuluku" ;
Number i = i.s ;
- Yes = "kyllä" ;
+ Yes = "kyllä" ;
No = "ei" ;
oper
pred : Str -> Str -> Str = \f,x -> "onko" ++ x ++ f ;
diff --git a/gf-book/examples/chapter9/ResIta.gf b/gf-book/examples/chapter9/ResIta.gf
index f39db69f9..28d7bc424 100644
--- a/gf-book/examples/chapter9/ResIta.gf
+++ b/gf-book/examples/chapter9/ResIta.gf
@@ -43,10 +43,10 @@ oper
} ;
auxVerb : Aux -> Verb = \a -> case a of {
- Avere =>
+ Avere =>
mkVerb "avere" "ho" "hai" "ha" "abbiamo" "avete" "hanno" "avuto" Avere ;
- Essere =>
- mkVerb "essere" "sono" "sei" "è" "siamo" "siete" "sono" "stato" Essere
+ Essere =>
+ mkVerb "essere" "sono" "sei" "è" "siamo" "siete" "sono" "stato" Essere
} ;
agrPart : Verb -> Agr -> ClitAgr -> Str = \v,a,c -> case v.aux of {
diff --git a/testsuite/canonical/grammars/LexFoodsFin.gf b/testsuite/canonical/grammars/LexFoodsFin.gf
index 8b12f449f..bc79b740a 100644
--- a/testsuite/canonical/grammars/LexFoodsFin.gf
+++ b/testsuite/canonical/grammars/LexFoodsFin.gf
@@ -10,12 +10,12 @@ instance LexFoodsFin of LexFoods =
fish_N = mkN "kala" ;
fresh_A = mkA "tuore" ;
warm_A = mkA
- (mkN "l�mmin" "l�mpim�n" "l�mmint�" "l�mpim�n�" "l�mpim��n"
- "l�mpimin�" "l�mpimi�" "l�mpimien" "l�mpimiss�" "l�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�mpim�mpi" "l�mpimin" ;
+ "lämpimämpi" "lämpimin" ;
italian_A = mkA "italialainen" ;
expensive_A = mkA "kallis" ;
delicious_A = mkA "herkullinen" ;
- boring_A = mkA "tyls�" ;
+ boring_A = mkA "tylsä" ;
}