#
-# "$Id: Makefile 5314 2006-03-20 19:06:50Z mike $"
+# "$Id: Makefile 5498 2006-05-07 16:52:14Z mike $"
#
# Top-level Makefile for the Common UNIX Printing System (CUPS).
#
done
+#
+# Remove all non-distribution files...
+#
+
+distclean: clean
+ $(RM) Makedefs config.h config.log config.status
+ $(RM) cups-config conf/cupsd.conf conf/pam.std
+ $(RM) doc/help/standard.html doc/index.html
+ $(RM) init/cups.sh init/cups-lpd
+ $(RM) man/cups-deviced.man man/cups-driverd.man
+ $(RM) man/cups-lpd.man man/cupsaddsmb.man man/cupsd.man
+ $(RM) man/cupsd.conf.man man/lpoptions.man
+ $(RM) packaging/cups templates/edit-config.tmpl templates/header.tmpl
+ -$(RM) doc/*/index.html
+ -$(RM) templates/*/edit-config.tmpl
+ -$(RM) templates/*/header.tmpl
+ -$(RM) -r autom4te*.cache
+
+
#
# Make dependencies
#
#
-# End of "$Id: Makefile 5314 2006-03-20 19:06:50Z mike $".
+# End of "$Id: Makefile 5498 2006-05-07 16:52:14Z mike $".
#
</head>
<body>
<!--
- "$Id: spec-ppd.html 5217 2006-03-02 21:24:01Z mike $"
+ "$Id: spec-ppd.html 5496 2006-05-05 19:26:23Z mike $"
CUPS PPD extensions specification for the Common UNIX Printing System (CUPS).
<h4>Customizing the Profile Selection Keywords</h4>
-<p>The <tt>ColorModel</tt>, <tt>MediaType</tt>, and
-<tt>Resolution</tt> keywords can be reassigned to different main
-keywords, allowing drivers to do color profile selection based
-on different parameters. The <tt>cupsICCQualifier1</tt>,
-<tt>cupsICCQualifier2</tt>, and <tt>cupsICCQualifier3</tt>
+<p>The <tt>MediaType</tt> and <tt>Resolution</tt> keywords can be
+reassigned to different main keywords, allowing drivers to do
+color profile selection based on different parameters. The
+<tt>cupsICCQualifier2</tt> and <tt>cupsICCQualifier3</tt>
attributes define the mapping from selector to main keyword:</p>
<pre class='command'>
-*cupsICCQualifier1: MainKeyword
-*cupsICCQualifier2: MainKeyword
-*cupsICCQualifier3: MainKeyword
+*cupsICCQualifier2: MainKeyword2
+*cupsICCQualifier3: MainKeyword3
</pre>
<p>The default mapping is as follows:</p>
<pre class='command'>
-*cupsICCQualifier1: ColorModel
*cupsICCQualifier2: MediaType
*cupsICCQualifier3: Resolution
</pre>
/*
- * "$Id: interpret.c 5490 2006-05-04 19:12:45Z mike $"
+ * "$Id: interpret.c 5497 2006-05-06 00:24:22Z mike $"
*
* PPD command interpreter for the Common UNIX Printing System (CUPS).
*
}
}
- /*
- * Check parameters...
- */
-
- if (!h->HWResolution[0] || !h->HWResolution[1] ||
- !h->PageSize[0] || !h->PageSize[1] ||
- (h->cupsBitsPerColor != 1 && h->cupsBitsPerColor != 2 &&
- h->cupsBitsPerColor != 4 && h->cupsBitsPerColor != 8) ||
- h->cupsBorderlessScalingFactor < 0.9 ||
- h->cupsBorderlessScalingFactor > 1.1)
- return (-1);
-
/*
* Allow option override for page scaling...
*/
if (func && (*func)(h, preferred_bits))
return (-1);
+ /*
+ * Check parameters...
+ */
+
+ if (!h->HWResolution[0] || !h->HWResolution[1] ||
+ !h->PageSize[0] || !h->PageSize[1] ||
+ (h->cupsBitsPerColor != 1 && h->cupsBitsPerColor != 2 &&
+ h->cupsBitsPerColor != 4 && h->cupsBitsPerColor != 8 &&
+ h->cupsBitsPerColor != 16) ||
+ h->cupsBorderlessScalingFactor < 0.9 ||
+ h->cupsBorderlessScalingFactor > 1.1)
+ return (-1);
+
/*
* Compute the bitmap parameters...
*/
/*
- * End of "$Id: interpret.c 5490 2006-05-04 19:12:45Z mike $".
+ * End of "$Id: interpret.c 5497 2006-05-06 00:24:22Z mike $".
*/