diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 4 | ||||
| -rw-r--r-- | doc/help/api-filter.html | 6 | ||||
| -rw-r--r-- | doc/help/api-httpipp.html | 6 | ||||
| -rw-r--r-- | doc/help/api-raster.html | 91 | ||||
| -rw-r--r-- | doc/help/ref-cupsd-conf.html.in | 12 | ||||
| -rw-r--r-- | doc/help/spec-ppd.html | 90 | ||||
| -rw-r--r-- | doc/images/generic.png | bin | 0 -> 16913 bytes |
7 files changed, 146 insertions, 63 deletions
diff --git a/doc/Makefile b/doc/Makefile index 24cf5962..7e4e44c1 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,5 +1,5 @@ # -# "$Id: Makefile 8841 2009-10-07 16:24:25Z mike $" +# "$Id: Makefile 9259 2010-08-13 04:11:46Z mike $" # # Documentation makefile for the Common UNIX Printing System (CUPS). # @@ -28,6 +28,7 @@ WEBIMAGES = \ images/color-wheel.png \ images/cups.png \ images/cups-icon.png \ + images/generic.png \ images/left.gif \ images/right.gif \ images/sel.gif \ @@ -69,7 +70,6 @@ HELPFILES = \ help/man-cupsenable.html \ help/man-cupstestdsc.html \ help/man-cupstestppd.html \ - help/man-drv.html \ help/man-filter.html \ help/man-lp.html \ help/man-lpadmin.html \ diff --git a/doc/help/api-filter.html b/doc/help/api-filter.html index 21ed6697..4b0ff8fa 100644 --- a/doc/help/api-filter.html +++ b/doc/help/api-filter.html @@ -338,7 +338,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-filter.html 9121 2010-04-23 18:57:00Z mike $" + "$Id: api-filter.html 9283 2010-08-31 18:07:49Z mike $" Filter and backend programming header for the Common UNIX Printing System (CUPS). @@ -375,7 +375,7 @@ div.contents ul.subcontents li { Programming: <a href='api-raster.html' target='_top'>Raster API</a><br> Programming: <a href='postscript-driver.html' target='_top'>Developing PostScript Printer Drivers</a><br> Programming: <a href='raster-driver.html' target='_top'>Developing Raster Printer Drivers</a><br> - Specifications: <a href='spec-design' target='_top'>CUPS Design Description</a></td> + Specifications: <a href='spec-design.html' target='_top'>CUPS Design Description</a></td> </tr> </tbody> </table></div> @@ -421,7 +421,7 @@ div.contents ul.subcontents li { <li><a href="#cups_sc_status_e" title="Response status codes">cups_sc_status_e</a></li> </ul></li> <!-- - "$Id: api-filter.html 9121 2010-04-23 18:57:00Z mike $" + "$Id: api-filter.html 9283 2010-08-31 18:07:49Z mike $" Filter and backend programming introduction for the Common UNIX Printing System (CUPS). diff --git a/doc/help/api-httpipp.html b/doc/help/api-httpipp.html index 19840091..715d71fe 100644 --- a/doc/help/api-httpipp.html +++ b/doc/help/api-httpipp.html @@ -338,7 +338,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-httpipp.html 9121 2010-04-23 18:57:00Z mike $" + "$Id: api-httpipp.html 9283 2010-08-31 18:07:49Z mike $" HTTP and IPP API header for the Common UNIX Printing System (CUPS). @@ -588,7 +588,7 @@ are server-oriented...">http_state_e</a></li> <li><a href="#ipp_tag_e" title="Format tags for attributes">ipp_tag_e</a></li> </ul></li> <!-- - "$Id: api-httpipp.html 9121 2010-04-23 18:57:00Z mike $" + "$Id: api-httpipp.html 9283 2010-08-31 18:07:49Z mike $" HTTP and IPP API introduction for the Common UNIX Printing System (CUPS). @@ -3647,7 +3647,7 @@ are server-oriented...</p> <dt>HTTP_ACCEPTED </dt> <dd class="description">DELETE command was successful</dd> <dt>HTTP_AUTHORIZATION_CANCELED </dt> -<dd class="description">User cancelled authorization</dd> +<dd class="description">User canceled authorization</dd> <dt>HTTP_BAD_GATEWAY </dt> <dd class="description">Bad gateway</dd> <dt>HTTP_BAD_REQUEST </dt> diff --git a/doc/help/api-raster.html b/doc/help/api-raster.html index 86438bf5..51263cb0 100644 --- a/doc/help/api-raster.html +++ b/doc/help/api-raster.html @@ -338,7 +338,7 @@ div.contents ul.subcontents li { <body> <div class='body'> <!-- - "$Id: api-raster.html 8653 2009-05-16 23:53:28Z mike $" + "$Id: api-raster.html 9283 2010-08-31 18:07:49Z mike $" Raster API header for the Common UNIX Printing System (CUPS). @@ -429,7 +429,7 @@ page header structure.">cupsRasterWriteHeader2</a></li> <li><a href="#cups_orient_e" title="Orientation attribute values">cups_orient_e</a></li> </ul></li> <!-- - "$Id: api-raster.html 8653 2009-05-16 23:53:28Z mike $" + "$Id: api-raster.html 9283 2010-08-31 18:07:49Z mike $" Raster API introduction for the Common UNIX Printing System (CUPS). @@ -1186,20 +1186,52 @@ factor not applied) </dd> <p class="description">cupsColorSpace attribute values</p> <h4 class="constants">Constants</h4> <dl> +<dt>CUPS_CSPACE_ADOBERGB <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">Red, green, blue (Adobe RGB) </dd> <dt>CUPS_CSPACE_CIELab <span class="info"> CUPS 1.1.19/Mac OS X 10.3 </span></dt> <dd class="description">CIE Lab </dd> <dt>CUPS_CSPACE_CIEXYZ <span class="info"> CUPS 1.1.19/Mac OS X 10.3 </span></dt> <dd class="description">CIE XYZ </dd> <dt>CUPS_CSPACE_CMY </dt> -<dd class="description">Cyan, magenta, yellow</dd> +<dd class="description">Cyan, magenta, yellow (DeviceCMY)</dd> <dt>CUPS_CSPACE_CMYK </dt> -<dd class="description">Cyan, magenta, yellow, black</dd> -<dt>CUPS_CSPACE_GMCK </dt> -<dd class="description">Gold, magenta, yellow, black</dd> -<dt>CUPS_CSPACE_GMCS </dt> -<dd class="description">Gold, magenta, yellow, silver</dd> -<dt>CUPS_CSPACE_GOLD </dt> -<dd class="description">Gold foil</dd> +<dd class="description">Cyan, magenta, yellow, black (DeviceCMYK)</dd> +<dt>CUPS_CSPACE_DEVICE1 <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 1 color </dd> +<dt>CUPS_CSPACE_DEVICE2 <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 2 colors </dd> +<dt>CUPS_CSPACE_DEVICE3 <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 3 colors </dd> +<dt>CUPS_CSPACE_DEVICE4 <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 4 colors </dd> +<dt>CUPS_CSPACE_DEVICE5 <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 5 colors </dd> +<dt>CUPS_CSPACE_DEVICE6 <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 6 colors </dd> +<dt>CUPS_CSPACE_DEVICE7 <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 7 colors </dd> +<dt>CUPS_CSPACE_DEVICE8 <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 8 colors </dd> +<dt>CUPS_CSPACE_DEVICE9 <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 9 colors </dd> +<dt>CUPS_CSPACE_DEVICEA <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 10 colors </dd> +<dt>CUPS_CSPACE_DEVICEB <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 11 colors </dd> +<dt>CUPS_CSPACE_DEVICEC <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 12 colors </dd> +<dt>CUPS_CSPACE_DEVICED <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 13 colors </dd> +<dt>CUPS_CSPACE_DEVICEE <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 14 colors </dd> +<dt>CUPS_CSPACE_DEVICEF <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">DeviceN, 15 colors </dd> +<dt>CUPS_CSPACE_GMCK <span class="info"> DEPRECATED </span></dt> +<dd class="description">Gold, magenta, yellow, black </dd> +<dt>CUPS_CSPACE_GMCS <span class="info"> DEPRECATED </span></dt> +<dd class="description">Gold, magenta, yellow, silver </dd> +<dt>CUPS_CSPACE_GOLD <span class="info"> DEPRECATED </span></dt> +<dd class="description">Gold foil </dd> <dt>CUPS_CSPACE_ICC1 <span class="info"> CUPS 1.1.19/Mac OS X 10.3 </span></dt> <dd class="description">ICC-based, 1 color </dd> <dt>CUPS_CSPACE_ICC2 <span class="info"> CUPS 1.1.19/Mac OS X 10.3 </span></dt> @@ -1231,28 +1263,31 @@ factor not applied) </dd> <dt>CUPS_CSPACE_ICCF <span class="info"> CUPS 1.1.19/Mac OS X 10.3 </span></dt> <dd class="description">ICC-based, 15 colors </dd> <dt>CUPS_CSPACE_K </dt> -<dd class="description">Black</dd> -<dt>CUPS_CSPACE_KCMY </dt> -<dd class="description">Black, cyan, magenta, yellow</dd> -<dt>CUPS_CSPACE_KCMYcm </dt> -<dd class="description">Black, cyan, magenta, yellow, * -light-cyan, light-magenta</dd> +<dd class="description">Black (DeviceK)</dd> +<dt>CUPS_CSPACE_KCMY <span class="info"> DEPRECATED </span></dt> +<dd class="description">Black, cyan, magenta, yellow </dd> +<dt>CUPS_CSPACE_KCMYcm <span class="info"> DEPRECATED </span></dt> +<dd class="description">Black, cyan, magenta, yellow, light-cyan, light-magenta </dd> <dt>CUPS_CSPACE_RGB </dt> -<dd class="description">Red, green, blue</dd> +<dd class="description">Red, green, blue (DeviceRGB, sRGB by default)</dd> <dt>CUPS_CSPACE_RGBA </dt> -<dd class="description">Red, green, blue, alpha</dd> +<dd class="description">Red, green, blue, alpha (DeviceRGB, sRGB by default)</dd> <dt>CUPS_CSPACE_RGBW <span class="info"> CUPS 1.2/Mac OS X 10.5 </span></dt> -<dd class="description">Red, green, blue, white </dd> -<dt>CUPS_CSPACE_SILVER </dt> -<dd class="description">Silver foil</dd> +<dd class="description">Red, green, blue, white (DeviceRGB, sRGB by default) </dd> +<dt>CUPS_CSPACE_SILVER <span class="info"> DEPRECATED </span></dt> +<dd class="description">Silver foil </dd> +<dt>CUPS_CSPACE_SRGB <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">Red, green, blue (sRGB) </dd> +<dt>CUPS_CSPACE_SW <span class="info"> CUPS 1.4.5 </span></dt> +<dd class="description">Luminance (gamma 2.2) </dd> <dt>CUPS_CSPACE_W </dt> -<dd class="description">Luminance</dd> -<dt>CUPS_CSPACE_WHITE </dt> -<dd class="description">White ink (as black)</dd> -<dt>CUPS_CSPACE_YMC </dt> -<dd class="description">Yellow, magenta, cyan</dd> -<dt>CUPS_CSPACE_YMCK </dt> -<dd class="description">Yellow, magenta, cyan, black</dd> +<dd class="description">Luminance (DeviceGray, gamma 2.2 by default)</dd> +<dt>CUPS_CSPACE_WHITE <span class="info"> DEPRECATED </span></dt> +<dd class="description">White ink (as black) </dd> +<dt>CUPS_CSPACE_YMC <span class="info"> DEPRECATED </span></dt> +<dd class="description">Yellow, magenta, cyan </dd> +<dt>CUPS_CSPACE_YMCK <span class="info"> DEPRECATED </span></dt> +<dd class="description">Yellow, magenta, cyan, black </dd> </dl> <h3 class="enumeration"><a name="cups_cut_e">cups_cut_e</a></h3> <p class="description">CutMedia attribute values</p> diff --git a/doc/help/ref-cupsd-conf.html.in b/doc/help/ref-cupsd-conf.html.in index 4f1089a1..a35ca4af 100644 --- a/doc/help/ref-cupsd-conf.html.in +++ b/doc/help/ref-cupsd-conf.html.in @@ -2931,23 +2931,23 @@ SetEnv MY_ENV_VAR foo variable that should be passed to child processes.</P> -<H2 CLASS="title"><A NAME="SSLOptions">SSLOptions</A></H2> +<H2 CLASS="title"><A NAME="SSLListen">SSLListen</A></H2> <H3>Examples</H3> <PRE CLASS="command"> -SSLOptions 127.0.0.1:443 -SSLOptions 192.0.2.1:443 +SSLListen 127.0.0.1:443 +SSLListen 192.0.2.1:443 </PRE> <H3>Description</H3> -<P>The <CODE>SSLOptions</CODE> directive specifies a network +<P>The <CODE>SSLListen</CODE> directive specifies a network address and port to listen for secure connections. Multiple -<CODE>SSLOptions</CODE> directives can be provided to listen on +<CODE>SSLListen</CODE> directives can be provided to listen on multiple addresses.</P> -<P>The <CODE>SSLOptions</CODE> directive is similar to the <A +<P>The <CODE>SSLListen</CODE> directive is similar to the <A HREF="#SSLPort"><CODE>SSLPort</CODE></A> directive but allows you to restrict access to specific interfaces or networks.</P> diff --git a/doc/help/spec-ppd.html b/doc/help/spec-ppd.html index bc308fe7..8d400575 100644 --- a/doc/help/spec-ppd.html +++ b/doc/help/spec-ppd.html @@ -8,11 +8,11 @@ </head> <body> <!-- - "$Id: spec-ppd.html 9143 2010-05-21 15:36:30Z mike $" + "$Id: spec-ppd.html 9170 2010-06-22 03:06:13Z mike $" - CUPS PPD extensions specification for the Common UNIX Printing System (CUPS). + CUPS PPD extensions specification for CUPS. - Copyright 2007-2009 by Apple Inc. + Copyright 2007-2010 by Apple Inc. Copyright 1997-2007 by Easy Software Products. These coded instructions, statements, and computer programs are the @@ -1566,6 +1566,31 @@ before the filter that accepts the given MIME type.</p> *cupsPreFilter: "image/png 0 mypngprefilter" </pre> + +<h3><span class='info'>CUPS 1.5</span><a name='cupsPrintQuality'>cupsPrintQuality</a></h3> + +<p class='summary'>*cupsPrintQuality keyword/text: "code"</p> + +<p>This UI keyword defines standard print qualities that directly map from the IPP "print-quality" job template attribute. Standard keyword values are "Draft", "Normal", and "High" which are mapped from the IPP "print-quality" values 3, 4, and 5 respectively. Each <code>cupsPrintQuality</code> option typically sets output mode and resolution parameters in the page device dictionary, eliminating the need for separate (and sometimes confusing) output mode and resolution options.</p> + +<blockquote><b>Note:</b> + +<p>Unlike all of the other keywords defined in this document, <code>cupsPrintQuality</code> is a UI keyword that MUST be enclosed inside the PPD <code>OpenUI</code> and <code>CloseUI</code> keywords.</p> + +</blockquote> + +<p>Examples:</p> + +<pre class='command'> +*OpenUI *cupsPrintQuality/Print Quality: PickOne +*OrderDependency: 10 AnySetup *cupsPrintQuality +*DefaultcupsPrintQuality: Normal +*cupsPrintQuality Draft/Draft: "code" +*cupsPrintQuality Normal/Normal: "code" +*cupsPrintQuality High/Photo: "code" +*CloseUI: *cupsPrintQuality +</pre> + <h3><span class='info'>CUPS 1.4/Mac OS X 10.6</span><a name='cupsSNMPSupplies'>cupsSNMPSupplies</a></h3> <p class='summary'>*cupsSNMPSupplies: boolean</p> @@ -1775,39 +1800,51 @@ Technical Note TN2144</a> for more information.</p> in the print dialog of applications (such as iPhoto) that set the job style hint to <tt>NSPrintPhotoJobStyleHint</tt>. Each preset maps to one or more pairs of PPD options and choices as well as providing key/value data for -the application. The following preset names are currently defined:</p> +the application. The following standard preset names are currently defined:</p> <ul> - <li><code>Photo_with_Paper_Auto-Detect</code>; Photo printing - with paper auto-detect</li> + <li><code>General_with_Paper_Auto-Detect</code>; Normal quality general printing with auto-detected media.</li> + + <li><code>General_with_Paper_Auto-Detect_-_Draft</code>; Draft quality general printing with auto-detected media.</li> + + <li><code>General_on_Plain_Paper</code>; Normal quality general printing on plain paper.</li> + + <li><code>General_on_Plain_Paper_-_Draft</code>; Draft quality general printing on plain paper.</li> - <li><code>Photo_with_Paper_Auto-Detect_-_Fine</code>; Photo printing - with paper auto-detect - fine</li> + <li><code>Photo_with_Paper_Auto-Detect</code>; Normal quality photo printing with auto-detected media.</li> - <li><code>Photo_on_Plain_Paper</code>; Photo printing on plain paper</li> + <li><code>Photo_with_Paper_Auto-Detect_-_Fine</code>; High quality photo printing with auto-detected media.</li> - <li><code>Photo_on_Plain_Paper_-_Fine</code>; Photo printing on plain - paper - fine</li> + <li><code>Photo_on_Plain_Paper</code>; Normal quality photo printing on plain paper.</li> - <li><code>Photo_on_Photo_Paper</code>; Photo printing on photo paper</li> + <li><code>Photo_on_Plain_Paper_-_Fine</code>; High quality photo printing on plain paper.</li> - <li><code>Photo_on_Photo_Paper_-_Fine</code>; Photo printing on photo - paper - fine</li> + <li><code>Photo_on_Photo_Paper</code>; Normal quality photo printing on glossy photo paper.</li> - <li><code>Photo_on_Matte_Paper</code>; Photo printing on matte paper</li> + <li><code>Photo_on_Photo_Paper_-_Fine</code>; High quality photo printing on glossy photo paper.</li> - <li><code>Photo_on_Matte_Paper_-_Fine</code>; Photo printing on matte - paper - fine</li> + <li><code>Photo_on_Matte_Paper</code>; Normal quality photo printing on matte paper.</li> + + <li><code>Photo_on_Matte_Paper_-_Fine</code>; High quality photo printing on matte paper.</li> </ul> <p>The value string consists of pairs of keywords, either an option name and choice (*MainKeyword OptionKeyword) or a preset identifier and value -(com.apple.print.preset.foo value). Preset identifiers and their supported -values are documented in "<a -href='http://developer.apple.com/mac/library/documentation/Printing/Conceptual/PresetDraft/presets_intro/presets_intro.html' ->Creating Printing Presets for iPhoto: Printing Presets File Format</a>".</p> +(com.apple.print.preset.foo value). The following preset identifiers are currently used:</p> + +<ul> + + <li><code>com.apple.print.preset.graphicsType</code>; specifies the type of printing used for this printing - "General" for general purpose printing and "Photo" for photo printing.</li> + + <li><code>com.apple.print.preset.media-front-coating</code>; specifies the media type selected by this preset - "none" (plain paper), "glossy", "high-gloss", "semi-gloss", "satin", "matte", and "autodetect".</li> + + <li><code>com.apple.print.preset.output-mode</code>; specifies the output mode for this preset - "color" (default for color printers) or "monochrome" (grayscale, default for B&W printers).</li> + + <li><code>com.apple.print.preset.quality</code>; specifies the overall print quality selected by this preset - "low" (draft), "mid" (normal), or "high".</li> + +</ul> <p>Presets, like options, can also be localized in multiple languages.</p> @@ -1871,6 +1908,17 @@ the device.</p> <h2 class='title'><a name='HISTORY'>Change History</a></h2> +<h3>Changes in CUPS 1.4.5</h3> + +<ul> + + <li>Added <a href='#cupsPrintQuality'><tt>cupsPrintQuality</tt></a> UI keyword.</li> + + <li>Added new properties and values for the <a href='#APPrinterPreset'><tt>APPrinterPreset</tt></a> keyword.</li> + +</ul> + + <h3>Changes in CUPS 1.4</h3> <ul> diff --git a/doc/images/generic.png b/doc/images/generic.png Binary files differnew file mode 100644 index 00000000..2abe9de9 --- /dev/null +++ b/doc/images/generic.png |
