- for (y = 0; y < t->n[TABLE_VERT]; y++)
- {
- for (x = 0; x < t->n[TABLE_HORZ]; x++)
- {
- struct table_cell cell;
-
- table_get_cell (t, x, y, &cell);
-
- if (x > 0)
- fputs (csv->separator, csv->file);
-
- if (x != cell.d[TABLE_HORZ][0] || y != cell.d[TABLE_VERT][0])
- csv_output_field (csv, "");
- else if (!(cell.options & TAB_MARKUP) && !cell.n_footnotes
- && !cell.n_subscripts && !cell.superscript)
- csv_output_field (csv, cell.text);
- else
- {
- struct string s = DS_EMPTY_INITIALIZER;
-
- if (cell.options & TAB_MARKUP)
- {
- char *t = output_get_text_from_markup (cell.text);
- ds_put_cstr (&s, t);
- free (t);
- }
- else
- ds_put_cstr (&s, cell.text);
-
- if (cell.n_subscripts)
- for (size_t i = 0; i < cell.n_subscripts; i++)
- ds_put_format (&s, "%c%s",
- i ? ',' : '_', cell.subscripts[i]);
- if (cell.superscript)
- ds_put_format (&s, "^%s", cell.superscript);
- csv_format_footnotes (cell.footnotes, cell.n_footnotes, &s);
- csv_output_field (csv, ds_cstr (&s));
- ds_destroy (&s);
- }
- }
- putc ('\n', csv->file);
+ if (x != cell.d[TABLE_HORZ][0] || y != cell.d[TABLE_VERT][0])
+ csv_output_field (csv, "");
+ else
+ csv_output_table_cell (csv, pt, &cell, !x ? leader : NULL);