*
* Private PPD definitions for CUPS.
*
- * Copyright 2007-2011 by Apple Inc.
+ * Copyright 2007-2013 by Apple Inc.
* Copyright 1997-2007 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
* Constants...
*/
-# define _PPD_CACHE_VERSION 5 /* Version number in cache file */
+# define _PPD_CACHE_VERSION 6 /* Version number in cache file */
/*
typedef struct _pwg_finishings_s /**** PWG finishings mapping data ****/
{
- ipp_finish_t value; /* finishings value */
- int num_options; /* Number of options to apply */
- cups_option_t *options; /* Options to apply */
+ ipp_finishings_t value; /* finishings value */
+ int num_options; /* Number of options to apply */
+ cups_option_t *options; /* Options to apply */
} _pwg_finishings_t;
struct _ppd_cache_s /**** PPD cache and PWG conversion data ****/
{
int num_bins; /* Number of output bins */
- _pwg_map_t *bins; /* Output bins */
+ pwg_map_t *bins; /* Output bins */
int num_sizes; /* Number of media sizes */
- _pwg_size_t *sizes; /* Media sizes */
+ pwg_size_t *sizes; /* Media sizes */
int custom_max_width, /* Maximum custom width in 2540ths */
custom_max_length, /* Maximum custom length in 2540ths */
custom_min_width, /* Minimum custom width in 2540ths */
char *custom_max_keyword, /* Maximum custom size PWG keyword */
*custom_min_keyword, /* Minimum custom size PWG keyword */
custom_ppd_size[41]; /* Custom PPD size name */
- _pwg_size_t custom_size; /* Custom size record */
+ pwg_size_t custom_size; /* Custom size record */
char *source_option; /* PPD option for media source */
int num_sources; /* Number of media sources */
- _pwg_map_t *sources; /* Media sources */
+ pwg_map_t *sources; /* Media sources */
int num_types; /* Number of media types */
- _pwg_map_t *types; /* Media types */
+ pwg_map_t *types; /* Media types */
int num_presets[_PWG_PRINT_COLOR_MODE_MAX][_PWG_PRINT_QUALITY_MAX];
/* Number of print-color-mode/print-quality options */
cups_option_t *presets[_PWG_PRINT_COLOR_MODE_MAX][_PWG_PRINT_QUALITY_MAX];
char *password; /* cupsJobPassword value */
cups_array_t *mandatory; /* cupsMandatory value */
char *charge_info_uri; /* cupsChargeInfoURI value */
+ cups_array_t *support_files; /* Support files - ICC profiles, etc. */
};
extern void _ppdCacheDestroy(_ppd_cache_t *pc);
extern const char *_ppdCacheGetBin(_ppd_cache_t *pc,
const char *output_bin);
-extern int _ppdCacheGetFinishingOptions(_ppd_cache_t *pc, ipp_t *job,
- ipp_finish_t value, int num_options,
+extern int _ppdCacheGetFinishingOptions(_ppd_cache_t *pc,
+ ipp_t *job,
+ ipp_finishings_t value,
+ int num_options,
cups_option_t **options);
-extern int _ppdCacheGetFinishingValues(_ppd_cache_t *pc, int num_options,
+extern int _ppdCacheGetFinishingValues(_ppd_cache_t *pc,
+ int num_options,
cups_option_t *options,
- int max_values, int *values);
+ int max_values,
+ int *values);
extern const char *_ppdCacheGetInputSlot(_ppd_cache_t *pc, ipp_t *job,
const char *keyword);
extern const char *_ppdCacheGetMediaType(_ppd_cache_t *pc, ipp_t *job,
const char *keyword);
extern const char *_ppdCacheGetPageSize(_ppd_cache_t *pc, ipp_t *job,
const char *keyword, int *exact);
-extern _pwg_size_t *_ppdCacheGetSize(_ppd_cache_t *pc,
+extern pwg_size_t *_ppdCacheGetSize(_ppd_cache_t *pc,
const char *page_size);
extern const char *_ppdCacheGetSource(_ppd_cache_t *pc,
const char *input_slot);
char *name, size_t namesize);
extern const char *_pwgMediaTypeForType(const char *media_type,
char *name, size_t namesize);
-extern const char *_pwgPageSizeForMedia(_pwg_media_t *media,
+extern const char *_pwgPageSizeForMedia(pwg_media_t *media,
char *name, size_t namesize);