summaryrefslogtreecommitdiff
path: root/cups/ipp-support.c
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2013-05-13 19:15:06 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2013-05-13 19:15:06 +0000
commit9475ec92d83ec01ae78222ed2bce154d7e71eac3 (patch)
treeb6b356d99c45b3ecc928ea021884762d6ad87905 /cups/ipp-support.c
parent2a241c9efcf4c422c64307e1034e156965e770d2 (diff)
downloadcups-9475ec92d83ec01ae78222ed2bce154d7e71eac3.tar.gz
<rdar://problem/13875803> cups.org: ipptool does not proceed past INCLUDE if ignore is not used
Also: IPP finishings values for (now standardized) punch and fold stuff, new IPP FaxOut Send-Hardcopy-Document operation. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10980 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/ipp-support.c')
-rw-r--r--cups/ipp-support.c98
1 files changed, 68 insertions, 30 deletions
diff --git a/cups/ipp-support.c b/cups/ipp-support.c
index 6c7aadeda..d5c39f940 100644
--- a/cups/ipp-support.c
+++ b/cups/ipp-support.c
@@ -204,7 +204,7 @@ static const char * const ipp_std_ops[] =
"Suspend-Current-Job",
"Resume-Job",
- /* 0x0030 - 0x003d */
+ /* 0x0030 - 0x003e */
"Promote-Job",
"Schedule-Job-After",
"0x0032",
@@ -218,7 +218,8 @@ static const char * const ipp_std_ops[] =
"Resubmit-Job",
"Close-Job",
"Identify-Printer",
- "Validate-Document"
+ "Validate-Document",
+ "Send-Hardcopy-Document"
},
* const ipp_cups_ops[] =
{
@@ -400,7 +401,44 @@ static const char * const ipp_document_states[] =
"trim-after-pages",
"trim-after-documents",
"trim-after-copies",
- "trim-after-job"
+ "trim-after-job",
+ "64",
+ "65",
+ "66",
+ "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",
+ "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"
},
* const ipp_finishings_vendor[] =
{
@@ -479,39 +517,39 @@ static const char * const ipp_document_states[] =
"0x40000043",
"0x40000044",
"0x40000045",
- "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",
+ "cups-punch-top-left",
+ "cups-punch-bottom-left",
+ "cups-punch-top-right",
+ "cups-punch-bottom-right",
+ "cups-punch-dual-left",
+ "cups-punch-dual-top",
+ "cups-punch-dual-right",
+ "cups-punch-dual-bottom",
+ "cups-punch-triple-left",
+ "cups-punch-triple-top",
/* 0x40000050 - 0x4000005F */
- "punch-triple-right",
- "punch-triple-bottom",
- "punch-quad-left",
- "punch-quad-top",
- "punch-quad-right",
- "punch-quad-bottom",
+ "cups-punch-triple-right",
+ "cups-punch-triple-bottom",
+ "cups-punch-quad-left",
+ "cups-punch-quad-top",
+ "cups-punch-quad-right",
+ "cups-punch-quad-bottom",
"0x40000056",
"0x40000057",
"0x40000058",
"0x40000059",
- "fold-accordian",
- "fold-double-gate",
- "fold-gate",
- "fold-half",
- "fold-half-z",
- "fold-left-gate",
+ "cups-fold-accordian",
+ "cups-fold-double-gate",
+ "cups-fold-gate",
+ "cups-fold-half",
+ "cups-fold-half-z",
+ "cups-fold-left-gate",
/* 0x40000060 - 0x40000064 */
- "fold-letter",
- "fold-parallel",
- "fold-poster",
- "fold-right-gate",
- "fold-z"
+ "cups-fold-letter",
+ "cups-fold-parallel",
+ "cups-fold-poster",
+ "cups-fold-right-gate",
+ "cups-fold-z"
},
* const ipp_job_collation_types[] =
{ /* job-collation-type enums */