pivot-table: Incorporate format settings.

[pspp] / src / output / driver.c

diff --git a/src/output/driver.c b/src/output/driver.c
index e6fc0ca9506de146ab8f48d7b5c41a97d01240a5..be60cb2746f4d0dc96b3ae6ee9ea5fc8e4c162e9 100644 (file)
--- a/src/output/driver.c
+++ b/src/output/driver.c
@@ -32,6 +32,7 @@
 #include "data/settings.h"
 #include "libpspp/array.h"
 #include "libpspp/assertion.h"
+#include "libpspp/i18n.h"
 #include "libpspp/message.h"
 #include "libpspp/llx.h"
 #include "libpspp/string-map.h"
@@ -53,8 +54,7 @@ struct output_engine
   {
     struct ll ll;                  /* Node for this engine. */
     struct llx_list drivers;       /* Contains "struct output_driver"s. */
-    struct string deferred_text;   /* Output text being accumulated. */
-    enum text_item_type deferred_type; /* Type of text being accumulated. */
+    struct text_item *deferred_text;   /* Output text being accumulated. */
     char *command_name;            /* Name of command being processed. */
     char *title, *subtitle;        /* Components of page title. */
 
@@ -100,7 +100,6 @@ output_engine_push (void)
   struct output_engine *e = xzalloc (sizeof (*e));
 
   llx_init (&e->drivers);
-  ds_init_empty (&e->deferred_text);
 
   string_map_init (&e->heading_vars);
 
@@ -123,7 +122,7 @@ output_engine_pop (void)
       struct output_driver *d = llx_pop_head (&e->drivers, &llx_malloc_mgr);
       output_driver_destroy (d);
     }
-  ds_destroy (&e->deferred_text);
+  text_item_unref (e->deferred_text);
   free (e->command_name);
   free (e->title);
   free (e->subtitle);
@@ -179,36 +178,30 @@ output_submit__ (struct output_engine *e, struct output_item *item)
 static void
 flush_deferred_text (struct output_engine *e)
 {
-  if (!ds_is_empty (&e->deferred_text))
+  struct text_item *deferred_text = e->deferred_text;
+  if (deferred_text)
     {
-      char *text = ds_steal_cstr (&e->deferred_text);
-      output_submit__ (e, text_item_super (text_item_create_nocopy (
-                                             e->deferred_type, text)));
+      e->deferred_text = NULL;
+      output_submit__ (e, text_item_super (deferred_text));
     }
 }
 
 static bool
-defer_text (struct output_engine *e, struct output_item *item)
+defer_text (struct output_engine *e, struct output_item *output_item)
 {
-  if (!is_text_item (item))
+  if (!is_text_item (output_item))
     return false;
 
-  enum text_item_type type = text_item_get_type (to_text_item (item));
-  if (type != TEXT_ITEM_SYNTAX && type != TEXT_ITEM_LOG)
-    return false;
-
-  if (!ds_is_empty (&e->deferred_text) && e->deferred_type != type)
-    flush_deferred_text (e);
-
-  e->deferred_type = type;
-
-  if (!ds_is_empty (&e->deferred_text))
-    ds_put_byte (&e->deferred_text, '\n');
-
-  const char *text = text_item_get_text (to_text_item (item));
-  ds_put_cstr (&e->deferred_text, text);
-  output_item_unref (item);
-
+  struct text_item *text = to_text_item (output_item);
+  if (!e->deferred_text)
+    e->deferred_text = text_item_unshare (text);
+  else if (text_item_append (e->deferred_text, text))
+    text_item_unref (text);
+  else
+    {
+      flush_deferred_text (e);
+      e->deferred_text = text_item_unshare (text);
+    }
   return true;
 }
 
@@ -273,16 +266,20 @@ output_submit (struct output_item *item)
   output_submit__ (e, item);
 }
 
-const char *
+/* Returns the name of the command currently being parsed, in all uppercase.
+   The caller must free the returned value.
+
+   Returns NULL if no command is being parsed. */
+char *
 output_get_command_name (void)
 {
   struct output_engine *e = engine_stack_top ();
   if (e == NULL)
     return NULL;
 
-  for (size_t i = e->n_groups; i-- > 0; )
+  for (size_t i = e->n_groups; i-- > 0;)
     if (e->groups[i])
-      return e->groups[i];
+      return utf8_to_upper (e->groups[i]);
 
   return NULL;
 }
@@ -317,7 +314,7 @@ output_set_title__ (struct output_engine *e, char **dst, const char *src)
        : e->subtitle ? xstrdup (e->subtitle)
        : xzalloc (1));
   text_item_submit (text_item_create_nocopy (TEXT_ITEM_PAGE_TITLE,
-                                             page_title));
+                                             page_title, NULL));
 }
 
 void
@@ -426,11 +423,14 @@ extern const struct output_driver_factory list_driver_factory;
 extern const struct output_driver_factory html_driver_factory;
 extern const struct output_driver_factory csv_driver_factory;
 extern const struct output_driver_factory odt_driver_factory;
+extern const struct output_driver_factory spv_driver_factory;
 #ifdef HAVE_CAIRO
 extern const struct output_driver_factory pdf_driver_factory;
 extern const struct output_driver_factory ps_driver_factory;
 extern const struct output_driver_factory svg_driver_factory;
+extern const struct output_driver_factory png_driver_factory;
 #endif
+extern const struct output_driver_factory tex_driver_factory;
 
 static const struct output_driver_factory *factories[] =
   {
@@ -439,11 +439,14 @@ static const struct output_driver_factory *factories[] =
     &html_driver_factory,
     &csv_driver_factory,
     &odt_driver_factory,
+    &spv_driver_factory,
 #ifdef HAVE_CAIRO
     &pdf_driver_factory,
     &ps_driver_factory,
     &svg_driver_factory,
+    &png_driver_factory,
 #endif
+    &tex_driver_factory,
     NULL
   };
 
@@ -585,7 +588,7 @@ output_driver_substitute_heading_vars (const char *src, int page_number)
   struct output_engine *e = engine_stack_top ();
   struct string dst = DS_EMPTY_INITIALIZER;
   ds_extend (&dst, strlen (src));
-  for (const char *p = src; *p; )
+  for (const char *p = src; *p;)
     {
       if (!strncmp (p, "&[", 6))
         {