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

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

ps-grammar/rsm/rsm.jsgf

 #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 );

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 );