X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fdriver.c;h=cf0a535f3c059ce6ae9b05a084b76ea94925265c;hb=e91782a2d25dec932c93b7a57bd03d836614ba43;hp=da448b31707c8154c8ad2e3f99d0342c0115500d;hpb=31127c303d92ce811f1dd365af83644266e4fd88;p=pspp diff --git a/src/output/driver.c b/src/output/driver.c index da448b3170..cf0a535f3c 100644 --- 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,7 +54,8 @@ 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. */ @@ -76,6 +78,8 @@ static struct output_engine * engine_stack_top (void) { struct ll *head = ll_head (&engine_stack); + if (ll_is_empty (&engine_stack)) + return NULL; return ll_data (head, struct output_engine, ll); } @@ -97,7 +101,7 @@ output_engine_push (void) struct output_engine *e = xzalloc (sizeof (*e)); llx_init (&e->drivers); - ds_init_empty (&e->deferred_syntax); + ds_init_empty (&e->deferred_text); string_map_init (&e->heading_vars); @@ -120,7 +124,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_syntax); + ds_destroy (&e->deferred_text); free (e->command_name); free (e->title); free (e->subtitle); @@ -174,25 +178,43 @@ output_submit__ (struct output_engine *e, struct output_item *item) } 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 @@ -202,17 +224,15 @@ output_submit (struct output_item *item) { 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)) { @@ -235,7 +255,7 @@ output_submit (struct output_item *item) if (idx >= 1 && idx <= 4) { char *key = xasprintf ("Head%zu", idx); - string_map_find_and_delete (&e->heading_vars, key); + free (string_map_find_and_delete (&e->heading_vars, key)); free (key); } } @@ -258,13 +278,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 (); - for (size_t i = e->n_groups; i-- > 0; ) + if (e == NULL) + return NULL; + + 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; } @@ -277,7 +304,7 @@ output_flush (void) 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)) { @@ -408,11 +435,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[] = { @@ -421,11 +451,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 }; @@ -567,7 +600,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)) {