fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-02-21 16:50:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix things up to conform with Adobe PostScript Document Structuring Conventions Specification. Thanks to Michael Sweet for bringing several items to our attention. Things that are fixed: Add Pages: (atend) to header, add Pages: N to trailer, properly advertise DocumentData of Binary rather than Clean7Bit, remove fictitious EndPage, move showpage to after the grestore.

Browse source
This commit is contained in:
Carl Worth 2006-01-13 13:41:45 +00:00
parent 6f3cb04d9c
commit 59eff46fdf
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2006-01-13 Carl Worth <cworth@cworth.org>
* src/cairo-ps-surface.c: (_cairo_ps_surface_emit_header),
(_cairo_ps_surface_emit_footer), (_cairo_ps_surface_end_page),
(_cairo_ps_surface_copy_page), (_cairo_ps_surface_show_page): Fix
things up to conform with Adobe PostScript Document Structuring
Conventions Specification. Thanks to Michael Sweet for bringing
several items to our attention. Things that are fixed: Add Pages:
(atend) to header, add Pages: N to trailer, properly advertise
DocumentData of Binary rather than Clean7Bit, remove fictitious
EndPage, move showpage to after the grestore.
2006-01-13 Carl Worth <cworth@cworth.org>
* src/cairo-paginated-surface.c:

25
src/cairo-ps-surface.c
View file

@ -94,15 +94,9 @@ _cairo_ps_surface_emit_header (cairo_ps_surface_t *surface)
"%%!PS-Adobe-3.0\n"
"%%%%Creator: cairo (http://cairographics.org)\n"
"%%%%CreationDate: %s"
"%%%%Title: Some clever title\n"
#if DONE_ADDING_PAGES_SUPPORT_AFTER_SWITCHING_TO_PAGINATED
"%%%%Pages: %d\n"
#endif
"%%%%Pages: (atend)\n"
"%%%%BoundingBox: %f %f %f %f\n",
ctime (&now),
#if DONE_ADDING_PAGES_SUPPORT_AFTER_SWITCHING_TO_PAGINATED
surface->pages.num_elements,
#endif
0.0, 0.0,
surface->width,
surface->height);
@ -110,7 +104,7 @@ _cairo_ps_surface_emit_header (cairo_ps_surface_t *surface)
/* The "/FlateDecode filter" currently used is a feature of
* LanguageLevel 3 */
_cairo_output_stream_printf (surface->stream,
"%%%%DocumentData: Clean7Bit\n"
"%%%%DocumentData: Binary\n"
"%%%%LanguageLevel: 3\n"
"%%%%Orientation: Portrait\n"
"%%%%EndComments\n");
@ -121,7 +115,9 @@ _cairo_ps_surface_emit_footer (cairo_ps_surface_t *surface)
{
_cairo_output_stream_printf (surface->stream,
"%%%%Trailer\n"
"%%%%EOF\n");
"%%%%Pages: %d\n"
"%%%%EOF\n",
surface->num_pages);
}
static cairo_surface_t *
@ -294,9 +290,6 @@ _cairo_ps_surface_end_page (cairo_ps_surface_t *surface)
_cairo_output_stream_printf (surface->stream,
"grestore\n");
_cairo_output_stream_printf (surface->stream,
"%%%%EndPage\n");
surface->need_start_page = TRUE;
}
@ -305,10 +298,10 @@ _cairo_ps_surface_copy_page (void *abstract_surface)
{
cairo_ps_surface_t *surface = abstract_surface;
_cairo_output_stream_printf (surface->stream, "copypage\n");
_cairo_ps_surface_end_page (surface);
_cairo_output_stream_printf (surface->stream, "copypage\n");
return CAIRO_STATUS_SUCCESS;
}
@ -317,10 +310,10 @@ _cairo_ps_surface_show_page (void *abstract_surface)
{
cairo_ps_surface_t *surface = abstract_surface;
_cairo_output_stream_printf (surface->stream, "showpage\n");
_cairo_ps_surface_end_page (surface);
_cairo_output_stream_printf (surface->stream, "showpage\n");
surface->need_start_page = TRUE;
return CAIRO_STATUS_SUCCESS;