Index: trunk/Ohana/src/kapa2/src/SetColormap.c
===================================================================
--- trunk/Ohana/src/kapa2/src/SetColormap.c	(revision 40626)
+++ trunk/Ohana/src/kapa2/src/SetColormap.c	(revision 40627)
@@ -214,5 +214,9 @@
 
   /* anuenue */
-  if (!strncmp (graphic->colormapName, "file:", 5)) {
+  if (!strncmp (graphic->colormapName, "file:", 5) || 
+      !strncmp (graphic->colormapName, "lgcy:", 5) || 
+      !strncmp (graphic->colormapName, "cetf:", 5) || 
+      !strncmp (graphic->colormapName, "csvf:", 5)) {
+
     FILE *f = fopen (&graphic->colormapName[5], "r");
     if (!f) {
@@ -227,10 +231,33 @@
     float lastGreen = 0.0;
 
+    int isCSV = !strncmp (graphic->colormapName, "csvf:", 5);
+    int isCET = !strncmp (graphic->colormapName, "cetf:", 5);
+    int isLegacy = !strncmp (graphic->colormapName, "lgcy:", 5);
+
     float fracIndex, fracRed, fracBlue, fracGreen;
+
+    if (isCET) fracIndex = 0.0;
 
     while (scan_line_maxlen (f, line, 1024) != EOF) {
       // file contains f R G B : f = 0.0 - 1.0, R,G,B = 0.0 - 1.0
-      int Nscan = sscanf (line, "%f %f %f %f", &fracIndex, &fracRed, &fracBlue, &fracGreen);
-      if (Nscan != 4) continue;
+
+      int Nscan;
+      if (isCSV) {
+	Nscan = sscanf (line, "%f,%f,%f,%f", &fracIndex, &fracRed, &fracGreen, &fracBlue);
+	if (Nscan != 4) continue;
+      }
+      if (isCET) {
+	Nscan = sscanf (line, "%f,%f,%f", &fracRed, &fracGreen, &fracBlue);
+	fracIndex += 1.0 / 256.0;
+	if (Nscan != 3) continue;
+      }
+      if (isLegacy) {
+	Nscan = sscanf (line, "%f %f %f %f", &fracIndex, &fracRed, &fracBlue, &fracGreen);
+	if (Nscan != 4) continue;
+      }
+      if (!isCSV && !isLegacy && !isCET) {
+	Nscan = sscanf (line, "%f %f %f %f", &fracIndex, &fracRed, &fracGreen, &fracBlue);
+	if (Nscan != 4) continue;
+      }
 
       int nextIndex = fracIndex * MaxValue;