Load cups into easysw/current.

[thirdparty/cups.git] / cups / ppd.h

diff --git a/cups/ppd.h b/cups/ppd.h
index d7688c3d5239f6deb93f739a8086257780a03701..cd67a51fc084f2b13ac18c2b5bfc405a4fd40025 100644 (file)
--- a/cups/ppd.h
+++ b/cups/ppd.h
@@ -1,26 +1,17 @@
 /*
- * "$Id: ppd.h 5238 2006-03-07 04:41:42Z mike $"
+ * "$Id: ppd.h 6649 2007-07-11 21:46:42Z mike $"
  *
  *   PostScript Printer Description definitions for the Common UNIX Printing
  *   System (CUPS).
  *
- *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
+ *   Copyright 2007 by Apple Inc.
+ *   Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   PostScript is a trademark of Adobe Systems, Inc.
  *
@@ -318,7 +309,7 @@ typedef struct ppd_file_s           /**** PPD File ****/
   char         **filters;              /* Filter strings... */
 
   /**** New in CUPS 1.1 ****/
-  int          flip_duplex;            /* 1 = Flip page for back sides @since CUPS 1.1@ */
+  int          flip_duplex;            /* 1 = Flip page for back sides @deprecated@ */
 
   /**** New in CUPS 1.1.19 ****/
   char         *protocols;             /* Protocols (BCP, TBCP) string @since CUPS 1.1.19@ */
@@ -331,6 +322,9 @@ typedef struct ppd_file_s           /**** PPD File ****/
   cups_array_t *sorted_attrs;          /* Attribute lookup array @since CUPS 1.2@ @private@ */
   cups_array_t *options;               /* Option lookup array @since CUPS 1.2@ @private@ */
   cups_array_t *coptions;              /* Custom options array @since CUPS 1.2@ @private@ */
+
+  /**** New in CUPS 1.3 ****/
+  cups_array_t *marked;                /* Marked choices @since CUPS 1.3@ @private@ */
 } ppd_file_t;
 
 
@@ -394,6 +388,12 @@ extern ppd_option_t        *ppdNextOption(ppd_file_t *ppd);
 extern int             ppdLocalize(ppd_file_t *ppd);
 extern ppd_file_t      *ppdOpen2(cups_file_t *fp);
 
+/**** New in CUPS 1.3 ****/
+extern const char      *ppdLocalizeIPPReason(ppd_file_t *ppd,
+                                             const char *reason,
+                                             const char *scheme,
+                                             char *buffer, size_t bufsize);
+
 
 /*
  * C++ magic...
@@ -405,5 +405,5 @@ extern ppd_file_t   *ppdOpen2(cups_file_t *fp);
 #endif /* !_CUPS_PPD_H_ */
 
 /*
- * End of "$Id: ppd.h 5238 2006-03-07 04:41:42Z mike $".
+ * End of "$Id: ppd.h 6649 2007-07-11 21:46:42Z mike $".
  */