*** bin/sqlt-graph.orig	Thu Dec  7 09:05:17 2006
--- bin/sqlt-graph	Fri Apr  6 14:36:48 2007
***************
*** 47,52 ****
--- 47,60 ----
                         set to "0" to undefine)
      --width            Image width (in inches, default "8.5", 
                         set to "0" to undefine)
+     --fontsize         custom font size for node and edge labels
+     --fontname         name of custom font (or full path to font file) for 
+                        node, edge, and graph labels
+     --nodeattr         attribute name and value (in key=val syntax) for
+                        nodes; this option may be repeated to specify 
+                        multiple node attributes
+     --edgeattr         same as --nodeattr, but for edge attributes
+     --graphattr        same as --nodeattr, but for graph attributes
      --natural-join     Perform natural joins
      --natural-join-pk  Perform natural joins from primary keys only
      --show-datatypes   Show datatype of each field
***************
*** 100,108 ****
      $layout, $node_shape, $out_file, $output_type, $db_driver, $add_color, 
      $natural_join, $join_pk_only, $skip_fields, $show_datatypes,
      $show_sizes, $show_constraints, $debug, $help, $height, $width,
!     $no_fields
  );
  
  GetOptions(
      'd|db|f|from=s'    => \$db_driver,
      'o|output:s'       => \$out_file,
--- 108,121 ----
      $layout, $node_shape, $out_file, $output_type, $db_driver, $add_color, 
      $natural_join, $join_pk_only, $skip_fields, $show_datatypes,
      $show_sizes, $show_constraints, $debug, $help, $height, $width,
!     $no_fields, $fontsize, $fontname
  );
  
+ # multi-valued options:
+ my %edgeattrs = ();
+ my %nodeattrs = ();
+ my %graphattrs = ();
+ 
  GetOptions(
      'd|db|f|from=s'    => \$db_driver,
      'o|output:s'       => \$out_file,
***************
*** 111,116 ****
--- 124,134 ----
      't|output-type:s'  => \$output_type,
      'height:f'         => \$height,
      'width:f'          => \$width,
+     'fontsize=i'       => \$fontsize,
+     'fontname=s'       => \$fontname,
+     'nodeattr=s'       => \%nodeattrs,
+     'edgeattr=s'       => \%edgeattrs,
+     'graphattr=s'      => \%graphattrs,
      'c|color'          => \$add_color,
      'no-fields'        => \$no_fields,
      'natural-join'     => \$natural_join,
***************
*** 146,151 ****
--- 164,174 ----
          show_constraints => $show_constraints,
          height           => $height || 0,
          width            => $width  || 0,
+         fontsize         => $fontsize,
+         fontname         => $fontname,
+         nodeattrs        => \%nodeattrs,
+         edgeattrs        => \%edgeattrs,
+         graphattrs       => \%graphattrs,
          show_fields      => $no_fields ? 0 : 1,
      },
  ) or die SQL::Translator->error;