diff --git a/ps-grammar/dictionary/tobiDic.dic b/ps-grammar/dictionary/tobiDic.dic index 29072b313235525b83c220e435aa56009392a1c1..19b7ff0370ca13054969bb9440311179d99dcfac 100644 --- a/ps-grammar/dictionary/tobiDic.dic +++ b/ps-grammar/dictionary/tobiDic.dic @@ -5556,7 +5556,6 @@ arlt AA R L T arlyne AA R L AY N arm AA R M arm_chair AA R M CH EH R -armchair AA R M CH EH R arm's AA R M Z armacost AA R M AH K AO S T armacost's AA R M AH K AO S T S diff --git a/ps-grammar/rsm/rsm.jsgf b/ps-grammar/rsm/rsm.jsgf index be6b777174a9d75b7e8999322c52f32e4584dc17..4a4d2a3acccef145baf95f9983ede3433cb3f9c0 100644 --- a/ps-grammar/rsm/rsm.jsgf +++ b/ps-grammar/rsm/rsm.jsgf @@ -1,8 +1,8 @@ #JSGF V1.0; grammar A4_rsm; -public <rsm> = [the] <furniture> [is] [on] [the] [in] ( <IN_FRONT_OF> | <BEHIND> | <RIGHT_OF> | <LEFT_OF> ) [of] [the] <furniture>; +public <rsm> = [the] <furniture> is ( <IN_FRONT_OF> | <BEHIND> | <RIGHT_OF> | <LEFT_OF> ) of the <furniture>; -<furniture> = ( ( sofa | couch ) | chair | cupboard | shelf | table ) ; +<furniture> = ( ( sofa | couch ) | (armchair) | chair | cupboard | shelf | table ) ; <IN_FRONT_OF> = ( before | front ); <BEHIND> = ( behind | after ); <LEFT_OF> = ( left ); diff --git a/ps-grammar/sfb/review.jsgf b/ps-grammar/sfb/review.jsgf index 37477c099a4cc9e0c74139c4ff45334cab155dae..3f10c997cbaa354a2d4ca3671081a18bc9ce4991 100644 --- a/ps-grammar/sfb/review.jsgf +++ b/ps-grammar/sfb/review.jsgf @@ -2,11 +2,11 @@ grammar A4_inspection; public <review> = [tobi] [please] (<follow> | <observe> | <teach> | <locate> | <list> | <leave> | <continue> | <stop> ) [please] [tobi]; -<follow> = ( follow me [into the elevator] ) | (observe) | (watch) ; -<observe> = (start observing | ([take a] look [(at this | here)])); +<follow> = ( follow me [into the elevator] ); +<observe> = (start observing) | observe | ([take a] look [(at this | here)]); <leave> = leave; <continue> = continue; -<stop> = (stop [observing | it]); +<stop> = (stop [it]); <teach> = ( (this is [a | an | the] ) | ( these are [the] ) ) <object>; <locate> = ( ( where is [a | an | the] ) | ( where are [the] ) ) ( <object> | <furniture> ); <list> = ( which objects do you know ) | ( list [the] objects );