#include <stdbool.h>
struct casereader;
+struct dictionary;
+struct spreadsheet_read_info;
+struct spreadsheet_read_options;
-struct gnumeric_read_info
-{
- char *sheet_name ; /* In UTF-8. */
- char *file_name ; /* In filename encoding. */
- char *cell_range ; /* In UTF-8. */
- int sheet_index ;
- bool read_names ;
- int asw ;
-};
-
-struct dictionary;
+struct spreadsheet *gnumeric_probe (const char *filename);
-struct casereader * gnumeric_open_reader (struct gnumeric_read_info *, struct dictionary **);
+struct casereader * gnumeric_make_reader (struct spreadsheet *spreadsheet,
+ const struct spreadsheet_read_info *gri,
+ struct spreadsheet_read_options *opts);
#endif