From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Fri, 6 Dec 2013 01:58:28 +0000 (+0000)
Subject: Sync up with IPP Finishings 2.0 values.
X-Git-Tag: v2.2b1~800
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd3614ae67be53dfe29e4cda97f21110eaa707f1;p=thirdparty%2Fcups.git

Sync up with IPP Finishings 2.0 values.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11449 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index e7cac2f4f6..598f76a202 100644
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -321,7 +321,7 @@ static const char * const ipp_document_states[] =
 		  "pending",
 		  "4",
 		  "processing",
-		  "6",
+		  "processing-stopped",	/* IPPSIX */
 		  "canceled",
 		  "aborted",
 		  "completed"
@@ -340,8 +340,8 @@ static const char * const ipp_document_states[] =
 		  "bale",
 		  "booklet-maker",
 		  "jog-offset",
-		  "15",
-		  "16",
+		  "coat",		/* Finishings 2.0 */
+		  "laminate",		/* Finishings 2.0 */
 		  "17",
 		  "18",
 		  "19",
@@ -357,10 +357,10 @@ static const char * const ipp_document_states[] =
 		  "staple-dual-top",
 		  "staple-dual-right",
 		  "staple-dual-bottom",
-		  "32",
-		  "33",
-		  "34",
-		  "35",
+		  "staple-triple-left",	/* Finishings 2.0 */
+		  "staple-triple-top",	/* Finishings 2.0 */
+		  "staple-triple-right",/* Finishings 2.0 */
+		  "staple-triple-bottom",/* Finishings 2.0 */
 		  "36",
 		  "37",
 		  "38",
@@ -395,37 +395,37 @@ static const char * const ipp_document_states[] =
 		  "67",
 		  "68",
 		  "69",
-		  "punch-top-left",
-		  "punch-bottom-left",
-		  "punch-top-right",
-		  "punch-bottom-right",
-		  "punch-dual-left",
-		  "punch-dual-top",
-		  "punch-dual-right",
-		  "punch-dual-bottom",
-		  "punch-triple-left",
-		  "punch-triple-top",
-		  "punch-triple-right",
-		  "punch-triple-bottom",
-		  "punch-quad-left",
-		  "punch-quad-top",
-		  "punch-quad-right",
-		  "punch-quad-bottom",
+		  "punch-top-left",	/* Finishings 2.0 */
+		  "punch-bottom-left",	/* Finishings 2.0 */
+		  "punch-top-right",	/* Finishings 2.0 */
+		  "punch-bottom-right",	/* Finishings 2.0 */
+		  "punch-dual-left",	/* Finishings 2.0 */
+		  "punch-dual-top",	/* Finishings 2.0 */
+		  "punch-dual-right",	/* Finishings 2.0 */
+		  "punch-dual-bottom",	/* Finishings 2.0 */
+		  "punch-triple-left",	/* Finishings 2.0 */
+		  "punch-triple-top",	/* Finishings 2.0 */
+		  "punch-triple-right",	/* Finishings 2.0 */
+		  "punch-triple-bottom",/* Finishings 2.0 */
+		  "punch-quad-left",	/* Finishings 2.0 */
+		  "punch-quad-top",	/* Finishings 2.0 */
+		  "punch-quad-right",	/* Finishings 2.0 */
+		  "punch-quad-bottom",	/* Finishings 2.0 */
 		  "86",
 		  "87",
 		  "88",
 		  "89",
-		  "fold-accordian",
-		  "fold-double-gate",
-		  "fold-gate",
-		  "fold-half",
-		  "fold-half-z",
-		  "fold-left-gate",
-		  "fold-letter",
-		  "fold-parallel",
-		  "fold-poster",
-		  "fold-right-gate",
-		  "fold-z"
+		  "fold-accordian",	/* Finishings 2.0 */
+		  "fold-double-gate",	/* Finishings 2.0 */
+		  "fold-gate",		/* Finishings 2.0 */
+		  "fold-half",		/* Finishings 2.0 */
+		  "fold-half-z",	/* Finishings 2.0 */
+		  "fold-left-gate",	/* Finishings 2.0 */
+		  "fold-letter",	/* Finishings 2.0 */
+		  "fold-parallel",	/* Finishings 2.0 */
+		  "fold-poster",	/* Finishings 2.0 */
+		  "fold-right-gate",	/* Finishings 2.0 */
+		  "fold-z"		/* Finishings 2.0 */
 		},
 		* const ipp_finishings_vendor[] =
 		{
diff --git a/cups/ipp.h b/cups/ipp.h
index a98702a1f0..1a930d7eac 100644
--- a/cups/ipp.h
+++ b/cups/ipp.h
@@ -103,6 +103,8 @@ typedef enum ipp_finishings_e		/**** Finishings ****/
   IPP_FINISHINGS_BALE,			/* Bale (any type) */
   IPP_FINISHINGS_BOOKLET_MAKER,		/* Fold to make booklet */
   IPP_FINISHINGS_JOG_OFFSET,		/* Offset for binding (any type) */
+  IPP_FINISHINGS_COAT,			/* Apply protective liquid or powder coating */
+  IPP_FINISHINGS_LAMINATE,		/* Apply protective (solid) material */
   IPP_FINISHINGS_STAPLE_TOP_LEFT = 20,	/* Staple top left corner */
   IPP_FINISHINGS_STAPLE_BOTTOM_LEFT,	/* Staple bottom left corner */
   IPP_FINISHINGS_STAPLE_TOP_RIGHT,	/* Staple top right corner */
@@ -115,6 +117,10 @@ typedef enum ipp_finishings_e		/**** Finishings ****/
   IPP_FINISHINGS_STAPLE_DUAL_TOP,	/* Two staples on top */
   IPP_FINISHINGS_STAPLE_DUAL_RIGHT,	/* Two staples on right */
   IPP_FINISHINGS_STAPLE_DUAL_BOTTOM,	/* Two staples on bottom */
+  IPP_FINISHINGS_STAPLE_TRIPLE_LEFT,	/* Three staples on left */
+  IPP_FINISHINGS_STAPLE_TRIPLE_TOP,	/* Three staples on top */
+  IPP_FINISHINGS_STAPLE_TRIPLE_RIGHT,	/* Three staples on right */
+  IPP_FINISHINGS_STAPLE_TRIPLE_BOTTOM,	/* Three staples on bottom */
   IPP_FINISHINGS_BIND_LEFT = 50,	/* Bind on left */
   IPP_FINISHINGS_BIND_TOP,		/* Bind on top */
   IPP_FINISHINGS_BIND_RIGHT,		/* Bind on right */