X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fodt.c;h=065ef379a6d176455dde3d0a523b1c7ea28872b8;hb=e04c680aae366f5af85cd50776875fcdf3c8927a;hp=a02506c1e9eeacbae9528aa663e55044e8194055;hpb=7b51bc9abbb6ed4a34cf396883d1dc8479b1e554;p=pspp diff --git a/src/output/odt.c b/src/output/odt.c index a02506c1e9..065ef379a6 100644 --- a/src/output/odt.c +++ b/src/output/odt.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,10 +31,12 @@ #include "libpspp/assertion.h" #include "libpspp/cast.h" +#include "libpspp/message.h" #include "libpspp/str.h" #include "libpspp/temp-file.h" #include "libpspp/version.h" #include "libpspp/zip-writer.h" +#include "data/file-handle-def.h" #include "output/driver-provider.h" #include "output/message-item.h" #include "output/options.h" @@ -44,7 +46,6 @@ #include "output/text-item.h" #include "gl/xalloc.h" -#include "gl/error.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -71,6 +72,9 @@ struct odt_driver /* Name of current command. */ char *command_name; + + /* Number of footnotes so far. */ + int n_footnotes; }; static const struct output_driver_class odt_driver_class; @@ -91,7 +95,7 @@ create_mimetype (struct zip_writer *zip) fp = create_temp_file (); if (fp == NULL) { - error (0, errno, _("error creating temporary file")); + msg_error (errno, _("error creating temporary file")); return false; } @@ -145,7 +149,7 @@ write_style_data (struct odt_driver *odt) _xml ("urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0") ); xmlTextWriterWriteAttribute (w, _xml ("office:version"), _xml ("1.1")); - + xmlTextWriterStartElement (w, _xml ("office:styles")); @@ -241,7 +245,7 @@ write_meta_data (struct odt_driver *odt) xmlTextWriterStartElement (w, _xml ("office:meta")); { xmlTextWriterStartElement (w, _xml ("meta:generator")); - xmlTextWriterWriteString (w, _xml (stat_version)); + xmlTextWriterWriteString (w, _xml (version)); xmlTextWriterEndElement (w); } @@ -287,12 +291,13 @@ write_meta_data (struct odt_driver *odt) } static struct output_driver * -odt_create (const char *file_name, enum settings_output_devices device_type, +odt_create (struct file_handle *fh, enum settings_output_devices device_type, struct string_map *o UNUSED) { struct output_driver *d; struct odt_driver *odt; struct zip_writer *zip; + const char *file_name = fh_get_file_name (fh); zip = zip_writer_create (file_name); if (zip == NULL) @@ -300,6 +305,7 @@ odt_create (const char *file_name, enum settings_output_devices device_type, odt = xzalloc (sizeof *odt); d = &odt->driver; + output_driver_init (d, &odt_driver_class, file_name, device_type); odt->zip = zip; @@ -379,33 +385,96 @@ odt_destroy (struct output_driver *driver) zip_writer_close (odt->zip); } - + free (odt->file_name); free (odt->command_name); free (odt); } static void -odt_submit_table (struct odt_driver *odt, struct table_item *item) +write_xml_with_line_breaks (struct odt_driver *odt, const char *line_) +{ + xmlTextWriterPtr writer = odt->content_wtr; + + if (!strchr (line_, '\n')) + xmlTextWriterWriteString (writer, _xml(line_)); + else + { + char *line = xstrdup (line_); + char *newline; + char *p; + + for (p = line; *p; p = newline + 1) + { + newline = strchr (p, '\n'); + + if (!newline) + { + xmlTextWriterWriteString (writer, _xml(p)); + free (line); + return; + } + + if (newline > p && newline[-1] == '\r') + newline[-1] = '\0'; + else + *newline = '\0'; + xmlTextWriterWriteString (writer, _xml(p)); + xmlTextWriterWriteElement (writer, _xml("text:line-break"), _xml("")); + } + } +} + +static void +write_footnote (struct odt_driver *odt, const char *footnote) +{ + char marker[16]; + + xmlTextWriterStartElement (odt->content_wtr, _xml("text:note")); + xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:note-class"), + _xml("footnote")); + + xmlTextWriterStartElement (odt->content_wtr, _xml("text:note-citation")); + str_format_26adic (++odt->n_footnotes, false, marker, sizeof marker); + if (strlen (marker) > 1) + xmlTextWriterWriteFormatAttribute (odt->content_wtr, _xml("text:label"), + "(%s)", marker); + else + xmlTextWriterWriteAttribute (odt->content_wtr, _xml("text:label"), + _xml(marker)); + xmlTextWriterEndElement (odt->content_wtr); + + xmlTextWriterStartElement (odt->content_wtr, _xml("text:note-body")); + xmlTextWriterStartElement (odt->content_wtr, _xml("text:p")); + write_xml_with_line_breaks (odt, footnote); + xmlTextWriterEndElement (odt->content_wtr); + xmlTextWriterEndElement (odt->content_wtr); + + xmlTextWriterEndElement (odt->content_wtr); +} + +static void +write_table (struct odt_driver *odt, const struct table_item *item) { const struct table *tab = table_item_get_table (item); const char *caption = table_item_get_caption (item); + const char *title = table_item_get_title (item); int r, c; /* Write a heading for the table */ - if (caption != NULL) + if (title != NULL) { xmlTextWriterStartElement (odt->content_wtr, _xml("text:h")); - xmlTextWriterWriteFormatAttribute (odt->content_wtr, _xml("text:level"), - "%d", 2); + xmlTextWriterWriteFormatAttribute (odt->content_wtr, + _xml("text:outline-level"), "%d", 2); xmlTextWriterWriteString (odt->content_wtr, - _xml (table_item_get_caption (item)) ); + _xml (table_item_get_title (item)) ); xmlTextWriterEndElement (odt->content_wtr); } /* Start table */ xmlTextWriterStartElement (odt->content_wtr, _xml("table:table")); - xmlTextWriterWriteFormatAttribute (odt->content_wtr, _xml("table:name"), + xmlTextWriterWriteFormatAttribute (odt->content_wtr, _xml("table:name"), "TABLE-%d", odt->table_num++); @@ -418,7 +487,7 @@ odt_submit_table (struct odt_driver *odt, struct table_item *item) /* Deal with row headers */ if ( table_ht (tab) > 0) xmlTextWriterStartElement (odt->content_wtr, _xml("table:table-header-rows")); - + /* Write all the rows */ for (r = 0 ; r < table_nr (tab); ++r) @@ -430,6 +499,7 @@ odt_submit_table (struct odt_driver *odt, 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); @@ -451,17 +521,32 @@ odt_submit_table (struct odt_driver *odt, struct table_item *item) odt->content_wtr, _xml("table:number-rows-spanned"), "%d", rowspan); - xmlTextWriterStartElement (odt->content_wtr, _xml("text:p")); + for (i = 0; i < cell.n_contents; i++) + { + const struct cell_contents *contents = &cell.contents[i]; + int j; + + if (contents->text) + { + 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")); + + write_xml_with_line_breaks (odt, contents->text); - 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")); + for (j = 0; j < contents->n_footnotes; j++) + write_footnote (odt, contents->footnotes[j]); - xmlTextWriterWriteString (odt->content_wtr, _xml(cell.contents)); + xmlTextWriterEndElement (odt->content_wtr); /* text:p */ + } + else if (contents->table) + write_table (odt, contents->table); - xmlTextWriterEndElement (odt->content_wtr); /* text:p */ - xmlTextWriterEndElement (odt->content_wtr); /* table:table-cell */ + } + xmlTextWriterEndElement (odt->content_wtr); /* table:table-cell */ } else { @@ -471,7 +556,7 @@ odt_submit_table (struct odt_driver *odt, struct table_item *item) table_cell_free (&cell); } - + xmlTextWriterEndElement (odt->content_wtr); /* row */ if ( table_ht (tab) > 0 && r == table_ht (tab) - 1) @@ -479,6 +564,18 @@ odt_submit_table (struct odt_driver *odt, struct table_item *item) } xmlTextWriterEndElement (odt->content_wtr); /* table */ + + /* Write a caption for the table */ + if (caption != NULL) + { + xmlTextWriterStartElement (odt->content_wtr, _xml("text:h")); + xmlTextWriterWriteFormatAttribute (odt->content_wtr, + _xml("text:outline-level"), "%d", 2); + xmlTextWriterWriteString (odt->content_wtr, + _xml (table_item_get_caption (item)) ); + xmlTextWriterEndElement (odt->content_wtr); + } + } static void @@ -499,7 +596,7 @@ odt_submit (struct output_driver *driver, output_driver_track_current_command (output_item, &odt->command_name); if (is_table_item (output_item)) - odt_submit_table (odt, to_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);