Add media-type localizations for printer-specific media types (Issue #5168)

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

diff --git a/cups/ppd-private.h b/cups/ppd-private.h
index b8254446ad5b33a2be625dd1dae38278a833f7bd..e7c0d6e5f8d578a95296e399709d4eea5d0d5c3e 100644 (file)
--- a/cups/ppd-private.h
+++ b/cups/ppd-private.h
@@ -1,27 +1,13 @@
 /*
- * "$Id$"
- *
  * Private PPD definitions for CUPS.
  *
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2017 by Apple Inc.
  * Copyright 1997-2007 by Easy Software Products, all rights reserved.
  *
- * These coded instructions, statements, and computer programs are the
- * 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/".
+ * Licensed under Apache License v2.0.  See the file "LICENSE" for more
+ * information.
  *
  * PostScript is a trademark of Adobe Systems, Inc.
- *
- * This code and any derivative of it may be used and distributed
- * freely under the terms of the GNU General Public License when
- * used with GNU Ghostscript or its derivatives.  Use of the code
- * (or any derivative of it) with software other than GNU
- * GhostScript (or its derivatives) is governed by the CUPS license
- * agreement.
- *
- * This file is subject to the Apple OS-Developed Software exception.
  */
 
 #ifndef _CUPS_PPD_PRIVATE_H_
@@ -49,7 +35,7 @@ extern "C" {
  * Constants...
  */
 
-#  define _PPD_CACHE_VERSION   7       /* Version number in cache file */
+#  define _PPD_CACHE_VERSION   9       /* Version number in cache file */
 
 
 /*
@@ -102,7 +88,7 @@ typedef enum _pwg_print_color_mode_e /**** PWG print-color-mode indices ****/
 {
   _PWG_PRINT_COLOR_MODE_MONOCHROME = 0,        /* print-color-mode=monochrome */
   _PWG_PRINT_COLOR_MODE_COLOR,         /* print-color-mode=color */
-  /* Other proposed values are not supported by CUPS yet. */
+  /* Other values are not supported by CUPS yet. */
   _PWG_PRINT_COLOR_MODE_MAX
 } _pwg_print_color_mode_t;
 
@@ -121,14 +107,6 @@ typedef struct _pwg_finishings_s   /**** PWG finishings mapping data ****/
   cups_option_t                *options;       /* Options to apply */
 } _pwg_finishings_t;
 
-typedef struct _pwg_material_s         /**** PWG material mapping data ****/
-{
-  char         *key,                   /* material-key value */
-               *name;                  /* material-name value */
-  int          num_props;              /* Number of properties */
-  cups_option_t        *props;                 /* Material properties */
-} _pwg_material_t;
-
 struct _ppd_cache_s                    /**** PPD cache and PWG conversion data ****/
 {
   int          num_bins;               /* Number of output bins */
@@ -167,12 +145,8 @@ struct _ppd_cache_s                        /**** PPD cache and PWG conversion data ****/
   char         *password;              /* cupsJobPassword value */
   cups_array_t *mandatory;             /* cupsMandatory value */
   char         *charge_info_uri;       /* cupsChargeInfoURI value */
+  char         *strings_uri;           /* cupsStringsURI value */
   cups_array_t *support_files;         /* Support files - ICC profiles, etc. */
-  char         *cups_3d,               /* cups3D value */
-               *cups_layer_order;      /* cupsLayerOrder value */
-  int          cups_accuracy[3];       /* cupsAccuracy value - x, y, and z in nanometers */
-  int          cups_volume[3];         /* cupsVolume value - x, y, and z in millimeters */
-  cups_array_t *materials;             /* cupsMaterial values */
 };
 
 
@@ -247,7 +221,3 @@ extern const char   *_pwgPageSizeForMedia(pwg_media_t *media,
 }
 #  endif /* __cplusplus */
 #endif /* !_CUPS_PPD_PRIVATE_H_ */
-
-/*
- * End of "$Id$".
- */