Change names from Graphics and Path to Vector, for consistency

We decided to follow the ObjectFilter subclass device's naming convention
for objects that are not Image or Text. This patch makes them all the same.

NOTE: The GS9_Color_Management.pdf document also needs to change since we
are changing the external names as well. Before going 'live' with this non-
backward compatible change (admittedly to something that has probably not
been widely used) we may consider issuing a warning for the previous option
names, or even a warning with automatic use of the new name.

12 files changed, 42 insertions, 42 deletions

diff --git a/base/gscms.h b/base/gscms.h
index caedcb903..7fb362fe7 100644
--- a/base/gscms.h
+++ b/base/gscms.h
@@ -29,7 +29,7 @@
 #define NUM_DEVICE_PROFILES 4
 #define NUM_SOURCE_PROFILES 3
 #define GS_DEFAULT_DEVICE_PROFILE 0
-#define GS_GRAPHIC_DEVICE_PROFILE 1
+#define GS_VECTOR_DEVICE_PROFILE 1
 #define GS_IMAGE_DEVICE_PROFILE 2
 #define GS_TEXT_DEVICE_PROFILE 3
 
@@ -210,7 +210,7 @@ typedef enum {
     GS_UNTOUCHED_TAG = 0x0,	/* UNTOUCHED *must* be 0 -- transparency code relies on this */
     GS_TEXT_TAG = 0x1,
     GS_IMAGE_TAG = 0x2,
-    GS_PATH_TAG = 0x4,
+    GS_VECTOR_TAG = 0x4,
     GS_UNKNOWN_TAG = 0x40,
     GS_DEVICE_ENCODES_TAGS = 0x80
 } gs_graphics_type_tag_t;
diff --git a/base/gscolor3.c b/base/gscolor3.c
index 66cadecdb..951f67418 100644
--- a/base/gscolor3.c
+++ b/base/gscolor3.c
@@ -109,7 +109,7 @@ gs_shfill(gs_gstate * pgs, const gs_shading_t * psh)
 
     /* make sure the tag gets set correctly */
     if (pgs->show_gstate == NULL)
-        ensure_tag_is_set(pgs, pgs->device, GS_PATH_TAG);	/* NB: may unset_dev_color */
+        ensure_tag_is_set(pgs, pgs->device, GS_VECTOR_TAG);	/* NB: may unset_dev_color */
     else
         ensure_tag_is_set(pgs, pgs->device, GS_TEXT_TAG);	/* NB: may unset_dev_color */
 
diff --git a/base/gsdparam.c b/base/gsdparam.c
index b86dcfb4d..79b273d8e 100644
--- a/base/gsdparam.c
+++ b/base/gsdparam.c
@@ -426,8 +426,8 @@ int gx_default_get_param(gx_device *dev, char *Param, void *list)
     if (strcmp(Param, "OutputICCProfile") == 0) {
         return param_write_string(plist,"OutputICCProfile", &(profile_array[0]));
     }
-    if (strcmp(Param, "GraphicICCProfile") == 0) {
-        return param_write_string(plist,"GraphicICCProfile", &(profile_array[1]));
+    if (strcmp(Param, "VectorICCProfile") == 0) {
+        return param_write_string(plist,"VectorICCProfile", &(profile_array[1]));
     }
     if (strcmp(Param, "ImageICCProfile") == 0) {
         return param_write_string(plist,"ImageICCProfile", &(profile_array[2]));
@@ -441,8 +441,8 @@ int gx_default_get_param(gx_device *dev, char *Param, void *list)
     if (strcmp(Param, "RenderIntent") == 0) {
         return param_write_int(plist,"RenderIntent", (const int *) (&(profile_intents[0])));
     }
-    if (strcmp(Param, "GraphicIntent") == 0) {
-        return param_write_int(plist,"GraphicIntent", (const int *) &(profile_intents[1]));
+    if (strcmp(Param, "VectorIntent") == 0) {
+        return param_write_int(plist,"VectorIntent", (const int *) &(profile_intents[1]));
     }
     if (strcmp(Param, "ImageIntent") == 0) {
         return param_write_int(plist,"ImageIntent", (const int *) &(profile_intents[2]));
@@ -453,8 +453,8 @@ int gx_default_get_param(gx_device *dev, char *Param, void *list)
     if (strcmp(Param, "BlackPtComp") == 0) {
         return param_write_int(plist,"BlackPtComp", (const int *) (&(blackptcomps[0])));
     }
-    if (strcmp(Param, "GraphicBlackPt") == 0) {
-        return param_write_int(plist,"GraphicBlackPt", (const int *) &(blackptcomps[1]));
+    if (strcmp(Param, "VectorBlackPt") == 0) {
+        return param_write_int(plist,"VectorBlackPt", (const int *) &(blackptcomps[1]));
     }
     if (strcmp(Param, "ImageBlackPt") == 0) {
         return param_write_int(plist,"ImageBlackPt", (const int *) &(blackptcomps[2]));
@@ -465,8 +465,8 @@ int gx_default_get_param(gx_device *dev, char *Param, void *list)
     if (strcmp(Param, "KPreserve") == 0) {
         return param_write_int(plist,"KPreserve", (const int *) (&(blackpreserve[0])));
     }
-    if (strcmp(Param, "GraphicKPreserve") == 0) {
-        return param_write_int(plist,"GraphicKPreserve", (const int *) &(blackpreserve[1]));
+    if (strcmp(Param, "VectorKPreserve") == 0) {
+        return param_write_int(plist,"VectorKPreserve", (const int *) &(blackpreserve[1]));
     }
     if (strcmp(Param, "ImageKPreserve") == 0) {
         return param_write_int(plist,"ImageKPreserve", (const int *) &(blackpreserve[2]));
@@ -718,7 +718,7 @@ gx_default_get_params(gx_device * dev, gs_param_list * plist)
         (code = param_write_bool(plist, "BlackText", &blacktext)) < 0 ||
         (code = param_write_bool(plist, "PreBandThreshold", &prebandthreshold)) < 0 ||
         (code = param_write_string(plist,"OutputICCProfile", &(profile_array[0]))) < 0 ||
-        (code = param_write_string(plist,"GraphicICCProfile", &(profile_array[1]))) < 0 ||
+        (code = param_write_string(plist,"VectorICCProfile", &(profile_array[1]))) < 0 ||
         (code = param_write_string(plist,"ImageICCProfile", &(profile_array[2]))) < 0 ||
         (code = param_write_string(plist,"TextICCProfile", &(profile_array[3]))) < 0 ||
         (code = param_write_string(plist,"ProofProfile", &(proof_profile))) < 0 ||
@@ -728,15 +728,15 @@ gx_default_get_params(gx_device * dev, gs_param_list * plist)
         (code = param_write_string(plist,"ICCOutputColors", &(icc_colorants))) < 0 ||
         (code = param_write_int(plist, "RenderIntent", (const int *)(&(profile_intents[0])))) < 0 ||
         (code = param_write_int(plist, "ColorAccuracy", (const int *)(&(color_accuracy)))) < 0 ||
-        (code = param_write_int(plist,"GraphicIntent", (const int *) &(profile_intents[1]))) < 0 ||
+        (code = param_write_int(plist,"VectorIntent", (const int *) &(profile_intents[1]))) < 0 ||
         (code = param_write_int(plist,"ImageIntent", (const int *) &(profile_intents[2]))) < 0 ||
         (code = param_write_int(plist,"TextIntent", (const int *) &(profile_intents[3]))) < 0 ||
         (code = param_write_int(plist,"BlackPtComp", (const int *) (&(blackptcomps[0])))) < 0 ||
-        (code = param_write_int(plist,"GraphicBlackPt", (const int *) &(blackptcomps[1]))) < 0 ||
+        (code = param_write_int(plist,"VectorBlackPt", (const int *) &(blackptcomps[1]))) < 0 ||
         (code = param_write_int(plist,"ImageBlackPt", (const int *) &(blackptcomps[2]))) < 0 ||
         (code = param_write_int(plist,"TextBlackPt", (const int *) &(blackptcomps[3]))) < 0 ||
         (code = param_write_int(plist,"KPreserve", (const int *) (&(blackpreserve[0])))) < 0 ||
-        (code = param_write_int(plist,"GraphicKPreserve", (const int *) &(blackpreserve[1]))) < 0 ||
+        (code = param_write_int(plist,"VectorKPreserve", (const int *) &(blackpreserve[1]))) < 0 ||
         (code = param_write_int(plist,"ImageKPreserve", (const int *) &(blackpreserve[2]))) < 0 ||
         (code = param_write_int(plist,"TextKPreserve", (const int *) &(blackpreserve[3]))) < 0 ||
         (code = param_write_int_array(plist, "HWSize", &hwsa)) < 0 ||
@@ -1737,10 +1737,10 @@ nce:
     }
     /* Note, if a change is made to NUM_DEVICE_PROFILES we need to update
        this with the name of the profile */
-    if ((code = param_read_string(plist, "GraphicICCProfile", &icc_pro)) != 1) {
+    if ((code = param_read_string(plist, "VectorICCProfile", &icc_pro)) != 1) {
         if ((code = gx_default_put_icc(&icc_pro, dev, gsGRAPHICPROFILE)) < 0) {
             ecode = code;
-            param_signal_error(plist, "GraphicICCProfile", ecode);
+            param_signal_error(plist, "VectorICCProfile", ecode);
         }
     }
     if ((code = param_read_string(plist, "ImageICCProfile", &icc_pro)) != 1) {
@@ -1772,7 +1772,7 @@ nce:
         ecode = code;
         param_signal_error(plist, param_name, ecode);
     }
-    if ((code = param_read_int(plist, (param_name = "GraphicIntent"),
+    if ((code = param_read_int(plist, (param_name = "VectorIntent"),
                                                     &(rend_intent[1]))) < 0) {
         ecode = code;
         param_signal_error(plist, param_name, ecode);
@@ -1792,7 +1792,7 @@ nce:
         ecode = code;
         param_signal_error(plist, param_name, ecode);
     }
-    if ((code = param_read_int(plist, (param_name = "GraphicBlackPt"),
+    if ((code = param_read_int(plist, (param_name = "VectorBlackPt"),
                                                     &(blackptcomp[1]))) < 0) {
         ecode = code;
         param_signal_error(plist, param_name, ecode);
@@ -1812,7 +1812,7 @@ nce:
         ecode = code;
         param_signal_error(plist, param_name, ecode);
     }
-    if ((code = param_read_int(plist, (param_name = "GraphicKPreserve"),
+    if ((code = param_read_int(plist, (param_name = "VectorKPreserve"),
                                                     &(blackpreserve[1]))) < 0) {
         ecode = code;
         param_signal_error(plist, param_name, ecode);
diff --git a/base/gsdps1.c b/base/gsdps1.c
index 640853d5f..06998b7bd 100644
--- a/base/gsdps1.c
+++ b/base/gsdps1.c
@@ -201,7 +201,7 @@ gs_rectfill(gs_gstate * pgs, const gs_rect * pr, uint count)
     bool center_of_pixel = (pgs->fill_adjust.x == 0 && pgs->fill_adjust.y == 0);
 
     /* Processing a fill object operation */
-    ensure_tag_is_set(pgs, pgs->device, GS_PATH_TAG);	/* NB: may unset_dev_color */
+    ensure_tag_is_set(pgs, pgs->device, GS_VECTOR_TAG);	/* NB: may unset_dev_color */
 
     code = gx_set_dev_color(pgs);
     if (code != 0)
diff --git a/base/gsicc_cache.c b/base/gsicc_cache.c
index fda958aa6..588c3bf1b 100644
--- a/base/gsicc_cache.c
+++ b/base/gsicc_cache.c
@@ -635,7 +635,7 @@ gsicc_get_srcprofile(gsicc_colorbuffer_t data_cs,
     case GS_UNTOUCHED_TAG:
     default:
         break;
-    case GS_PATH_TAG:
+    case GS_VECTOR_TAG:
         if (data_cs == gsRGB) {
             (*profile) = srcgtag_profile->rgb_profiles[gsSRC_GRAPPRO];
             *render_cond = srcgtag_profile->rgb_rend_cond[gsSRC_GRAPPRO];
diff --git a/base/gsicc_manage.c b/base/gsicc_manage.c
index 4cf82e0cf..4586441a5 100644
--- a/base/gsicc_manage.c
+++ b/base/gsicc_manage.c
@@ -759,7 +759,7 @@ gsicc_set_srcgtag_struct(gsicc_manager_t *icc_manager, const char* pname,
                     /* Color tune profile. No intent */
                     srcgtag->color_warp_profile = icc_profile;
                     break;
-                case GRAPHIC_CMYK:
+                case VECTOR_CMYK:
                     srcgtag->cmyk_profiles[gsSRC_GRAPPRO] = icc_profile;
                     srcgtag->cmyk_rend_cond[gsSRC_GRAPPRO].cmm = cmm;
                     if (cmm == gsCMM_DEFAULT) {
@@ -786,7 +786,7 @@ gsicc_set_srcgtag_struct(gsicc_manager_t *icc_manager, const char* pname,
                             return code;
                     }
                     break;
-                case GRAPHIC_RGB:
+                case VECTOR_RGB:
                     srcgtag->rgb_profiles[gsSRC_GRAPPRO] = icc_profile;
                     srcgtag->rgb_rend_cond[gsSRC_GRAPPRO].cmm = cmm;
                     if (cmm == gsCMM_DEFAULT) {
@@ -813,7 +813,7 @@ gsicc_set_srcgtag_struct(gsicc_manager_t *icc_manager, const char* pname,
                             return code;
                     }
                     break;
-                case GRAPHIC_GRAY:
+                case VECTOR_GRAY:
                     srcgtag->gray_profiles[gsSRC_GRAPPRO] = icc_profile;
                     srcgtag->gray_rend_cond[gsSRC_GRAPPRO].cmm = cmm;
                     if (cmm == gsCMM_DEFAULT) {
@@ -2796,10 +2796,10 @@ gsicc_extract_profile(gs_graphics_type_tag_t graphics_type_tag,
             (*profile) = profile_struct->device_profile[GS_DEFAULT_DEVICE_PROFILE];
             *render_cond = profile_struct->rendercond[GS_DEFAULT_DEVICE_PROFILE];
             break;
-        case GS_PATH_TAG:
-            *render_cond = profile_struct->rendercond[GS_GRAPHIC_DEVICE_PROFILE];
-            if (profile_struct->device_profile[GS_GRAPHIC_DEVICE_PROFILE] != NULL) {
-                (*profile) = profile_struct->device_profile[GS_GRAPHIC_DEVICE_PROFILE];
+        case GS_VECTOR_TAG:
+            *render_cond = profile_struct->rendercond[GS_VECTOR_DEVICE_PROFILE];
+            if (profile_struct->device_profile[GS_VECTOR_DEVICE_PROFILE] != NULL) {
+                (*profile) = profile_struct->device_profile[GS_VECTOR_DEVICE_PROFILE];
             } else {
                 (*profile) = profile_struct->device_profile[GS_DEFAULT_DEVICE_PROFILE];
             }
diff --git a/base/gsicc_manage.h b/base/gsicc_manage.h
index 437db0454..bc5a00826 100644
--- a/base/gsicc_manage.h
+++ b/base/gsicc_manage.h
@@ -45,13 +45,13 @@
 /* This enumeration has to be in sync with GSICC_SRCGTAG_KEYS */
 typedef enum {
     COLOR_TUNE,
-    GRAPHIC_CMYK,
+    VECTOR_CMYK,
     IMAGE_CMYK,
     TEXT_CMYK,
-    GRAPHIC_RGB,
+    VECTOR_RGB,
     IMAGE_RGB,
     TEXT_RGB,
-    GRAPHIC_GRAY,
+    VECTOR_GRAY,
     IMAGE_GRAY,
     TEXT_GRAY
 } gsicc_srcgtagkey_t;
diff --git a/base/gsncdummy.c b/base/gsncdummy.c
index 631bf2c49..aadc2d1c8 100644
--- a/base/gsncdummy.c
+++ b/base/gsncdummy.c
@@ -526,7 +526,7 @@ convert_intensity_into_device_color(const frac intensity,
                 cm = ck = 0;
                 cc = cy = frac_1 - intensity;
                 break;
-        case GS_PATH_TAG:		/* Make lines and fills blue. */
+        case GS_VECTOR_TAG:		/* Make lines and fills blue. */
         default:
                 cy = ck = 0;
                 cc = cm = frac_1 - intensity;
diff --git a/base/gspaint.c b/base/gspaint.c
index 70ff0ce68..9c4e82108 100644
--- a/base/gspaint.c
+++ b/base/gspaint.c
@@ -295,7 +295,7 @@ static int do_fill(gs_gstate *pgs, int rule)
        segment structure (depending on how fine grained we require it to be).
      */
     if (pgs->show_gstate == NULL)
-        ensure_tag_is_set(pgs, pgs->device, GS_PATH_TAG);	/* NB: may unset_dev_color */
+        ensure_tag_is_set(pgs, pgs->device, GS_VECTOR_TAG);	/* NB: may unset_dev_color */
     else
         ensure_tag_is_set(pgs, pgs->device, GS_TEXT_TAG);	/* NB: may unset_dev_color */
 
@@ -415,7 +415,7 @@ do_stroke(gs_gstate * pgs)
        segment structure (depending on how fine grained we require it to be).
      */
     if (pgs->show_gstate == NULL)
-        ensure_tag_is_set(pgs, pgs->device, GS_PATH_TAG);	/* NB: may unset_dev_color */
+        ensure_tag_is_set(pgs, pgs->device, GS_VECTOR_TAG);	/* NB: may unset_dev_color */
     else
         ensure_tag_is_set(pgs, pgs->device, GS_TEXT_TAG);	/* NB: may unset_dev_color */
 
@@ -644,7 +644,7 @@ static int do_fill_stroke(gs_gstate *pgs, int rule, int *restart)
            segment structure (depending on how fine grained we require it to be).
          */
         if (pgs->show_gstate == NULL)
-            ensure_tag_is_set(pgs, pgs->device, GS_PATH_TAG);	/* NB: may unset_dev_color */
+            ensure_tag_is_set(pgs, pgs->device, GS_VECTOR_TAG);	/* NB: may unset_dev_color */
         else
             ensure_tag_is_set(pgs, pgs->device, GS_TEXT_TAG);	/* NB: may unset_dev_color */
 
@@ -684,7 +684,7 @@ static int do_fill_stroke(gs_gstate *pgs, int rule, int *restart)
 
     /* Have to set the fill color too */
     if (pgs->show_gstate == NULL)
-        ensure_tag_is_set(pgs, pgs->device, GS_PATH_TAG);	/* NB: may unset_dev_color */
+        ensure_tag_is_set(pgs, pgs->device, GS_VECTOR_TAG);	/* NB: may unset_dev_color */
     else
         ensure_tag_is_set(pgs, pgs->device, GS_TEXT_TAG);	/* NB: may unset_dev_color */
 
diff --git a/base/gxshade.c b/base/gxshade.c
index 80e3b742b..a0ddf2900 100644
--- a/base/gxshade.c
+++ b/base/gxshade.c
@@ -390,7 +390,7 @@ top:
             return code;
     }
     rendering_params.black_point_comp = pgs->blackptcomp;
-    rendering_params.graphics_type_tag = GS_PATH_TAG;
+    rendering_params.graphics_type_tag = GS_VECTOR_TAG;
     rendering_params.override_icc = false;
     rendering_params.preserve_black = gsBKPRESNOTSPECIFIED;
     rendering_params.rendering_intent = pgs->renderingintent;
diff --git a/psi/zupath.c b/psi/zupath.c
index 49f2c45d8..8a1095cef 100644
--- a/psi/zupath.c
+++ b/psi/zupath.c
@@ -131,7 +131,7 @@ zinustroke(i_ctx_t *i_ctx_p)
     if (npop > 1)		/* matrix was supplied */
         code = gs_concat(igs, &mat);
     if (code >= 0) {
-        dev_proc(&hdev, set_graphics_type_tag)(&hdev, GS_PATH_TAG);	/* so that fills don't unset dev_color */
+        dev_proc(&hdev, set_graphics_type_tag)(&hdev, GS_VECTOR_TAG);	/* so that fills don't unset dev_color */
         code = gs_stroke(igs);
     }
     return in_upath_result(i_ctx_p, npop + spop, code);
@@ -150,7 +150,7 @@ in_test(i_ctx_t *i_ctx_p, int (*paintproc)(gs_gstate *))
 
     if (npop < 0)
         return npop;
-    dev_proc(&hdev, set_graphics_type_tag)(&hdev, GS_PATH_TAG);	/* so that fills don't unset dev_color */
+    dev_proc(&hdev, set_graphics_type_tag)(&hdev, GS_VECTOR_TAG);	/* so that fills don't unset dev_color */
     code = (*paintproc)(igs);
     return in_path_result(i_ctx_p, npop, code);
 }
@@ -245,7 +245,7 @@ in_utest(i_ctx_t *i_ctx_p, int (*paintproc)(gs_gstate *))
 
     if (npop < 0)
         return npop;
-    dev_proc(&hdev, set_graphics_type_tag)(&hdev, GS_PATH_TAG);	/* so that fills don't unset dev_color */
+    dev_proc(&hdev, set_graphics_type_tag)(&hdev, GS_VECTOR_TAG);	/* so that fills don't unset dev_color */
     code = (*paintproc)(igs);
     return in_upath_result(i_ctx_p, npop, code);
 }
diff --git a/xps/xpsgradient.c b/xps/xpsgradient.c
index 0300f8256..d941f46c7 100644
--- a/xps/xpsgradient.c
+++ b/xps/xpsgradient.c
@@ -85,7 +85,7 @@ xps_parse_gradient_stops(xps_context_t *ctx, char *base_uri, xps_item_t *node,
 
                 /* Set the rendering parameters */
                 rendering_params.black_point_comp = gsBLACKPTCOMP_ON;
-                rendering_params.graphics_type_tag = GS_PATH_TAG;
+                rendering_params.graphics_type_tag = GS_VECTOR_TAG;
                 rendering_params.override_icc = false;
                 rendering_params.preserve_black = gsBKPRESNOTSPECIFIED;
                 rendering_params.rendering_intent = gsPERCEPTUAL;