--- ray/src/meta/meta.h	2003/06/08 12:03:10	1.2
+++ ray/src/meta/meta.h	2004/03/22 02:24:23	1.10
@@ -1,28 +1,28 @@
-/* RCSid: $Id: meta.h,v 1.2 2003/06/08 12:03:10 schorsch Exp $ */
+/* RCSid: $Id: meta.h,v 1.10 2004/03/22 02:24:23 greg Exp $ */
 /*
  *   Standard meta-file definitions and limits
  */
 #ifndef _RAD_META_H_
 #define _RAD_META_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #include "copyright.h"
 
 #include  <stdio.h>
 #include  <stdlib.h>
-#include  <malloc.h>
-
 #include  <ctype.h>
 
+#include  "rterror.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define  TRUE  1
 #define  FALSE  0
 
 #define  PEOF  'F'		/* end of file global */
 #define  PEOP  'E'		/* end of page global */
-#define  PPAUSE  'P'		/* pause global */
+#define  PPAUS  'P'		/* pause global */
 #define  PDRAW  'D'		/* draw global */
 #define  POPEN  'O'		/* open segment */
 #define  PCLOSE  'C'		/* close segment */
@@ -46,7 +46,7 @@ extern "C" {
 #define  ADELIM  '`'		/* additional argument delimiter */
 #define  CDELIM  '#'		/* comment delimiter */
 
-#define  MAXARGS  512		/* maximum # of arguments for primitive */
+#define  MAXARGS  2048		/* maximum argument string for primitive */
 
 #define  SALL  0		/* set all */
 #define  SPAT0  04		/* set pattern 0 */
@@ -54,11 +54,13 @@ extern "C" {
 #define  SPAT2  06		/* set pattern 2 */
 #define  SPAT3  07		/* set pattern 3 */
 
-#define  SYSTEM	 0		/* system error, internal, fatal */
-#define  USER  1		/* user error, fatal */
-#define  WARNING  2		/* user error, not fatal */
 
-#ifdef  UNIX
+#ifdef  _WIN32  /* XXX */
+#define MDIR "C:\\tmp\\" /* XXX we just need something to compile for now */
+#define TTY "CON:"   /* XXX this probably doesn't work */
+#define TDIR "C:\\tmp\\" /* XXX we just need something to compile for now */
+#else  /* XXX */
+
 #define  TDIR  "/tmp/"		/* directory for temporary files */
 #ifndef  MDIR
 #define  MDIR  "/usr/local/lib/meta/"	/* directory for metafiles */
@@ -66,23 +68,6 @@ extern "C" {
 #define  TTY  "/dev/tty"	/* console name */
 #endif
 
-#ifdef  MAC
-#define  TDIR  "5:tmp/"		/* directory for temporary files */
-#define  MDIR  "/meta/"		/* directory for metafiles */
-#define  TTY  ".con"		/* console name */
-#endif
-
-#ifdef  CPM
-#define  TDIR  "0/"		/* directory for temporary files */
-#define  MDIR  "0/"		/* directory for metafiles */
-#define  TTY  "CON:"		/* console name */
-#endif
-
-#ifdef  _WIN32  /* XXX */
-#define MDIR "c\\tmp\\" /* XXX we just need something to compile for now */
-#define TTY "CON:"   /* XXX this probably doesn't work */
-#endif  /* XXX */
-
 #define  MAXFNAME  64		/* maximum file name length */
 
 #define  XYSIZE  (1<<14)	/* metafile coordinate size */
@@ -149,11 +134,11 @@ extern char  *progname;
 extern void expand(FILE *infp, short *exlist);
 	/* palloc.c */
 extern PRIMITIVE *palloc(void);
-extern void pfree(register PRIMITIVE *p);
-extern void plfree(register PLIST *pl);
+extern void pfree(PRIMITIVE *p);
+extern void plfree(PLIST *pl);
 	/* sort.c */
 extern void sort(FILE *infp, int (*pcmp)());
-extern void mergesort(FILE *fi[], int nf, PLIST *pl, int (*pcmp)(), FILE *ofp);
+extern void pmergesort(FILE *fi[], int nf, PLIST *pl, int (*pcmp)(), FILE *ofp);
 	/* metacalls.c */
 extern void mdraw(int x, int y);
 extern void msegment(int xmin, int ymin, int xmax, int ymax, char *sname,
@@ -173,6 +158,32 @@ extern void msetpat(int pn, char *pat);
 extern void minclude(char *fname);
 extern void mdone(void);
 extern void mendpage(void);
+	/* misc.c */
+extern int comndx(int c);
+extern PRIMITIVE  *pop(PLIST  *pl);
+extern void push(PRIMITIVE  *p, PLIST  *pl);
+extern void add(PRIMITIVE  *p, PLIST  *pl);
+extern void append(PLIST  *pl1, PLIST  *pl2);
+extern void fargs(PRIMITIVE  *p);
+extern char * nextscan(char  *start, char  *format, char  *result);
+extern void mcopy(char  *p1, char  *p2, int  n);
+	/* segment.c */
+extern int inseg(void);
+extern void closeseg(void);
+extern void openseg(char *name);
+extern void segprim(PRIMITIVE  *p);
+extern void segment(PRIMITIVE *p, void (*funcp)(PRIMITIVE *p));
+extern int xlate(short extrema, PRIMITIVE *p, PRIMITIVE *px);
+	/* cgraph.c */
+extern void cgraph(int width, int length);
+extern void cplot(void);
+extern void cpoint(int  c, double  x, double  y);
+	/* gcalc.c */
+extern void gcalc(char  *types);
+	/* hfio.c, mfio.c */
+extern int readp(PRIMITIVE  *p, FILE  *fp);
+extern void writep(PRIMITIVE  *p, FILE  *fp);
+extern void writeof(FILE  *fp); 
 
 
 #ifdef __cplusplus