prepared examples for Speechgram presentation

9 files changed, 16 insertions, 20 deletions

diff --git a/examples/regulus/toy0/Toy0.gf b/examples/regulus/toy0/Toy0.gf
index ed0ba51e8..00c7ed0a4 100644
--- a/examples/regulus/toy0/Toy0.gf
+++ b/examples/regulus/toy0/Toy0.gf
@@ -2,13 +2,12 @@ abstract Toy0 = {
 
 -- grammar from Chapter 2 of the Regulus book
 
-flags startcat=MAIN ;
+flags startcat=NP ;
 
 cat 
-  MAIN ; NP ; Noun ; Spec ;
+  NP ; Noun ; Spec ;
 
 fun
-  Main : NP -> MAIN ;
   SpecNoun : Spec -> Noun -> NP ;
 
   One, Two : Spec ;
diff --git a/examples/regulus/toy0/Toy0Eng.gf b/examples/regulus/toy0/Toy0Eng.gf
index 68e2e4c07..977fb09c5 100644
--- a/examples/regulus/toy0/Toy0Eng.gf
+++ b/examples/regulus/toy0/Toy0Eng.gf
@@ -6,10 +6,9 @@ param
 lincat
   Spec = {s : Str ; n : Number} ;
   Noun = {s : Number => Str} ;
-  MAIN,NP = {s : Str} ;
+  NP = {s : Str} ;
 
 lin
-  Main np = np ;
   SpecNoun spec noun = {s = spec.s ++ noun.s ! spec.n} ;
 
   One = {s = "one" ; n = Sg} ;
diff --git a/examples/regulus/toy0/Toy0Fre.gf b/examples/regulus/toy0/Toy0Fre.gf
index 425c85af0..c5267ae18 100644
--- a/examples/regulus/toy0/Toy0Fre.gf
+++ b/examples/regulus/toy0/Toy0Fre.gf
@@ -7,10 +7,9 @@ param
 lincat
   Spec = {s : Gender => Str ; n : Number} ;
   Noun = {s : Number => Str ; g : Gender} ;
-  MAIN,NP = {s : Str} ;
+  NP = {s : Str} ;
 
 lin
-  Main np = np ;
   SpecNoun spec noun = {s = spec.s ! noun.g ++ noun.s ! spec.n} ;
 
   One = {s = table {Fem => "une" ; _ => "un"} ; n = Sg} ;
diff --git a/examples/regulus/toy0/Toy0I.gf b/examples/regulus/toy0/Toy0I.gf
index 3d206d612..7610816d7 100644
--- a/examples/regulus/toy0/Toy0I.gf
+++ b/examples/regulus/toy0/Toy0I.gf
@@ -3,12 +3,10 @@ incomplete concrete Toy0I of Toy0 = open Syntax, Lexicon in {
 lincat
   Spec = Det ;
   Noun = N ;
-  NP   = Syntax.NP ;
-  MAIN = Utt ;
+  NP   = Utt ;
 
 lin
-  Main np = mkUtt np ;
-  SpecNoun spec noun = mkNP spec noun ;
+  SpecNoun spec noun = mkUtt (mkNP spec noun) ;
 
   One = mkDet one_Quant ;
   Two = mkDet (mkNum n2_Numeral) ;
diff --git a/examples/regulus/toy0/toy0.gfprobs b/examples/regulus/toy0/toy0.gfprobs
new file mode 100644
index 000000000..7c97562e2
--- /dev/null
+++ b/examples/regulus/toy0/toy0.gfprobs
@@ -0,0 +1 @@
+--# prob Felis 0.9
diff --git a/examples/regulus/toy1/Toy1.gf b/examples/regulus/toy1/Toy1.gf
index 70fa5ce9f..49bd320c1 100644
--- a/examples/regulus/toy1/Toy1.gf
+++ b/examples/regulus/toy1/Toy1.gf
@@ -38,7 +38,7 @@ fun
 
   switchable_light : Switchable light ;
   switchable_fan : Switchable fan ;
-  dimmable_fan : Dimmable fan ;
+  dimmable_light : Dimmable light ;
 
   statelike_switchOn  : (k : Kind) -> (s : Switchable k) -> Statelike k (switchOn k s) ;
   statelike_switchOff : (k : Kind) -> (s : Switchable k) -> Statelike k (switchOff k s) ;
diff --git a/examples/regulus/toy1/Toy1Eng.gf b/examples/regulus/toy1/Toy1Eng.gf
index 30e861f44..384e50060 100644
--- a/examples/regulus/toy1/Toy1Eng.gf
+++ b/examples/regulus/toy1/Toy1Eng.gf
@@ -71,14 +71,14 @@ oper
     Pl => "are"
     } ;
 
+  hidden : SS = ss [] ;
 lin
-  switchable_light = ss [] ;
-  switchable_fan  = ss [] ;
-  dimmable_fan  = ss [] ;
-
-  statelike_switchOn _ _ = ss [] ;
-  statelike_switchOff _ _ = ss [] ;
+  switchable_light = hidden ;
+  switchable_fan = hidden ;
+  dimmable_light = hidden ;
 
+  statelike_switchOn _ _ = hidden ;
+  statelike_switchOff _ _ = hidden ;
 
 }
 
diff --git a/examples/regulus/toy1/Toy1Fre.gf b/examples/regulus/toy1/Toy1Fre.gf
index 73ac9aa97..c5d903519 100644
--- a/examples/regulus/toy1/Toy1Fre.gf
+++ b/examples/regulus/toy1/Toy1Fre.gf
@@ -86,7 +86,7 @@ oper
 lin
   switchable_light = ss [] ;
   switchable_fan  = ss [] ;
-  dimmable_fan  = ss [] ;
+  dimmable_light  = ss [] ;
 
   statelike_switchOn _ _ = ss [] ;
   statelike_switchOff _ _ = ss [] ;
diff --git a/examples/regulus/toy1/Toy1I.gf b/examples/regulus/toy1/Toy1I.gf
index 03193d5b7..eb7a9db7a 100644
--- a/examples/regulus/toy1/Toy1I.gf
+++ b/examples/regulus/toy1/Toy1I.gf
@@ -41,7 +41,7 @@ lin
 lin
   switchable_light = ss [] ;
   switchable_fan  = ss [] ;
-  dimmable_fan  = ss [] ;
+  dimmable_light  = ss [] ;
 
   statelike_switchOn _ _ = ss [] ;
   statelike_switchOff _ _ = ss [] ;