Update info files

diff --git a/doc/info/command.html b/doc/info/command.html
index db2829942000975bb5920aa16cb2d3007e610d75..2ec3855a0f9c7217c25e777c1179244fbf6927a2 100644 (file)
--- a/doc/info/command.html
+++ b/doc/info/command.html
@@ -20,19 +20,28 @@ If no input files are supplied, the program reads from <STRONG>stdin</STRONG>.
 <DD>Set a default node attribute, with default <I>value</I> = <TT>true</TT>.
 <DT><STRONG>-E</STRONG><I>name</I>[=<I>value</I>]
 <DD>Set a default edge attribute, with default <I>value</I> = <TT>true</TT>.
-<DT><STRONG>-T</STRONG><I>format</I>>[:<I>renderer</I>]       
+<DT><A NAME=d:T><STRONG>-T</STRONG></A><I>format</I>[:<I>renderer</I>[:<I>formatter</I>]]       
 <DD>Set output language to one of the <A HREF=output.html>supported formats</A>.
 By default, <A HREF=output.html#d:dot>attributed dot</A> is produced.
 <P>
 Depending on how Graphviz was built, there may be multiple renderers for
-generating a particular output format. For example, a typical installation
+generating a particular output format, and multiple formatters for 
+creating the final output. For example, a typical installation
 can produce <A HREF="http://www.graphviz.org/doc/info/output.html#d:png">PNG</A>
 output using either the Cairo or GD library. The desired rendering engine
-can be specified after a colon. Thus, <TT>-Tpng:cairo</TT> specifies PNG
-output produced by Cairo. If no renderer is specified, the default one
+can be specified after a colon. If there are multiple formatting engines
+available, the desired one can be specified in a similar fashion after
+the rendering engine. Thus, <TT>-Tpng:cairo</TT> specifies PNG
+output produced by Cairo (using the Cairo's default formatter), and 
+<TT>-Tpng:cairo:gd</TT> specifies PNG
+output produced by Cairo formatted using the GD library.
+<P>
+If no renderer is specified, or a renderer but no formatter, the default one
 is invoked. The flag <TT>-T<I>format</I>:</TT> produces a list of all
 of the renderers available for the specified <I>format</I>, the first one
-listed being the default.
+listed with a prefix matching <I>format</I> being the default.
+Using the <TT>-v</TT> flag, described below, will print which format,
+renderer, and formatter are actually used.
 <DT><STRONG>-V</STRONG>             
 <DD>Emit version information and exit.
 <DT><STRONG>-l</STRONG><I>library</I>

diff --git a/doc/info/output.html b/doc/info/output.html
index 6e07dfacec8d8bfa770c959bf8afcec6b8093197..cc35760fc49c948ff190a255ad32b190ca83660a 100644 (file)
--- a/doc/info/output.html
+++ b/doc/info/output.html
@@ -14,6 +14,12 @@ The output format is specified with the <STRONG>-T</STRONG><I>lang</I>
 flag on the <A HREF=command.html>command line</A>, where <I>lang</I>
 is one of the parameters listed below.
 <P>
+The formats actually available in a given Graphviz system depend on 
+how the system was built and the presence of additional libraries.
+To see what formats <b>dot</b> supports, run <TT>dot -T?</TT>.
+See the <A HREF=command.html#d.T> description of the -T</A> 
+flag for additional information.
+<P>
 Note that the internal coordinate system has the origin 
 in the lower left corner.
 Thus, positions in the
@@ -26,6 +32,8 @@ formats need to be interpreted in this manner.
 <P>
 <TABLE ALIGN=CENTER>
 <TR><TH>Command-line<BR>parameter</TH><TH>Format</TH></TR>
+ <TR><TD ALIGN=CENTER><A NAME=a:bmp HREF=#d:bmp>bmp</A>
+</TD><TD>Windows Bitmap Format</TD> </TR>
  <TR><TD ALIGN=CENTER><A NAME=a:canon HREF=#d:canon>canon</A>
 <BR><A NAME=a:dot HREF=#d:dot>dot</A>
 <BR><A NAME=a:xdot HREF=#d:xdot>xdot</A>
@@ -41,8 +49,12 @@ formats need to be interpreted in this manner.
 </TD><TD>GD/GD2 formats</TD> </TR>
  <TR><TD ALIGN=CENTER><A NAME=a:gif HREF=#d:gif>gif</A>
 </TD><TD>GIF</TD> </TR>
+ <TR><TD ALIGN=CENTER><A NAME=a:gtk HREF=#d:gtk>gtk</A>
+</TD><TD>GTK canvas</TD> </TR>
  <TR><TD ALIGN=CENTER><A NAME=a:hpgl HREF=#d:hpgl>hpgl</A>
 </TD><TD>HP-GL/2</TD> </TR>
+ <TR><TD ALIGN=CENTER><A NAME=a:ico HREF=#d:ico>ico</A>
+</TD><TD>Icon Image File Format</TD> </TR>
  <TR><TD ALIGN=CENTER><A NAME=a:imap HREF=#d:imap>imap</A>
 <BR><A NAME=a:cmapx HREF=#d:cmapx>cmapx</A>
 </TD><TD>Server-side and client-side imagemaps</TD> </TR>
@@ -53,13 +65,16 @@ formats need to be interpreted in this manner.
 </TD><TD>Server-side imagemap (deprecated)</TD> </TR>
  <TR><TD ALIGN=CENTER><A NAME=a:jpg HREF=#d:jpg>jpg</A>
 <BR><A NAME=a:jpeg HREF=#d:jpeg>jpeg</A>
-</TD><TD>JPEG (deprecated - 8 May 2006 - will no longer be supported)</TD> </TR>
+<BR><A NAME=a:jpe HREF=#d:jpe>jpe</A>
+</TD><TD>JPEG</TD> </TR>
  <TR><TD ALIGN=CENTER><A NAME=a:mif HREF=#d:mif>mif</A>
 </TD><TD>FrameMaker MIF format</TD> </TR>
  <TR><TD ALIGN=CENTER><A NAME=a:mp HREF=#d:mp>mp</A>
 </TD><TD>MetaPost</TD> </TR>
  <TR><TD ALIGN=CENTER><A NAME=a:pcl HREF=#d:pcl>pcl</A>
 </TD><TD>PCL</TD> </TR>
+ <TR><TD ALIGN=CENTER><A NAME=a:pdf HREF=#d:pdf>pdf</A>
+</TD><TD>Portable Document Format (PDF)</TD> </TR>
  <TR><TD ALIGN=CENTER><A NAME=a:pic HREF=#d:pic>pic</A>
 </TD><TD>PIC</TD> </TR>
  <TR><TD ALIGN=CENTER><A NAME=a:plain HREF=#d:plain>plain</A>
@@ -74,16 +89,27 @@ formats need to be interpreted in this manner.
  <TR><TD ALIGN=CENTER><A NAME=a:svg HREF=#d:svg>svg</A>
 <BR><A NAME=a:svgz HREF=#d:svgz>svgz</A>
 </TD><TD>Scalable Vector Graphics</TD> </TR>
+ <TR><TD ALIGN=CENTER><A NAME=a:tif HREF=#d:tif>tif</A>
+<BR><A NAME=a:tiff HREF=#d:tiff>tiff</A>
+</TD><TD>TIFF (Tag Image File Format)</TD> </TR>
+ <TR><TD ALIGN=CENTER><A NAME=a:vml HREF=#d:vml>vml</A>
+<BR><A NAME=a:vmlz HREF=#d:vmlz>vmlz</A>
+</TD><TD>Vector Markup Language (VML)</TD> </TR>
  <TR><TD ALIGN=CENTER><A NAME=a:vrml HREF=#d:vrml>vrml</A>
 </TD><TD>VRML</TD> </TR>
  <TR><TD ALIGN=CENTER><A NAME=a:vtx HREF=#d:vtx>vtx</A>
 </TD><TD>Visual Thought format</TD> </TR>
  <TR><TD ALIGN=CENTER><A NAME=a:wbmp HREF=#d:wbmp>wbmp</A>
 </TD><TD>Wireless BitMap format</TD> </TR>
+ <TR><TD ALIGN=CENTER><A NAME=a:xlib HREF=#d:xlib>xlib</A>
+</TD><TD>Xlib canvas</TD> </TR>
 </TABLE>
 <HR>
 <H2>Format Descriptions</H2>
 <DL>
+<DT><A NAME=d:bmp HREF=#a:bmp><STRONG>bmp</STRONG></A>
+<DD>  Outputs images in the Windows <A HREF="http://en.wikipedia.org/wiki/Bitmap">BMP</A> format.
+
 <DT><A NAME=d:canon HREF=#a:canon><STRONG>canon</STRONG></A>
 ,<DT><A NAME=d:dot HREF=#a:dot><STRONG>dot</STRONG></A>
 ,<DT><A NAME=d:xdot HREF=#a:xdot><STRONG>xdot</STRONG></A>
@@ -227,9 +253,15 @@ formats need to be interpreted in this manner.
 <DT><A NAME=d:gif HREF=#a:gif><STRONG>gif</STRONG></A>
 <DD>  Outputs GIF bitmap images.
 
+<DT><A NAME=d:gtk HREF=#a:gtk><STRONG>gtk</STRONG></A>
+<DD>  Creates a <A HREF="http://www.gtk.org/">GTK</A> window and displays the output there.
+
 <DT><A NAME=d:hpgl HREF=#a:hpgl><STRONG>hpgl</STRONG></A>
 <DD>  Produces output in the HP-GL/2 vector graphic printer language.
 
+<DT><A NAME=d:ico HREF=#a:ico><STRONG>ico</STRONG></A>
+<DD>  Outputs images in the Windows <A HREF="http://en.wikipedia.org/wiki/ICO_(icon_image_file_format)">ICO format</A>.
+
 <DT><A NAME=d:imap HREF=#a:imap><STRONG>imap</STRONG></A>
 ,<DT><A NAME=d:cmapx HREF=#a:cmapx><STRONG>cmapx</STRONG></A>
 <DD>  Produces map files for server-side and client-side image maps,
@@ -304,8 +336,8 @@ formats need to be interpreted in this manner.
 
 <DT><A NAME=d:jpg HREF=#a:jpg><STRONG>jpg</STRONG></A>
 ,<DT><A NAME=d:jpeg HREF=#a:jpeg><STRONG>jpeg</STRONG></A>
+,<DT><A NAME=d:jpe HREF=#a:jpe><STRONG>jpe</STRONG></A>
 <DD>  Output JPEG compressed image files.
-  This format relies on the installation having the JPEG library.
 
 <DT><A NAME=d:mif HREF=#a:mif><STRONG>mif</STRONG></A>
 <DD>  Generates Frame Maker MIF files.
@@ -319,6 +351,11 @@ formats need to be interpreted in this manner.
   PCL, so that PCL output is the same as HP-GL, wrapped with some initial
   and final commands to set the printer to and from HP-GL mode.
 
+<DT><A NAME=d:pdf HREF=#a:pdf><STRONG>pdf</STRONG></A>
+<DD>  Produces <A HREF="http://www.adobe.com/devnet/pdf/">PDF</A> output.
+  Alternatively, one can use the <A HREF="#d:ps2">ps2</A> to produce PDF-compatible
+  PostScript, and then use a ps-to-pdf converter.
+
 <DT><A NAME=d:pic HREF=#a:pic><STRONG>pic</STRONG></A>
 <DD>  Outputs in PIC, the picture description language in the troff-family
 
@@ -412,7 +449,6 @@ formats need to be interpreted in this manner.
 
 <DT><A NAME=d:png HREF=#a:png><STRONG>png</STRONG></A>
 <DD>   Produces output in the PNG (Portable Network Graphics) format.
-   PNG relies on having libz and the PNG library.
 
 <DT><A NAME=d:ps HREF=#a:ps><STRONG>ps</STRONG></A>
 <DD>  Produces PostScript output.
@@ -433,7 +469,15 @@ formats need to be interpreted in this manner.
 ,<DT><A NAME=d:svgz HREF=#a:svgz><STRONG>svgz</STRONG></A>
 <DD>  Produce <A HREF="http://www.adobe.com/svg/">SVG</A> output, 
   the latter in compressed format.
-  SVG relies on having libz.
+
+<DT><A NAME=d:tif HREF=#a:tif><STRONG>tif</STRONG></A>
+,<DT><A NAME=d:tiff HREF=#a:tiff><STRONG>tiff</STRONG></A>
+<DD>  Produces <A HREF="http://www.libtiff.org/">TIFF</A> output.
+
+<DT><A NAME=d:vml HREF=#a:vml><STRONG>vml</STRONG></A>
+,<DT><A NAME=d:vmlz HREF=#a:vmlz><STRONG>vmlz</STRONG></A>
+<DD>  Produces <A HREF="http://www.w3.org/TR/NOTE-VML/">VML</A> output,
+  the latter in compressed format.
 
 <DT><A NAME=d:vrml HREF=#a:vrml><STRONG>vrml</STRONG></A>
 <DD>  Outputs graphs in the <A HREF="http://www.vrml.org/">VRML</A> format.
@@ -456,6 +500,9 @@ formats need to be interpreted in this manner.
 <DD>  Produces output in the Wireless BitMap (WBMP) format, optimized for
   mobile computing.
 
+<DT><A NAME=d:xlib HREF=#a:xlib><STRONG>xlib</STRONG></A>
+<DD>  Creates an <A HREF="http://en.wikipedia.org/wiki/Xlib/">Xlib</A> window and displays the output there.
+
 </DL>
 <HR>
 </BODY>