X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fdriver.c;h=824a1ee2112a0810fe72fc83199cf8ca52015ed2;hb=cb08510bbbab7646bc1031427243489024d22a3b;hp=cf0a535f3c059ce6ae9b05a084b76ea94925265c;hpb=13ca98079f4cb3cd80deb10b173813548b1f3ddc;p=pspp diff --git a/src/output/driver.c b/src/output/driver.c index cf0a535f3c..824a1ee211 100644 --- a/src/output/driver.c +++ b/src/output/driver.c @@ -21,8 +21,6 @@ #include #include -#include -#include #include #include #include @@ -54,8 +52,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. */ @@ -101,7 +98,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); @@ -124,7 +120,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); @@ -180,40 +176,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; - 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); - + 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; } @@ -241,9 +227,8 @@ output_submit (struct output_item *item) if (e->n_groups >= e->allocated_groups) e->groups = x2nrealloc (e->groups, &e->allocated_groups, sizeof *e->groups); - e->groups[e->n_groups] = (group_open_item->command_name - ? xstrdup (group_open_item->command_name) - : NULL); + e->groups[e->n_groups] = xstrdup_if_nonnull ( + group_open_item->command_name); e->n_groups++; } else if (is_group_close_item (item)) @@ -252,27 +237,21 @@ output_submit (struct output_item *item) size_t idx = --e->n_groups; free (e->groups[idx]); - if (idx >= 1 && idx <= 4) - { - char *key = xasprintf ("Head%zu", idx); - free (string_map_find_and_delete (&e->heading_vars, key)); - free (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)) { const struct text_item *text_item = to_text_item (item); enum text_item_type type = text_item_get_type (text_item); - const char *text = text_item_get_text (text_item); - if (type == TEXT_ITEM_TITLE - && e->n_groups >= 1 && e->n_groups <= 4) - { - 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); + char *key = (type == TEXT_ITEM_TITLE ? xasprintf ("Head%zu", e->n_groups) + : type == TEXT_ITEM_PAGE_TITLE ? xstrdup ("PageTitle") + : NULL); + if (key) + string_map_replace_nocopy (&e->heading_vars, key, + text_item_get_plain_text (text_item)); } output_submit__ (e, item); @@ -318,7 +297,7 @@ static void output_set_title__ (struct output_engine *e, char **dst, const char *src) { free (*dst); - *dst = src ? xstrdup (src) : NULL; + *dst = xstrdup_if_nonnull (src); char *page_title = (e->title && e->subtitle ? xasprintf ("%s\n%s", e->title, e->subtitle) @@ -326,7 +305,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 @@ -430,19 +409,17 @@ output_driver_is_registered (const struct output_driver *driver) return output_driver_get_engine (driver) != NULL; } -extern const struct output_driver_factory txt_driver_factory; -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 html_driver_factory; +extern const struct output_driver_factory list_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 png_driver_factory; extern const struct output_driver_factory ps_driver_factory; +extern const struct output_driver_factory spv_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; +extern const struct output_driver_factory txt_driver_factory; static const struct output_driver_factory *factories[] = { @@ -452,12 +429,10 @@ static const struct output_driver_factory *factories[] = &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 }; @@ -570,30 +545,6 @@ output_driver_parse_option (const char *option, struct string_map *options) string_map_insert_nocopy (options, key, value); } -/* Extracts the actual text content from the given Pango MARKUP and returns it - as as a malloc()'d string. */ -char * -output_get_text_from_markup (const char *markup) -{ - xmlParserCtxt *parser = xmlCreatePushParserCtxt (NULL, NULL, NULL, 0, NULL); - if (!parser) - return xstrdup (markup); - - xmlParseChunk (parser, "", strlen (""), false); - xmlParseChunk (parser, markup, strlen (markup), false); - xmlParseChunk (parser, "", strlen (""), true); - - char *content - = (parser->wellFormed - ? CHAR_CAST (char *, - xmlNodeGetContent (xmlDocGetRootElement (parser->myDoc))) - : xstrdup (markup)); - xmlFreeDoc (parser->myDoc); - xmlFreeParserCtxt (parser); - - return content; -} - char * output_driver_substitute_heading_vars (const char *src, int page_number) {