/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011, 2012, 2014 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011, 2012, 2014, 2019 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
#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"
struct output_engine
{
+ struct ll ll; /* Node for this engine. */
struct llx_list drivers; /* Contains "struct output_driver"s. */
- struct string deferred_syntax; /* TEXT_ITEM_SYNTAX being accumulated. */
+ struct string deferred_text; /* Output text being accumulated. */
+ enum text_item_type deferred_type; /* Type of text being accumulated. */
char *command_name; /* Name of command being processed. */
char *title, *subtitle; /* Components of page title. */
struct string_map heading_vars;
};
-static const struct output_driver_factory *factories[];
+static struct ll_list engine_stack = LL_INITIALIZER (engine_stack);
-/* A stack of output engines.. */
-static struct output_engine *engine_stack;
-static size_t n_stack, allocated_stack;
+static const struct output_driver_factory *factories[];
static struct output_engine *
engine_stack_top (void)
{
- assert (n_stack > 0);
- return &engine_stack[n_stack - 1];
+ struct ll *head = ll_head (&engine_stack);
+ if (ll_is_empty (&engine_stack))
+ return NULL;
+ return ll_data (head, struct output_engine, ll);
}
static void
void
output_engine_push (void)
{
- struct output_engine *e;
-
- if (n_stack >= allocated_stack)
- engine_stack = x2nrealloc (engine_stack, &allocated_stack,
- sizeof *engine_stack);
+ struct output_engine *e = xzalloc (sizeof (*e));
- e = &engine_stack[n_stack++];
- memset (e, 0, sizeof *e);
llx_init (&e->drivers);
- ds_init_empty (&e->deferred_syntax);
+ ds_init_empty (&e->deferred_text);
string_map_init (&e->heading_vars);
const struct tm *tm = localtime (&t);
put_strftime ("Date", "%x", tm, &e->heading_vars);
put_strftime ("Time", "%X", tm, &e->heading_vars);
+
+ ll_push_head (&engine_stack, &e->ll);
}
void
output_engine_pop (void)
{
- struct output_engine *e;
+ struct ll *head = ll_pop_head (&engine_stack);
+ struct output_engine *e =ll_data (head, struct output_engine, ll);
- assert (n_stack > 0);
- e = &engine_stack[--n_stack];
while (!llx_is_empty (&e->drivers))
{
struct output_driver *d = llx_pop_head (&e->drivers, &llx_malloc_mgr);
output_driver_destroy (d);
}
- ds_destroy (&e->deferred_syntax);
+ ds_destroy (&e->deferred_text);
free (e->command_name);
free (e->title);
free (e->subtitle);
free (e->groups[i]);
free (e->groups);
string_map_destroy (&e->heading_vars);
+ free (e);
}
void
}
static void
-flush_deferred_syntax (struct output_engine *e)
+flush_deferred_text (struct output_engine *e)
{
- if (!ds_is_empty (&e->deferred_syntax))
+ if (!ds_is_empty (&e->deferred_text))
{
- ds_trim (&e->deferred_syntax, ss_cstr ("\n"));
- if (!ds_is_empty (&e->deferred_syntax))
- {
- char *syntax = ds_steal_cstr (&e->deferred_syntax);
- output_submit__ (e, text_item_super (text_item_create_nocopy (
- TEXT_ITEM_SYNTAX, syntax)));
- }
+ char *text = ds_steal_cstr (&e->deferred_text);
+ output_submit__ (e, text_item_super (text_item_create_nocopy (
+ e->deferred_type, text)));
}
}
static bool
-is_syntax_item (const struct output_item *item)
+defer_text (struct output_engine *e, struct output_item *item)
{
- return (is_text_item (item)
- && text_item_get_type (to_text_item (item)) == TEXT_ITEM_SYNTAX);
+ if (!is_text_item (item))
+ return false;
+
+ struct text_item *text_item = to_text_item (item);
+ if (text_item->markup) /* XXX */
+ return false;
+
+ enum text_item_type type = text_item_get_type (text_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 (text_item);
+ ds_put_cstr (&e->deferred_text, text);
+ output_item_unref (item);
+
+ return true;
}
/* Submits ITEM to the configured output drivers, and transfers ownership to
{
struct output_engine *e = engine_stack_top ();
- if (item == NULL)
+ if (e == NULL)
return;
- if (is_syntax_item (item))
- {
- ds_put_cstr (&e->deferred_syntax, text_item_get_text (to_text_item (item)));
- output_item_unref (item);
- return;
- }
+ if (item == NULL)
+ return;
- flush_deferred_syntax (e);
+ if (defer_text (e, item))
+ return;
+ flush_deferred_text (e);
if (is_group_open_item (item))
{
free (e->groups[idx]);
if (idx >= 1 && idx <= 4)
{
- char key[6];
- snprintf (key, sizeof key, "Head%d", idx);
- string_map_find_and_delete (&e->heading_vars, key);
+ char *key = xasprintf ("Head%zu", idx);
+ free (string_map_find_and_delete (&e->heading_vars, key));
+ free (key);
}
}
else if (is_text_item (item))
if (type == TEXT_ITEM_TITLE
&& e->n_groups >= 1 && e->n_groups <= 4)
{
- char key[6];
- snprintf (key, sizeof key, "Head%d", e->n_groups);
+ char *key = xasprintf ("Head%zu", e->n_groups);
string_map_replace (&e->heading_vars, key, text);
+ free (key);
}
else if (type == TEXT_ITEM_PAGE_TITLE)
string_map_replace (&e->heading_vars, "PageTitle", text);
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)
{
- if (n_stack)
- {
- struct output_engine *e = engine_stack_top ();
- for (size_t i = e->n_groups; i-- > 0; )
- if (e->groups[i])
- return e->groups[i];
- }
+ struct output_engine *e = engine_stack_top ();
+ if (e == NULL)
+ return NULL;
+
+ for (size_t i = e->n_groups; i-- > 0;)
+ if (e->groups[i])
+ return utf8_to_upper (e->groups[i]);
return NULL;
}
struct output_engine *e = engine_stack_top ();
struct llx *llx;
- flush_deferred_syntax (e);
+ flush_deferred_text (e);
for (llx = llx_head (&e->drivers); llx != llx_null (&e->drivers);
llx = llx_next (llx))
{
{
struct output_engine *e;
- for (e = engine_stack; e < &engine_stack[n_stack]; e++)
- if (llx_find (llx_head (&e->drivers), llx_null (&e->drivers), driver))
- return e;
+ ll_for_each (e, struct output_engine, ll, &engine_stack)
+ {
+ if (llx_find (llx_head (&e->drivers), llx_null (&e->drivers), driver))
+ return e;
+ }
return NULL;
}
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;
#endif
+extern const struct output_driver_factory tex_driver_factory;
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,
#endif
+ &tex_driver_factory,
NULL
};
char *
output_get_text_from_markup (const char *markup)
{
- xmlDoc *doc = xmlReadMemory (markup, strlen (markup), "noname.xml", "UTF-8",
- (XML_PARSE_NOERROR | XML_PARSE_NOWARNING
- | XML_PARSE_NONET | XML_PARSE_NOCDATA));
- if (!doc)
+ xmlParserCtxt *parser = xmlCreatePushParserCtxt (NULL, NULL, NULL, 0, NULL);
+ if (!parser)
return xstrdup (markup);
- char *content = CHAR_CAST (char *,
- xmlNodeGetContent (xmlDocGetRootElement (doc)));
- if (!content)
- content = xstrdup (markup);
+ xmlParseChunk (parser, "<xml>", strlen ("<xml>"), false);
+ xmlParseChunk (parser, markup, strlen (markup), false);
+ xmlParseChunk (parser, "</xml>", strlen ("</xml>"), true);
- xmlFreeDoc (doc);
+ char *content
+ = (parser->wellFormed
+ ? CHAR_CAST (char *,
+ xmlNodeGetContent (xmlDocGetRootElement (parser->myDoc)))
+ : xstrdup (markup));
+ xmlFreeDoc (parser->myDoc);
+ xmlFreeParserCtxt (parser);
return content;
}
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))
{
projects / pspp / blobdiff