jsp@Princeton.EDU (James Plank) (05/03/91)
Submitted-by: James Plank <jsp@Princeton.EDU>
Posting-number: Volume 19, Issue 16
Archive-name: jgraph/patch01
Patch-To: jgraph: Volume 16, Issue 20
This is a small patch to jgraph. Please read the
PATCH.5.README for the information about the patch
and a few announcements.
Unshar the following patch and apply it with
"patch < patch.5".
Jim
------
# To unbundle, "sed '1,/^# To unbundle/d' < thisfile | sh"
# Thu May 2 15:31:12 EDT 1991
echo PATCH.5.README 1>&2
sed 's/^-//' >'PATCH.5.README' <<'End of PATCH.5.README'
-This is a small patch, and a few announcements.
-
-First, the patch -- token.c was still having problems
-compiling and working all all systems. This has
-hopefully been fixed, now. I've personally gotten it
-working on a vax, mipsel, sparc & sgi machine. Please
-send me bug reports if token.c still is having problems
-either compiling or finding EOF's.
-
-Apply the patch with "patch < patch.5"
-
-Second, jgraph is now available via anonymous FTP to
-Princeton.edu. It is in the directory pub, in the file
-jgraph.Z. I'll keep this file updated, so if you don't
-feel like dealing with patches, this is the file.
-
-Third, I'd like to have a mailing list for those who would
-like to be notified of jgraph problems/fixes without keeping
-up with comp.sources.misc. If you'd like to be on this
-mailing list, please drop me a line.
-
-Take it easy,
-
-Jim
End of PATCH.5.README
echo patch.5 1>&2
sed 's/^-//' >'patch.5' <<'End of patch.5'
-*** ../patches/patch.5/work/draw.c Thu May 2 15:15:25 1991
---- draw.c Thu May 2 14:47:30 1991
-***************
-*** 1,38 ****
-! /* $Log: draw.c,v $
-! * Revision 1.9 91/01/31 16:14:56 jsp
-! * For patch #2 -- Fixed a bug with disttop which caused it to
-! * work incorrectly with axis minima which != 0.
-! *
-! * Revision 1.8 91/01/16 10:57:25 jsp
-! * After Patch #1 -- Ifdefs have been included for VMS and LCC, and
-! * minor bugs have been fixed
-! *
-! * Revision 1.7 91/01/10 12:08:49 jsp
-! * Version exported to comp.sources.misc
-! *
-! * Revision 1.6 90/12/03 16:48:24 jsp
-! * Added the -P option to print postscript suitable for direct piping to lpr.
-! *
-! * Revision 1.5 90/10/18 12:43:35 jsp
-! * First release version.
-! *
-! * Revision 1.4 90/10/14 19:52:38 jsp
-! * Moved processing of hash lines & labels to process.c.
-! *
-! * Made Marktypes into a global array.
-! *
-! * Revision 1.3 90/10/14 14:23:02 jsp
-! * Added code for bar graphs
-! *
-! * Revision 1.2 90/10/14 13:35:57 jsp
-! * Updated to use error_header, as defined in token.c 1.2.
-! *
-! * Revision 1.1 90/10/12 18:09:31 jsp
-! * Initial revision
-! *
-! *
-! * Module for drawing graphs using the postscript drawing
-! * routines in printline.c
- */
-
- #include "jgraph.h"
---- 1,8 ----
-! /*
-! * $Source: /n/fs/vd/jsp/src/jgraph/RCS/draw.c,v $
-! * $Revision: 5.0 $
-! * $Date: 91/05/02 14:45:08 $
-! * $Author: jsp $
- */
-
- #include "jgraph.h"
-*** ../patches/patch.5/work/edit.c Thu May 2 15:15:26 1991
---- edit.c Thu May 2 14:47:30 1991
-***************
-*** 1,39 ****
-! /* $Log: edit.c,v $
-! * Revision 1.9 91/01/16 10:58:24 jsp
-! * After Patch #1 -- Ifdefs have been included for VMS and LCC, and
-! * minor bugs have been fixed
-! *
-! * Revision 1.8 91/01/10 12:09:29 jsp
-! * Version exported to comp.sources.misc
-! *
-! * Revision 1.7 90/12/03 16:49:28 jsp
-! * Who knows why this is any different from 1.6.
-! *
-! * Revision 1.6 90/10/18 12:44:44 jsp
-! * First release version
-! *
-! * Changes include the addition of logrhythmic axes, better hash mark
-! * editing, etc.
-! *
-! * Revision 1.5 90/10/14 21:26:15 jsp
-! * Allows user-inputted hash lines and hash labels
-! *
-! * Revision 1.4 90/10/14 19:53:36 jsp
-! * Incorporated the global array MARKTYPES, etc, into the editing procedure.
-! *
-! * Added no_hash_label option.
-! *
-! * Revision 1.3 90/10/14 14:23:29 jsp
-! * Added code for bar graphs
-! *
-! * Revision 1.2 90/10/14 13:36:39 jsp
-! * Updated to use error_header, as defined in token.c 1.2.
-! *
-! * Revision 1.1 90/10/12 18:10:46 jsp
-! * Initial revision
-! *
-! * Module for taking the tokens from token.c and using them to
-! * edit the graph structs.
- */
-
-
---- 1,8 ----
-! /*
-! * $Source: /n/fs/vd/jsp/src/jgraph/RCS/edit.c,v $
-! * $Revision: 5.0 $
-! * $Date: 91/05/02 14:45:11 $
-! * $Author: jsp $
- */
-
-
-*** ../patches/patch.5/work/jgraph.1 Thu May 2 15:15:31 1991
---- jgraph.1 Thu May 2 14:47:33 1991
-***************
-*** 349,357 ****
- .TP
- \fBlog_base \|[\fIfloat\fB\|]\fR
- Set the base of the logarithmic axis. Default =
-! 10. What this means is that the distance from \fB\fIlog_base\fB\fR^i and
-! \fB\fIlog_base\fB\fR^(i+1) will be the same as from \fB\fIlog_base\fB\fR^(i+1) to
-! \fB\fIlog_base\fB\fR(i+2). It is also the value which determines which hash
- marks and hash labels are automatically produced.
- .TP
- \fBhash \|[\fIfloat\fB\|]\fR
---- 349,355 ----
- .TP
- \fBlog_base \|[\fIfloat\fB\|]\fR
- Set the base of the logarithmic axis. Default =
-! 10. This is the value which determines which hash
- marks and hash labels are automatically produced.
- .TP
- \fBhash \|[\fIfloat\fB\|]\fR
-*** ../patches/patch.5/work/jgraph.c Thu May 2 15:15:32 1991
---- jgraph.c Thu May 2 14:47:31 1991
-***************
-*** 1,36 ****
-! /* $Log: jgraph.c,v $
-! * Revision 1.7 91/01/16 10:58:29 jsp
-! * After Patch #1 -- Ifdefs have been included for VMS and LCC, and
-! * minor bugs have been fixed
-! *
-! * Revision 1.6 91/01/10 12:09:37 jsp
-! * Version exported to comp.sources.misc
-! *
-! * Revision 1.5 90/12/03 16:49:58 jsp
-! * Added the -P option to print postscript suitable for direct piping to lpr.
-! *
-! * Revision 1.4 90/10/18 12:45:21 jsp
-! * First release version
-! *
-! * Changes include the addition of logrhythmic axes, better hash mark
-! * editing, etc.
-! *
-! * Revision 1.3 90/10/14 19:54:36 jsp
-! * Made the new MARKTYPES array, and set default marktypes accordingly.
-! *
-! * Updated to account for the new hash_lines and hash_labels fields
-! * in struct curve.
-! *
-! * Revision 1.2 90/10/14 14:23:42 jsp
-! * Added code for bar graphs
-! *
-! * Revision 1.1 90/10/12 18:12:51 jsp
-! * Initial revision
-! *
-! *
-! * Module with the main() routine, and with routines to allocate
-! * memory and initialize the structs defined in jgraph.h.
- */
- #include <stdio.h>
-
- #ifdef VMS
---- 1,10 ----
-! /*
-! * $Source: /n/fs/vd/jsp/src/jgraph/RCS/jgraph.c,v $
-! * $Revision: 5.0 $
-! * $Date: 91/05/02 14:45:13 $
-! * $Author: jsp $
- */
-+
- #include <stdio.h>
-
- #ifdef VMS
-*** ../patches/patch.5/work/jgraph.h Thu May 2 15:15:33 1991
---- jgraph.h Thu May 2 14:47:31 1991
-***************
-*** 1,43 ****
-! /* $Log: jgraph.h,v $
-! * Revision 1.7 91/01/16 10:58:42 jsp
-! * After Patch #1 -- Ifdefs have been included for VMS and LCC, and
-! * minor bugs have been fixed
-! *
-! * Revision 1.6 91/01/10 12:10:15 jsp
-! * Version exported to comp.sources.misc
-! *
-! * Revision 1.5 90/12/03 16:50:45 jsp
-! * Added the -P option to print postscript suitable for direct piping to lpr.
-! *
-! * Revision 1.4 90/11/26 17:14:22 jsp
-! * Fixed include parameter so that the directory must be specified by -I
-! * command line option
-! *
-! * Revision 1.3 90/10/18 12:47:18 jsp
-! * First release version
-! *
-! * Changes include the addition of logrhythmic axes, better hash mark
-! * editing, etc.
-! *
-! * Revision 1.2 90/10/14 19:58:28 jsp
-! * Added the new fields hash_lines and hash_labels to struct curve so that
-! * processing of the hash lines & labels could be done in process.c.
-! *
-! * Added extern declarations for MARKTYPES, etc., to clean up the
-! * editing of marktypes.
-! *
-! * Revision 1.1 90/10/12 18:15:00 jsp
-! * Initial revision
-! *
-! * This is the main header file which defines all the
-! * structs and macro definitions of the jgraph program.
-! *
-! * All of the structures which have flink and blink fields
-! * are meant to be used with the list manipulation routines
-! * in /u/jsp/src/list.
- */
--
--
-
- #include "list.h"
- #include "prio_list.h"
---- 1,9 ----
-! /*
-! * $Source: /n/fs/vd/jsp/src/jgraph/RCS/jgraph.h,v $
-! * $Revision: 5.0 $
-! * $Date: 91/05/02 14:46:24 $
-! * $Author: jsp $
- */
-
- #include "list.h"
- #include "prio_list.h"
-*** ../patches/patch.5/work/list.c Thu May 2 15:15:34 1991
---- list.c Thu May 2 14:47:31 1991
-***************
-*** 1,7 ****
-! /* $Log: list.c,v $
-! * Revision 1.1 90/10/12 17:51:13 jsp
-! * Initial revision
-! *
- */
-
- #include <stdio.h> /* Basic includes and definitions */
---- 1,8 ----
-! /*
-! * $Source: /n/fs/vd/jsp/src/jgraph/RCS/list.c,v $
-! * $Revision: 5.0 $
-! * $Date: 91/05/02 14:45:14 $
-! * $Author: jsp $
- */
-
- #include <stdio.h> /* Basic includes and definitions */
-*** ../patches/patch.5/work/list.h Thu May 2 15:15:35 1991
---- list.h Thu May 2 14:47:31 1991
-***************
-*** 1,12 ****
-! /* $Log: list.h,v $
-! * Revision 1.1 90/10/12 17:51:31 jsp
-! * Initial revision
-! *
- */
--
-- /* Jim Plank
-- * list.h
-- * List manipulation header file */
-
- /* This is the header file for the list manipulation routines in list.c.
- * Any struct can be turned into a list as long as its first two fields are
---- 1,9 ----
-! /*
-! * $Source: /n/fs/vd/jsp/src/jgraph/RCS/list.h,v $
-! * $Revision: 5.0 $
-! * $Date: 91/05/02 14:46:26 $
-! * $Author: jsp $
- */
-
- /* This is the header file for the list manipulation routines in list.c.
- * Any struct can be turned into a list as long as its first two fields are
-*** ../patches/patch.5/work/printline.c Thu May 2 15:15:38 1991
---- printline.c Thu May 2 14:47:31 1991
-***************
-*** 1,20 ****
-! /* $Log: printline.c,v $
-! * Revision 1.4 91/01/16 10:58:31 jsp
-! * After Patch #1 -- Ifdefs have been included for VMS and LCC, and
-! * minor bugs have been fixed
-! *
-! * Revision 1.3 91/01/10 12:09:40 jsp
-! * Version exported to comp.sources.misc
-! *
-! * Revision 1.2 90/10/18 12:45:49 jsp
-! * First release version
-! *
-! *
-! * Revision 1.1 90/10/12 18:16:16 jsp
-! * Initial revision
-! *
-! *
-! * Module to put postscript commands to the standard output
- */
-
- #include "jgraph.h"
---- 1,8 ----
-! /*
-! * $Source: /n/fs/vd/jsp/src/jgraph/RCS/printline.c,v $
-! * $Revision: 5.0 $
-! * $Date: 91/05/02 14:45:15 $
-! * $Author: jsp $
- */
-
- #include "jgraph.h"
-*** ../patches/patch.5/work/prio_list.c Thu May 2 15:15:38 1991
---- prio_list.c Thu May 2 14:47:32 1991
-***************
-*** 1,13 ****
-! /* $Log: prio_list.c,v $
-! * Revision 1.1 90/10/12 17:52:01 jsp
-! * Initial revision
-! *
- */
-
-- /* Jim Plank
-- * prio_list.c
-- * Prioirity list manipulation */
--
- #include "list.h"
- #include "prio_list.h"
- #include <stdio.h>
---- 1,10 ----
-! /*
-! * $Source: /n/fs/vd/jsp/src/jgraph/RCS/prio_list.c,v $
-! * $Revision: 5.0 $
-! * $Date: 91/05/02 14:45:17 $
-! * $Author: jsp $
- */
-
- #include "list.h"
- #include "prio_list.h"
- #include <stdio.h>
-*** ../patches/patch.5/work/prio_list.h Thu May 2 15:15:39 1991
---- prio_list.h Thu May 2 14:47:32 1991
-***************
-*** 1,12 ****
-! /* $Log: prio_list.h,v $
-! * Revision 1.1 90/10/12 17:52:29 jsp
-! * Initial revision
-! *
- */
--
-- /* Jim Plank
-- * prio_list.h
-- * Prioirity list manipulation header file */
-
- /* Priority lists are just like normal lists of list.h and list.c, except
- * that their third field is a (int) prioriy. The routines of list.c should all
---- 1,9 ----
-! /*
-! * $Source: /n/fs/vd/jsp/src/jgraph/RCS/prio_list.h,v $
-! * $Revision: 5.0 $
-! * $Date: 91/05/02 14:46:27 $
-! * $Author: jsp $
- */
-
- /* Priority lists are just like normal lists of list.h and list.c, except
- * that their third field is a (int) prioriy. The routines of list.c should all
-*** ../patches/patch.5/work/process.c Thu May 2 15:15:39 1991
---- process.c Thu May 2 14:47:32 1991
-***************
-*** 1,44 ****
-! /* $Log: process.c,v $
-! * Revision 1.10 91/01/16 10:58:34 jsp
-! * After Patch #1 -- Ifdefs have been included for VMS and LCC, and
-! * minor bugs have been fixed
-! *
-! * Revision 1.9 91/01/10 12:09:45 jsp
-! * Version exported to comp.sources.misc
-! *
-! * Revision 1.8 90/12/04 13:51:14 jsp
-! * Fixed a bug in the automatic spacing of legend entries.
-! *
-! * Revision 1.7 90/11/26 17:11:55 jsp
-! * Changed so that default legends for curves with large marksizes will
-! * look ok. Previously, this was a problem, especially bad with bar graphs.
-! *
-! * Revision 1.6 90/10/18 12:46:12 jsp
-! * First release version
-! *
-! * Changes include the addition of logrhythmic axes, better hash mark
-! * editing, etc.
-! *
-! * Revision 1.5 90/10/14 21:26:59 jsp
-! * Changed to process user-inputted hash lines and has labels
-! *
-! * Revision 1.4 90/10/14 19:55:49 jsp
-! * Took over the processing of hash lines and labels to use the new
-! * hash_lines and hash_labels fields of struct curve. Also, took over
-! * almost all processing that was previously done in draw.c.
-! *
-! * Revision 1.3 90/10/14 14:23:19 jsp
-! * Added code for bar graphs
-! *
-! * Revision 1.2 90/10/14 13:36:24 jsp
-! * Updated to use error_header, as defined in token.c 1.2.
-! *
-! * Revision 1.1 90/10/12 18:17:55 jsp
-! * Initial revision
-! *
-! *
-! * Module to process the data structures after they've been
-! * editted by the routines in edit.c
- */
-
- #include <stdio.h>
---- 1,8 ----
-! /*
-! * $Source: /n/fs/vd/jsp/src/jgraph/RCS/process.c,v $
-! * $Revision: 5.0 $
-! * $Date: 91/05/02 14:45:18 $
-! * $Author: jsp $
- */
-
- #include <stdio.h>
-*** ../patches/patch.5/work/show.c Thu May 2 15:15:40 1991
---- show.c Thu May 2 14:47:32 1991
-***************
-*** 1,36 ****
-! /* $Log: show.c,v $
-! * Revision 1.8 91/01/31 16:15:37 jsp
-! * For patch #2 -- Fixed a bug with disttop which caused it to
-! * work incorrectly with axis minima which != 0.
-! *
-! * Revision 1.7 91/01/16 10:58:37 jsp
-! * After Patch #1 -- Ifdefs have been included for VMS and LCC, and
-! * minor bugs have been fixed
-! *
-! * Revision 1.6 91/01/10 12:09:48 jsp
-! * Version exported to comp.sources.misc
-! *
-! * Revision 1.5 90/11/26 17:12:53 jsp
-! * Fixed a bug (faulty comment printed out)
-! *
-! * Revision 1.4 90/10/18 12:46:59 jsp
-! * First release version
-! *
-! * Changes include the addition of logrhythmic axes, better hash mark
-! * editing, etc.
-! *
-! * Revision 1.3 90/10/14 21:27:41 jsp
-! * Changed to show hash line and label defaults
-! *
-! * Revision 1.2 90/10/14 19:57:01 jsp
-! * Updated to reflect changes in edit.c.
-! *
-! * Revision 1.1 90/10/12 18:29:39 jsp
-! * Initial revision
-! *
-! *
-! * Module to pretty-print / show the defaults of the input,
-! * as flagged by the -p option.
- */
-
- #include <stdio.h>
---- 1,8 ----
-! /*
-! * $Source: /n/fs/vd/jsp/src/jgraph/RCS/show.c,v $
-! * $Revision: 5.0 $
-! * $Date: 91/05/02 14:45:21 $
-! * $Author: jsp $
- */
-
- #include <stdio.h>
-*** ../patches/patch.5/work/token.c Thu May 2 15:15:49 1991
---- token.c Thu May 2 14:47:33 1991
-***************
-*** 1,50 ****
-! /* $Log: token.c,v $
-! * Revision 1.10 91/04/12 17:06:55 jsp
-! * Added the shell command to allow jgraph to execute stuff
-! *
-! * Revision 1.9 91/01/16 11:04:04 jsp
-! * Fixed Rlog information
-! *
-! * Revision 1.8 91/01/16 10:58:39 jsp
-! * After Patch #1 -- Ifdefs have been included for VMS and LCC, and
-! * minor bugs have been fixed
-! *
-! * Revision 1.7 91/01/15 12:06:04 jsp
-! * Fixed a bug in new_printable_text -- the end of the string had
-! * not been set to null.
-! *
-! * Revision 1.6 91/01/10 12:09:52 jsp
-! * Version exported to comp.sources.misc
-! *
-! * Revision 1.5 90/11/26 17:13:32 jsp
-! * Fixed include parameter so that the directory must be specified by -I
-! * command line option
-! *
-! * Revision 1.4 90/10/18 12:46:43 jsp
-! * First release version
-! *
-! * Revision 1.3 90/10/14 13:49:47 jsp
-! * Fixed bug with revision 1.2 by pushing oldchar & oldcharvalid onto
-! * the iostack.
-! *
-! * Revision 1.2 90/10/14 13:34:29 jsp
-! * Added better error-flagging capabilities:
-! * The function "error_header" will print out <filename>,<line number>:
-! * to stderr.
-! * The Iostack struct had to be changed to accomodate this.
-! * Also, getchar/sprintf could no longer be used, as line tracking
-! * had to be incorporated.
-! * Thus, new procedures gettokenchar() and ungettokenchar() were
-! * implemented.
-! *
-! * Revision 1.1 90/10/12 18:08:04 jsp
-! * Initial revision
-! *
-! *
-! * Module for getting tokens from stdin and included files.
- */
-
--
- #include <math.h>
- #ifdef LCC
- #include <stdlib.h>
---- 1,10 ----
-! /*
-! * $Source: /n/fs/vd/jsp/src/jgraph/RCS/token.c,v $
-! * $Revision: 5.0 $
-! * $Date: 91/05/02 14:45:23 $
-! * $Author: jsp $
- */
-
- #include <math.h>
- #ifdef LCC
- #include <stdlib.h>
-***************
-*** 65,71 ****
- char *filename;
- FILE *stream;
- int oldcharvalid;
-! signed char oldchar;
- char pipe;
- int line;
- } *Iostack;
---- 25,31 ----
- char *filename;
- FILE *stream;
- int oldcharvalid;
-! char oldchar;
- char pipe;
- int line;
- } *Iostack;
-***************
-*** 72,83 ****
-
- static char INPUT[300];
- static int getnew = 1;
-! static signed char oldchar = '\0';
- static oldcharvalid = 0;
- static char pipe = 0;
- static int eof = 0;
- static int init = 0;
- static Iostack stack;
-
- #ifndef VMS
- static FILE *IOSTREAM = stdin;
---- 32,44 ----
-
- static char INPUT[300];
- static int getnew = 1;
-! static char oldchar = '\0';
- static oldcharvalid = 0;
- static char pipe = 0;
- static int eof = 0;
- static int init = 0;
- static Iostack stack;
-+ static char real_eof = EOF;
-
- #ifndef VMS
- static FILE *IOSTREAM = stdin;
-***************
-*** 131,143 ****
- char *s;
- {
- int i;
-! signed char c;
-
- for (c = gettokenchar();
- c == ' ' || c == '\t' || c == '\n';
- c = gettokenchar()) ;
- for (i = 0;
-! c != EOF && c != ' ' && c != '\t' && c != '\n';
- c = gettokenchar()) {
- s[i++] = c;
- }
---- 92,104 ----
- char *s;
- {
- int i;
-! char c;
-
- for (c = gettokenchar();
- c == ' ' || c == '\t' || c == '\n';
- c = gettokenchar()) ;
- for (i = 0;
-! c != real_eof && c != ' ' && c != '\t' && c != '\n';
- c = gettokenchar()) {
- s[i++] = c;
- }
-***************
-*** 361,378 ****
-
- char *getlabel()
- {
-! signed char c;
- int i;
-
- if (getnew == 0) return CNULL;
-
- c = gettokenchar();
-! if (c == EOF) {
- ungettokenchar();
- return CNULL;
- }
- i = 0;
-! for (c = gettokenchar(); c != EOF && c != '\n'; c = gettokenchar()) {
- INPUT[i++] = c;
- }
- ungettokenchar();
---- 322,339 ----
-
- char *getlabel()
- {
-! char c;
- int i;
-
- if (getnew == 0) return CNULL;
-
- c = gettokenchar();
-! if (c == real_eof) {
- ungettokenchar();
- return CNULL;
- }
- i = 0;
-! for (c = gettokenchar(); c != real_eof && c != '\n'; c = gettokenchar()) {
- INPUT[i++] = c;
- }
- ungettokenchar();
-***************
-*** 382,399 ****
-
- int getsystemstring()
- {
-! signed char c;
- int i;
-
- if (getnew == 0) return 0;
-
- c = gettokenchar();
-! if (c == EOF) {
- ungettokenchar();
- return 0;
- }
- i = 0;
-! for (c = gettokenchar(); c != EOF && c != '\n'; c = gettokenchar()) {
- INPUT[i++] = c;
- }
- ungettokenchar();
---- 343,360 ----
-
- int getsystemstring()
- {
-! char c;
- int i;
-
- if (getnew == 0) return 0;
-
- c = gettokenchar();
-! if (c == real_eof) {
- ungettokenchar();
- return 0;
- }
- i = 0;
-! for (c = gettokenchar(); c != real_eof && c != '\n'; c = gettokenchar()) {
- INPUT[i++] = c;
- }
- ungettokenchar();
End of patch.5
exit 0 # Just in case...
--
Kent Landfield INTERNET: kent@sparky.IMD.Sterling.COM
Sterling Software, IMD UUCP: uunet!sparky!kent
Phone: (402) 291-8300 FAX: (402) 291-4362
Please send comp.sources.misc-related mail to kent@uunet.uu.net.