Merge branch 'master' of rcs:/home/biron/git/robocup-speechrec

ps-grammar/restaurant/command.jsgf

-#JSGF V1.0;
-grammar restaurant_command;
-
-public <restaurant> = [tobi] [please] <command> [please] [tobi];
-<command> = <followMe> | <stop> | <ordering> | <savePlaceLeft> | <savePlaceRight> | <savePlace>;
-<followMe> = (follow me) | (come [(with me) | here]) | (keep up);
-<stop> = stop [this];
-<ordering> = ordering;
-<savePlaceLeft> = left;
-<savePlaceRight> = right;
-<savePlace> = <save>;
-<save> = save [the] (place | location) [[to | on] [the | my] (<savePlaceRight> | <savePlaceLeft>)];

ps-grammar/restaurant/location.jsgf

-#JSGF V1.0;
-grammar restaurant_location;
-
-public <restaurant> = [tobi] [please] <command> [please] [tobi];
-<command> = <objectCategory> | <deliveryLocations>;
-
-<deliveryLocations> = table (one | two | three);
-<objectCategory> = drinks | snacks;

ps-grammar/restaurant/object.jsgf

-#JSGF V1.0;
-grammar restaurant_object;
-
-public <restaurant> = [tobi] [please] <command> [please] [tobi];
-<command> = <objects>;
-<objects> = <drinks> | <snacks>;
-
-<drinks> = (orange juice) | (fruit juice) | (ice tea) | coffee | beer;
-<snacks> = chocolates | (chewing gum) | peanuts;

ps-grammar/restaurant/ordering.jsgf

@@ -10,4 +10,4 @@ public <restaurant> = [tobi] [please] bring <objects> to <deliveryLocations>;
 <objects> = <drinks> | <snacks>;
 
 <drinks> = (orange juice) | (fruit juice) | (ice tea) | coffee | beer;
-<snacks> = chocolates | (chewing gum) | peanuts;
+<snacks> = chocolates | (chewing gum) | peanuts | apple;

ps-grammar/restaurant/restaurant.jsgf

-#JSGF V1.0;
-grammar ToBI_restaurant;
-public <restaurant> = [tobi] [please] <command> [please] [tobi];
-<command> = <followMe> | <stop> | <beverages> | <ordering> | <deliveryLocations> | <savePlaceLeft> | <savePlaceRight> | <savePlace>;
-
-<followMe> = (follow me) | (come [(with me) | here]) | (keep up);
-<stop> = stop [this];
-<beverages> = <objectCategory> | <objects>;
-<objectCategory> = drinks | snacks;
-<objects> = <drinks> | <snacks>;
-
-<drinks> = (orange juice) | (fruit juice) | (ice tea) | coffee | beer;
-<snacks> = chocolates | (chewing gum) | peanuts;
-
-<ordering> = ordering;
-<deliveryLocations> = table (one | two | three);
-<savePlaceLeft> = left;
-<savePlaceRight> = right;
-<savePlace> = <save>;
-<save> = save [the] (place | location) [[to | on] [the | my] (<savePlaceRight> | <savePlaceLeft>)];

ps-grammar/restaurant/saveCommand.jsgf

 #JSGF V1.0;
 grammar restaurant_save_command;
 
-public <restaurant> = [tobi] [please] save ( <deliveryLocations> | <objectCategory> ) [[to | on] [the | my] ( <savePlaceLeft> | <savePlaceRight> )];
+public <restaurant> = [tobi] [please] save ( <deliveryLocations> | <objectCategory> ) [[to | on] [the | my]] ( <savePlaceLeft> | <savePlaceRight> | <savePlaceFront> | <savePlaceBack> );
+<savePlaceFront> = front;
+<savePlaceBack> = back;
 <savePlaceLeft> = left;
 <savePlaceRight> = right;
 <deliveryLocations> = table <numberOfTable>;