*** ./src/genbez.c	Fri Jun 16 03:26:44 1995
--- ../ralcgm/./src/genbez.c	Mon Aug 10 17:22:40 1998
***************
*** 32,38 ****
  
  static char *func="genbez";
  
! Logical cgmerrcount=FALSE, cgmquiet=FALSE;
  
  BezDir  Dir;
  BezFont Bfont;
--- 32,39 ----
  
  static char *func="genbez";
  
! Int     cgmerrcount=FALSE;
! Logical cgmquiet=FALSE;
  
  BezDir  Dir;
  BezFont Bfont;
*** ./src/cgmotek.c	Fri Apr 15 09:29:45 1994
--- ../ralcgm/./src/cgmotek.c	Mon Aug 10 17:15:53 1998
***************
*** 673,679 ****
  
  {
     int i, len = strlen(opts);
!    char *func="TEKoptions",*temp=" ";
  
     for ( i=0; i < len; i++ )
     {
--- 673,679 ----
  
  {
     int i, len = strlen(opts);
!    char *func="TEKoptions",temp[2];
  
     for ( i=0; i < len; i++ )
     {
***************
*** 690,696 ****
             n_collev = DEF_COLLEV;   /* Colour Levels in TEK RGB units */
             break;
           default:   /*  Unknown Option */
!            *temp = opts[i];
             (void)CGMerror(func,ERR_INVOPT,ERROR,temp);
             break;
        }
--- 690,697 ----
             n_collev = DEF_COLLEV;   /* Colour Levels in TEK RGB units */
             break;
           default:   /*  Unknown Option */
!            temp[0] = opts[i];
! 	   temp[1] = '\0';
             (void)CGMerror(func,ERR_INVOPT,ERROR,temp);
             break;
        }
*** ./src/Makefile	Mon Aug 10 16:53:41 1998
--- ../ralcgm/./src/Makefile	Tue Aug 11 11:17:11 1998
***************
*** 0 ****
--- 1,333 ----
+ #  RAL-CGM Interpreter source Makefile: @(#) Makebase  version 3.4
+ #
+ #  Name of executable module (usually ../bin/ralcgm)
+ #
+ MODULE = ../bin/ralcgm
+ #
+ #  Name of callable library (Optional) (usually ../bin/libcgm.a)
+ #
+ LIB = ../bin/libcgm.a
+ #
+ #  Include file directory (usually ../include)
+ #
+ INCLUDE = ../include
+ #
+ #  Data files directory (usually ../data)
+ #
+ DATADIR = ../data
+ #
+ #  Main Interpreter object file (usually cgmmain.o)
+ #
+ MAIN = cgmmain.o
+ #
+ #
+ #
+ MAKEFILE = Makefile
+ #
+ #  CGM input encoding - Object files
+ #                       Include here files for each encoding that
+ #                       may need to be processed; usually
+ #                       cgmichar.o cgmitext.o cgmibin.o
+ #
+ INPUT = cgmichar.o cgmitext.o cgmibin.o
+ #
+ #  CGM output encoding - Object files
+ #                        Include here files for each encoding that
+ #                        may be generated; usually
+ #                        cgmochar.o cgmotext.o cgmobin.o
+ #
+ OUTPUT = cgmochar.o cgmotext.o cgmobin.o
+ #
+ #  User callable Library (comment out if not required)
+ #
+ CGMLIB = cgmlib.o
+ #
+ #  Optional Drivers
+ #
+ #     IGL - Iris Graphics Library
+ #     PS  - PostScript
+ #     XW  - X-Windows
+ #     VID - Topaz Library
+ #
+ IGL = cgmoigl.o
+ PS = cgmops.o
+ XW = cgmoxw.o
+ VID = cgmotpz.o
+ TEK = cgmotek.o
+ HPGL = cgmohpgl.o
+ #
+ #  List of driver files to be used in generating the $(MODULE).
+ #
+ #  The possible candidates are:
+ #
+ #     $(OUTPUT)       list of CGM output encodings defined above
+ #     $(IGL)          Iris graphics library
+ #     $(XW)           X-Windows
+ #     $(PS)           PostScript
+ #     $(HPGL)         HPGL
+ #     $(TEK)          Tektronix 4200
+ #     $(VID)          Video system
+ #
+ DRIVERS =  $(XW) $(PS) $(HPGL) $(TEK)
+ #
+ #  Input utilities Object files
+ #                These provides random access input and convenient
+ #                handling of input attributes
+ #
+ ERRUTILS = cgmerr.o
+ ERRINCLUDES = $(INCLUDE)/cgmerr.h
+ 
+ FILEUTILS = cgmfile.o
+ FILEINCLUDES = $(INCLUDE)/cgmfile.h
+ 
+ GENUTILS = $(FILEUTILS) $(ERRUTILS)
+ GENINCS  = $(FILEINCLUDES) \
+ 	   $(ERRINCLUDES)
+ 
+ RANUTILS = cgmrand.o cgmprof.o
+ INPUTILS = cgminput.o
+ #
+ #  Output utility Object files (only needed with output drivers)
+ #                 These provide emulation of GDPs, filled areas
+ #                 and other graphical operations. Not needed by all drivers
+ #                 currently cgmgdp.o is used by XW, IGL & VID
+ #                           cgmfill.o & cgmgraph.o are used by IGL only
+ #
+ ATTUTILS = cgmatt.o
+ GDPUTILS = cgmgdp.o
+ FILUTILS = cgmpoly.o cgmtrap.o cgmfill.o cgmgraph.o
+ COLRUTILS = cgmcolr.o
+ CELLUTILS = cgmcell.o
+ PTSUTILS = cgmpts.o
+ #
+ OUTUTILS = $(ATTUTILS) $(GDPUTILS) $(FILUTILS) $(COLRUTILS) $(CELLUTILS) $(PTSUTILS)
+ #
+ #  Text utility Object files
+ #                 These provide software emulation of text and
+ #                 generally useful text facilities.
+ #
+ #                 cgmtext.o  - general text utility - PS & XW
+ #                 cgmfont.o  - general font utility - PS & XW
+ #                 cgmbez.o   - Bezier text - if wanted
+ #                 cgmher.o   - Hershey text - if wanted
+ #
+ FNTUTILS = cgmfont.o
+ FNTINCLUDES = $(INCLUDE)/cgmfont.h
+ TEXTUTILS = cgmtext.o
+ TEXTINCLUDES = $(INCLUDE)/cgmtext.h
+ #
+ BEZIER = genbez
+ BEZUTILS = cgmbez.o
+ BEZLINK = $(BEZIER).o
+ BEZDATA = $(DATADIR)/*.bfs
+ BEZINCLUDES = $(INCLUDE)/cgmbez.h
+ #
+ HERSHEY = genher
+ HERUTILS = cgmher.o
+ HERLINK = $(HERSHEY).o
+ HERDATA = $(DATADIR)/*.hfs
+ HERINCLUDES = $(INCLUDE)/cgmher.h
+ #
+ #    TXTSYS settings, supported text systems are:
+ #
+ #             $(HERSHEY)
+ #             $(BEZIER)
+ #
+ TXTSYS = $(BEZIER) $(HERSHEY)
+ #
+ #    TXTUTILS settings, supported text utilities are:
+ #
+ #             $(HERUTILS)
+ #             $(BEZUTILS)
+ #   List of utility modules required;
+ #
+ TXTUTILS =  $(BEZUTILS) $(HERUTILS)
+ #
+ #
+ CGMUTILS = $(RANUTILS)\
+            $(INPUTILS)\
+            $(GENUTILS)\
+            $(OUTUTILS)\
+            $(TXTUTILS)\
+            $(TEXTUTILS)\
+            $(FNTUTILS)
+ #
+ #  Set up names for the modules that make up `ralcgm' and `cgmlib'.
+ #
+ RALCGM = $(INPUT)\
+          $(OUTPUT)\
+          $(DRIVERS)\
+          $(CGMUTILS)
+ 
+ LIBCGM = $(CGMLIB)\
+          $(OUTPUT)\
+          $(DRIVERS)\
+          $(INPUTILS)\
+          $(GENUTILS)\
+          $(OUTUTILS)\
+          $(TXTUTILS)\
+          $(TEXTUTILS)\
+          $(FNTUTILS)
+ #
+ #  Local flags for Compiler (system dependent)
+ #
+ #      Examples:   (Iris 3130)         -Zf           -g      -p
+ #                  (Iris 4D)           -O
+ #                  (GNU C on Topaz)    -O -m68881    -g
+ #                  (Sun 3)             -O -fswitch
+ #                  (Sun 4)             -O
+ #                  (Unicos)            -O            -g
+ #
+ CFLAGS = -c -DPOSTSCRIPT="" -DHPGL="" -DTEK4200="" -DBEZIER="" -DHERSHEY=""
+ #
+ #  Local flags for Linker (system dependent)
+ #  For X-windows, add some extra libraries (comment out otherwise)
+ #
+ #      Examples:   (Iris 3130)         -Zg -lm
+ #                  (Iris 4D)           -lm -lgl_s -lX11_s -lc_s
+ #                  (Topaz)             -lE -lmalloc -lm
+ #                  (Sun 3 or 4)        -lm -lX11 -lc
+ #                  (Unicos)            -lm -lX11 -lnet -lc
+ #                  (Unicos - scc)      -lm -lX11 -lnet -lsc
+ #
+ LFLAGS = -lm -lX11 -lc
+ #
+ #  Common include files
+ #
+ GENINCLUDES = $(INCLUDE)/cgmmach.h $(INCLUDE)/mach.h \
+ 	$(INCLUDE)/cgmtypes.h \
+ 	$(INCLUDE)/cgmstruc.h \
+ 	$(INCLUDE)/cgmelem.h \
+ 	$(INCLUDE)/cgmpar.h \
+ 	$(INCLUDE)/cgmtran.h \
+ 	$(INCLUDE)/cgmatt.h
+ #
+ #  List of includes for the text system; must match the text utility
+ #  .o files given above.
+ #
+ INCLUDES = $(GENINCLUDES) $(TXTINCLUDES) $(FNTINCLUDES) \
+            $(BEZINCLUDES) $(HERINCLUDES) $(GENINCS)
+ #
+ #  Define various commands in just one place.
+ #
+ #         for Unicos   LINK = segldr
+ #                      AR   = bld rv
+ #         all others   LINK = cc $(LFLAGS)
+ #                      AR = ar rv
+ #
+ COMPILE = $(CC)
+ LINK = $(CC) $(LDFLAGS)
+ AR = ar crv
+ #
+ #   Main dependencies (should not need altering)
+ 
+ ralcgm:	$(MODULE) $(TXTSYS)
+ 	@echo "$(MODULE) is now made"
+ 
+ cgmlib:	$(LIB) $(TXTSYS)
+ 	@echo "$(LIB) is now made"
+ 
+ iutils: $(INPUTILS) $(GENUTILS)
+ 
+ outils: $(OUTUTILS)
+ 
+ tutils: $(TXTUTILS)
+ 
+ clean:
+ 	rm -f *.o core a.out $(TXTSYS)
+ 
+ $(MODULE):	$(MAIN) $(RALCGM)
+ 	$(LINK) $(MAIN) $(RALCGM) $(LFLAGS) -o $(MODULE)
+ 	chmod 755 $(MODULE)
+ 
+ $(LIB):	$(LIBCGM)
+ 	$(AR) $(LIB) $(LIBCGM)
+ 	chmod 644 $(LIB)
+ 
+ #  include file dependencies
+ 
+ $(MAIN):	$(INCLUDE)/cgminit.h $(GENINCLUDES) $(MAKEFILE)
+ 
+ $(CGMLIB):	$(INCLUDE)/cgmlib.h $(INCLUDE)/cgminit.h $(INCLUDE)/cgmin.h \
+                 $(GENINCLUDES) $(MAKEFILE)
+ 
+ $(INPUT) $(INPUTILS) $(RANUTILS):	$(INCLUDE)/cgmin.h $(GENINCLUDES) $(MAKEFILE)
+ 
+ $(GENUTILS):	$(GENINCLUDES)
+ 
+ $(OUTPUT) $(OUTUTILS):	$(GENINCLUDES) $(MAKEFILE)
+ 
+ $(DRIVERS):	$(INCLUDE)/cgmout.h \
+                 $(INCLUDES) \
+                 $(MAKEFILE)
+ 
+ $(FNTUTILS):	$(FNTINCLUDES) \
+ 		$(INCLUDE)/cgmufont.h \
+                 $(TXTINCLUDES) \
+                 $(MAKEFILE)
+ 
+ $(TEXTUTILS):	$(TEXTINCLUDES) \
+ 		$(FNTINCLUDES) \
+                 $(MAKEFILE)
+ 
+ $(ERRUTILS):	$(ERRINCLUDES) \
+ 		$(GENINCLUDES) \
+ 		$(MAKEFILE)
+ 
+ $(BEZUTILS):	$(BEZINCLUDES) \
+ 		$(INCLUDE)/cgmubez.h \
+ 		$(GENINCLUDES) \
+ 		$(MAKEFILE)
+ 
+ $(BEZIER):	$(BEZLINK) \
+                 $(GENINCS) \
+ 		$(INCLUDE)/cgmubez.h \
+ 		$(BEZDATA) \
+ 		$(MAKEFILE)
+ 	$(LINK) $(BEZLINK) $(GENUTILS) $(LFLAGS) -o $(BEZIER)
+ 	CGMDATA="$(DATADIR)/" ./$(BEZIER)
+ 	chmod 644 $(DATADIR)/*.bfb $(DATADIR)/fontdir.bez
+ 
+ $(HERUTILS):	$(HERINCLUDES) \
+ 		$(INCLUDE)/cgmuher.h \
+ 		$(GENINCLUDES) \
+ 		$(MAKEFILE)
+ 
+ $(HERSHEY):	$(HERLINK) \
+ 		$(GENINCS) \
+ 		$(INCLUDE)/cgmuher.h \
+ 		$(HERDATA) \
+ 		$(MAKEFILE)
+ 	$(LINK) $(HERLINK) $(GENUTILS) $(LFLAGS) -o $(HERSHEY)
+ 	CGMDATA="$(DATADIR)/" ./$(HERSHEY)
+ 	chmod 644 $(DATADIR)/*.hfb $(DATADIR)/fontdir.her
+ 
+ $(IGL):	$(INCLUDE)/cgmigl.h \
+         $(INCLUDE)/cgmgdp.h \
+         $(INCLUDE)/cgmfill.h \
+         $(INCLUDE)/cgmgraph.h \
+ 	$(INCLUDE)/cgmpoly.h \
+         $(INCLUDE)/cgmtrap.h
+ 
+ $(PS):	$(INCLUDE)/cgmps.h \
+         $(INCLUDE)/cgmgdp.h \
+ 	$(INCLUDE)/cgmpoly.h \
+         $(INCLUDE)/cgmtrap.h
+ 
+ $(XW):	$(INCLUDE)/cgmxw.h \
+ 	$(INCLUDE)/cgmgdp.h
+ 
+ $(HPGL):	$(INCLUDE)/cgmhpgl.h \
+ 	$(INCLUDE)/cgmgdp.h \
+ 	$(INCLUDE)/cgmcolr.h
+ 
+ $(TEK):	$(INCLUDE)/cgmtek.h \
+         $(INCLUDE)/cgmgdp.h \
+         $(INCLUDE)/cgmcolr.h \
+         $(INCLUDE)/cgmcell.h \
+         $(INCLUDE)/cgmpts.h
+ 
+ .c.o:
+ 	$(COMPILE) $(CFLAGS) -I$(INCLUDE) $<
+ 
+ .SUFFIXES: .c .o
*** ./src/genher.c	Fri Jun 16 03:26:48 1995
--- ../ralcgm/./src/genher.c	Mon Aug 10 17:22:44 1998
***************
*** 49,55 ****
  HerDef fontdef[maxfpoints];   /*  definitions of chars in a font  */
  
  static char *func = "genher";
! Logical cgmerrcount=FALSE, cgmquiet=FALSE;
  
  main()
  
--- 49,56 ----
  HerDef fontdef[maxfpoints];   /*  definitions of chars in a font  */
  
  static char *func = "genher";
! Int     cgmerrcount=FALSE;
! Logical cgmquiet=FALSE;
  
  main()
  
*** ./src/cgmohpgl.c	Wed Oct 27 06:31:24 1993
--- ../ralcgm/./src/cgmohpgl.c	Mon Aug 10 17:12:03 1998
***************
*** 356,365 ****
                 {
                    Long col[3];
  
!                   col[0] = 0;
!                   col[1] = cur.back.red;
!                   col[2] = cur.back.green;
!                   col[3] = cur.back.blue;
  
                    COLRput(1, col);
                 }
--- 356,364 ----
                 {
                    Long col[3];
  
!                   col[0] = cur.back.red;
!                   col[1] = cur.back.green;
!                   col[2] = cur.back.blue;
  
                    COLRput(1, col);
                 }
***************
*** 689,697 ****
  
           default:
            {
!             char *t=" ";
  
!             *t = opts[i];
              (void)CGMerror(func, ERR_INVOPT, ERROR, t);
              break;
            }
--- 688,697 ----
  
           default:
            {
!             char t[2];
  
!             t[0] = opts[i];
! 	    t[1] = '\0';
              (void)CGMerror(func, ERR_INVOPT, ERROR, t);
              break;
            }
*** ./src/cgmops.c	Tue Jun 13 11:32:33 1995
--- ../ralcgm/./src/cgmops.c	Mon Aug 10 17:05:53 1998
***************
*** 1207,1213 ****
  
  {
     int i, len = strlen(opts);
!    char *func="PSoptions",*temp=" ";
  
     for ( i=0; i < len; i++ )
     {
--- 1207,1213 ----
  
  {
     int i, len = strlen(opts);
!    char *func="PSoptions",temp[2];
  
     for ( i=0; i < len; i++ )
     {
***************
*** 1265,1271 ****
             poly_mode = WHOLE;
             break;
           default:   /*  Unknown Option */
!            *temp = opts[i];
             (void)CGMerror(func,ERR_INVOPT,ERROR,temp);
             break;
        }
--- 1265,1272 ----
             poly_mode = WHOLE;
             break;
           default:   /*  Unknown Option */
!            temp[0] = opts[i];
! 	   temp[1] = '\0';
             (void)CGMerror(func,ERR_INVOPT,ERROR,temp);
             break;
        }
*** ./include/mach.h	Mon Aug 10 16:53:50 1998
--- ../ralcgm/./include/mach.h	Mon Aug 10 16:35:24 1998
***************
*** 0 ****
--- 1,83 ----
+ /*   RAL-CGM Interpreter header file:  @(#) mc_iris.h  version 3.3
+  *
+  *  Irix Specific setting for CGM Interpreter
+  */
+ 
+ #define IRIS
+ #define SYSV
+ 
+ /*  Define Graphics system(s)  */
+ 
+ #define XW
+ 
+ #define POSTSCRIPT
+ #define BEZIER
+ #define HERSHEY
+ 
+ /* Default output is X windows  */
+ 
+ #define DEFOUT  'X'
+ 
+ #define DATADIR "/usr/freeware/share/ralcgm/"
+ 
+ #define NAMELGTH 14
+ #define EXTLGTH   8
+ 
+ #ifdef  IGL      /* Iris Graphics Library */
+ 
+ /*  Set colour and pattern table sizes */
+ 
+ #define COLOUR_TAB  4096
+ #define COLOUR_BITS   12
+ 
+ /*  Set pattern table sizes */
+ #define PATT_TAB   4096
+ #define PATTERNS     40
+ 
+ #endif  /*  IGL  */
+ 
+ #ifdef CGMIGL_H
+ #include "gl.h"
+ #include "device.h"
+ #endif
+ 
+ #define DEFVIRTUALRGB FALSE
+ 
+ #ifdef __mips   /*  Iris 4D  */
+ 
+ #ifdef INDIGO
+ #undef DEFVIRTUALRGB
+ #define DEFVIRTUALRGB TRUE
+ #define IRIS
+ #endif
+ #ifdef IRIS4D
+ #define IRIS
+ #endif
+ 
+ #define XW
+ #define ANSI
+ 
+ #ifdef CGMIGL_H
+ #undef FATAL
+ #undef WARNING
+ #endif
+ 
+ #else          /* Iris 3130 */
+ 
+ typedef unsigned int size_t;
+ typedef long fpos_t;
+ 
+ #define SQRT(x)  sqrt( (float) (x) )
+ 
+ #endif
+ 
+ #ifdef XW     /* X-Windows specific settings  *****/
+ 
+ #ifdef CGMOXW_C
+ #include <X11/cursorfont.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include <X11/Xatom.h>
+ #endif
+ 
+ #endif  /*  XW  */
*** ./include/cgmlib.h	Tue Aug 10 04:10:48 1993
--- ../ralcgm/./include/cgmlib.h	Mon Aug 10 17:20:47 1998
***************
*** 32,38 ****
  
     extern FILE *cgmo;
     extern Enum cgmdriver;
!    extern Logical cgmerrcount;
  
  #define Extern    /*  routines are in this module */
  
--- 32,38 ----
  
     extern FILE *cgmo;
     extern Enum cgmdriver;
!    extern Int cgmerrcount;
  
  #define Extern    /*  routines are in this module */