Merge branch 'master' of rcs:robocup-speechrec

pocketsphinxAdapter/grammar/gprs/gprs.jsgf

 #JSGF V1.0;
 grammar ToBI_GPRS;
-public <task> = [tobi] [please] <command> [please] [tobi];
+public <task> = [tobi] [(would | could) you] [please] <command> [please] [tobi];
 
-<command> = <bring_command> | <goto_command> | <follow_command> | <find_command> | <put_command> | <learn_command>;
+<command> = <bring_command> | <goto_command> | <follow_command> | <find_command> | <put_command> | <learn_command> | <wait>;
 
 <bring_command> = <bringVerb> [<person>] <grab_object> [from | into | to] [<location> | <person>];
 <goto_command> = <gotoVerb> <preposition> <location>;
@@ -18,17 +18,17 @@ public <task> = [tobi] [please] <command> [please] [tobi];
 <followVerb> = follow;
 <learnVerb> = learn | remember | memorize;
 
-<person> = <personal_pronoun> | <person_name> | (the | a | this) (person | man | woman | guy | girl | boy | human | robot);
+<person> = someone | <personal_pronoun> | <person_name> | (the | a | this) (person | man | woman | guy | girl | boy | human | robot);
 <personal_pronoun> = him | her | me;
 <person_name> = james|john|robert|michael|william|david|richard|charles|linda|thomas|mary|patricia|joseph|dorothy|barbara|susan|jennifer|maria|elizabeth|margaret;
 
-<grab_object> = [the | an | a | some | this] (<medicine_class> | <stuff_class> | <drink_class> | <snack_class> | medicine | stuff | drink | snack | object);
+<grab_object> = [the | an | a | some | this] (<medicine_class> | <stuff_class> | <drink_class> | <snack_class> | medicine | stuff | drink | snack | object | something);
 <stuff_class> = matches | cards | flowers | sponge | bag | cube | headphone | cup | tape | microphone;
 <medicine_class> = bandaids | creme | kleenex;
 <drink_class> = coke | beer | wine | redbull | water | juice;
 <snack_class> = cookies | peanuts | chocolate | hazelnuts | noodles;
 
-<location> = [the | an | a | this] (<appliance_class> | <shelf_class> | <seat_class> | <table_class> | <bin_class> | <decoration_class> | <room_class> | location | room | appliance | shelf | seat | table | bin | decoration);
+<location> = [the | an | a | this] (<appliance_class> | <shelf_class> | <seat_class> | <table_class> | <bin_class> | <decoration_class> | <room_class> | location | room | appliance | shelf | seat | table | bin | decoration | somewhere);
 <appliance_class> = fridge | sink | tv;
 <shelf_class> = hanger | shelf;
 <seat_class> = couch | lounge | bed | armchair;
@@ -37,3 +37,5 @@ public <task> = [tobi] [please] <command> [please] [tobi];
 <decoration_class> = plant | poster;
 <room_class> = kitchen | living_room | dining_room;
 <preposition> = (on [top]) | in | ([next] to) | at | near | in | into | from;
+
+<wait> = wait;