[cairo-commit] svg2png/doc svg2png.1,1.1.1.1,1.2

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/svg2png/doc
In directory pdx:/tmp/cvs-serv27401/doc

Modified Files:
	svg2png.1 
Log Message:

2004-06-11  Carl Worth  <cworth at isi.edu>

        * doc/svg2png.1: Update documentation for new behavior of --width
        and --height.

  From 2004-05-13  John Ellson  <ellson at research.att.com>

        * src/args.c:
        * docs/svg2png.1: default input/output to '-', i.e. stdin/stdout, so
        that svg2png can be use in a pipe without any args.

        * src/svg2png.c: clean up unused #includes and #defines


Index: svg2png.1
===================================================================
RCS file: /cvs/cairo/svg2png/doc/svg2png.1,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** svg2png.1	27 Apr 2004 02:10:02 -0000	1.1.1.1
--- svg2png.1	11 Jun 2004 12:49:58 -0000	1.2
***************
*** 10,14 ****
  svg2png
  .RB [ OPTIONS ]
! .IR "<SVG_input_file> <PNG_output_file>"
  .SH "EXAMPLE"
  .nf
--- 10,14 ----
  svg2png
  .RB [ OPTIONS ]
! [\fISVG_input_file\fR [\fIPNG_output_file\fR]]
  .SH "EXAMPLE"
  .nf
***************
*** 16,33 ****
  .br
  .SH DESCRIPTION
! Renders the given SVG file to the given PNG file. A single '\-' for an input/output filename indicates that the standard input/output stream should be used rather than a file. Rendering is performed by the cairo graphics library.
  .SH OPTIONS
  .TP
  .B \-h, \-\-height=\fIHEIGHT\fR
! Set the height in pixels for the output PNG (see \--png).
  .TP
! .B \-p, \-\-png=\fIFILENAME\fR
! Render to a  PNG image in \fIFILENAME\fR instead of a window (EXPERIMENTAL).
  .TP
  .B \-s, \-\-scale=\fIFACTOR\fR
! Scale image by \fIFACTOR\fR
! .TP
! .B \-w, \-\-width=\fIWIDTH\fR
! Set the width in pixels for the output PNG (see \--png)
  .TP
  .B \-x, \-\-flipx
--- 16,32 ----
  .br
  .SH DESCRIPTION
! Renders the given SVG file to the given PNG file. Omitted filenames, or a single '\-' for an input/output filename indicates that the standard input/output stream should be used rather than a file. Rendering is performed by the cairo graphics library.
  .SH OPTIONS
  .TP
+ .B \-w, \-\-width=\fIWIDTH\fR
+ Scale the image so that the output has a width of \fIWIDTH\fR pixels. The original aspect ratio is preserved.
+ .TP
  .B \-h, \-\-height=\fIHEIGHT\fR
! Scale the image so that the output has a height of \fIHEIGHT\fR pixels. The original aspect ratio is preserved.
  .TP
! If both the --width and --height options are provided, the image will be scaled to the smaller dimension and will be centered within any extra space.
  .TP
  .B \-s, \-\-scale=\fIFACTOR\fR
! Scale image by \fIFACTOR\fR. This option is ignored if either of the --width or --height options are provided.
  .TP
  .B \-x, \-\-flipx