X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fodt.c;h=8e50c7b9cc4b56573223621a7289e5a8117f6abb;hb=5805214e9bb9e2a4705ada8cdf5f5d0f1814db0e;hp=153cd393c116f357f615e3d113ea9e336d8292e5;hpb=395cd4395449dbdff7c9ba0d56ba14529063d350;p=pspp diff --git a/src/output/odt.c b/src/output/odt.c index 153cd393c1..8e50c7b9cc 100644 --- a/src/output/odt.c +++ b/src/output/odt.c @@ -40,7 +40,6 @@ #include "output/driver-provider.h" #include "output/message-item.h" #include "output/options.h" -#include "output/tab.h" #include "output/table-item.h" #include "output/table-provider.h" #include "output/text-item.h" @@ -57,6 +56,7 @@ struct odt_driver struct output_driver driver; struct zip_writer *zip; /* ZIP file writer. */ + struct file_handle *handle; /* Handle for 'file_name'. */ char *file_name; /* Output file name. */ /* content.xml */ @@ -80,26 +80,6 @@ odt_driver_cast (struct output_driver *driver) return UP_CAST (driver, struct odt_driver, driver); } -/* Create the "mimetype" file needed by ODF */ -static bool -create_mimetype (struct zip_writer *zip) -{ - FILE *fp; - - fp = create_temp_file (); - if (fp == NULL) - { - msg_error (errno, _("error creating temporary file")); - return false; - } - - fprintf (fp, "application/vnd.oasis.opendocument.text"); - zip_writer_add (zip, fp, "mimetype"); - close_temp_file (fp); - - return true; -} - /* Creates a new temporary file and stores it in *FILE, then creates an XML writer for it and stores it in *W. */ static void @@ -303,13 +283,11 @@ odt_create (struct file_handle *fh, enum settings_output_devices device_type, output_driver_init (d, &odt_driver_class, file_name, device_type); odt->zip = zip; + odt->handle = fh; odt->file_name = xstrdup (file_name); - if (!create_mimetype (zip)) - { - output_driver_destroy (d); - return NULL; - } + zip_writer_add_string (zip, "mimetype", + "application/vnd.oasis.opendocument.text"); /* Create the manifest */ create_writer (&odt->manifest_file, &odt->manifest_wtr); @@ -380,6 +358,7 @@ odt_destroy (struct output_driver *driver) zip_writer_close (odt->zip); } + fh_unref (odt->handle); free (odt->file_name); free (odt); } @@ -459,6 +438,26 @@ write_table_item_text (struct odt_driver *odt, xmlTextWriterEndElement (odt->content_wtr); } +static void +write_table_item_layers (struct odt_driver *odt, + const struct table_item_layers *layers) +{ + if (!layers) + return; + + for (size_t i = 0; i < layers->n_layers; i++) + { + const struct table_item_layer *layer = &layers->layers[i]; + xmlTextWriterStartElement (odt->content_wtr, _xml("text:h")); + xmlTextWriterWriteFormatAttribute (odt->content_wtr, + _xml("text:outline-level"), "%d", 2); + xmlTextWriterWriteString (odt->content_wtr, _xml (layer->content) ); + for (size_t i = 0; i < layer->n_footnotes; i++) + write_footnote (odt, layer->footnotes[i]); + xmlTextWriterEndElement (odt->content_wtr); + } +} + static void write_table (struct odt_driver *odt, const struct table_item *item) { @@ -467,6 +466,7 @@ write_table (struct odt_driver *odt, const struct table_item *item) /* Write a heading for the table */ write_table_item_text (odt, table_item_get_title (item)); + write_table_item_layers (odt, table_item_get_layers (item)); /* Start table */ xmlTextWriterStartElement (odt->content_wtr, _xml("table:table")); @@ -495,7 +495,6 @@ write_table (struct odt_driver *odt, const struct table_item *item) for (c = 0 ; c < table_nc (tab) ; ++c) { struct table_cell cell; - size_t i; table_get_cell (tab, c, r, &cell); @@ -517,25 +516,27 @@ write_table (struct odt_driver *odt, const struct table_item *item) odt->content_wtr, _xml("table:number-rows-spanned"), "%d", rowspan); - for (i = 0; i < cell.n_contents; i++) - { - const struct cell_contents *contents = &cell.contents[i]; - int j; - - xmlTextWriterStartElement (odt->content_wtr, _xml("text:p")); + xmlTextWriterStartElement (odt->content_wtr, _xml("text:p")); - if ( r < table_ht (tab) || c < table_hl (tab) ) - xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Heading")); - else - xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Contents")); + if ( r < table_ht (tab) || c < table_hl (tab) ) + xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Heading")); + else + xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:style-name"), _xml("Table_20_Contents")); - write_xml_with_line_breaks (odt, contents->text); + if (cell.options & TAB_MARKUP) + { + /* XXX */ + char *s = output_get_text_from_markup (cell.text); + write_xml_with_line_breaks (odt, s); + free (s); + } + else + write_xml_with_line_breaks (odt, cell.text); - for (j = 0; j < contents->n_footnotes; j++) - write_footnote (odt, contents->footnotes[j]); + for (int i = 0; i < cell.n_footnotes; i++) + write_footnote (odt, cell.footnotes[i]); - xmlTextWriterEndElement (odt->content_wtr); /* text:p */ - } + xmlTextWriterEndElement (odt->content_wtr); /* text:p */ xmlTextWriterEndElement (odt->content_wtr); /* table:table-cell */ } else @@ -543,8 +544,6 @@ write_table (struct odt_driver *odt, const struct table_item *item) xmlTextWriterStartElement (odt->content_wtr, _xml("table:covered-table-cell")); xmlTextWriterEndElement (odt->content_wtr); } - - table_cell_free (&cell); } xmlTextWriterEndElement (odt->content_wtr); /* row */ @@ -577,17 +576,11 @@ odt_submit (struct output_driver *driver, if (is_table_item (output_item)) write_table (odt, to_table_item (output_item)); else if (is_text_item (output_item)) - { - struct text_item *text_item = to_text_item (output_item); - - if (text_item_get_type (text_item) != TEXT_ITEM_COMMAND_CLOSE) - odt_output_text (odt, text_item_get_text (text_item)); - } + odt_output_text (odt, text_item_get_text (to_text_item (output_item))); else if (is_message_item (output_item)) { const struct message_item *message_item = to_message_item (output_item); - const struct msg *msg = message_item_get_msg (message_item); - char *s = msg_to_string (msg, message_item->command_name); + char *s = msg_to_string (message_item_get_msg (message_item)); odt_output_text (odt, s); free (s); }