chap on syntax and morpho

3 files changed, 36 insertions, 36 deletions

diff --git a/examples/tutorial/syntax/Test.gf b/examples/tutorial/syntax/Test.gf
index 3ced1e55a..99c81e938 100644
--- a/examples/tutorial/syntax/Test.gf
+++ b/examples/tutorial/syntax/Test.gf
@@ -1,8 +1,8 @@
 abstract Test = Syntax ** {
 
   fun
-    Wine, Cheese, Fish, Pizza, Waiter, Customer : N ;
-    Fresh, Warm, Italian, Expensive, Delicious, Boring : A ;
-    Stink : V ;
-    Eat, Love, Talk : V2 ;
+    wine_N, cheese_N, fish_N, pizza_N, waiter_N, customer_N : N ;
+    fresh_A, warm_A, italian_A, expensive_A, delicious_A, boring_A : A ;
+    stink_V : V ;
+    eat_V2, love_V2, talk_V2 : V2 ;
 }
diff --git a/examples/tutorial/syntax/TestEng.gf b/examples/tutorial/syntax/TestEng.gf
index 4099753f1..cb5dc8da3 100644
--- a/examples/tutorial/syntax/TestEng.gf
+++ b/examples/tutorial/syntax/TestEng.gf
@@ -3,21 +3,21 @@
 concrete TestEng of Test = SyntaxEng ** open Prelude, MorphoEng in {
 
   lin
-    Wine = mkN "wine" ;
-    Cheese = mkN "cheese" ;
-    Fish = mkN "fish" "fish" ;
-    Pizza = mkN "pizza" ;
-    Waiter = mkN "waiter" ;
-    Customer = mkN "customer" ;
-    Fresh = mkA "fresh" ;
-    Warm = mkA "warm" ;
-    Italian = mkA "Italian" ;
-    Expensive = mkA "expensive" ;
-    Delicious = mkA "delicious" ;
-    Boring = mkA "boring" ;
-    Stink = mkV "stink" ;
-    Eat = mkV2 (mkV "eat") ;
-    Love = mkV2 (mkV "love") ;
-    Talk = mkV2 (mkV "talk") "about" ;
+    wine_N = mkN "wine" ;
+    cheese_N = mkN "cheese" ;
+    fish_N = mkN "fish" "fish" ;
+    pizza_N = mkN "pizza" ;
+    waiter_N = mkN "waiter" ;
+    customer_N = mkN "customer" ;
+    fresh_A = mkA "fresh" ;
+    warm_A = mkA "warm" ;
+    italian_A = mkA "Italian" ;
+    expensive_A = mkA "expensive" ;
+    delicious_A = mkA "delicious" ;
+    boring_A = mkA "boring" ;
+    stink_V = mkV "stink" ;
+    eat_V2 = mkV2 (mkV "eat") ;
+    love_V2 = mkV2 (mkV "love") ;
+    talk_V2 = mkV2 (mkV "talk") "about" ;
 }
 
diff --git a/examples/tutorial/syntax/TestIta.gf b/examples/tutorial/syntax/TestIta.gf
index d58b258cd..0066deac2 100644
--- a/examples/tutorial/syntax/TestIta.gf
+++ b/examples/tutorial/syntax/TestIta.gf
@@ -3,21 +3,21 @@
 concrete TestIta of Test = SyntaxIta ** open Prelude, MorphoIta in {
 
   lin
-    Wine = regNoun "vino" ;
-    Cheese = regNoun "formaggio" ;
-    Fish = regNoun "pesce" ;
-    Pizza = regNoun "pizza" ;
-    Waiter = regNoun "cameriere" ;
-    Customer = regNoun "cliente" ;
-    Fresh = regAdjective "fresco" ;
-    Warm = regAdjective "caldo" ;
-    Italian = regAdjective "italiano" ;
-    Expensive = regAdjective "caro" ;
-    Delicious = regAdjective "delizioso" ;
-    Boring = regAdjective "noioso" ;
-    Stink = regVerb "puzzare" ;
-    Eat = regVerb "mangiare" ** {c = []} ;
-    Love = regVerb "amare" ** {c = []} ;
-    Talk = regVerb "parlare" ** {c = "di"} ;
+    wine_N = regNoun "vino" ;
+    cheese_N = regNoun "formaggio" ;
+    fish_N = regNoun "pesce" ;
+    pizza_N = regNoun "pizza" ;
+    waiter_N = regNoun "cameriere" ;
+    customer_N = regNoun "cliente" ;
+    fresh_A = regAdjective "fresco" ;
+    warm_A = regAdjective "caldo" ;
+    italian_A = regAdjective "italiano" ;
+    expensive_A = regAdjective "caro" ;
+    delicious_A = regAdjective "delizioso" ;
+    boring_A = regAdjective "noioso" ;
+    stink_V = regVerb "puzzare" ;
+    eat_V2 = regVerb "mangiare" ** {c = []} ;
+    love_V2 = regVerb "amare" ** {c = []} ;
+    talk_V2 = regVerb "parlare" ** {c = "di"} ;
 }