Add new fold enumeration values.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10910 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index 62eb0b19c9c221706f91e4560ed4ea1063b5c2f2..1610de0f825a41839e37b4511d66698237d4d902 100644 (file)
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -489,13 +489,29 @@ static const char * const ipp_document_states[] =
                  "punch-dual-bottom",
                  "punch-triple-left",
                  "punch-triple-top",
-                 /* 0x40000050 - 0x40000055 */
+                 /* 0x40000050 - 0x4000005F */
                  "punch-triple-right",
                  "punch-triple-bottom",
                  "punch-quad-left",
                  "punch-quad-top",
                  "punch-quad-right",
                  "punch-quad-bottom",
+                 "0x40000056",
+                 "0x40000057",
+                 "0x40000058",
+                 "0x40000059",
+                 "fold-accordian",
+                 "fold-double-gate",
+                 "fold-gate",
+                 "fold-half",
+                 "fold-half-z",
+                 "fold-left-gate",
+                 /* 0x40000060 - 0x40000064 */
+                 "fold-letter",
+                 "fold-parallel",
+                 "fold-poster",
+                 "fold-right-gate",
+                 "fold-z"
                },
                * const ipp_job_collation_types[] =
                {                       /* job-collation-type enums */
@@ -1714,7 +1730,10 @@ ippEnumString(const char *attrname,      /* I - Attribute name */
           !strcmp(attrname, "finishings-actual") ||
           !strcmp(attrname, "finishings-default") ||
           !strcmp(attrname, "finishings-ready") ||
-          !strcmp(attrname, "finishings-supported"))
+          !strcmp(attrname, "finishings-supported") ||
+          !strcmp(attrname, "job-finishings") ||
+          !strcmp(attrname, "job-finishings-default") ||
+          !strcmp(attrname, "job-finishings-supported"))
   {
     if (enumvalue >= 3 &&
         enumvalue < (3 + (int)(sizeof(ipp_finishings) /

diff --git a/cups/ipp.h b/cups/ipp.h
index 16c54bf3c6a30a2b6e4de556bd845f787235ef84..58dba597c5a04663d40398bb66e3b7afd775348a 100644 (file)
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -144,7 +144,20 @@ typedef enum ipp_finishings_e              /**** Finishings ****/
   IPP_FINISHINGS_CUPS_PUNCH_QUAD_LEFT, /* Punch 4 holes left side */
   IPP_FINISHINGS_CUPS_PUNCH_QUAD_TOP,  /* Punch 4 holes top edge */
   IPP_FINISHINGS_CUPS_PUNCH_QUAD_RIGHT,        /* Punch 4 holes right side */
-  IPP_FINISHINGS_CUPS_PUNCH_QUAD_BOTTOM        /* Punch 4 holes bottom edge */
+  IPP_FINISHINGS_CUPS_PUNCH_QUAD_BOTTOM,/* Punch 4 holes bottom edge */
+
+  IPP_FINISHINGS_CUPS_FOLD_ACCORDIAN = 0x4000005A,
+                                       /* Accordian-fold the paper vertically into four sections */
+  IPP_FINISHINGS_CUPS_FOLD_DOUBLE_GATE,        /* Fold the top and bottom quarters of the paper towards the midline, then fold in half vertically */
+  IPP_FINISHINGS_CUPS_FOLD_GATE,       /* Fold the top and bottom quarters of the paper towards the midline */
+  IPP_FINISHINGS_CUPS_FOLD_HALF,       /* Fold the paper in half vertically */
+  IPP_FINISHINGS_CUPS_FOLD_HALF_Z,     /* Fold the paper in half horizontally, then Z-fold the paper vertically */
+  IPP_FINISHINGS_CUPS_FOLD_LEFT_GATE,  /* Fold the top quarter of the paper towards the midline */
+  IPP_FINISHINGS_CUPS_FOLD_LETTER,     /* Fold the paper into three sections vertically; sometimes also known as a C fold*/
+  IPP_FINISHINGS_CUPS_FOLD_PARALLEL,   /* Fold the paper in half vertically two times, yielding four sections */
+  IPP_FINISHINGS_CUPS_FOLD_POSTER,     /* Fold the paper in half horizontally and vertically; sometimes also called a cross fold */
+  IPP_FINISHINGS_CUPS_FOLD_RIGHT_GATE, /* Fold the bottom quarter of the paper towards the midline */
+  IPP_FINISHINGS_CUPS_FOLD_Z           /* Fold the paper vertically into three sections, forming a Z */
 } ipp_finishings_t;
 #  ifndef _CUPS_NO_DEPRECATED
 typedef enum ipp_finishings_e ipp_finish_t;