diff --git a/psGrammar/tasks/eegpsr/commands_cat2.jsgf b/psGrammar/tasks/eegpsr/commands_cat2.jsgf index 1ef13a827c570b13864947abbdb15e865ac67278..59e4bbf8e6fce522881b41c95b5f222a8ca07ec6 100644 --- a/psGrammar/tasks/eegpsr/commands_cat2.jsgf +++ b/psGrammar/tasks/eegpsr/commands_cat2.jsgf @@ -148,7 +148,7 @@ public <sentence> = [could you | robot | tobi] [please] <VP>; <NP_offer> = <N_offer>; -<N_name> = angie | mary | amy | kimberly | lisa | melissa | michelle | jennifer | elizabeth | julie | brian | micheal | christpher | william | john | david | james | robert | scott | richard; +<N_name> = angie | mary | amy | kimberly | lisa | melissa | michelle | jennifer | elizabeth | julie | brian | micheal | christopher | william | john | david | james | robert | scott | richard; <N_location> = (couch table) | bed | bar | (dining table); <N_locationtwo> = (couch table) | bed | bar | (dining table); <N_room> = bedroom | (dining room) | kitchen | (living room); diff --git a/psGrammar/tasks/gpsr/commands.jsgf b/psGrammar/tasks/gpsr/commands.jsgf index 527b726e6f645c3b74684c6f17b90186d1e58ef0..e68b9d54df7dfec4da45983fb6f3fe00d6a560d3 100644 --- a/psGrammar/tasks/gpsr/commands.jsgf +++ b/psGrammar/tasks/gpsr/commands.jsgf @@ -93,7 +93,7 @@ public <sentence> = ([could you | robot | tobi] [please] <VP1> [([and|then] <VP2 <N_placementTwo> = (tv table) | cupboard | (couch table) | desk | bookcase | (bedside table) | (kitchen table) | (kitchen cabinet) | bar | (dining table) | cabinet | (display case) | storage shelf; <N_beacon> = (couch table) | bed | bar | (dining table); <N_beaconTwo> = (couch table) | bed | bar | (dining table); -<N_name> = angie | mary | amy | kimberly | lisa | melissa | michelle | jennifer | elizabeth | julie | brian | micheal | christpher | william | john | david | james | robert | scott | richard; +<N_name> = angie | mary | amy | kimberly | lisa | melissa | michelle | jennifer | elizabeth | julie | brian | micheal | christopher | william | john | david | james | robert | scott | richard; <N_objectpron> = it; <N_objectprop> = biggest | largest | smallest | heaviest | lightest | thinnest; <N_me> = me;