jsp@Princeton.EDU (James Plank) (01/17/91)
Submitted-by: jsp@Princeton.EDU (James Plank)
Posting-number: Volume 16, Issue 77
Archive-name: jgraph/patch1
Patch-To: jgraph: Volume 16, Issue 20
# To unbundle, "sed '1,/^# To unbundle/d' < thisfile | sh"
# Wed Jan 16 11:12:39 EST 1991
echo PATCH.1.README 1>&2
sed 's/^-//' >'PATCH.1.README' <<'End of PATCH.1.README'
-To apply these patches, make sure the unbundled files are in the
-same directory as the sources, and then
-
-sh apply_patch.1
End of PATCH.1.README
echo acc.tex.1.patch 1>&2
sed 's/^-//' >'acc.tex.1.patch' <<'End of acc.tex.1.patch'
-*** acc.tex Wed Jan 16 11:07:39 1991
---- acc.tex.new Wed Jan 16 11:06:39 1991
-***************
-*** 5,11 ****
- \begin{document}
-
-
-! A scatter plot with plotted text:
-
- \begin{figure}[h]
- \centerline{\psfig{figure=/u/jsp/src/jgraph/graphs/acc.jps}}
---- 5,11 ----
- \begin{document}
-
-
-! A sample bar graph
-
- \begin{figure}[h]
- \centerline{\psfig{figure=/u/jsp/src/jgraph/graphs/acc.jps}}
End of acc.tex.1.patch
echo apply_patch.1 1>&2
sed 's/^-//' >'apply_patch.1' <<'End of apply_patch.1'
-#!/bin/sh
-
-patch acc.tex acc.tex.1.patch
-
-patch draw.c draw.c.1.patch
-
-patch edit.c edit.c.1.patch
-
-patch jgraph.c jgraph.c.1.patch
-
-patch jgraph.h jgraph.h.1.patch
-
-patch makefile makefile.1.patch
-
-patch printline.c printline.c.1.patch
-
-patch process.c process.c.1.patch
-
-patch show.c show.c.1.patch
-
-patch token.c token.c.1.patch
End of apply_patch.1
echo draw.c.1.patch 1>&2
sed 's/^-//' >'draw.c.1.patch' <<'End of draw.c.1.patch'
-*** draw.c Wed Jan 16 11:07:40 1991
---- draw.c.new Wed Jan 16 11:06:31 1991
-***************
-*** 1,4 ****
---- 1,11 ----
- /* $Log: draw.c,v $
-+ * 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.
- *
-***************
-*** 25,31 ****
- */
-
- #include "jgraph.h"
--
- #include <stdio.h>
- #include <math.h>
-
---- 32,37 ----
End of draw.c.1.patch
echo edit.c.1.patch 1>&2
sed 's/^-//' >'edit.c.1.patch' <<'End of edit.c.1.patch'
-*** edit.c Wed Jan 16 11:07:41 1991
---- edit.c.new Wed Jan 16 11:06:31 1991
-***************
-*** 1,4 ****
---- 1,11 ----
- /* $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.
- *
-***************
-*** 168,174 ****
- g->y_axis->pmax = MAX(g->y_axis->pmax, p->y);
- g->y_axis->pmin = MIN(g->y_axis->pmin, p->y);
- }
-! insert(p, c->pts, 0);
- }
- rejecttoken();
- } else if (strcmp(inp_str, "label") == 0) {
---- 175,182 ----
- g->y_axis->pmax = MAX(g->y_axis->pmax, p->y);
- g->y_axis->pmin = MIN(g->y_axis->pmin, p->y);
- }
-! /*insert(p, c->pts, 0); insert only takes 2 arguments -hdd */
-! insert(p, c->pts);
- }
- rejecttoken();
- } else if (strcmp(inp_str, "label") == 0) {
End of edit.c.1.patch
echo jgraph.c.1.patch 1>&2
sed 's/^-//' >'jgraph.c.1.patch' <<'End of jgraph.c.1.patch'
-*** jgraph.c Wed Jan 16 11:07:45 1991
---- jgraph.c.new Wed Jan 16 11:06:32 1991
-***************
-*** 1,4 ****
---- 1,11 ----
- /* $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.
- *
-***************
-*** 24,32 ****
- * Module with the main() routine, and with routines to allocate
- * memory and initialize the structs defined in jgraph.h.
- */
--
- #include <stdio.h>
-
- #include "jgraph.h"
-
- int NMARKTYPES = 11;
---- 31,43 ----
- * Module with the main() routine, and with routines to allocate
- * memory and initialize the structs defined in jgraph.h.
- */
- #include <stdio.h>
-
-+ #ifdef VMS
-+ #include <redexp.VMS>
-+ extern FILE *IOSTREAM; /* for token.c, q.v. -hdd */
-+ #endif
-+
- #include "jgraph.h"
-
- int NMARKTYPES = 11;
-***************
-*** 195,200 ****
---- 206,212 ----
-
- g = (Graph) get_node(gs);
- g->num = num;
-+ g->minval = 0.0; /* added -hdd */
- g->x_axis = new_axis(1);
- g->y_axis = new_axis(0);
- g->x_translate = 0.0;
-***************
-*** 225,233 ****
---- 237,249 ----
- int i;
- char show;
-
-+ #ifdef VMS
-+ IOSTREAM = stdin; /* for token.c -hdd */
-+ #endif
- show = 0;
- gs.g = (Graph) make_list(sizeof(struct graph));
- gs.height = 0.0;
-+ gs.width = 0.0; /* added -hdd */
- gs.printable_postscript = 0;
- edit_graphs(&gs);
- process_graphs(&gs);
End of jgraph.c.1.patch
echo jgraph.h.1.patch 1>&2
sed 's/^-//' >'jgraph.h.1.patch' <<'End of jgraph.h.1.patch'
-*** jgraph.h Wed Jan 16 11:07:46 1991
---- jgraph.h.new Wed Jan 16 11:06:32 1991
-***************
-*** 1,4 ****
---- 1,11 ----
- /* $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.
- *
-***************
-*** 30,38 ****
---- 37,50 ----
- * in /u/jsp/src/list.
- */
-
-+
-+
- #include "list.h"
- #include "prio_list.h"
- #include "fprio_list.h"
-+ #ifdef LCC
-+ #include <stdlib.h>
-+ #endif
-
- #define PPI 120
- #define FPPI 120.0
End of jgraph.h.1.patch
echo makefile.1.patch 1>&2
sed 's/^-//' >'makefile.1.patch' <<'End of makefile.1.patch'
-*** makefile Wed Jan 16 11:07:47 1991
---- makefile.new Wed Jan 16 11:06:36 1991
-***************
-*** 1,7 ****
- LISTSOURCE = /u/jsp/src/list
- CC = cc
-
-! OBJS = list.o prio_list.o fprio_list.o jgraph.o token.o printline.o draw.o process.o edit.o show.o
-
- all: jgraph
-
---- 1,16 ----
- LISTSOURCE = /u/jsp/src/list
- CC = cc
-
-! OBJS = draw.o \
-! edit.o \
-! fprio_list.o \
-! jgraph.o \
-! list.o \
-! printline.o \
-! prio_list.o \
-! process.o \
-! show.o \
-! token.o
-
- all: jgraph
-
-***************
-*** 17,21 ****
-
-
- jgraph: $(OBJS)
-! $(CC) -g $(OBJS) -lm
-
---- 26,43 ----
-
-
- jgraph: $(OBJS)
-! $(CC) -g $(OBJS) -lm -o jgraph
-
-+ ###
-+ draw.o: draw.c jgraph.h list.h prio_list.h fprio_list.h
-+ edit.o: edit.c jgraph.h list.h prio_list.h fprio_list.h
-+ fprio_list.o: fprio_list.c list.h prio_list.h
-+ jgraph.o: jgraph.c jgraph.h list.h prio_list.h fprio_list.h
-+ list.o: list.c list.h
-+ printline.o: printline.c jgraph.h list.h prio_list.h fprio_list.h
-+ prio_list.o: prio_list.c list.h prio_list.h
-+ process.o: process.c jgraph.h list.h prio_list.h fprio_list.h
-+ show.o: show.c jgraph.h list.h prio_list.h fprio_list.h
-+ token.o: token.c list.h
-+ clean:
-+ rm -f *.o a.out
End of makefile.1.patch
echo printline.c.1.patch 1>&2
sed 's/^-//' >'printline.c.1.patch' <<'End of printline.c.1.patch'
-*** printline.c Wed Jan 16 11:07:48 1991
---- printline.c.new Wed Jan 16 11:06:32 1991
-***************
-*** 1,4 ****
---- 1,11 ----
- /* $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
- *
-***************
-*** 11,17 ****
- */
-
- #include "jgraph.h"
--
- #include <stdio.h>
-
- #define LINEWIDTHFACTOR 0.700
---- 18,23 ----
End of printline.c.1.patch
echo process.c.1.patch 1>&2
sed 's/^-//' >'process.c.1.patch' <<'End of process.c.1.patch'
-*** process.c Wed Jan 16 11:07:49 1991
---- process.c.new Wed Jan 16 11:06:33 1991
-***************
-*** 1,4 ****
---- 1,11 ----
- /* $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.
- *
-***************
-*** 35,41 ****
- */
-
- #include <stdio.h>
--
- #include <math.h>
-
- #include "jgraph.h"
---- 42,47 ----
End of process.c.1.patch
echo show.c.1.patch 1>&2
sed 's/^-//' >'show.c.1.patch' <<'End of show.c.1.patch'
-*** show.c Wed Jan 16 11:07:50 1991
---- show.c.new Wed Jan 16 11:06:33 1991
-***************
-*** 1,4 ****
---- 1,11 ----
- /* $Log: show.c,v $
-+ * 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)
- *
-***************
-*** 23,29 ****
- */
-
- #include <stdio.h>
--
- #include <math.h>
- #include "jgraph.h"
-
---- 30,35 ----
End of show.c.1.patch
echo token.c.1.patch 1>&2
sed 's/^-//' >'token.c.1.patch' <<'End of token.c.1.patch'
-*** token.c Wed Jan 16 11:08:00 1991
---- token.c.new Wed Jan 16 11:06:33 1991
-***************
-*** 1,4 ****
---- 1,18 ----
- /* $Log: token.c,v $
-+ * 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
-***************
-*** 27,33 ****
---- 41,55 ----
- * Module for getting tokens from stdin and included files.
- */
-
-+
- #include <math.h>
-+ #ifdef LCC
-+ #include <stdlib.h>
-+ #endif
-+ /* On VMS, math.h does not have a definition for atof. Grrr. */
-+ #ifdef VMS
-+ #include <stdlib.h>
-+ #endif
- #include <stdio.h>
-
- #include "list.h"
-***************
-*** 50,56 ****
---- 72,82 ----
- static int eof = 0;
- static int init = 0;
- static Iostack stack;
-+ #ifndef VMS
- static FILE *IOSTREAM = stdin;
-+ #else
-+ FILE *IOSTREAM; /* VMS cannot initialize streams, init in jgraph.c -hdd */
-+ #endif
- static char FILENAME[300];
- static int line = 1;
-
-***************
-*** 252,257 ****
---- 278,284 ----
- }
- new_s[j++] = s[i];
- }
-+ new_s[j] = '\0'; /* added: tie off -hdd */
- return new_s;
- }
-
End of token.c.1.patch
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.