add matrix yes/no to grammar