Index: trunk/Ohana/src/libkapa/include/kapa.h
===================================================================
--- trunk/Ohana/src/libkapa/include/kapa.h	(revision 38986)
+++ trunk/Ohana/src/libkapa/include/kapa.h	(revision 39926)
@@ -25,29 +25,45 @@
 typedef struct sockaddr_in KapaSockAddress;
 
-typedef struct {
-  float *data1d;
-  float **data2d;
-  int Nx;
-  int Ny;
-} KiiImage;
-
-typedef struct {
-  float x;
-  float y;
-  float dx;
-  float dy;
-  float angle;
-  int type;
-} KiiOverlayBase;
-
-typedef struct {
-  float x;
-  float y;
-  float dx;
-  float dy;
-  float angle;
-  int type;
-  char *text;
-} KiiOverlay;
+// retain historical numerical definitions:
+typedef enum {
+  KAPA_LINE_INVALID_MIN = -1,
+  KAPA_LINE_SOLID       = 0,
+  KAPA_LINE_DOT         = 1,
+  KAPA_LINE_DASH_SHORT  = 2,
+  KAPA_LINE_DASH_LONG   = 3,
+  KAPA_LINE_DOT_DASH    = 4,
+  KAPA_LINE_INVALID_MAX = 5,
+} KapaLineType;
+
+// retain historical numerical definitions:
+typedef enum {
+  KAPA_PLOT_INVALID_MIN = -1,
+  KAPA_PLOT_CONNECT     =  0,
+  KAPA_PLOT_HISTOGRAM   =  1,
+  KAPA_PLOT_POINTS      =  2,
+  KAPA_PLOT_INVALID_MAX =  3,
+} KapaPlotStyle;
+
+typedef enum {
+  KAPA_POINT_INVALID_MIN         = -1,
+  KAPA_POINT_BOX_SOLID           =  0,
+  KAPA_POINT_BOX_OPEN            =  1,
+  KAPA_POINT_CROSS               =  2, // OR PLUS
+  KAPA_POINT_X                   =  3, 
+  KAPA_POINT_Y                   =  4, 
+  KAPA_POINT_TRIANGLE_SOLID      =  5, 
+  KAPA_POINT_TRIANGLE_OPEN       =  6, 
+  KAPA_POINT_CIRCLE_OPEN         =  7, 
+  KAPA_POINT_PENTAGON            =  8, 
+  KAPA_POINT_HEXAGON             =  9, 
+  KAPA_POINT_CIRCLE_SOLID        = 10, 
+  KAPA_POINT_TRIANGLE_SOLID_DOWN = 11, 
+  KAPA_POINT_TRIANGLE_OPEN_DOWN  = 12, 
+  KAPA_POINT_Y_DOWN              = 13, 
+  KAPA_POINT_INVALID_MAX         = 14,
+  KAPA_POINT_PAIR_CONNECT        = 100, // change to a plot style?
+} KapaPointStyle;
+// note that PAIR_CONNECT was historically 100
+
 
 typedef enum {
@@ -75,4 +91,30 @@
   KAPA_PS_RAWPAGE
 } KapaPSmode;
+
+typedef struct {
+  float *data1d;
+  float **data2d;
+  int Nx;
+  int Ny;
+} KiiImage;
+
+typedef struct {
+  float x;
+  float y;
+  float dx;
+  float dy;
+  float angle;
+  int type;
+} KiiOverlayBase;
+
+typedef struct {
+  float x;
+  float y;
+  float dx;
+  float dy;
+  float angle;
+  int type;
+  char *text;
+} KiiOverlay;
 
 typedef struct {
@@ -219,4 +261,9 @@
 unsigned long *KapaX11colors (Display *display, Colormap colormap, unsigned long default_color, int *Ncolors);
 
+/* KapaStyles.c */
+KapaLineType KapaLineTypeFromString (char *string);
+KapaPlotStyle KapaPlotStyleFromString (char *string);
+KapaPointStyle KapaPointStyleFromString (char *string);
+
 /* RotFont.c */
 void InitRotFonts PROTO((void));