diff -u graph/extern.h plotutils-2.4.1/graph/extern.h --- graph/extern.h Sat Jan 26 16:23:00 2002 +++ plotutils-2.4.1/graph/extern.h Fri Mar 3 03:01:12 2000 @@ -77,7 +77,7 @@ extern void end_graph ____P((Multigrapher *multigrapher)); -extern void set_graph_parameters ____P((Multigrapher *multigrapher, double frame_line_width, const char *frame_color, const char *title, const char *title_font_name, double title_font_size, double tick_size, grid_type grid_spec, double x_min, double x_max, double x_spacing, double y_min, double y_max, double y_spacing, bool spec_x_spacing, bool spec_y_spacing, double width, double height, double up, double right, const char *x_font_name, double x_font_size, const char *x_label, const char *y_font_name, double y_font_size, const char *y_label, bool no_rotate_y_label, int log_axis, int round_to_next_tick, int switch_axis_end, int omit_labels, int clip_mode, double blankout_fraction, bool transpose_axes, bool errorbar_line_inherit)); +extern void set_graph_parameters ____P((Multigrapher *multigrapher, double frame_line_width, const char *frame_color, const char *title, const char *title_font_name, double title_font_size, double tick_size, grid_type grid_spec, double x_min, double x_max, double x_spacing, double y_min, double y_max, double y_spacing, bool spec_x_spacing, bool spec_y_spacing, double width, double height, double up, double right, const char *x_font_name, double x_font_size, const char *x_label, const char *y_font_name, double y_font_size, const char *y_label, bool no_rotate_y_label, int log_axis, int round_to_next_tick, int switch_axis_end, int omit_labels, int clip_mode, double blankout_fraction, bool transpose_axes)); extern void draw_frame_of_graph ____P((Multigrapher *multigrapher, bool draw_canvas)); diff -u graph/graph.c plotutils-2.4.1/graph/graph.c --- graph/graph.c Sat Jan 26 16:04:41 2002 +++ plotutils-2.4.1/graph/graph.c Sat Jun 17 17:08:04 2000 @@ -61,7 +61,6 @@ {"title-font-size", ARG_REQUIRED, NULL, 'F' << 8}, {"toggle-rotate-y-label", ARG_NONE, NULL, 'N' << 8}, {"page-size", ARG_REQUIRED, NULL, 'P' << 8}, - {"toggle-errorbar-line", ARG_NONE, NULL, 'E' << 8}, /* Options relevant only to raw graph (refers to plot(5) output) */ {"portable-output", ARG_NONE, NULL, 'O'}, /* Documentation options */ @@ -164,7 +163,7 @@ int round_to_next_tick = 0; /* round axis limits to nearest tick? */ int switch_axis_end = 0; /* axis at top/right instead of bottom/left? */ int omit_ticks = 0; /* omit ticks and tick labels from an axis? */ - bool errorbar_line_inherit = false; /* do we take the same linestyle for error bar lines? */ + /* graph dimensions, expressed as fractions of the width of the libplot graphics display [by convention square]; <0.0 means use libplot default */ double frame_line_width = -0.001; /* width of lines in the graph frame */ @@ -714,10 +713,7 @@ case 'P' << 8: /* Page size, ARG REQUIRED */ page_size = xstrdup (optarg); break; - case 'E' << 8: /* Errorbar line inherit, ARG NONE */ - errorbar_line_inherit = (errorbar_line_inherit == true ? false : true); - break; - case 'p' << 8: /* Pen color string, ARG REQUIRED */ + case 'p' << 8: /* Pen color string, ARG REQUIRED */ if (parse_pen_string (optarg) == false) { fprintf (stderr, "%s: ignoring unparseable pen string `%s'\n", @@ -1018,8 +1014,7 @@ /* more args */ clip_mode, blankout_fraction, - final_transpose_axes, - errorbar_line_inherit); + final_transpose_axes); /* draw the graph frame (grid, ticks, etc.); draw a `canvas' (a background opaque white rectangle) only if @@ -1238,8 +1233,7 @@ /* more args */ clip_mode, blankout_fraction, - final_transpose_axes, - errorbar_line_inherit); + final_transpose_axes); /* draw the graph frame (grid, ticks, etc.); draw a `canvas' (a background opaque white rectangle) only if @@ -1475,8 +1469,7 @@ /* more args */ clip_mode, blankout_fraction, - final_transpose_axes, - errorbar_line_inherit); + final_transpose_axes); /* draw the graph frame (grid, ticks, etc.); draw a `canvas' (a background opaque white rectangle) only if this isn't the diff -u graph/plotter.c plotutils-2.4.1/graph/plotter.c --- graph/plotter.c Sat Jan 26 16:28:27 2002 +++ plotutils-2.4.1/graph/plotter.c Fri Mar 3 03:05:24 2000 @@ -266,7 +266,6 @@ double oldpoint_x, oldpoint_y; /* last-plotted point */ int symbol; /* symbol being plotted at each point */ int linemode; /* linemode used for polyline */ - bool errorbar_line_inherit; /* do we keep the linestyle for error bars */ }; /* forward references */ @@ -527,7 +526,7 @@ return S_UNKNOWN; } - + /* prepare_axis() fills in the Axis structure for an axis, and some of * the linear transformation variables in the Transform structure also. */ @@ -823,9 +822,9 @@ void #ifdef _HAVE_PROTOS -set_graph_parameters (Multigrapher *multigrapher, double frame_line_width, const char *frame_color, const char *title, const char *title_font_name, double title_font_size, double tick_size, grid_type grid_spec, double x_min, double x_max, double x_spacing, double y_min, double y_max, double y_spacing, bool spec_x_spacing, bool spec_y_spacing, double width, double height, double up, double right, const char *x_font_name, double x_font_size, const char *x_label, const char *y_font_name, double y_font_size, const char *y_label, bool no_rotate_y_label, int log_axis, int round_to_next_tick, int switch_axis_end, int omit_ticks, int clip_mode, double blankout_fraction, bool transpose_axes, bool errorbar_line_inherit) +set_graph_parameters (Multigrapher *multigrapher, double frame_line_width, const char *frame_color, const char *title, const char *title_font_name, double title_font_size, double tick_size, grid_type grid_spec, double x_min, double x_max, double x_spacing, double y_min, double y_max, double y_spacing, bool spec_x_spacing, bool spec_y_spacing, double width, double height, double up, double right, const char *x_font_name, double x_font_size, const char *x_label, const char *y_font_name, double y_font_size, const char *y_label, bool no_rotate_y_label, int log_axis, int round_to_next_tick, int switch_axis_end, int omit_ticks, int clip_mode, double blankout_fraction, bool transpose_axes) #else -set_graph_parameters (multigrapher, frame_line_width, frame_color, title, title_font_name, title_font_size, tick_size, grid_spec, x_min, x_max, x_spacing, y_min, y_max, y_spacing, spec_x_spacing, spec_y_spacing, width, height, up, right, x_font_name, x_font_size, x_label, y_font_name, y_font_size, y_label, no_rotate_y_label, log_axis, round_to_next_tick, switch_axis_end, omit_ticks, clip_mode, blankout_fraction, transpose_axes, errorbar_line_inherit) +set_graph_parameters (multigrapher, frame_line_width, frame_color, title, title_font_name, title_font_size, tick_size, grid_spec, x_min, x_max, x_spacing, y_min, y_max, y_spacing, spec_x_spacing, spec_y_spacing, width, height, up, right, x_font_name, x_font_size, x_label, y_font_name, y_font_size, y_label, no_rotate_y_label, log_axis, round_to_next_tick, switch_axis_end, omit_ticks, clip_mode, blankout_fraction, transpose_axes) Multigrapher *multigrapher; double frame_line_width; /* fractional width of lines in the frame */ const char *frame_color; /* color for frame (and plot if no -C option)*/ @@ -855,7 +854,6 @@ int clip_mode; /* clip mode = 0, 1, or 2 */ double blankout_fraction; /* 1.0 means blank out whole box before plot*/ bool transpose_axes; - bool errorbar_line_inherit; #endif { double x_subsubtick_spacing = 0.0, y_subsubtick_spacing = 0.0; @@ -1012,7 +1010,6 @@ multigrapher->subtick_size = RELATIVE_SUBTICK_SIZE * tick_size; multigrapher->grid_spec = grid_spec; multigrapher->clip_mode = clip_mode; - multigrapher->errorbar_line_inherit = errorbar_line_inherit; /* fill in the Transform and Axis elements for each coordinate */ prepare_axis (&multigrapher->x_axis, &multigrapher->x_trans, @@ -2704,9 +2701,8 @@ /* save & restore state, since we invoke pl_linemod_r() */ { pl_savestate_r (multigrapher->plotter); - if (!multigrapher->errorbar_line_inherit) - pl_linemod_r (multigrapher->plotter, "solid"); - + pl_linemod_r (multigrapher->plotter, "solid"); + if (p->have_x_errorbar) { pl_fline_r (multigrapher->plotter,