Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.0b2@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -5,382 +5,265 @@

 <BODY BGCOLOR=#ffffff>

-<H2 ALIGN="CENTER">Common UNIX Printing System License Agreement</H2>
+<H1 ALIGN=CENTER><FONT FACE="Arial,HELVETICA">Aladdin Free Public License</FONT></H1>

-<P ALIGN="CENTER">Copyright 1997-1999 by Easy Software Products<BR>
-44141 AIRPORT VIEW DR STE 204<BR>
-HOLLYWOOD, MARYLAND 20636-3111 USA<BR>
-<BR>
-Voice: +1.301.373.9603<BR>
-Email: cups-info@cups.org<BR>
-WWW: http://www.cups.org
+<P ALIGN=CENTER>(Version 6, June 17, 1997)</P>

-<H3>Introduction</H3>
+<P ALIGN=CENTER>Copyright &copy; 1994, 1995, 1997 Aladdin Enterprises,<BR><BR>
+Menlo Park, California, U.S.A.  All rights reserved.</P>

-<P>The Common UNIX Printing System<SUP>TM</SUP>, or CUPS<SUP>TM</SUP>,
-is provided under the GNU General Public License, Version 2. A copy of
-this license follows this introduction.
-
-<P>For those not familiar with the GNU General Public License, the license
-basically allows you to:
-
-<UL>
-
-	<LI>Use the CUPS software at no charge.
-
-	<LI>Distribute verbatim copies of the software in source or
-	binary form.
-
-	<LI>Sell verbatim copies of the software for a media fee, or
-	sell support for the software.
-
-	<LI>Distribute or sell printer drivers and filters that use the
-	CUPS API so long as source code is made available under the GPL.
-
-</UL>
-
-<P>What this license <B>does not</B> allow you to do is make changes or
-add features to CUPS and then sell a binary distribution without source
-code. You have to provide source for any new drivers, changes, or
-additions to the software, and all code must be provided under the GPL.
-
-<P>Also, since we have trademarked the Common UNIX Printing System, CUPS,
-and CUPS logo, you may not release a derivative product using those names
-without permission from Easy Software Products.
-
-<H3>Binary Distribution Rights</H3>
-
-<P>Easy Software Products also sells rights to the CUPS source code
-under a binary distribution license for vendors that are unable to
-release source code for their drivers or additions and modifications to
-CUPS under the GPL. For pricing information please contact us at the
-address shown above.
-
-<P>The Common UNIX Printing System utilizes GNU GhostScript 4.03 to
-convert PostScript files into a stream of raster images. For binary
-distribution licensing of this software, please contact:
-
-<BLOCKQUOTE>Miles Jones<BR>
-Director of Marketing<BR>
-Artifex Software Inc.<BR>
-454 Las Gallinas Ave., Suite 108<BR>
-San Rafael, CA 94903 USA<BR>
-Voice: +1.415.492.9861<BR>
-Fax: +1.415.492.9862<BR>
-EMail: info@arsoft.com
+<BLOCKQUOTE>
+NOTE: This License is not the same as any of the GNU Licenses published
+by the Free Software Foundation.  Its terms are substantially different
+from those of the GNU Licenses. If you are familiar with the GNU
+Licenses, please read this license with extra care.
 </BLOCKQUOTE>

-<H3>Support</H3>
+<P>Aladdin Enterprises hereby grants to anyone the permission to apply
+this License to their own work, as long as the entire License
+(including the above notices and this paragraph) is copied with no
+changes, additions, or deletions except for changing the first
+paragraph of Section 0 to include a suitable description of the work to
+which the license is being applied and of the person or entity that
+holds the copyright in the work, and, if the License is being applied
+to a work created in a country other than the United States, replacing
+the first paragraph of Section 6 with an appropriate reference to the
+laws of the appropriate country.</P>

-<P>Easy Software Products sells software support for distributors and
-resellers of CUPS. Support for users of CUPS is available from Easy
-Software Products through our ESP Print software.
+<H2><FONT FACE="Arial,HELVETICA">0. Subject Matter</FONT></H2>

-<H3>Trademarks</H3>
+This License applies to the Common UNIX Printing System ("PROGRAM").
+The Common UNIX Printing System is a copyrighted work whose copyright
+is held by Easy Software Products (the "LICENSOR").  The Common UNIX
+Printing System, CUPS, and the CUPS logo are the trademark property of
+Easy Software Products.

-<P>The Common UNIX Printing System, CUPS, and the CUPS logo are the
-trademark property of Easy Software Products. Any derivative of this
-software may not use any of these trademarks without the expressed
-written consent of Easy Software Products.
+<P>A "work based on the PROGRAM" means either the PROGRAM or any
+derivative work of the PROGRAM, as defined in the United States
+Copyright Act of 1976, such as a translation or a modification.

-<H2 ALIGN="CENTER">GNU General Public License</H2>
+<P>BY MODIFYING OR DISTRIBUTING THE PROGRAM (OR ANY WORK BASED ON THE
+PROGRAM), YOU INDICATE YOUR ACCEPTANCE OF THIS LICENSE TO DO SO, AND
+ALL ITS TERMS AND CONDITIONS FOR COPYING, DISTRIBUTING OR MODIFYING THE
+PROGRAM OR WORKS BASED ON IT.  NOTHING OTHER THAN THIS LICENSE GRANTS
+YOU PERMISSION TO MODIFY OR DISTRIBUTE THE PROGRAM OR ITS DERIVATIVE
+WORKS. THESE ACTIONS ARE PROHIBITED BY LAW.  IF YOU DO NOT ACCEPT THESE
+TERMS AND CONDITIONS, DO NOT MODIFY OR DISTRIBUTE THE PROGRAM.

-<P ALIGN="CENTER">Version 2, June 1991<BR>
-<BR>
-Copyright 1989, 1991 Free Software Foundation, Inc.<BR>
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+<H2><FONT FACE="Arial,HELVETICA">1. Licenses</FONT></H2>

-<P ALIGN="CENTER">Everyone is permitted to copy and distribute verbatim
-copies of this license document, but changing it is not allowed.
+LICENSOR hereby grants you the following rights, provided that you comply
+with all of the restrictions set forth in this License and provided,
+further, that you distribute an unmodified copy of this License with the
+PROGRAM:

-<H3>Preamble</H3>
+<OL TYPE=a>

-<P>The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
+	<LI>You may copy and distribute literal (i.e., verbatim) copies
+	of the PROGRAM's source code as you receive it throughout the
+	world, in any medium.<BR><BR>

-<P>When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-<P>To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-<P>For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-<P>We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-<P>Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-<P>Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-<P>The precise terms and conditions for copying, distribution and
-modification follow.
-
-<H3>GNU GENERAL PUBLIC LICENSE<BR>
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</H3>
-
-<OL START="0">
-
-<LI>This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-<P>Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-<LI>You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-<P>You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-<LI>You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-<OL TYPE="a">
-
-<LI>You must cause the modified files to carry prominent notices
-stating that you changed the files and the date of any change.
-
-<LI>You must cause any work that you distribute or publish, that in
-whole or in part contains or is derived from the Program or any
-part thereof, to be licensed as a whole at no charge to all third
-parties under the terms of this License.
-
-<LI>if the modified program normally reads commands interactively
-when run, you must cause it, when started running for such
-interactive use in the most ordinary way, to print or display an
-announcement including an appropriate copyright notice and a
-notice that there is no warranty (or else, saying that you provide
-a warranty) and that users may redistribute the program under
-these conditions, and telling the user how to view a copy of this
-License.  (Exception: if the Program itself is interactive but
-does not normally print such an announcement, your work based on
-the Program is not required to print an announcement.)
+	<LI>You may modify the PROGRAM, create works based on the
+	PROGRAM and distribute copies of such throughout the world, in
+	any medium.<BR><BR>

 </OL>

-<P>These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+<H2><FONT FACE="Arial,HELVETICA">2. Restrictions</FONT></H2>

-<P>Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+This license is subject to the following restrictions:

-<P>In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+<OL TYPE=a>

-<LI>You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+	<LI>Distribution of the PROGRAM or any work based on the
+	PROGRAM by a commercial organization to any third party is
+	prohibited if any payment is made in connection with such
+	distribution, whether directly (as in payment for a copy of the
+	PROGRAM) or indirectly (as in payment for some service related
+	to the PROGRAM, or payment for some product or service that
+	includes a copy of the PROGRAM "without charge"; these are only
+	examples, and not an exhaustive enumeration of prohibited
+	activities).  The following methods of distribution involving
+	payment shall not in and of themselves be a violation of this
+	restriction:<BR><BR>

-<OL TYPE="a">
+	<OL TYPE=i>

-<LI>Accompany it with the complete corresponding machine-readable
-source code, which must be distributed under the terms of Sections
-1 and 2 above on a medium customarily used for software interchange; or,
+		<LI>Posting the PROGRAM on a public access information
+		storage and retrieval service for which a fee is
+		received for retrieving information (such as an on-line
+		service), provided that the fee is not
+		content-dependent (i.e., the fee would be the same for
+		retrieving the same volume of information consisting of
+		random data) and that access to the service and to the
+		PROGRAM is available independent of any other product
+		or service.  An example of a service that does not fall
+		under this section is an on-line service that is
+		operated by a company and that is only available to
+		customers of that company.  (This is not an exhaustive
+		enumeration.)<BR><BR>

-<LI>Accompany it with a written offer, valid for at least three
-years, to give any third party, for a charge no more than your
-cost of physically performing source distribution, a complete
-machine-readable copy of the corresponding source code, to be
-distributed under the terms of Sections 1 and 2 above on a medium
-customarily used for software interchange; or,
+		<LI>Distributing the PROGRAM on removable
+		computer-readable media, provided that the files
+		containing the PROGRAM are reproduced entirely and
+		verbatim on such media, that all information on such
+		media be redistributable for non-commercial purposes
+		without charge, and that such media are distributed by
+		themselves (except for accompanying documentation)
+		independent of any other product or service.  Examples
+		of such media include CD-ROM, magnetic tape, and
+		optical storage media.  (This is not intended to be an
+		exhaustive list.)  An example of a distribution that
+		does not fall under this section is a CD-ROM included
+		in a book or magazine.  (This is not an exhaustive
+		enumeration.)<BR><BR>

-<LI>Accompany it with the information you received as to the offer
-to distribute corresponding source code.  (This alternative is
-allowed only for noncommercial distribution and only if you
-received the program in object code or executable form with such
-an offer, in accord with Subsection b above.)
+	</OL>
+
+	<LI>Activities other than copying, distribution and
+	modification of the PROGRAM are not subject to this License and
+	they are outside its scope. Functional use (running) of the
+	PROGRAM is not restricted, and any output produced through the
+	use of the PROGRAM is subject to this license only if its
+	contents constitute a work based on the PROGRAM (independent of
+	having been made by running the PROGRAM).<BR><BR>
+
+	<LI>You must meet all of the following conditions with respect to any work
+	that you distribute or publish that in whole or in part contains or is
+	derived from the PROGRAM or any part thereof ("the Work"):<BR><BR>
+
+	<OL TYPE=i>
+
+		<LI>If you have modified the PROGRAM, you must cause
+		the Work to carry prominent notices stating that you
+		have modified the PROGRAM's files and the date of any
+		change;<BR><BR>
+
+		<LI>You must cause the Work to be licensed as a whole
+		and at no charge to all third parties under the terms
+		of this License;<BR><BR>
+
+		<LI>If the Work normally reads commands interactively
+		when run, you must cause it, at each time the Work
+		commences operation, to print or display an
+		announcement including an appropriate copyright notice
+		and a notice that there is no warranty (or else, saying
+		that you provide a warranty).  Such notice must also
+		state that users may redistribute the Work only under
+		the conditions of this License and tell the user how to
+		view the copy of this License included with the Work. 
+		(Exceptions: if the PROGRAM is interactive but normally
+		prints or displays such an announcement only at the
+		request of a user, such as in an "About box", the Work
+		is required to print or display the notice only under
+		the same circumstances; if the PROGRAM itself is
+		interactive but does not normally print such an
+		announcement, the Work is not required to print an
+		announcement.);<BR><BR>
+
+		<LI>You must accompany the Work with the complete
+		corresponding machine-readable source code, delivered
+		on a medium customarily used for software interchange. 
+		The source code for a work means the preferred form of
+		the work for making modifications to it.  For an
+		executable work, complete source code means all the
+		source code for all modules it contains, plus any
+		associated interface definition files, plus the scripts
+		used to control compilation and installation of the
+		executable code.  If you distribute with the Work any
+		component that is normally distributed (in either
+		source or binary form) with the major components
+		(compiler, kernel, and so on) of the operating system
+		on which the executable runs, you must also distribute
+		the source code of that component if you have it and
+		are allowed to do so;<BR><BR>
+
+		<LI>If you distribute any written or printed material
+		at all with the Work, such material must include either
+		a written copy of this License, or a prominent written
+		indication that the Work is covered by this License and
+		written instructions for printing and/or displaying the
+		copy of the License on the distribution medium;<BR><BR>
+
+		<LI>You may not impose any further restrictions on the
+		recipient's exercise of the rights granted herein.<BR><BR>
+
+	</OL>

 </OL>

-<P>The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
+If distribution of executable or object code is made by offering the
+equivalent ability to copy from a designated place, then offering
+equivalent ability to copy the source code from the same place counts
+as distribution of the source code, even though third parties are not
+compelled to copy the source code along with the object code.

-<P>If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+<H2><FONT FACE="Arial,HELVETICA">3. Reservation of Rights</FONT></H2>

-<LI>You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+No rights are granted to the PROGRAM except as expressly set forth
+herein. You may not copy, modify, sublicense, or distribute the PROGRAM
+except as expressly provided under this License.  Any attempt otherwise
+to copy, modify, sublicense or distribute the PROGRAM is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such parties
+remain in full compliance.

-<LI>You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+<H2><FONT FACE="Arial,HELVETICA">4. Other Restrictions</FONT></H2>

-<LI>Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
+If the distribution and/or use of the PROGRAM is restricted in certain
+countries for any reason, LICENSOR may add an explicit geographical
+distribution limitation excluding those countries, so that distribution
+is permitted only in or among countries not thus excluded.  In such
+case, this License incorporates the limitation as if written in the
+body of this License.

-<LI>If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+<H2><FONT FACE="Arial,HELVETICA">5. Limitations</FONT></H2>

-<P>If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
+THE PROGRAM IS PROVIDED TO YOU "AS IS", WITHOUT WARRANTY.  THERE IS NO
+WARRANTY FOR THE PROGRAM, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 
+THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS
+WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

-<P>It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
+<P>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL LICENSOR, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING
+ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT
+OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED
+BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY
+OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.

-<P>This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
+<H2><FONT FACE="Arial,HELVETICA">6. General</FONT></H2>

-<LI>If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+This License is governed by the laws of the State of Maryland, U.S.A.,
+excluding choice of law rules.

-<LI>The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
+<P>If any part of this License is found to be in conflict with the law,
+that part shall be interpreted in its broadest meaning consistent with
+the law, and no other parts of the License shall be affected.

-<P>Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
+<P>For United States Government users, the PROGRAM is provided with
+RESTRICTED RIGHTS.  If you are a unit or agency of the United States
+Government or are acquiring the Software for any such unit or agency,
+the following apply:

-<LI>If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-</OL>
-
-<H3>NO WARRANTY</H3>
-
-<OL START="11">
-
-<LI>BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-<LI>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-</OL>
-
-<H3>END OF TERMS AND CONDITIONS</H3>
+<BLOCKQUOTE>
+If the unit or agency is the Department of Defense ("DOD"), the
+Software and its documentation are classified as "commercial computer
+software" and "commercial computer software documentation" respectively
+and, pursuant to DFAR Section 227.7202, the Government is acquiring the
+Software and its documentation in accordance with the terms of this
+License.  If the unit or agency is other than DOD, the Software and its
+documentation are classified as "commercial computer software" and
+"commercial computer software documentation" respectively and, pursuant
+to FAR Section 12.212, the Government is acquiring the Software and its
+documentation in accordance with the terms of this License.
+</BLOCKQUOTE>

 </BODY>
 </HTML>
@@ -0,0 +1,223 @@
+                         Aladdin Free Public License
+
+                         (Version 6, June 17, 1997)
+
+              Copyright © 1994, 1995, 1997 Aladdin Enterprises,
+
+             Menlo Park, California, U.S.A. All rights reserved.
+
+     NOTE: This License is not the same as any of the GNU Licenses
+     published by the Free Software Foundation. Its terms are
+     substantially different from those of the GNU Licenses. If you are
+     familiar with the GNU Licenses, please read this license with
+     extra care.
+
+Aladdin Enterprises hereby grants to anyone the permission to apply this
+License to their own work, as long as the entire License (including the
+above notices and this paragraph) is copied with no changes, additions, or
+deletions except for changing the first paragraph of Section 0 to include a
+suitable description of the work to which the license is being applied and
+of the person or entity that holds the copyright in the work, and, if the
+License is being applied to a work created in a country other than the
+United States, replacing the first paragraph of Section 6 with an
+appropriate reference to the laws of the appropriate country.
+
+0. Subject Matter
+
+This License applies to the Common UNIX Printing System ("PROGRAM"). The
+Common UNIX Printing System is a copyrighted work whose copyright is held by
+Easy Software Products (the "LICENSOR"). The Common UNIX Printing System,
+CUPS, and the CUPS logo are the trademark property of Easy Software
+Products.
+
+A "work based on the PROGRAM" means either the PROGRAM or any derivative
+work of the PROGRAM, as defined in the United States Copyright Act of 1976,
+such as a translation or a modification.
+
+BY MODIFYING OR DISTRIBUTING THE PROGRAM (OR ANY WORK BASED ON THE PROGRAM),
+YOU INDICATE YOUR ACCEPTANCE OF THIS LICENSE TO DO SO, AND ALL ITS TERMS AND
+CONDITIONS FOR COPYING, DISTRIBUTING OR MODIFYING THE PROGRAM OR WORKS BASED
+ON IT. NOTHING OTHER THAN THIS LICENSE GRANTS YOU PERMISSION TO MODIFY OR
+DISTRIBUTE THE PROGRAM OR ITS DERIVATIVE WORKS. THESE ACTIONS ARE PROHIBITED
+BY LAW. IF YOU DO NOT ACCEPT THESE TERMS AND CONDITIONS, DO NOT MODIFY OR
+DISTRIBUTE THE PROGRAM.
+
+1. Licenses
+
+LICENSOR hereby grants you the following rights, provided that you comply
+with all of the restrictions set forth in this License and provided,
+further, that you distribute an unmodified copy of this License with the
+PROGRAM:
+
+  a. You may copy and distribute literal (i.e., verbatim) copies of the
+     PROGRAM's source code as you receive it throughout the world, in any
+     medium.
+
+  b. You may modify the PROGRAM, create works based on the PROGRAM and
+     distribute copies of such throughout the world, in any medium.
+
+2. Restrictions
+
+This license is subject to the following restrictions:
+
+  a. Distribution of the PROGRAM or any work based on the PROGRAM by a
+     commercial organization to any third party is prohibited if any payment
+     is made in connection with such distribution, whether directly (as in
+     payment for a copy of the PROGRAM) or indirectly (as in payment for
+     some service related to the PROGRAM, or payment for some product or
+     service that includes a copy of the PROGRAM "without charge"; these are
+     only examples, and not an exhaustive enumeration of prohibited
+     activities). The following methods of distribution involving payment
+     shall not in and of themselves be a violation of this restriction:
+
+       i. Posting the PROGRAM on a public access information storage and
+          retrieval service for which a fee is received for retrieving
+          information (such as an on-line service), provided that the fee is
+          not content-dependent (i.e., the fee would be the same for
+          retrieving the same volume of information consisting of random
+          data) and that access to the service and to the PROGRAM is
+          available independent of any other product or service. An example
+          of a service that does not fall under this section is an on-line
+          service that is operated by a company and that is only available
+          to customers of that company. (This is not an exhaustive
+          enumeration.)
+
+      ii. Distributing the PROGRAM on removable computer-readable media,
+          provided that the files containing the PROGRAM are reproduced
+          entirely and verbatim on such media, that all information on such
+          media be redistributable for non-commercial purposes without
+          charge, and that such media are distributed by themselves (except
+          for accompanying documentation) independent of any other product
+          or service. Examples of such media include CD-ROM, magnetic tape,
+          and optical storage media. (This is not intended to be an
+          exhaustive list.) An example of a distribution that does not fall
+          under this section is a CD-ROM included in a book or magazine.
+          (This is not an exhaustive enumeration.)
+
+  b. Activities other than copying, distribution and modification of the
+     PROGRAM are not subject to this License and they are outside its scope.
+     Functional use (running) of the PROGRAM is not restricted, and any
+     output produced through the use of the PROGRAM is subject to this
+     license only if its contents constitute a work based on the PROGRAM
+     (independent of having been made by running the PROGRAM).
+
+  c. You must meet all of the following conditions with respect to any work
+     that you distribute or publish that in whole or in part contains or is
+     derived from the PROGRAM or any part thereof ("the Work"):
+
+       i. If you have modified the PROGRAM, you must cause the Work to carry
+          prominent notices stating that you have modified the PROGRAM's
+          files and the date of any change;
+
+      ii. You must cause the Work to be licensed as a whole and at no charge
+          to all third parties under the terms of this License;
+
+     iii. If the Work normally reads commands interactively when run, you
+          must cause it, at each time the Work commences operation, to print
+          or display an announcement including an appropriate copyright
+          notice and a notice that there is no warranty (or else, saying
+          that you provide a warranty). Such notice must also state that
+          users may redistribute the Work only under the conditions of this
+          License and tell the user how to view the copy of this License
+          included with the Work. (Exceptions: if the PROGRAM is interactive
+          but normally prints or displays such an announcement only at the
+          request of a user, such as in an "About box", the Work is required
+          to print or display the notice only under the same circumstances;
+          if the PROGRAM itself is interactive but does not normally print
+          such an announcement, the Work is not required to print an
+          announcement.);
+
+      iv. You must accompany the Work with the complete corresponding
+          machine-readable source code, delivered on a medium customarily
+          used for software interchange. The source code for a work means
+          the preferred form of the work for making modifications to it. For
+          an executable work, complete source code means all the source code
+          for all modules it contains, plus any associated interface
+          definition files, plus the scripts used to control compilation and
+          installation of the executable code. If you distribute with the
+          Work any component that is normally distributed (in either source
+          or binary form) with the major components (compiler, kernel, and
+          so on) of the operating system on which the executable runs, you
+          must also distribute the source code of that component if you have
+          it and are allowed to do so;
+
+       v. If you distribute any written or printed material at all with the
+          Work, such material must include either a written copy of this
+          License, or a prominent written indication that the Work is
+          covered by this License and written instructions for printing
+          and/or displaying the copy of the License on the distribution
+          medium;
+
+      vi. You may not impose any further restrictions on the recipient's
+          exercise of the rights granted herein.
+
+If distribution of executable or object code is made by offering the
+equivalent ability to copy from a designated place, then offering equivalent
+ability to copy the source code from the same place counts as distribution
+of the source code, even though third parties are not compelled to copy the
+source code along with the object code.
+
+3. Reservation of Rights
+
+No rights are granted to the PROGRAM except as expressly set forth herein.
+You may not copy, modify, sublicense, or distribute the PROGRAM except as
+expressly provided under this License. Any attempt otherwise to copy,
+modify, sublicense or distribute the PROGRAM is void, and will automatically
+terminate your rights under this License. However, parties who have received
+copies, or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+4. Other Restrictions
+
+If the distribution and/or use of the PROGRAM is restricted in certain
+countries for any reason, LICENSOR may add an explicit geographical
+distribution limitation excluding those countries, so that distribution is
+permitted only in or among countries not thus excluded. In such case, this
+License incorporates the limitation as if written in the body of this
+License.
+
+5. Limitations
+
+THE PROGRAM IS PROVIDED TO YOU "AS IS", WITHOUT WARRANTY. THERE IS NO
+WARRANTY FOR THE PROGRAM, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. THE ENTIRE
+RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD
+THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+LICENSOR, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM
+AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR
+DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES
+OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+6. General
+
+This License is governed by the laws of the State of Maryland, U.S.A.,
+excluding choice of law rules.
+
+If any part of this License is found to be in conflict with the law, that
+part shall be interpreted in its broadest meaning consistent with the law,
+and no other parts of the License shall be affected.
+
+For United States Government users, the PROGRAM is provided with RESTRICTED
+RIGHTS. If you are a unit or agency of the United States Government or are
+acquiring the Software for any such unit or agency, the following apply:
+
+     If the unit or agency is the Department of Defense ("DOD"), the
+     Software and its documentation are classified as "commercial
+     computer software" and "commercial computer software
+     documentation" respectively and, pursuant to DFAR Section
+     227.7202, the Government is acquiring the Software and its
+     documentation in accordance with the terms of this License. If the
+     unit or agency is other than DOD, the Software and its
+     documentation are classified as "commercial computer software" and
+     "commercial computer software documentation" respectively and,
+     pursuant to FAR Section 12.212, the Government is acquiring the
+     Software and its documentation in accordance with the terms of
+     this License.
@@ -16,7 +16,7 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44141 Airport View Drive, Suite 204
+#       44145 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -31,30 +31,14 @@
 AR	=	@AR@
 AWK	=	@AWK@
 CC	=	@CC@
-CHMOD	=	@CHMOD@
 CP	=	@CP@
-DSO	=	@DSO@
 HTMLDOC	=	@HTMLDOC@
 LN	=	/bin/ln -sf
 MKDIR	=	@MKDIR@ -p
-NROFF	=	@NROFF@
-PACK	=	@PACK@
+NROFF	=	@GROFF@ -T ascii
 RANLIB	=	@RANLIB@
 RM	=	@RM@ -f
-SED	=	@SED@
 SHELL	=	/bin/sh
-SMBCLIENT =	@SMBCLIENT@
-
-#
-# Libraries...
-#
-
-LIBCUPS	=	@LIBCUPS@
-LIBCUPSIMAGE =	@LIBCUPSIMAGE@
-LIBJPEG	=	@LIBJPEG@
-LIBPNG	=	@LIBPNG@
-LIBTIFF	=	@LIBTIFF@
-LIBZ	=	@LIBZ@

 #
 # Program options...
@@ -66,20 +50,12 @@ LIBZ	=	@LIBZ@

 ARFLAGS	=	crvs
 CFLAGS	=	@CFLAGS@ $(OPTIM) -I.. $(OPTIONS)
-DSOLIBS	=	@DSOLIBS@
-IMGLIBS	=	@IMGLIBS@ -lm
+IMGLIBS	=	@IMGLIBS@ $(LIBS) -lm
 LDFLAGS	=	@LDFLAGS@ $(OPTIM)
-LIBS	=	-L../cups -lcups $(NETLIBS) @LIBS@
-NETLIBS	=	@NETLIBS@
+LIBS	=	@LIBS@ -L../cups -lcups
 OPTIM	=	@OPTIM@
 OPTIONS	=

-#
-# Formatted man page extension...
-#
-
-CAT	=	@CAT@
-
 #
 # Directories...
 #
@@ -111,7 +87,7 @@ top_srcdir	=	@top_srcdir@

 BINDIR		=	@bindir@
 DATADIR		=	@CUPS_DATADIR@
-INCLUDEDIR	=	$(includedir)
+INCLUDEDIR	=	$(includedir)/cups
 LIBDIR		=	$(libdir)
 LOCALEDIR	= 	@CUPS_LOCALEDIR@
 MANDIR		=	@mandir@
@@ -122,16 +98,13 @@ SERVERROOT	= 	@CUPS_SERVERROOT@
 # Rules...
 #

-.SILENT:
-.SUFFIXES:	.a .c .gz .h .o .z .1 .5 .8
+.SUFFIXES:	.a .c .h .1 .2 .3 .4 .5 .6 .7 .8 .o .z
 .c.o:
-	echo Compiling $<...
 	$(CC) $(CFLAGS) -c $<
-.1.z .5.z .8.z .1.gz .5.gz .8.gz:
-	echo Formatting $<...
+.1.z .2.z .3.z .4.z .5.z .6.z .7.z .8.z:
 	$(NROFF) -man $< >t
-	$(PACK) t
-	-mv t.$(CAT) $@
+	pack -f t
+	mv t.z $@

 #
 # End of "$Id$"
@@ -14,7 +14,7 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44141 Airport View Drive, Suite 204
+#       44145 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -37,7 +37,6 @@ DIRS	=	cups backend berkeley cgi-bin filter man pstoraster \

 all:
 	for dir in $(DIRS); do\
-		echo Making all in $$dir... ;\
 		(cd $$dir; make);\
 	done

@@ -47,7 +46,6 @@ all:

 clean:
 	for dir in $(DIRS); do\
-		echo Cleaning in $$dir... ;\
 		(cd $$dir; make clean);\
 	done

@@ -57,18 +55,12 @@ clean:

 install:
 	for dir in $(DIRS); do\
-		echo Installing in $$dir... ;\
 		(cd $$dir; make install);\
 	done
-	echo Installing in conf...
 	(cd conf; make install)
-	echo Installing in data...
 	(cd data; make install)
-	echo Installing in doc...
 	(cd doc; make install)
-	echo Installing in fonts...
 	(cd fonts; make install)
-	echo Installing in ppd...
 	(cd ppd; make install)

 #
@@ -0,0 +1,243 @@
+<HTML>
+<HEAD>
+	<TITLE>README - Common UNIX Printing System</TITLE>
+</HEAD>
+<BODY>
+
+<H1>README - CUPS v1.0b1</H1>
+
+<H2>Contents</H2>
+
+<UL>
+	<LI><A HREF="#intro">Introduction</A>
+	<LI><A HREF="#require">Requirements</A>
+	<LI><A HREF="#compile">Compiling CUPS</A>
+	<LI><A HREF="#config">Configuring the Software</A>
+	<LI><A HREF="#run">Running the Software</A>
+	<LI><A HREF="#use">Using the Software</A>
+	<LI><A HREF="#known">Known Problems</A>
+	<LI><A HREF="#report">Reporting Problems</A>
+	<LI><A HREF="#resources">Other Resources</A>
+	<LI><A HREF="#license">Legal Stuff</A>
+</UL>
+
+<H2><A NAME="intro">Introduction</A></H2>
+
+The Common UNIX Printing System provides a portable printing layer for 
+UNIX&reg; operating systems. It has been developed by Easy Software 
+Products to promote a standard printing solution for all UNIX vendors 
+and users. CUPS provides the System V and Berkeley command-line 
+interfaces. 
+
+<P>CUPS uses the Internet Printing Protocol (IETF-IPP) as the basis
+for  managing print jobs and queues. The Line Printer Daemon (LPD,
+RFC1179), Server Message Block (SMB), and AppSocket protocols are also
+supported with reduced functionality.
+
+<P>CUPS adds network printer browsing and PostScript Printer 
+Description (&quot;PPD&quot;)-based printing options to support real
+world applications under UNIX.
+
+<P>CUPS also includes a customized version of GNU GhostScript (currently
+based off GNU GhostScript 4.03) and an image file RIP that can be used to
+support non-PostScript printers.
+
+<H2><A NAME="require">Requirements</A></H2>
+
+You'll need an ANSI C compiler to build CUPS on your system. As its name
+implies, CUPS is designed to run on the UNIX operating system, however
+the CUPS interface library and most of the filters and backends supplied
+with CUPS should also run under Microsoft&reg; Windows&reg;.
+
+<P>For the image file filters you'll need the JPEG, PNG, TIFF, and ZLIB
+libraries.  CUPS will build without these, but with reduced functionality.
+
+<P>If you make changes to the man pages you'll need GNU groff or another
+nroff-like package.
+
+<P>The documentation is formatted using the HTMLDOC software (again, not
+needed unless you make changes.)
+
+<H2><A NAME="compile">Compiling CUPS</A></H2>
+
+CUPS uses GNU autoconf to configure the makefiles and source code for your
+system. To configure CUPS for your system type:
+
+<UL><PRE>
+% ./configure ENTER
+</PRE></UL>
+
+The default installation will put the CUPS software in the <CODE>/usr</CODE>
+and <CODE>/var</CODE> directories on your system, which will overwrite any
+existing printing commands on your system. To install the CUPS software in
+another location use the <CODE>--prefix</CODE> option:
+
+<UL><PRE>
+% ./configure --prefix=/usr/local ENTER
+</PRE></UL>
+
+Once you have configured things, just type:
+
+<UL><PRE>
+% make ENTER
+</PRE></UL>
+
+to build the software.
+
+<H2><A NAME="install">Installing the Software</A></H2>
+
+To install the software type:
+
+<UL><PRE>
+% make install ENTER
+</PRE></UL>
+
+<H2><A NAME="config">Configuring the Software</A></H2>
+
+Before you run CUPS for the first time you'll need to edit the CUPS
+configuration files which are normally located in /var/cups/conf.
+
+<UL>
+
+	The <CODE>cupsd.conf</CODE> file configures all of the
+	"global" server settings and access control. The default
+	settings are usually appropriate for most environments.
+
+	<P>The <CODE>printers.conf</CODE> file configures each printer
+	queue. You'll need to add a listing for each printer on your
+	system.
+
+	<P>The <CODE>classes.conf</CODE> file configures each printer
+	class. You'll need to add a listing for each printer class you
+	want.
+
+	<P>The <CODE>mime.types</CODE> file defines all of the
+	recognized file types. You don't normally have to edit this
+	file.
+
+	<P>The <CODE>mime.convs</CODE> file defines all of the file
+	conversion filters. You don't normally have to edit this file.
+
+</UL>
+
+In addition to the files in the /var/cups/conf directory, you'll also need
+to copy PPD files for each printer to the /var/cups/ppd directory.  If you
+don't have a PPD file for your printer, the drivers will still work, just
+with reduced functionality.
+
+<H2><A NAME="run">Running the Software</A></H2>
+
+Once you have configured the software you can start the CUPS daemon by
+typing:
+
+<UL><PRE>
+% /usr/sbin/cupsd &amp; ENTER
+</PRE></UL>
+
+<H2><A NAME="use">Using the Software</A></H2>
+
+Once you have installed the software, you can use the normal lp or lpr
+commands to print jobs. If you installed the software under /usr then
+you shouldn't have to reconfigure any applications to recognize the new
+printing system.
+
+<P>One of the advantages of CUPS is that you don't always have to send
+PostScript or Text files to your printers. If you have a JPEG file, you
+can just type "lp filename.jpg" and CUPS will handle converting it for
+you!
+
+<P>You can monitor the status of jobs via the lpstat command or with your
+web browser by pointing it at "http://localhost:631".
+
+<H2><A NAME="known">Known Problems</A></H2>
+
+The following known problems are being worked on and should be resolved for
+the second beta release of CUPS:
+
+<UL>
+
+	<LI>Documentation is not completed.
+
+	<LI>The lpadmin command is currently not provided.
+
+	<LI>The lpq command is currently not provided.
+
+	<LI>The lpc command currently only supports the help and status
+	commands.
+
+	<LI>While both GNU GhostScript and the CUPS image RIP are
+	provided, no sample raster printer driver is provided. The
+	final release of CUPS will include a PCL printer driver.
+
+	<LI>Automatic classing is currently not supported.
+
+	<LI>The CUPS server should disable core dumps by filters, backends,
+	and CGI programs.
+
+	<LI>The CUPS server should increase the FD limit to the maximum
+	allowed on the system.
+
+	<LI>The CUPS server should close stdin, stdout, and stderr and
+	run in the background ("daemon" mode...)
+
+	<LI>The class and job CGIs are currently not provided.
+
+</UL>
+
+CUPS has been built and tested on the following operating systems:
+
+<UL>
+	<LI>Digital UNIX 4.0d
+	<LI>HP-UX 10.20 and 11.0
+	<LI>IRIX 5.3, 6.2, 6.5.3
+	<LI>Linux (RedHat 5.2)
+	<LI>Solaris 2.5.1, 2.6, 2.7 (aka 7)
+</UL>
+
+The client libraries and filters have been successfully compiled under
+Microsoft Windows using Visual C++ 6.0.
+
+<H2><A NAME="report">Reporting Problems</A></H2>
+
+If you have problems, please send an email to
+<A HREF="mailto:cups-support@cups.org">cups-support@cups.org</A>.  Include
+your operating system and version, compiler and version, and any errors
+or problems you've run into.
+
+<H2><A NAME="resources">Other Resources</A></H2>
+
+See the CUPS web site at "http://www.cups.org" for other site links.
+
+<P>You can subscribe to the CUPS mailing list by sending a message containing
+"subscribe cups" to <A HREF="mailto:majordomo@cups.org">majordomo@cups.org</A>.
+This list is provided to discuss problems, questions, and improvements to
+the CUPS software. New releases of CUPS are announced to this list as well.
+
+<H2><A NAME="legal">Legal Stuff</A></H2>
+
+CUPS is Copyright 1993-1999 by Easy Software Products. CUPS, the CUPS logo,
+and the Common UNIX Printing System are the trademark property of Easy Software
+Products.
+
+<P>CUPS is provided under the terms of the
+<A HREF="LICENSE.html">Aladdin Free Public License</A>
+which is located in the files "LICENSE.html" and "LICENSE.txt". For commercial
+licensing information, please contact:
+
+<UL>
+	Attn: CUPS Licensing Information
+	<BR>Easy Software Products
+	<BR>44141 Airport View Drive, Suite 204
+	<BR>Hollywood, Maryland 20636-3111 USA
+
+	<P>Voice: +1.301.373.9603
+	<BR>Email: <A HREF="mailto:cups-info@cups.org">cups-info@cups.org</A>
+	<BR>WWW: <A HREF="http://www.cups.org">http://www.cups.org</A>
+</UL>
+
+<P>If you're interested in a complete, commercial printing solution for UNIX,
+check out our ESP Print software at <A HREF="http://www.easysw.com/print.html">
+http://www.easysw.com/print.html</A>.
+
+</BODY>
+</HTML>
@@ -1,195 +1,192 @@
-README - CUPS v1.0b6 - 07/30/1999
---------------------------------
+README - CUPS v1.0b1

-BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE
-
-    WARNING - This is a BETA release of CUPS, which means that it may
-	      contain "bugs" that could prevent you from printing.  If
-	      you are concerned that this may cause you lost time or
-	      money, please STOP and do not install this software!
-
-BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE
+CONTENTS

+   * Introduction
+   * Requirements
+   * Compiling CUPS
+   * Configuring the Software
+   * Running the Software
+   * Using the Software
+   * Known Problems
+   * Reporting Problems
+   * Other Resources
+   * Legal Stuff

 INTRODUCTION

-The Common UNIX Printing System provides a portable printing layer for
-UNIX® operating systems.  It has been developed by Easy Software
-Products to promote a standard printing solution for all UNIX vendors
-and users.  CUPS provides the System V and Berkeley command-line
-interfaces.
+The Common UNIX Printing System provides a portable printing layer for UNIX®
+operating systems. It has been developed by Easy Software Products to
+promote a standard printing solution for all UNIX vendors and users. CUPS
+provides the System V and Berkeley command-line interfaces.

 CUPS uses the Internet Printing Protocol (IETF-IPP) as the basis for
-managing print jobs and queues.  The Line Printer Daemon (LPD,
-RFC1179), Server Message Block (SMB), and AppSocket protocols are also
-supported with reduced functionality.
+managing print jobs and queues. The Line Printer Daemon (LPD, RFC1179),
+Server Message Block (SMB), and AppSocket protocols are also supported with
+reduced functionality.

 CUPS adds network printer browsing and PostScript Printer Description
 ("PPD")-based printing options to support real world applications under
 UNIX.

-CUPS also includes a customized version of GNU GhostScript (currently
-based off GNU GhostScript 4.03) and an image file RIP that can be used
-to support non-PostScript printers.
+CUPS also includes a customized version of GNU GhostScript (currently based
+off GNU GhostScript 4.03) and an image file RIP that can be used to support
+non-PostScript printers.

-CUPS is Copyright 1993-1999 by Easy Software Products, All Rights
-Reserved.  CUPS is currently licensed under the terms of the GNU
-General Public License.  Please see the license file for details.
+REQUIREMENTS

+You'll need an ANSI C compiler to build CUPS on your system. As its name
+implies, CUPS is designed to run on the UNIX operating system, however the
+CUPS interface library and most of the filters and backends supplied with
+CUPS should also run under Microsoft® Windows®.

-SYSTEM REQUIREMENTS
+For the image file filters you'll need the JPEG, PNG, TIFF, and ZLIB
+libraries. CUPS will build without these, but with reduced functionality.

-Binary distributions require a minimum of 10MB of free disk space. We
-do not recommend using CUPS on a workstation with less than 32MB of RAM
-or a PC with less than 16MB of RAM.
+If you make changes to the man pages you'll need GNU groff or another
+nroff-like package.

-If you are installing from source you'll need an ANSI C compiler and
-optionally one or more image file support libraries.  Complete source
-installation instructions can be found in the CUPS System
-Administrator's Manual in the files "doc/sam.html" or "doc/sam.pdf".
+The documentation is formatted using the HTMLDOC software (again, not needed
+unless you make changes.)

+COMPILING CUPS

-SOFTWARE REQUIREMENTS
+CUPS uses GNU autoconf to configure the makefiles and source code for your
+system. To configure CUPS for your system type:

-The following operating system software is required to install one of
-the binary distributions from Easy Software Products:
+     % ./configure ENTER

-    - Digital UNIX (aka OSF1 aka Compaq Tru64 UNIX) 4.0 or higher
-    - HP-UX 10.20 or higher
-    - IRIX 5.3 or higher
-    - Linux 2.0.36 with glibc2 or higher (tested with RedHat 5.2)
-    - Solaris 2.5 or higher (SPARC or Intel)
+The default installation will put the CUPS software in the /usr and /var
+directories on your system, which will overwrite any existing printing
+commands on your system. To install the CUPS software in another location
+use the --prefix option:

+     % ./configure --prefix=/usr/local ENTER

-INSTALLING CUPS
+Once you have configured things, just type:

-We are currently distributing CUPS binary distributions in TAR format
-with installation and removal scripts generated by our ESP Package
-Manager (EPM) software, which is also included with the source
-distribution.
+     % make ENTER

-WARNING: Installing CUPS will overwrite your existing printing system.
-Backup files are made by the installation script and restored by the
-removal script, so if you experience problems you should be able to
-remove the CUPS software to restore your previous configuration. 
-However, Easy Software Products makes no warranty for this and will not
-be liable for any lost revenues, etc.
+to build the software.

-To install the CUPS software you will need to be logged in as root
-(doing an "su" is good enough).  Once you are the root user, run the
-installation script with:
+INSTALLING THE SOFTWARE

-    ./cups.install ENTER
+To install the software type:

-After asking you a few yes/no questions the CUPS software will be
-installed and the scheduler will be started automatically.
+     % make install ENTER

+CONFIGURING THE SOFTWARE

-SETTING UP PRINTER QUEUES
+Before you run CUPS for the first time you'll need to edit the CUPS
+configuration files which are normally located in /var/cups/conf.

-CUPS works best with PPD (PostScript Printer Description) files.  In a
-pinch you can also use System V style printer interface scripts.
+     The cupsd.conf file configures all of the "global" server settings and
+     access control. The default settings are usually appropriate for most
+     environments.

-Two sample PPD files are provided with this distribution that utilize
-the PostScript and image file RIPs and the sample HP printer driver. 
-To add the sample DeskJet driver to the system for a printer connected
-to the parallel port, use one of the following commands:
+     The printers.conf file configures each printer queue. You'll need to
+     add a listing for each printer on your system.

-    Digital UNIX:
+     The classes.conf file configures each printer class. You'll need to add
+     a listing for each printer class you want.

-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp0 -E
+     The mime.types file defines all of the recognized file types. You don't
+     normally have to edit this file.

-    HP-UX:
+     The mime.convs file defines all of the file conversion filters. You
+     don't normally have to edit this file.

-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/c2t0d0_lp -E
+In addition to the files in the /var/cups/conf directory, you'll also need
+to copy PPD files for each printer to the /var/cups/ppd directory. If you
+don't have a PPD file for your printer, the drivers will still work, just
+with reduced functionality.

-    IRIX:
+RUNNING THE SOFTWARE

-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/plp -E
+Once you have configured the software you can start the CUPS daemon by
+typing:

-    Linux:
+     % /usr/sbin/cupsd & ENTER

-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/par0 -E
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/par1 -E
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/par2 -E
+USING THE SOFTWARE

-    Solaris:
+Once you have installed the software, you can use the normal lp or lpr
+commands to print jobs. If you installed the software under /usr then you
+shouldn't have to reconfigure any applications to recognize the new printing
+system.

-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/bpp0 -E
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/ecpp0 -E
+One of the advantages of CUPS is that you don't always have to send
+PostScript or Text files to your printers. If you have a JPEG file, you can
+just type "lp filename.jpg" and CUPS will handle converting it for you!

-Similarly, for the sample LaserJet driver you can use "LaserJet" and
-"laserjet.ppd".
+You can monitor the status of jobs via the lpstat command or with your web
+browser by pointing it at "http://localhost:631".

-For other printers and interfaces see the CUPS System Administator's
-Manual included with this software.
+KNOWN PROBLEMS

+The following known problems are being worked on and should be resolved for
+the second beta release of CUPS:

-PRINTING FILES
+   * Documentation is not completed.
+   * The lpadmin command is currently not provided.
+   * The lpq command is currently not provided.
+   * The lpc command currently only supports the help and status commands.
+   * While both GNU GhostScript and the CUPS image RIP are provided, no
+     sample raster printer driver is provided. The final release of CUPS
+     will include a PCL printer driver.
+   * Automatic classing is currently not supported.
+   * The CUPS server should disable core dumps by filters, backends, and CGI
+     programs.
+   * The CUPS server should increase the FD limit to the maximum allowed on
+     the system.
+   * The CUPS server should close stdin, stdout, and stderr and run in the
+     background ("daemon" mode...)
+   * The class and job CGIs are currently not provided.

-CUPS provides both the System V "lp" and Berkeley "lpr" commands for
-printing:
+CUPS has been built and tested on the following operating systems:

-    lp filename
-    lpr filename
-
-Both the "lp" and "lpr" commands support printing options for the
-driver:
-
-    lp -omedia=A4 -oresolution=600dpi filename
-    lpr -omedia=A4 -oresolution=600dpi filename
-
-CUPS recognizes many types of images files as well as PostScript, HP-GL/2,
-and text files, so you can print those files directly rather than through
-an application.
-
-If you have an application that generates output specifically for your
-printer then you need to use the "-oraw" or "-l" options:
-
-    lp -oraw filename
-    lpr -l filename
-
-This will prevent the filters from misinterpreting your print file.
+   * Digital UNIX 4.0d
+   * HP-UX 10.20 and 11.0
+   * IRIX 5.3, 6.2, 6.5.3
+   * Linux (RedHat 5.2)
+   * Solaris 2.5.1, 2.6, 2.7 (aka 7)

+The client libraries and filters have been successfully compiled under
+Microsoft Windows using Visual C++ 6.0.

 REPORTING PROBLEMS

-If you have problems, please send an email to cups-support@cups.org. 
-Include your operating system and version, compiler and version, and
-any errors or problems you've run into.
-
+If you have problems, please send an email to cups-support@cups.org. Include
+your operating system and version, compiler and version, and any errors or
+problems you've run into.

 OTHER RESOURCES

 See the CUPS web site at "http://www.cups.org" for other site links.

-You can subscribe to the CUPS mailing list by sending a message
-containing "subscribe cups" to majordomo@cups.org.  This list is
-provided to discuss problems, questions, and improvements to the CUPS
-software.  New releases of CUPS are announced to this list as well.
-
+You can subscribe to the CUPS mailing list by sending a message containing
+"subscribe cups" to majordomo@cups.org. This list is provided to discuss
+problems, questions, and improvements to the CUPS software. New releases of
+CUPS are announced to this list as well.

 LEGAL STUFF

-CUPS is Copyright 1993-1999 by Easy Software Products.  CUPS, the CUPS
-logo, and the Common UNIX Printing System are the trademark property of
-Easy Software Products.
+CUPS is Copyright 1993-1999 by Easy Software Products. CUPS, the CUPS logo,
+and the Common UNIX Printing System are the trademark property of Easy
+Software Products.

-CUPS is provided under the terms of the GNU General Public License
-which is located in the files "LICENSE.html" and "LICENSE.txt" (or the
-file "cups.license" for a binary distribution.)  For commercial
+CUPS is provided under the terms of the Aladdin Free Public License which is
+located in the files "LICENSE.html" and "LICENSE.txt". For commercial
 licensing information, please contact:

-    Attn: CUPS Licensing Information
-    Easy Software Products
-    44141 Airport View Drive, Suite 204
-    Hollywood, Maryland 20636-3111 USA
+     Attn: CUPS Licensing Information
+     Easy Software Products
+     44141 Airport View Drive, Suite 204
+     Hollywood, Maryland 20636-3111 USA

-    Voice: +1.301.373.9603
-    Email: cups-info@cups.org
-    WWW: http://www.cups.org
+     Voice: +1.301.373.9603
+     Email: cups-info@cups.org
+     WWW: http://www.cups.org

-If you're interested in a complete, commercial printing solution for
-UNIX, check out our ESP Print Pro software at:
-
-    http://www.easysw.com/printpro
+If you're interested in a complete, commercial printing solution for UNIX,
+check out our ESP Print software at http://www.easysw.com/print.html.
@@ -14,7 +14,7 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44141 Airport View Drive, Suite 204
+#       44145 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -24,8 +24,8 @@

 include ../Makedefs

-TARGETS	=	ipp lpd parallel serial smb socket
-OBJS	=	ipp.o lpd.o parallel.o serial.o socket.o
+TARGETS	=	lpd parallel serial smb socket
+OBJS	=	lpd.o parallel.o serial.o smb.o socket.o

 #
 # Make all targets...
@@ -47,26 +47,12 @@ clean:
 install:
 	-$(MKDIR) $(SERVERROOT)/backend
 	$(CP) $(TARGETS) $(SERVERROOT)/backend
-	-$(LN) ipp $(SERVERROOT)/backend/http
-	$(CHMOD) u+s $(SERVERROOT)/backend/lpd
-
-#
-# ipp
-#
-
-ipp:	ipp.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o ipp ipp.o $(LIBS)
-	-$(LN) ipp http
-
-ipp.o:	../cups/cups.h ../Makedefs

 #
 # lpd
 #

-lpd:	lpd.o ../cups/$(LIBCUPS)
-	echo Linking $@...
+lpd:	lpd.o ../cups/libcups.a
 	$(CC) $(LDFLAGS) -o lpd lpd.o $(LIBS)

 lpd.o:	../cups/cups.h ../Makedefs
@@ -75,8 +61,7 @@ lpd.o:	../cups/cups.h ../Makedefs
 # parallel
 #

-parallel:	parallel.o ../cups/$(LIBCUPS)
-	echo Linking $@...
+parallel:	parallel.o ../cups/libcups.a
 	$(CC) $(LDFLAGS) -o parallel parallel.o $(LIBS)

 parallel.o:	../cups/cups.h ../Makedefs
@@ -85,8 +70,7 @@ parallel.o:	../cups/cups.h ../Makedefs
 # serial
 #

-serial:	serial.o ../cups/$(LIBCUPS)
-	echo Linking $@...
+serial:	serial.o ../cups/libcups.a
 	$(CC) $(LDFLAGS) -o serial serial.o $(LIBS)

 serial.o:	../cups/cups.h ../Makedefs
@@ -94,22 +78,17 @@ serial.o:	../cups/cups.h ../Makedefs
 #
 # smb
 #
-# Note: reading through these commands is a good way to get a headache... :)
-#

-smb:	smb.sh ../Makedefs
-	echo Generating $@...
-	$(RM) smb
-	sedcmd="1,\$$s/^SMBCLIENT=.\*/SMBCLIENT=`echo $(SMBCLIENT) | sed -e '1,$$s/\\//\\\\\\//g'`/" ;\
-	$(SED) -e "$$sedcmd" <smb.sh >smb
-	$(CHMOD) +x smb
+smb:	smb.o ../cups/libcups.a
+	$(CC) $(LDFLAGS) -o smb smb.o $(LIBS)
+
+smb.o:	../cups/cups.h ../Makedefs

 #
 # socket
 #

-socket:	socket.o ../cups/$(LIBCUPS)
-	echo Linking $@...
+socket:	socket.o ../cups/libcups.a
 	$(CC) $(LDFLAGS) -o socket socket.o $(LIBS)

 socket.o:	../cups/cups.h ../Makedefs
@@ -1,401 +0,0 @@
-/*
- * "$Id$"
- *
- *   IPP backend for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-1999 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" 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-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- * Contents:
- *
- *   main() - Send a file to the printer or server.
- */
-
-/*
- * Include necessary headers.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <cups/cups.h>
-#include <cups/language.h>
-#include <cups/string.h>
-
-
-/*
- * 'main()' - Send a file to the printer or server.
- *
- * Usage:
- *
- *    printer-uri job-id user title copies options [file]
- */
-
-int			/* O - Exit status */
-main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
-     char *argv[])	/* I - Command-line arguments */
-{
-  int		i;		/* Looping var */
-  int		n, n2;		/* Attribute values */
-  char		*option,	/* Name of option */
-		*val,		/* Pointer to option value */
-		*s;		/* Pointer into option value */
-  int		num_options;	/* Number of printer options */
-  cups_option_t	*options;	/* Printer options */
-  char		method[255],	/* Method in URI */
-		hostname[1024],	/* Hostname */
-		username[255],	/* Username info */
-		resource[1024],	/* Resource info (printer name) */
-		filename[1024];	/* File to print */
-  int		port;		/* Port number (not used) */
-  char		password[255],	/* Password info */
-		uri[HTTP_MAX_URI];/* Updated URI without user/pass */
-  http_status_t	status;		/* Status of HTTP job */
-  FILE		*fp;		/* File to print */
-  http_t	*http;		/* HTTP connection */
-  ipp_t		*request,	/* IPP request */
-		*response;	/* IPP response */
-  ipp_attribute_t *job_id;	/* job-id attribute */
-  cups_lang_t	*language;	/* Default language */
-  struct stat	fileinfo;	/* File statistics */
-  size_t	nbytes,		/* Number of bytes written */
-		tbytes;		/* Total bytes written */
-  char		buffer[8192];	/* Output buffer */
-
-
-  if (argc < 6 || argc > 7)
-  {
-    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
-            argv[0]);
-    return (1);
-  }
-
- /*
-  * If we have 7 arguments, print the file named on the command-line.
-  * Otherwise, print stdin...
-  */
-
-  if (argc == 6)
-    fp = stdin;
-  else if ((fp = fopen(argv[6], "rb")) == NULL)
-  {
-    perror("ERROR: Unable to open print file");
-    return (1);
-  }
-  else
-    stat(argv[6], &fileinfo);
-
- /*
-  * Extract the hostname and printer name from the URI...
-  */
-
-  httpSeparate(argv[0], method, username, hostname, &port, resource);
-
- /*
-  * Try connecting to the remote server...
-  */
-
-  fprintf(stderr, "INFO: Connecting to %s...\n", hostname);
-
-  if ((http = httpConnect(hostname, port)) == NULL)
-  {
-    perror("ERROR: Unable to connect to IPP host");
-
-    if (fp != stdin)
-      fclose(fp);
-    return (1);
-  }
-
- /*
-  * Build a URI for the printer and fill the standard IPP attributes for
-  * an IPP_PRINT_FILE request.  We can't use the URI in argv[0] because it
-  * might contain username:password information...
-  */
-
-  request = ippNew();
-  request->request.op.operation_id = IPP_PRINT_JOB;
-  request->request.op.request_id   = 1;
-
-  sprintf(uri, "%s://%s:%d%s", method, hostname, port, resource);
-
-  language = cupsLangDefault();
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL,
-               language != NULL ? language->language : "C");
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
-               NULL, uri);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
-               NULL, argv[2]);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL, argv[3]);
-
- /*
-  * Handle options on the command-line...
-  */
-
-  options     = NULL;
-  num_options = cupsParseOptions(argv[5], 0, &options);
-
-  if (cupsGetOption("raw", num_options, options))
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
-        	 NULL, "application/vnd.cups-raw");
-  else
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
-        	 NULL, "application/octet-stream");
-
-  ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies", atoi(argv[4]));
-
-  for (i = 0; i < num_options; i ++)
-  {
-   /*
-    * Skip the "raw" option - handled above...
-    */
-
-    if (strcmp(options[i].name, "raw") == 0)
-      continue;
-
-   /*
-    * See what the option value is; for compatibility with older interface
-    * scripts, we have to support single-argument options as well as
-    * option=value, option=low-high, and option=MxN.
-    */
-
-    option = options[i].name;
-    val    = options[i].value;
-
-    if (*val == '\0')
-      val = NULL;
-
-    if (val != NULL)
-    {
-      if (strcasecmp(val, "true") == 0 ||
-          strcasecmp(val, "on") == 0 ||
-	  strcasecmp(val, "yes") == 0)
-      {
-       /*
-	* Boolean value - true...
-	*/
-
-	n   = 1;
-	val = "";
-      }
-      else if (strcasecmp(val, "false") == 0 ||
-               strcasecmp(val, "off") == 0 ||
-	       strcasecmp(val, "no") == 0)
-      {
-       /*
-	* Boolean value - false...
-	*/
-
-	n   = 0;
-	val = "";
-      }
-
-      n = strtol(val, &s, 0);
-    }
-    else
-    {
-      if (strncmp(option, "no", 2) == 0)
-      {
-	option += 2;
-	n      = 0;
-      }
-      else
-        n = 1;
-
-      s = "";
-    }
-
-    if (*s != '\0' && *s != '-' && (*s != 'x' || s == val))
-     /*
-      * String value(s)...
-      */
-      ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, option, NULL, val);
-    else if (val != NULL)
-    {
-     /*
-      * Numeric value, range, or resolution...
-      */
-
-      if (*s == '-')
-      {
-        n2 = strtol(s + 1, NULL, 0);
-        ippAddRange(request, IPP_TAG_JOB, option, n, n2);
-      }
-      else if (*s == 'x')
-      {
-        n2 = strtol(s + 1, &s, 0);
-
-	if (strcmp(s, "dpc") == 0)
-          ippAddResolution(request, IPP_TAG_JOB, option, IPP_RES_PER_CM, n, n2);
-        else if (strcmp(s, "dpi") == 0)
-          ippAddResolution(request, IPP_TAG_JOB, option, IPP_RES_PER_INCH, n, n2);
-        else
-          ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, option, NULL, val);
-      }
-      else
-        ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, option, n);
-    }
-    else
-     /*
-      * Boolean value...
-      */
-      ippAddBoolean(request, IPP_TAG_JOB, option, (char)n);
-  }
-
- /*
-  * Now fill in the HTTP request stuff...
-  */
-
-  httpClearFields(http);
-  httpSetField(http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
-  httpEncode64(password, username);
-  httpSetField(http, HTTP_FIELD_AUTHORIZATION, password);
-
-  if (fp != stdin)
-  {
-    sprintf(buffer, "%u", ippLength(request) + (size_t)fileinfo.st_size);
-    httpSetField(http, HTTP_FIELD_CONTENT_LENGTH, buffer);
-  }
-  else
-    httpSetField(http, HTTP_FIELD_TRANSFER_ENCODING, "chunked");
-
- /*
-  * Do the request...
-  */
-
-  for (;;)
-  {
-   /*
-    * POST the request, retrying as needed...
-    */
-
-    if (httpPost(http, resource))
-      if (httpPost(http, resource))
-      {
-        fputs("INFO: Unable to POST print request; retrying...\n", stderr);
-	sleep(10);
-	continue;
-      }
-
-    fputs("INFO: POST successful, sending IPP request...\n", stderr);
-
-   /*
-    * Send the IPP request...
-    */
-
-    request->state = IPP_IDLE;
-
-    if (ippWrite(http, request) == IPP_ERROR)
-    {
-      fputs("ERROR: Unable to send IPP request!\n", stderr);
-      status = HTTP_ERROR;
-      break;
-    }
-
-    fputs("INFO: IPP request sent, sending print file...\n", stderr);
-
-   /*
-    * Then send the file...
-    */
-
-    tbytes = 0;
-    while ((nbytes = fread(buffer, 1, sizeof(buffer), fp)) > 0)
-    {
-      tbytes += nbytes;
-      fprintf(stderr, "INFO: Sending print file, %uk...\n", tbytes / 1024);
-
-      if (httpWrite(http, buffer, nbytes) < nbytes)
-      {
-        perror("ERROR: Unable to send print file to printer");
-	status = HTTP_ERROR;
-        break;
-      }
-    }
-
-    httpWrite(http, buffer, 0);
-
-    fputs("INFO: Print file sent; checking status...\n", stderr);
-
-   /*
-    * Finally, check the status from the HTTP server...
-    */
-
-    while ((status = httpUpdate(http)) == HTTP_CONTINUE);
-
-    if (status == HTTP_OK)
-    {
-      response = ippNew();
-      ippRead(http, response);
-
-      if (response->request.status.status_code > IPP_OK_CONFLICT)
-        fprintf(stderr, "ERROR: Print file was not accepted (%04x)!\n",
-	        response->request.status.status_code);
-      else if ((job_id = ippFindAttribute(response, "job-id", IPP_TAG_INTEGER)) == NULL)
-        fputs("INFO: Print file accepted - job ID unknown.\n", stderr);
-      else
-        fprintf(stderr, "INFO: Print file accepted - job ID %d.\n",
-	        job_id->values[0].integer);
-    }
-    else
-    {
-      response = NULL;
-      httpFlush(http);
-
-      fprintf(stderr, "ERROR: Print request was not accepted (%d)!\n", status);
-    }
-
-    break;
-  }
-
- /*
-  * Free memory...
-  */
-
-  httpClose(http);
-  if (request != NULL)
-    ippDelete(request);
-  if (response != NULL)
-    ippDelete(response);
-
- /*
-  * Close the print file as needed...
-  */
-
-  if (fp != stdin)
-    fclose(fp);
-
- /*
-  * Return the queue status...
-  */
-
-  return (status != HTTP_OK);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
+ *       44145 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -109,14 +109,14 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */

    if ((fp = fopen(tmpnam(filename), "w")) == NULL)
    {
-      perror("ERROR: unable to create temporary file");
+      perror("lpd: unable to create temporary file");
      return (1);
    }

    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
      if (fwrite(buffer, 1, bytes, fp) < bytes)
      {
-        perror("ERROR: unable to write to temporary file");
+        perror("lpd: unable to write to temporary file");
 	fclose(fp);
 	unlink(filename);
 	return (1);
@@ -178,7 +178,7 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */
  bytes = vsprintf(buf, format, ap);
  va_end(ap);

-  fprintf(stderr, "DEBUG: lpd_command %02.2x %s", buf[0], buf + 1);
+  fprintf(stderr, "lpd: lpd_command %02.2x %s", buf[0], buf + 1);

 /*
  * Send the command...
@@ -194,7 +194,7 @@ lpd_command(int  fd,		/* I - Socket connection to LPD host */
  if (recv(fd, &status, 1, 0) < 1)
    return (-1);

-  fprintf(stderr, "DEBUG: lpd_command returning %d\n", status);
+  fprintf(stderr, "lpd: lpd_command returning %d\n", status);

  return (status);
 }
@@ -288,13 +288,13 @@ lpd_queue(char *hostname,	/* I - Host to connect to */

  if (stat(filename, &filestats))
  {
-    perror("ERROR: unable to stat print file");
+    perror("lpd: unable to stat print file");
    return (1);
  }

  if ((fp = fopen(filename, "rb")) == NULL)
  {
-    perror("ERROR: unable to open print file for reading");
+    perror("lpd: unable to open print file for reading");
    return (1);
  }

@@ -306,7 +306,8 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
  lpd_command(fd, "\002%s\n", printer);	/* Receive print job(s) */

  gethostname(localhost, sizeof(localhost));
-  localhost[31] = '\0'; /* RFC 1179, Section 7.2 - host name < 32 chars */
+  if (strchr(localhost, '.') != NULL)
+    *strchr(localhost, '.') = '\0';

  sprintf(control, "H%s\nP%s\n", localhost, user);
  cptr = control + strlen(control);
@@ -322,12 +323,12 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
          getpid() % 1000, localhost,
          getpid() % 1000, localhost);

-  fprintf(stderr, "DEBUG: Control file is:\n%s", control);
+  fprintf(stderr, "lpd: Control file is:\n%s", control);

  lpd_command(fd, "\002%d cfA%03.3d%s\n", strlen(control), getpid() % 1000,
              localhost);

-  fprintf(stderr, "INFO: Sending control file (%d bytes)\n", strlen(control));
+  fprintf(stderr, "lpd: Sending control file (%d bytes)\n", strlen(control));

  if (send(fd, control, strlen(control) + 1, 0) < (strlen(control) + 1))
  {
@@ -343,12 +344,12 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
    * Send the print file...
    */

-    fputs("INFO: Control file sent successfully\n", stderr);
+    fputs("lpd: Control file sent successfully\n", stderr);

-    lpd_command(fd, "\003%u dfA%03.3d%s\n", (unsigned)filestats.st_size,
+    lpd_command(fd, "\003%d dfA%03.3d%s\n", filestats.st_size,
                getpid() % 1000, localhost);

-    fprintf(stderr, "INFO: Sending data file (%u bytes)\n",
+    fprintf(stderr, "lpd: Sending data file (%u bytes)\n",
            (unsigned)filestats.st_size);

    tbytes = 0;
@@ -374,7 +375,7 @@ lpd_queue(char *hostname,	/* I - Host to connect to */
      fprintf(stderr, "ERROR: Remote host did not accept data file (%d)\n",
              status);
    else
-      fputs("INFO: Data file sent successfully\n", stderr);
+      fputs("lpd: Data file sent successfully\n", stderr);
  }

 /*
@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
+ *       44145 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
+ *       44145 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -0,0 +1,66 @@
+/*
+ * "$Id$"
+ *
+ *   Server Message Block backend for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 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" 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
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ */
+
+/*
+ * Include necessary headers.
+ */
+
+#include <cups/cups.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <cups/string.h>
+
+
+/*
+ * 'main()' - Send a file to the printer or server.
+ *
+ * Usage:
+ *
+ *    printer-uri job-id user title copies options [file]
+ */
+
+int			/* O - Exit status */
+main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
+     char *argv[])	/* I - Command-line arguments */
+{
+  if (argc < 6 || argc > 7)
+  {
+    fprintf(stderr, "Usage: %s job-id user title copies options [file]\n",
+            argv[0]);
+    return (1);
+  }
+
+  fputs("ERROR: Backend not implemented yet!\n", stderr);
+
+  return (1);
+}
+
+
+
+/*
+ * End of "$Id$".
+ */
@@ -1,88 +0,0 @@
-#!/bin/sh
-#
-# "$Id$"
-#
-#   SMB printing script for the Common UNIX Printing System (CUPS).
-#
-#   Copyright 1993-1999 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
-#       44145 Airport View Drive, Suite 204
-#       Hollywood, Maryland 20636-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-SMBCLIENT=/usr/local/samba/bin/smbclient
-
-#
-# Usage:
-#
-#     printer job user title copies options [filename]
-#
-
-if [ $# -lt 5 -o $# -gt 6 ]; then
-	# Too few or too many arguments
-	echo 'Usage: smb job-id user title copies options [file]' >&2
-	exit 1
-fi
-
-#
-# If "filename" is not on the command-line, then we read the print
-# data from stdin and write it to a temporary file.
-#
-
-if [ $# = 5 ]; then
-	# Collect all print data and put it in a temporary file...
-	if [ "$TMPDIR" = "" ]; then
-		TMPDIR=/var/tmp
-	fi
-
-	filename="$TMPDIR/$$.smb"
-	cat >$filename
-else
-	# Use the file on the command-line...
-	filename="$6"
-fi
-
-#
-# Take apart the URI in $0...
-#
-
-uri="$0"
-host=`echo $uri | awk -F/ '{print substr($3, index($3, "@") + 1)}'`
-user=`echo $uri | awk -F/ '{print substr($3, 0, index($3, "@") - 1)}'`
-if [ "$user" != "" ]; then
-	user="-U $user"
-fi
-printer=`echo $uri | awk -F/ '{print $4}'`
-
-#
-# Send the file to the remote system...
-#
-
-$SMBCLIENT //$host/$printer $user -P -N <<EOF
-print $filename
-EOF
-
-#
-# Lastly, remove the temporary file as needed...
-#
-
-if [ $# = 5 ]; then
-	rm -f $filename
-fi
-
-#
-# End of "$Id$".
-#
@@ -14,7 +14,7 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44141 Airport View Drive, Suite 204
+#       44145 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -24,8 +24,8 @@

 include ../Makedefs

-TARGETS	=	lpc lpq lpr lprm
-OBJS	=	lpc.o lpq.o lpr.o lprm.o
+TARGETS	=	lpc lpr lprm
+OBJS	=	lpc.o lpr.o lprm.o

 #
 # Make all targets...
@@ -47,35 +47,23 @@ clean:
 install:
 	-$(MKDIR) $(BINDIR)
 	-$(MKDIR) $(SBINDIR)
-	$(CP) lpq lpr lprm $(BINDIR)
+	$(CP) lpr lprm $(BINDIR)
 	$(CP) lpc $(SBINDIR)

 #
 # lpc
 #

-lpc:	lpc.o ../cups/$(LIBCUPS)
-	echo Linking $@...
+lpc:	lpc.o ../cups/libcups.a
 	$(CC) $(LDFLAGS) -o lpc lpc.o $(LIBS)

 lpc.o:	../cups/cups.h ../Makedefs

-#
-# lpq
-#
-
-lpq:	lpq.o ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o lpq lpq.o $(LIBS)
-
-lpq.o:	../cups/cups.h ../Makedefs
-
 #
 # lpr
 #

-lpr:	lpr.o ../cups/$(LIBCUPS)
-	echo Linking $@...
+lpr:	lpr.o ../cups/libcups.a
 	$(CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)

 lpr.o:	../cups/cups.h ../Makedefs
@@ -84,8 +72,7 @@ lpr.o:	../cups/cups.h ../Makedefs
 # lprm
 #

-lprm:	lprm.o ../cups/$(LIBCUPS)
-	echo Linking $@...
+lprm:	lprm.o ../cups/libcups.a
 	$(CC) $(LDFLAGS) -o lprm lprm.o $(LIBS)

 lprm.o:	../cups/cups.h ../Makedefs
@@ -70,7 +70,7 @@ main(int  argc,		/* I - Number of command-line arguments */
  * Connect to the scheduler...
  */

-  http = httpConnect(cupsServer(), ippPort());
+  http = httpConnect("localhost", ippPort());

  if (argc > 1)
  {
@@ -87,14 +87,8 @@ main(int  argc,		/* I - Number of command-line arguments */
    */

    printf("lpc> ");
-    while (fgets(line, sizeof(line), stdin) != NULL)
+    while (gets(line) != NULL)
    {
-     /*
-      * Strip the trailing newline...
-      */
-
-      line[strlen(line) - 1] = '\0';
-
     /*
      * Find any options in the string...
      */
@@ -231,7 +225,7 @@ show_status(http_t *http,	/* I - HTTP connection to server */
 				/* Printer URI */


-  DEBUG_printf(("show_status(%08x, %08x)\n", http, dests));
+  DEBUG_printf(("show_printers(%08x, %08x)\n", http, dests));

  if (http == NULL)
    return;
@@ -263,7 +257,7 @@ show_status(http_t *http,	/* I - HTTP connection to server */

  if ((response = cupsDoRequest(http, request, "/printers/")) != NULL)
  {
-    DEBUG_puts("show_status: request succeeded...");
+    DEBUG_puts("show_printers: request succeeded...");

   /*
    * Loop through the printers returned in the list and display
@@ -403,15 +397,15 @@ show_status(http_t *http,	/* I - HTTP connection to server */

 	  language = cupsLangDefault();

-	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                       "attributes-charset", NULL,
-		       cupsLangEncoding(language));
+	  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                	      "attributes-charset", NULL,
+			      cupsLangEncoding(language));

-	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                       "attributes-natural-language", NULL,
-		       language->language);
+	  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+                	      "attributes-natural-language", NULL,
+			      language->language);

-          sprintf(printer_uri, "ipp://localhost/printers/%s", printer);
+          sprintf(printer_uri, "http://localhost/printers/%s", printer);
 	  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
 	                      "printer-uri", NULL, printer_uri);

@@ -1,369 +0,0 @@
-/*
- * "$Id$"
- *
- *   "lpq" command for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-1999 by Easy Software Products.
- *
- *   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-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- * Contents:
- *
- *   main()      - Parse options and commands.
- *   show_jobs() - Show jobs.
- */
-
-/*
- * Include necessary headers...
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <cups/cups.h>
-#include <cups/language.h>
-#include <cups/debug.h>
-
-
-/*
- * Local functions...
- */
-
-static int	show_jobs(http_t *, const char *, const char *, const int,
-		          const int);
-
-
-/*
- * 'main()' - Parse options and commands.
- */
-
-int
-main(int  argc,		/* I - Number of command-line arguments */
-     char *argv[])	/* I - Command-line arguments */
-{
-  int		i;		/* Looping var */
-  http_t	*http;		/* Connection to server */
-  const char	*dest,		/* Desired printer */
-		*user;		/* Desired user */
-  int		id,		/* Desired job ID */
-		interval,	/* Reporting interval */
-		longstatus;	/* Show file details */
-
- /*
-  * Connect to the scheduler...
-  */
-
-  http = httpConnect(cupsServer(), ippPort());
-
- /*
-  * Check for command-line options...
-  */
-
-  dest       = cupsGetDefault();
-  user       = NULL;
-  id         = 0;
-  interval   = 0;
-  longstatus = 0;
-
-  for (i = 1; i < argc; i ++)
-    if (argv[i][0] == '+')
-      interval = atoi(argv[i] + 1);
-    else if (argv[i][0] == '-')
-    {
-      switch (argv[i][1])
-      {
-        case 'P' : /* Printer */
-	    if (argv[i][2])
-	      dest = argv[i] + 2;
-	    else
-	    {
-	      i ++;
-	      dest = argv[i];
-	    }
-	    break;
-
-	case 'l' : /* Long status */
-	    longstatus = 1;
-	    break;
-
-	default :
-	    fputs("Usage: lpq [-P dest] [-l] [+interval]\n", stderr);
-	    return (1);
-      }
-    }
-    else if (isdigit(argv[i][0]))
-      id = atoi(argv[i]);
-    else
-      user = argv[i];
-
- /*
-  * Show the status in a loop...
-  */
-
-  for (;;)
-  {
-    i = show_jobs(http, dest, user, id, longstatus);
-
-    if (i && interval)
-      sleep(interval);
-    else
-      break;
-  }
-
- /*
-  * Close the connection to the server and return...
-  */
-
-  httpClose(http);
-
-  return (0);
-}
-
-
-/*
- * 'show_jobs()' - Show jobs.
- */
-
-static int			/* O - Number of jobs in queue */
-show_jobs(http_t     *http,	/* I - HTTP connection to server */
-          const char *dest,	/* I - Destination */
-	  const char *user,	/* I - User */
-	  const int  id,	/* I - Job ID */
-	  const int  longstatus)/* I - 1 if long report desired */
-{
-  ipp_t		*request,	/* IPP Request */
-		*response;	/* IPP Response */
-  ipp_attribute_t *attr;	/* Current attribute */
-  cups_lang_t	*language;	/* Default language */
-  const char	*jobdest,	/* Pointer into job-printer-uri */
-		*jobuser,	/* Pointer to job-originating-user-name */
-		*jobname;	/* Pointer to job-name */
-  ipp_jstate_t	jobstate;	/* job-state */
-  int		jobid,		/* job-id */
-		jobsize,	/* job-k-octets */
-		jobpriority,	/* job-priority */
-		jobcount,	/* Number of jobs */
-		rank;		/* Rank of job */
-  char		resource[1024];	/* Resource string */
-  static const char *ranks[10] =/* Ranking strings */
-		{
-		  "th",
-		  "st",
-		  "nd",
-		  "rd",
-		  "th",
-		  "th",
-		  "th",
-		  "th",
-		  "th",
-		  "th"
-		};
-
-
-  DEBUG_printf(("show_jobs(%08x, %08x, %08x, %d, %d)\n", http, dest, user, id,
-                longstatus));
-
-  if (http == NULL)
-    return (0);
-
- /*
-  * Build an IPP_GET_JOBS or IPP_GET_JOB_ATTRIBUTES request, which requires
-  * the following attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    job-uri or printer-uri
-  *    [
-  */
-
-  request = ippNew();
-
-  request->request.op.operation_id = id ? IPP_GET_JOB_ATTRIBUTES : IPP_GET_JOBS;
-  request->request.op.request_id   = 1;
-
-  language = cupsLangDefault();
-
-  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                      "attributes-charset", NULL, cupsLangEncoding(language));
-
-  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                      "attributes-natural-language", NULL, language->language);
-
-  if (dest == NULL)
-  {
-    if (id)
-      sprintf(resource, "ipp://localhost/jobs/%d", id);
-    else
-      strcpy(resource, "ipp://localhost/jobs");
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
-                 NULL, resource);
-  }
-  else
-  {
-    sprintf(resource, "ipp://localhost/printers/%s", dest);
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
-                 NULL, resource);
-  }
-
-  if (user)
-  {
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME,
-                 "requesting-user-name", NULL, user);
-    ippAddBoolean(request, IPP_TAG_OPERATION, "my-jobs", 1);
-  }
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if (!longstatus)
-    puts("Rank\tPri   Owner  Job    Files              Total Size");
-
-  jobcount = 0;
-
-  if ((response = cupsDoRequest(http, request, "/jobs/")) != NULL)
-  {
-    rank = 1;
-
-   /*
-    * Loop through the job list and display them...
-    */
-
-    for (attr = response->attrs; attr != NULL; attr = attr->next)
-    {
-     /*
-      * Skip leading attributes until we hit a job...
-      */
-
-      while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
-        attr = attr->next;
-
-      if (attr == NULL)
-        break;
-
-     /*
-      * Pull the needed attributes from this job...
-      */
-
-      jobid       = 0;
-      jobsize     = 0;
-      jobpriority = 50;
-      jobstate    = IPP_JOB_PENDING;
-      jobname     = "untitled";
-      jobuser     = NULL;
-      jobdest     = NULL;
-
-      while (attr != NULL && attr->group_tag == IPP_TAG_JOB)
-      {
-        if (strcmp(attr->name, "job-id") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobid = attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-k-octets") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobsize = attr->values[0].integer * 1024;
-
-        if (strcmp(attr->name, "job-priority") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobpriority = attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-state") == 0 &&
-	    attr->value_tag == IPP_TAG_ENUM)
-	  jobstate = (ipp_jstate_t)attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-printer-uri") == 0 &&
-	    attr->value_tag == IPP_TAG_URI)
-	  if ((jobdest = strrchr(attr->values[0].string.text, '/')) != NULL)
-	    jobdest ++;
-
-        if (strcmp(attr->name, "job-originating-user-name") == 0 &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  jobuser = attr->values[0].string.text;
-
-        if (strcmp(attr->name, "job-name") == 0 &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  jobname = attr->values[0].string.text;
-
-        attr = attr->next;
-      }
-
-     /*
-      * See if we have everything needed...
-      */
-
-      if (jobdest == NULL || jobid == 0)
-      {
-        if (attr == NULL)
-	  break;
-	else
-          continue;
-      }
-
-      jobcount ++;
-
-     /*
-      * Display the job...
-      */
-
-      if (longstatus)
-      {
-        puts("");
-
-        if (jobstate == IPP_JOB_PROCESSING)
-	  printf("%s: active\t\t\t\t ", jobuser);
-	else
-	{
-	  printf("%s: %d%s\t\t\t\t ", jobuser, rank, ranks[rank % 10]);
-	  rank ++;
-	}
-
-        printf("[job %03dlocalhost]\n", jobid);
-        printf("\t%-33s%d bytes\n", jobname, jobsize);
-      }
-      else
-      {
-        if (jobstate == IPP_JOB_PROCESSING)
-	  printf("active\t");
-	else
-	{
-	  printf("%d%s\t", rank, ranks[rank % 10]);
-	  rank ++;
-	}
-
-        printf(" %-5d%-7.7s%-7d%-19s%d bytes\n", jobpriority, jobuser, jobid,
-	       jobname, jobsize);
-      }
-      if (attr == NULL)
-        break;
-    }
-
-    ippDelete(response);
-  }
-
-  return (jobcount);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -45,22 +45,20 @@ main(int  argc,		/* I - Number of command-line arguments */
 {
  int		i;		/* Looping var */
  int		job_id;		/* Job ID */
-  const char	*dest;		/* Destination printer */
-  const char	*title;		/* Job title */
+  char		*dest;		/* Destination printer */
+  char		*title;		/* Job title */
  int		priority;	/* Job priority (1-100) */
  int		num_copies;	/* Number of copies per file */
  int		num_files;	/* Number of files printed */
  int		num_options;	/* Number of options */
  cups_option_t	*options;	/* Options */
-  int		silent,		/* Silent or verbose output? */
-		deletefile;	/* Delete file after print? */
+  int		silent;		/* Silent or verbose output? */
  char		tempfile[1024];	/* Temporary file for printing from stdin */
  char		buffer[8192];	/* Copy buffer */
  FILE		*temp;		/* Temporary file pointer */


  silent      = 0;
-  deletefile  = 0;
  dest        = cupsGetDefault();
  num_options = 0;
  options     = NULL;
@@ -86,16 +84,6 @@ main(int  argc,		/* I - Number of command-line arguments */
 	            argv[i][1]);
 	    break;

-	case 'o' : /* Option */
-	    if (argv[i][2] != '\0')
-	      num_options = cupsParseOptions(argv[i] + 2, num_options, &options);
-	    else
-	    {
-	      i ++;
-	      num_options = cupsParseOptions(argv[i], num_options, &options);
-	    }
-	    break;
-
 	case 'l' : /* Literal/raw */
            num_options = cupsParseOptions("raw", num_options, &options);
 	    break;
@@ -108,14 +96,10 @@ main(int  argc,		/* I - Number of command-line arguments */
 	case 's' : /* Don't use symlinks */
 	    break;

-	case 'm' : /* Mail on completion */
+	case 'm' : /* mail on completion */
 	    fputs("Warning: email notification is not supported!\n", stderr);
 	    break;

-	case 'r' : /* Remove file after printing */
-	    deletefile = 1;
-	    break;
-
        case 'P' : /* Destination printer or class */
 	    if (argv[i][2] != '\0')
 	      dest = argv[i] + 2;
@@ -193,8 +177,6 @@ main(int  argc,		/* I - Number of command-line arguments */
 	fprintf(stderr, "lpr: unable to print file \'%s\'.\n", argv[i]);
 	return (1);
      }
-      else if (deletefile)
-        unlink(argv[i]);
    }

 /*
@@ -225,7 +207,7 @@ main(int  argc,		/* I - Number of command-line arguments */

    if (i == 0)
    {
-      fputs("lpr: standard input is empty, so no job has been sent.\n", stderr);
+      fputs("lpr: stdin is empty, so no job has been sent.\n", stderr);
      return (1);
    }

@@ -236,7 +218,7 @@ main(int  argc,		/* I - Number of command-line arguments */

    if (job_id < 1)
    {
-      fputs("lpr: unable to print standard input.\n", stderr);
+      fprintf(stderr, "lpr: unable to print file \'%s\'.\n", argv[i]);
      return (1);
    }
  }
@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
+ *       44145 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -49,7 +49,7 @@ main(int  argc,			/* I - Number of command-line arguments */
  http_t	*http;		/* HTTP connection to server */
  int		i;		/* Looping var */
  int		job_id;		/* Job ID */
-  const char	*dest;		/* Destination printer */
+  char		*dest;		/* Destination printer */
  char		uri[1024];	/* Printer or job URI */
  ipp_t		*request;	/* IPP request */
  ipp_t		*response;	/* IPP response */
@@ -70,7 +70,7 @@ main(int  argc,			/* I - Number of command-line arguments */
  * Open a connection to the server...
  */

-  if ((http = httpConnect(cupsServer(), ippPort())) == NULL)
+  if ((http = httpConnect("localhost", ippPort())) == NULL)
  {
    fputs("lprm: Unable to contact server!\n", stderr);
    return (1);
@@ -146,7 +146,7 @@ main(int  argc,			/* I - Number of command-line arguments */

      if (dest)
      {
-        sprintf(uri, "ipp://localhost/printers/%s", dest);
+        sprintf(uri, "http://localhost/printers/%s", dest);
 	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
 	             "printer-uri", NULL, uri);
 	ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id",
@@ -154,7 +154,7 @@ main(int  argc,			/* I - Number of command-line arguments */
      }
      else
      {
-        sprintf(uri, "ipp://localhost/jobs/%d", job_id);
+        sprintf(uri, "http://localhost/jobs/%d", job_id);
 	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL,
 	             uri);
      }
@@ -169,14 +169,7 @@ main(int  argc,			/* I - Number of command-line arguments */
        response = cupsDoRequest(http, request, "/jobs/");

      if (response != NULL)
-      {
-        if (response->request.status.status_code == IPP_NOT_FOUND)
-          fputs("lprm: Job or printer not found!\n", stderr);
-        else if (response->request.status.status_code > IPP_OK_CONFLICT)
-          fputs("lprm: Unable to cancel job(s)!\n", stderr);
-
        ippDelete(response);
-      }
      else
      {
        fputs("lprm: Unable to cancel job(s)!\n", stderr);
@@ -14,7 +14,7 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44141 Airport View Drive, Suite 204
+#       44145 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -24,7 +24,8 @@

 include ../Makedefs

-TARGETS	=	classes.cgi jobs.cgi printers.cgi
+#TARGETS	=	classes.cgi jobs.cgi printers.cgi
+TARGETS	=	printers.cgi
 OBJS	=	classes.o jobs.o printers.o

 #
@@ -48,32 +49,11 @@ install:
 	-$(MKDIR) $(SERVERROOT)/cgi-bin
 	$(CP) $(TARGETS) $(SERVERROOT)/cgi-bin

-#
-# classes.cgi
-#
-
-classes.cgi:	classes.o ../Makedefs ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ classes.o $(LIBS)
-
-$(OBJS):	../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h
-
-#
-# jobs.cgi
-#
-
-jobs.cgi:	jobs.o ../Makedefs ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ jobs.o $(LIBS)
-
-$(OBJS):	../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h
-
 #
 # printers.cgi
 #

-printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS)
-	echo Linking $@...
+printers.cgi:	printers.o ../Makedefs ../cups/libcups.a
 	$(CC) $(LDFLAGS) -o $@ printers.o $(LIBS)

 $(OBJS):	../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h
@@ -1,475 +0,0 @@
-/*
- * "$Id$"
- *
- *   Class status CGI for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-1999 by Easy Software Products.
- *
- *   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-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- * Contents:
- *
- *   main()            - Main entry for CGI.
- *   show_class_list() - Show a list of classes...
- *   show_class_info() - Show class information.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <cups/cups.h>
-#include <cups/language.h>
-#include <cups/debug.h>
-
-
-/*
- * Local functions...
- */
-
-static void	show_class_list(http_t *http, cups_lang_t *language);
-static void	show_class_info(http_t *http, cups_lang_t *language,
-		                  char *name);
-
-
-/*
- * 'main()' - Main entry for CGI.
- */
-
-int				/* O - Exit status */
-main(int  argc,			/* I - Number of command-line arguments */
-     char *argv[])		/* I - Command-line arguments */
-{
-  cups_lang_t	*language;	/* Language information */
-  char		*name;		/* Class name */
-  http_t	*http;		/* Connection to the server */
-
-
- /*
-  * Get the request language...
-  */
-
-  language = cupsLangDefault();
-
- /*
-  * Connect to the HTTP server...
-  */
-
-  http = httpConnect("localhost", ippPort());
-
- /*
-  * Tell the client to expect HTML...
-  */
-
-  printf("Content-Type: text/html;charset=%s\n\n", cupsLangEncoding(language));
-
- /*
-  * See if we need to show a list of classes or the status of a
-  * single class...
-  */
-
-  name = argv[0];
-  if (strcmp(name, "/") == 0 || strcmp(name, "classes.cgi") == 0)
-    name = NULL;
-
- /*
-  * Print the standard header...
-  */
-
-  puts("<HTML>");
-  puts("<HEAD>");
-  if (name)
-    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"10\">");
-  else
-    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"30\">");
-  printf("<TITLE>%s on %s - Common UNIX Printing System</TITLE>\n",
-         name == NULL ? "Classes" : name, getenv("SERVER_NAME"));
-  puts("<LINK REL=STYLESHEET TYPE=\"text/css\" HREF=\"/cups.css\">");
-  puts("<MAP NAME=\"navbar\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"10,10,85,30\" HREF=\"/printers\" ALT=\"Current Printer Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"95,10,175,30\" HREF=\"/classes\" ALT=\"Current Printer Classes Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"185,10,235,30\" HREF=\"/jobs\" ALT=\"Current Jobs Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"245,10,395,30\" HREF=\"/documentation.html\" ALT=\"Read CUPS Documentation On-Line\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.cups.org\" ALT=\"Download the Current CUPS Software\">");
-  puts("</MAP>");
-  puts("</HEAD>");
-  puts("<BODY>");
-  puts("<P ALIGN=CENTER>");
-  puts("<A HREF=\"http://www.easysw.com\" ALT=\"Easy Software Products Home Page\">");
-  puts("<IMG SRC=\"/images/logo.gif\" WIDTH=\"71\" HEIGHT=\"40\" BORDER=0 ALT=\"Easy Software Products Home Page\"></A>");
-  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"540\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");
-
-  printf("<H1>%s on %s</H1>\n", name == NULL ? "Classes" : name,
-         getenv("SERVER_NAME"));
-  fflush(stdout);
-
-  puts("<CENTER>");
-  puts("<TABLE WIDTH=\"90%\" BORDER=\"1\">");
-  puts("<TR>");
-  puts("<TH>Name</TH>");
-  puts("<TH WIDTH=\"50%\">Status</TH>");
-  puts("<TH WIDTH=\"25%\">Jobs</TH>");
-  puts("</TR>");
-
- /*
-  * Show the information...
-  */
-
-  if (name == NULL)
-    show_class_list(http, language);
-  else
-    show_class_info(http, language, name);
-
- /*
-  * Write a standard trailer...
-  */
-
-  puts("</TABLE>");
-  puts("</CENTER>");
-
-  puts("<HR>");
-
-  puts("<P>The Common UNIX Printing System, CUPS, and the CUPS logo are the");
-  puts("trademark property of <A HREF=\"http://www.easysw.com\">Easy Software");
-  puts("Products</A>. CUPS is copyright 1997-1999 by Easy Software Products,");
-  puts("All Rights Reserved.");
-
-  puts("</BODY>");
-  puts("</HTML>");
-
- /*
-  * Close the HTTP server connection...
-  */
-
-  httpClose(http);
-  cupsLangFree(language);
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'show_class_list()' - Show a list of classes...
- */
-
-static void
-show_class_list(http_t      *http,	/* I - HTTP connection */
-                  cups_lang_t *language)/* I - Client's language */
-{
-  ipp_t		*request,	/* IPP request */
-		*response;	/* IPP response */
-  ipp_attribute_t *attr;	/* IPP attribute */
-
-
- /*
-  * Build a CUPS_GET_CLASSES request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  */
-
-  request = ippNew();
-
-  request->request.op.operation_id = CUPS_GET_CLASSES;
-  request->request.op.request_id   = 1;
-
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, "/classes/")) != NULL)
-  {
-   /*
-    * Loop through the classes returned in the list and display
-    * their devices...
-    */
-
-    for (attr = response->attrs; attr != NULL; attr = attr->next)
-    {
-     /*
-      * Skip leading attributes until we hit a job...
-      */
-
-      while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
-        attr = attr->next;
-
-      if (attr == NULL)
-        break;
-
-     /*
-      * Show the class status for each class...
-      */
-
-      while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
-      {
-        if (strcmp(attr->name, "printer-name") == 0 &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  show_class_info(http, language, attr->values[0].string.text);
-
-        attr = attr->next;
-      }
-
-      if (attr == NULL)
-        break;
-    }
-
-    ippDelete(response);
-  }
-}
-
-
-/*
- * 'show_class_info()' - Show class information.
- */
-
-static void
-show_class_info(http_t      *http,
-                  cups_lang_t *language,
-                  char        *name)
-{
-  ipp_t		*request,	/* IPP request */
-		*response,	/* IPP response */
-		*jobs;		/* IPP Get Jobs response */
-  int		jobcount;	/* Number of jobs */
-  ipp_attribute_t *attr;	/* IPP attribute */
-  char		*message;	/* Printer state message */
-  int		accepting;	/* Accepting requests? */
-  ipp_pstate_t	pstate;		/* Printer state */
-  char		uri[HTTP_MAX_URI];/* Printer URI */
-
-
- /*
-  * Build a IPP_GET_PRINTER_ATTRIBUTES request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    printer-uri
-  */
-
-  request = ippNew();
-
-  request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
-  request->request.op.request_id   = 1;
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
-  sprintf(uri, "ipp://localhost/classes/%s", name);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri", NULL, uri);
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, uri + 15)) == NULL)
-  {
-    puts("<P>Unable to communicate with CUPS server!");
-    return;
-  }
-
-  if (response->request.status.status_code == IPP_NOT_FOUND)
-  {
-    puts("<P>Class does not exist.");
-    ippDelete(response);
-    return;
-  }
-
- /*
-  * Grab the needed class attributes...
-  */
-
-  if ((attr = ippFindAttribute(response, "printer-state", IPP_TAG_ENUM)) != NULL)
-    pstate = (ipp_pstate_t)attr->values[0].integer;
-  else
-    pstate = IPP_PRINTER_IDLE;
-
-  if ((attr = ippFindAttribute(response, "printer-state-message", IPP_TAG_TEXT)) != NULL)
-    message = attr->values[0].string.text;
-  else
-    message = NULL;
-
-  if ((attr = ippFindAttribute(response, "printer-is-accepting-jobs",
-                               IPP_TAG_BOOLEAN)) != NULL)
-    accepting = attr->values[0].boolean;
-  else
-    accepting = 1;
-
-  if ((attr = ippFindAttribute(response, "printer-uri-supported", IPP_TAG_URI)) != NULL)
-  {
-    strcpy(uri, "http:");
-    strcpy(uri + 5, strchr(attr->values[0].string.text, '/'));
-  }
-
- /*
-  * Display the class entry...
-  */
-
-  puts("<TR>");
-
-  printf("<TD VALIGN=TOP><A HREF=\"%s\">%s</A></TD>\n", uri, name);
-
-  puts("<TD VALIGN=TOP><IMG SRC=\"/images/classes.gif\" ALIGN=\"LEFT\">");
-
-  printf("%s: %s, %s<BR>\n",
-         cupsLangString(language, CUPS_MSG_PRINTER_STATE),
-         cupsLangString(language, pstate == IPP_PRINTER_IDLE ? CUPS_MSG_IDLE :
-	                          pstate == IPP_PRINTER_PROCESSING ?
-				  CUPS_MSG_PROCESSING : CUPS_MSG_STOPPED),
-         cupsLangString(language, accepting ? CUPS_MSG_ACCEPTING_JOBS :
-	                          CUPS_MSG_NOT_ACCEPTING_JOBS));
-
-  if (message)
-    printf("<BR CLEAR=ALL><I>\"%s\"</I>\n", message);
-  else if (!accepting || pstate == IPP_PRINTER_STOPPED)
-    puts("<BR CLEAR=ALL><I>\"Reason Unknown\"</I>");
-
-  puts("</TD>");
-
- /*
-  * Show a list of jobs as needed...
-  */
-
-  if (pstate != IPP_PRINTER_IDLE)
-  {
-   /*
-    * Build an IPP_GET_JOBS request, which requires the following
-    * attributes:
-    *
-    *    attributes-charset
-    *    attributes-natural-language
-    *    printer-uri
-    */
-
-    request = ippNew();
-
-    request->request.op.operation_id = IPP_GET_JOBS;
-    request->request.op.request_id   = 1;
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-              	 "attributes-charset", NULL,
-		 cupsLangEncoding(language));
-
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                 "attributes-natural-language", NULL,
-		 language->language);
-
-    sprintf(uri, "ipp://localhost/printers/%s", name);
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
-	         "printer-uri", NULL, uri);
-
-    jobs = cupsDoRequest(http, request, uri + 15);
-  }
-  else
-    jobs = NULL;
-
-  puts("<TD VALIGN=\"TOP\">");
-  jobcount = 0;
-
-  if (jobs != NULL)
-  {
-    char	*username;	/* Pointer to job-originating-user-name */
-    int		jobid,		/* job-id */
-		size;		/* job-k-octets */
-
-
-    for (attr = jobs->attrs; attr != NULL; attr = attr->next)
-    {
-     /*
-      * Skip leading attributes until we hit a job...
-      */
-
-      while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
-        attr = attr->next;
-
-      if (attr == NULL)
-        break;
-
-     /*
-      * Pull the needed attributes from this job...
-      */
-
-      jobid    = 0;
-      size     = 0;
-      username = NULL;
-
-      while (attr != NULL && attr->group_tag == IPP_TAG_JOB)
-      {
-        if (strcmp(attr->name, "job-id") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobid = attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-k-octets") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  size = attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-originating-user-name") == 0 &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  username = attr->values[0].string.text;
-
-        attr = attr->next;
-      }
-
-     /*
-      * Display the job if it matches the current class...
-      */
-
-      if (username != NULL)
-      {
-	jobcount ++;
-	printf("<A HREF=\"/jobs/%d\">%s-%d %s %dk</A><BR>\n", jobid, name,
-	       jobid, username, size);
-      }
-
-      if (attr == NULL)
-        break;
-    }
-
-    ippDelete(jobs);
-  }
-
-  if (jobcount == 0)
-    puts("None");
-  puts("</TD>");
-  puts("</TR>");
-
-  ippDelete(response);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -1,577 +0,0 @@
-/*
- * "$Id$"
- *
- *   Job status CGI for the Common UNIX Printing System (CUPS).
- *
- *   Copyright 1997-1999 by Easy Software Products.
- *
- *   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-3111 USA
- *
- *       Voice: (301) 373-9603
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
- *
- * Contents:
- *
- *   main()          - Main entry for CGI.
- *   show_job_list() - Show a list of jobs...
- *   show_job_info() - Show job information.
- */
-
-/*
- * Include necessary headers...
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <cups/cups.h>
-#include <cups/language.h>
-#include <cups/debug.h>
-
-
-/*
- * Local functions...
- */
-
-static void	show_job_list(http_t *http, cups_lang_t *language);
-static void	show_job_info(http_t *http, cups_lang_t *language,
-		              char *name);
-
-
-/*
- * 'main()' - Main entry for CGI.
- */
-
-int				/* O - Exit status */
-main(int  argc,			/* I - Number of command-line arguments */
-     char *argv[])		/* I - Command-line arguments */
-{
-  cups_lang_t	*language;	/* Language information */
-  char		*job;		/* Job name */
-  http_t	*http;		/* Connection to the server */
-
-
-  setbuf(stdout, NULL);
-
- /*
-  * Get the request language...
-  */
-
-  language = cupsLangDefault();
-
- /*
-  * Connect to the HTTP server...
-  */
-
-  http = httpConnect("localhost", ippPort());
-
- /*
-  * Tell the client to expect HTML...
-  */
-
-  printf("Content-Type: text/html;charset=%s\n\n", cupsLangEncoding(language));
-
- /*
-  * See if we need to show a list of jobs or the status of a
-  * single job...
-  */
-
-  job = argv[0];
-  if (strcmp(job, "/") == 0 || strcmp(job, "jobs.cgi") == 0)
-    job = NULL;
-
- /*
-  * Print the standard header...
-  */
-
-  puts("<HTML>");
-  puts("<HEAD>");
-  if (job)
-    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"10\">");
-  else
-    puts("<META HTTP-EQUIV=\"Refresh\" CONTENT=\"30\">");
-  printf("<TITLE>%s on %s - Common UNIX Printing System</TITLE>\n",
-         job == NULL ? "Jobs" : job, getenv("SERVER_NAME"));
-  puts("<LINK REL=STYLESHEET TYPE=\"text/css\" HREF=\"/cups.css\">");
-  puts("<MAP NAME=\"navbar\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"10,10,85,30\" HREF=\"/printers\" ALT=\"Current Printer Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"95,10,175,30\" HREF=\"/classes\" ALT=\"Current Printer Classes Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"185,10,235,30\" HREF=\"/jobs\" ALT=\"Current Jobs Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"245,10,395,30\" HREF=\"/documentation.html\" ALT=\"Read CUPS Documentation On-Line\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.cups.org\" ALT=\"Download the Current CUPS Software\">");
-  puts("</MAP>");
-  puts("</HEAD>");
-  puts("<BODY>");
-  puts("<P ALIGN=CENTER>");
-  puts("<A HREF=\"http://www.easysw.com\" ALT=\"Easy Software Products Home Page\">");
-  puts("<IMG SRC=\"/images/logo.gif\" WIDTH=\"71\" HEIGHT=\"40\" BORDER=0 ALT=\"Easy Software Products Home Page\"></A>");
-  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"540\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");
-
-  fflush(stdout);
-
- /*
-  * Show the information...
-  */
-
-  if (job == NULL)
-    show_job_list(http, language);
-  else
-    show_job_info(http, language, job);
-
- /*
-  * Write a standard trailer...
-  */
-
-  puts("<HR>");
-
-  puts("<P>The Common UNIX Printing System, CUPS, and the CUPS logo are the");
-  puts("trademark property of <A HREF=\"http://www.easysw.com\">Easy Software");
-  puts("Products</A>. CUPS is copyright 1997-1999 by Easy Software Products,");
-  puts("All Rights Reserved.");
-
-  puts("</BODY>");
-  puts("</HTML>");
-
- /*
-  * Close the HTTP server connection...
-  */
-
-  httpClose(http);
-  cupsLangFree(language);
-
- /*
-  * Return with no errors...
-  */
-
-  return (0);
-}
-
-
-/*
- * 'show_job_list()' - Show a list of jobs...
- */
-
-static void
-show_job_list(http_t      *http,	/* I - HTTP connection */
-              cups_lang_t *language)	/* I - Client's language */
-{
-  ipp_t		*request,	/* IPP request */
-		*response;	/* IPP response */
-  ipp_attribute_t *attr;	/* IPP attribute */
-  char		*job_uri,	/* job-uri */
-		*printer_uri,	/* job-printer-uri */
-		*job_name,	/* job-name */
-		*job_user;	/* job-originating-user-name */
-  int		job_id,		/* job-id */
-		job_priority,	/* job-priority */
-		job_k_octets,	/* job-k-octets */
-		copies;		/* copies */
-  ipp_jstate_t	job_state;	/* job-state */
-
-
-  printf("<H1>Jobs on %s</H1>\n", getenv("SERVER_NAME"));
-
- /*
-  * Build an IPP_GET_JOBS request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    job-uri
-  */
-
-  request = ippNew();
-
-  request->request.op.operation_id = IPP_GET_JOBS;
-  request->request.op.request_id   = 1;
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri",
-               NULL, "ipp://localhost/jobs/");
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, "/jobs/")) != NULL)
-  {
-   /*
-    * Do a table for the jobs...
-    */
-
-    puts("<CENTER>");
-    puts("<TABLE WIDTH=\"90%\" BORDER=\"1\">");
-    puts("<TR>");
-    printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_PRINT_JOBS));
-    printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_JOB_STATE));
-    printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_JOB_NAME));
-    printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_USER_NAME));
-    printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_PRIORITY));
-    printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_COPIES));
-    printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_FILE_SIZE));
-    puts("</TR>");
-
-   /*
-    * Loop through the jobs returned in the list and display
-    * their devices...
-    */
-
-    for (attr = response->attrs; attr != NULL; attr = attr->next)
-    {
-     /*
-      * Skip leading attributes until we hit a job...
-      */
-
-      while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
-        attr = attr->next;
-
-      if (attr == NULL)
-        break;
-
-     /*
-      * Show the job status for each job...
-      */
-
-      job_uri      = NULL;
-      printer_uri  = NULL;
-      job_name     = "unknown";
-      job_user     = "unknown";
-      job_id       = 0;
-      job_priority = 50;
-      job_k_octets = 0;
-      copies       = 1;
-      job_state    = IPP_JOB_PENDING;
-
-      while (attr != NULL && attr->group_tag == IPP_TAG_JOB)
-      {
-        if (strcmp(attr->name, "job-uri") == 0 &&
-	    attr->value_tag == IPP_TAG_URI)
-	  job_uri = attr->values[0].string.text;
-
-        if (strcmp(attr->name, "job-printer-uri") == 0 &&
-	    attr->value_tag == IPP_TAG_URI)
-	  printer_uri = attr->values[0].string.text;
-
-        if (strcmp(attr->name, "job-name") == 0 &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  job_name = attr->values[0].string.text;
-
-        if (strcmp(attr->name, "job-originating-user-name") == 0 &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  job_user = attr->values[0].string.text;
-
-        if (strcmp(attr->name, "job-id") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  job_id = attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-priority") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  job_priority = attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-k-octets") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  job_k_octets = attr->values[0].integer;
-
-        if (strcmp(attr->name, "copies") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  copies = attr->values[0].integer;
-
-        if (strcmp(attr->name, "job-state") == 0 &&
-	    attr->value_tag == IPP_TAG_ENUM)
-	  job_state = (ipp_jstate_t)attr->values[0].integer;
-
-        attr = attr->next;
-      }
-
-     /*
-      * See if we have everything needed...
-      */
-
-      if (job_id && job_uri != NULL && printer_uri != NULL)
-      {
-	puts("<TR>");
-	printf("<TD><A HREF=\"http://%s:%s/jobs/%d\">%s-%d</A></TD>\n",
-	       getenv("SERVER_NAME"), getenv("SERVER_PORT"), job_id,
-	       strrchr(printer_uri, '/') + 1, job_id);
-	printf("<TD>%s</TD>\n", job_state == IPP_JOB_PROCESSING ?
-	       cupsLangString(language, CUPS_MSG_PROCESSING) :
-	       cupsLangString(language, CUPS_MSG_PENDING));
-	printf("<TD>%s</TD>\n", job_name);
-	printf("<TD>%s</TD>\n", job_user);
-	printf("<TD>%d</TD>\n", job_priority);
-	printf("<TD>%d</TD>\n", copies);
-	printf("<TD>%dk</TD>\n", job_k_octets);
-	puts("</TR>");
-      }
-
-      if (attr == NULL)
-        break;
-    }
-
-    ippDelete(response);
-
-    puts("</TABLE>");
-    puts("</CENTER>");
-  }
-  else
-    puts("<P>No jobs found.");
-}
-
-
-/*
- * 'show_job_info()' - Show job information.
- */
-
-static void
-show_job_info(http_t      *http,	/* I - Server connection */
-              cups_lang_t *language,	/* I - Language */
-              char        *name)	/* I - Job "name" */
-{
-  int		i;		/* Looping var */
-  ipp_t		*request,	/* IPP request */
-		*response;	/* IPP response */
-  ipp_attribute_t *attr;	/* IPP attribute */
-  char		uri[HTTP_MAX_URI];/* Real URI */
-  char		*job_uri,	/* job-uri */
-		*printer_uri,	/* job-printer-uri */
-		*job_name,	/* job-name */
-		*job_user;	/* job-originating-user-name */
-  int		job_id,		/* job-id */
-		job_priority,	/* job-priority */
-		job_k_octets;	/* job-k-octets */
-  ipp_jstate_t	job_state;	/* job-state */
-
-
- /*
-  * Build an IPP_GET_JOB_ATTRIBUTES request, which requires the following
-  * attributes:
-  *
-  *    attributes-charset
-  *    attributes-natural-language
-  *    job-uri
-  */
-
-  request = ippNew();
-
-  request->request.op.operation_id = IPP_GET_JOB_ATTRIBUTES;
-  request->request.op.request_id   = 1;
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
-
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
-
-  sprintf(uri, "ipp://localhost/jobs/%s", name);
-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL, uri);
-
- /*
-  * Do the request and get back a response...
-  */
-
-  if ((response = cupsDoRequest(http, request, uri + 15)) == NULL)
-  {
-    puts("<P>Unable to communicate with CUPS server!");
-    return;
-  }
-
-  if (response->request.status.status_code == IPP_NOT_FOUND)
-  {
-    puts("<P>Job does not exist or has completed.");
-    ippDelete(response);
-    return;
-  }
-
- /*
-  * Get the job status for this job...
-  */
-
-  if ((attr = ippFindAttribute(response, "job-uri", IPP_TAG_URI)) != NULL)
-    job_uri = attr->values[0].string.text;
-  else
-  {
-    puts("<P>Missing job-uri attribute!");
-    ippDelete(request);
-    return;
-  }
-
-  if ((attr = ippFindAttribute(response, "job-printer-uri", IPP_TAG_URI)) != NULL)
-    printer_uri = attr->values[0].string.text;
-  else
-  {
-    puts("<P>Missing job-printer-uri attribute!");
-    ippDelete(request);
-    return;
-  }
-
-  if ((attr = ippFindAttribute(response, "job-name", IPP_TAG_NAME)) != NULL)
-    job_name = attr->values[0].string.text;
-  else
-    job_name = "unknown";
-
-  if ((attr = ippFindAttribute(response, "job-originating-user-name",
-                               IPP_TAG_NAME)) != NULL)
-    job_user = attr->values[0].string.text;
-  else
-    job_user = "unknown";
-
-  if ((attr = ippFindAttribute(response, "job-id", IPP_TAG_INTEGER)) != NULL)
-    job_id = attr->values[0].integer;
-  else
-  {
-    puts("<P>Missing job-id attribute!");
-    ippDelete(request);
-    return;
-  }
-
-  if ((attr = ippFindAttribute(response, "job-priority", IPP_TAG_INTEGER)) != NULL)
-    job_priority = attr->values[0].integer;
-  else
-    job_priority = 50;
-
-  if ((attr = ippFindAttribute(response, "job-k-octets", IPP_TAG_INTEGER)) != NULL)
-    job_k_octets = attr->values[0].integer;
-  else
-    job_k_octets = 0;
-
-  if ((attr = ippFindAttribute(response, "job-state", IPP_TAG_ENUM)) != NULL)
-    job_state = (ipp_jstate_t)attr->values[0].integer;
-  else
-    job_state = IPP_JOB_PENDING;
-
- /*
-  * Do a table for the job...
-  */
-
-  printf("<H1><A HREF=\"http://%s:%s/printers/%s\">%s-%d</A></H1>\n",
-	 getenv("SERVER_NAME"), getenv("SERVER_PORT"),
-	 strrchr(printer_uri, '/') + 1, strrchr(printer_uri, '/') + 1, job_id);
-
-  puts("<CENTER>");
-  puts("<TABLE WIDTH=\"90%\" BORDER=\"1\">");
-
-  puts("<TR>");
-  printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_JOB_STATE));
-  printf("<TD>%s</TD>\n", job_state == IPP_JOB_PROCESSING ?
-	 cupsLangString(language, CUPS_MSG_PROCESSING) :
-	 cupsLangString(language, CUPS_MSG_PENDING));
-  puts("</TR>");
-
-  puts("<TR>");
-  printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_JOB_NAME));
-  printf("<TD>%s</TD>\n", job_name);
-  puts("</TR>");
-
-  puts("<TR>");
-  printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_USER_NAME));
-  printf("<TD>%s</TD>\n", job_user);
-  puts("</TR>");
-
-  puts("<TR>");
-  printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_PRIORITY));
-  printf("<TD>%d</TD>\n", job_priority);
-  puts("</TR>");
-
-  puts("<TR>");
-  printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_FILE_SIZE));
-  printf("<TD>%dk</TD>\n", job_k_octets);
-  puts("</TR>");
-
-  puts("<TR VALIGN=\"TOP\">");
-  printf("<TH>%s</TH>\n", cupsLangString(language, CUPS_MSG_OPTIONS));
-  puts("<TD>");
-
-  for (attr = response->attrs; attr != NULL; attr = attr->next)
-  {
-    if (attr->group_tag != IPP_TAG_JOB &&
-        attr->group_tag != IPP_TAG_EXTENSION)
-      continue;
-
-    if (strcmp(attr->name, "job-uri") == 0 ||
-        strcmp(attr->name, "job-printer-uri") == 0 ||
-        strcmp(attr->name, "job-name") == 0 ||
-        strcmp(attr->name, "job-originating-user-name") == 0 ||
-        strcmp(attr->name, "job-id") == 0 ||
-        strcmp(attr->name, "job-priority") == 0 ||
-        strcmp(attr->name, "job-k-octets") == 0 ||
-        strcmp(attr->name, "job-state") == 0)
-      continue;
-
-    if (attr->value_tag != IPP_TAG_BOOLEAN)
-      printf("%s=", attr->name);
-
-    for (i = 0; i < attr->num_values; i ++)
-    {
-      if (i)
-	putchar(',');
-
-      switch (attr->value_tag)
-      {
-	case IPP_TAG_INTEGER :
-	case IPP_TAG_ENUM :
-	    printf("%d", attr->values[i].integer);
-	    break;
-
-	case IPP_TAG_BOOLEAN :
-	    if (!attr->values[i].boolean)
-	      printf("no");
-
-	case IPP_TAG_NOVALUE :
-	    fputs(attr->name, stdout);
-	    break;
-
-	case IPP_TAG_RANGE :
-	    printf("%d-%d", attr->values[i].range.lower,
-		   attr->values[i].range.upper);
-	    break;
-
-	case IPP_TAG_RESOLUTION :
-	    printf("%dx%d%s", attr->values[i].resolution.xres,
-		   attr->values[i].resolution.yres,
-		   attr->values[i].resolution.units == IPP_RES_PER_INCH ?
-		       "dpi" : "dpc");
-	    break;
-
-        case IPP_TAG_STRING :
-	case IPP_TAG_TEXT :
-	case IPP_TAG_NAME :
-	case IPP_TAG_KEYWORD :
-	case IPP_TAG_CHARSET :
-	case IPP_TAG_LANGUAGE :
-	case IPP_TAG_MIMETYPE :
-	case IPP_TAG_URI :
-	    printf("\"%s\"", attr->values[i].string.text);
-	    break;
-      }
-    }
-
-    puts("<BR>");
-  }
-
-  puts("</TD>");
-  puts("</TR>");
-  puts("</TABLE></CENTER>");
-
-  ippDelete(response);
-}
-
-
-/*
- * End of "$Id$".
- */
@@ -62,6 +62,7 @@ main(int  argc,			/* I - Number of command-line arguments */
  http_t	*http;		/* Connection to the server */


+  setbuf(stdout, NULL);
 /*
  * Get the request language...
  */
@@ -103,11 +104,11 @@ main(int  argc,			/* I - Number of command-line arguments */
         printer == NULL ? "Printers" : printer, getenv("SERVER_NAME"));
  puts("<LINK REL=STYLESHEET TYPE=\"text/css\" HREF=\"/cups.css\">");
  puts("<MAP NAME=\"navbar\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"10,10,85,30\" HREF=\"/printers\" ALT=\"Current Printer Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"95,10,175,30\" HREF=\"/classes\" ALT=\"Current Printer Classes Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"185,10,235,30\" HREF=\"/jobs\" ALT=\"Current Jobs Status\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"245,10,395,30\" HREF=\"/documentation.html\" ALT=\"Read CUPS Documentation On-Line\">");
-  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.cups.org\" ALT=\"Download the Current CUPS Software\">");
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"10,10,100,35\" HREF=\"/printers\" ALT=\"Current Printer Status\">");
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"115,10,205,35\" HREF=\"/classes\" ALT=\"Current Printer Classes Status\">");
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"220,10,280,35\" HREF=\"/jobs\" ALT=\"Current Jobs Status\">");
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"295,10,470,35\" HREF=\"/documentation.html\" ALT=\"Read CUPS Documentation On-Line\">");
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"485,10,590,35\" HREF=\"http://www.cups.org\" ALT=\"Download the Current CUPS Software\">");
  puts("</MAP>");
  puts("</HEAD>");
  puts("<BODY>");
@@ -196,11 +197,11 @@ show_printer_list(http_t      *http,	/* I - HTTP connection */
  request->request.op.request_id   = 1;


-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-               "attributes-charset", NULL, cupsLangEncoding(language));
+  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                      "attributes-charset", NULL, cupsLangEncoding(language));

-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-               "attributes-natural-language", NULL, language->language);
+  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+                      "attributes-natural-language", NULL, language->language);

 /*
  * Do the request and get back a response...
@@ -264,7 +265,7 @@ show_printer_info(http_t      *http,
  char		*message;	/* Printer state message */
  int		accepting;	/* Accepting requests? */
  ipp_pstate_t	pstate;		/* Printer state */
-  char		uri[HTTP_MAX_URI];/* Printer URI */
+  char		uri[1024];	/* Printer URI */


 /*
@@ -295,180 +296,163 @@ show_printer_info(http_t      *http,
  * Do the request and get back a response...
  */

-  if ((response = cupsDoRequest(http, request, uri + 15)) == NULL)
-  {
-    puts("<P>Unable to communicate with CUPS server!");
-    return;
-  }
-
-  if (response->request.status.status_code == IPP_NOT_FOUND)
-  {
-    puts("<P>Printer does not exist.");
-    ippDelete(response);
-    return;
-  }
-
- /*
-  * Grab the needed printer attributes...
-  */
-
-  if ((attr = ippFindAttribute(response, "printer-state", IPP_TAG_ENUM)) != NULL)
-    pstate = (ipp_pstate_t)attr->values[0].integer;
-  else
-    pstate = IPP_PRINTER_IDLE;
-
-  if ((attr = ippFindAttribute(response, "printer-state-message", IPP_TAG_TEXT)) != NULL)
-    message = attr->values[0].string.text;
-  else
-    message = NULL;
-
-  if ((attr = ippFindAttribute(response, "printer-is-accepting-jobs",
-                               IPP_TAG_BOOLEAN)) != NULL)
-    accepting = attr->values[0].boolean;
-  else
-    accepting = 1;
-
-  if ((attr = ippFindAttribute(response, "printer-uri-supported", IPP_TAG_URI)) != NULL)
-  {
-    strcpy(uri, "http:");
-    strcpy(uri + 5, strchr(attr->values[0].string.text, '/'));
-  }
-
- /*
-  * Display the printer entry...
-  */
-
-  puts("<TR>");
-
-  printf("<TD VALIGN=TOP><A HREF=\"%s\">%s</A></TD>\n", uri, name);
-
-  printf("<TD VALIGN=TOP><IMG SRC=\"/images/printer-%s.gif\" ALIGN=\"LEFT\">\n",
-         pstate == IPP_PRINTER_IDLE ? "idle" :
-	     pstate == IPP_PRINTER_PROCESSING ? "processing" : "stopped");
-
-  printf("%s: %s, %s<BR>\n",
-         cupsLangString(language, CUPS_MSG_PRINTER_STATE),
-         cupsLangString(language, pstate == IPP_PRINTER_IDLE ? CUPS_MSG_IDLE :
-	                          pstate == IPP_PRINTER_PROCESSING ?
-				  CUPS_MSG_PROCESSING : CUPS_MSG_STOPPED),
-         cupsLangString(language, accepting ? CUPS_MSG_ACCEPTING_JOBS :
-	                          CUPS_MSG_NOT_ACCEPTING_JOBS));
-
-  if (message)
-    printf("<BR CLEAR=ALL><I>\"%s\"</I>\n", message);
-  else if (!accepting || pstate == IPP_PRINTER_STOPPED)
-    puts("<BR CLEAR=ALL><I>\"Reason Unknown\"</I>");
-
-  puts("</TD>");
-
- /*
-  * Show a list of jobs as needed...
-  */
-
-  if (pstate != IPP_PRINTER_IDLE)
+  if ((response = cupsDoRequest(http, request, uri + 15)) != NULL)
  {
   /*
-    * Build an IPP_GET_JOBS request, which requires the following
-    * attributes:
-    *
-    *    attributes-charset
-    *    attributes-natural-language
-    *    printer-uri
+    * Grab the needed printer attributes...
    */

-    request = ippNew();
+    if ((attr = ippFindAttribute(response, "printer-state", IPP_TAG_ENUM)) != NULL)
+      pstate = (ipp_pstate_t)attr->values[0].integer;
+    else
+      pstate = IPP_PRINTER_IDLE;

-    request->request.op.operation_id = IPP_GET_JOBS;
-    request->request.op.request_id   = 1;
+    if ((attr = ippFindAttribute(response, "printer-state-message", IPP_TAG_TEXT)) != NULL)
+      message = attr->values[0].string.text;
+    else
+      message = NULL;

-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                 "attributes-charset", NULL,
-		 cupsLangEncoding(language));
+    if ((attr = ippFindAttribute(response, "printer-is-accepting-jobs",
+                                 IPP_TAG_BOOLEAN)) != NULL)
+      accepting = attr->values[0].boolean;
+    else
+      accepting = 1;

-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
-                 "attributes-natural-language", NULL,
-		 language->language);
+   /*
+    * Display the printer entry...
+    */

-    sprintf(uri, "ipp://localhost/printers/%s", name);
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
-	         "printer-uri", NULL, uri);
+    puts("<TR>");

-    jobs = cupsDoRequest(http, request, uri + 15);
-  }
-  else
-    jobs = NULL;
+    printf("<TD VALIGN=TOP><A HREF=\"/printers/%s\">%s</A></TD>\n", name, name);

-  puts("<TD VALIGN=\"TOP\">");
-  jobcount = 0;
+    printf("<TD VALIGN=TOP><IMG SRC=\"/images/printer-%s.gif\" ALIGN=\"LEFT\">\n",
+           pstate == IPP_PRINTER_IDLE ? "idle" :
+	       pstate == IPP_PRINTER_PROCESSING ? "processing" : "stopped");

-  if (jobs != NULL)
-  {
-    char	*username;	/* Pointer to job-originating-user-name */
-    int		jobid,		/* job-id */
+    printf("%s: %s, %s<BR>\n",
+           cupsLangString(language, CUPS_MSG_PRINTER_STATE),
+           cupsLangString(language, pstate == IPP_PRINTER_IDLE ? CUPS_MSG_IDLE :
+	                            pstate == IPP_PRINTER_PROCESSING ?
+				    CUPS_MSG_PROCESSING : CUPS_MSG_STOPPED),
+           cupsLangString(language, accepting ? CUPS_MSG_ACCEPTING_JOBS :
+	                            CUPS_MSG_NOT_ACCEPTING_JOBS));
+
+    if (message)
+      printf("<BR CLEAR=ALL><I>\"%s\"</I>\n", message);
+    else if (!accepting || pstate == IPP_PRINTER_STOPPED)
+      puts("<BR CLEAR=ALL><I>\"Reason Unknown\"</I>");
+
+    puts("</TD>");
+
+   /*
+    * Show a list of jobs as needed...
+    */
+
+    if (pstate != IPP_PRINTER_IDLE)
+    {
+     /*
+      * Build an IPP_GET_JOBS request, which requires the following
+      * attributes:
+      *
+      *    attributes-charset
+      *    attributes-natural-language
+      *    printer-uri
+      */
+
+      request = ippNew();
+
+      request->request.op.operation_id = IPP_GET_JOBS;
+      request->request.op.request_id   = 1;
+
+      attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                	  "attributes-charset", NULL,
+			  cupsLangEncoding(language));
+
+      attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+                	  "attributes-natural-language", NULL,
+			  language->language);
+
+      attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI,
+	                  "printer-uri", NULL, uri);
+
+      jobs = cupsDoRequest(http, request, uri + 15);
+    }
+    else
+      jobs = NULL;
+
+    puts("<TD VALIGN=\"TOP\">");
+    jobcount = 0;
+
+    if (jobs != NULL)
+    {
+      char	*username;	/* Pointer to job-originating-user-name */
+      int	jobid,		/* job-id */
 		size;		/* job-k-octets */


-    for (attr = jobs->attrs; attr != NULL; attr = attr->next)
-    {
-     /*
-      * Skip leading attributes until we hit a job...
-      */
-
-      while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
-        attr = attr->next;
-
-      if (attr == NULL)
-        break;
-
-     /*
-      * Pull the needed attributes from this job...
-      */
-
-      jobid    = 0;
-      size     = 0;
-      username = NULL;
-
-      while (attr != NULL && attr->group_tag == IPP_TAG_JOB)
+      for (attr = jobs->attrs; attr != NULL; attr = attr->next)
      {
-        if (strcmp(attr->name, "job-id") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  jobid = attr->values[0].integer;
+       /*
+	* Skip leading attributes until we hit a job...
+	*/

-        if (strcmp(attr->name, "job-k-octets") == 0 &&
-	    attr->value_tag == IPP_TAG_INTEGER)
-	  size = attr->values[0].integer;
+	while (attr != NULL && attr->group_tag != IPP_TAG_JOB)
+          attr = attr->next;

-        if (strcmp(attr->name, "job-originating-user-name") == 0 &&
-	    attr->value_tag == IPP_TAG_NAME)
-	  username = attr->values[0].string.text;
+	if (attr == NULL)
+          break;

-        attr = attr->next;
+       /*
+	* Pull the needed attributes from this job...
+	*/
+
+	jobid    = 0;
+	size     = 0;
+	username = NULL;
+
+	while (attr != NULL && attr->group_tag == IPP_TAG_JOB)
+	{
+          if (strcmp(attr->name, "job-id") == 0 &&
+	      attr->value_tag == IPP_TAG_INTEGER)
+	    jobid = attr->values[0].integer;
+
+          if (strcmp(attr->name, "job-k-octets") == 0 &&
+	      attr->value_tag == IPP_TAG_INTEGER)
+	    size = attr->values[0].integer;
+
+          if (strcmp(attr->name, "job-originating-user-name") == 0 &&
+	      attr->value_tag == IPP_TAG_NAME)
+	    username = attr->values[0].string.text;
+
+          attr = attr->next;
+	}
+
+       /*
+        * Display the job if it matches the current printer...
+	*/
+
+        if (username != NULL)
+	{
+	  jobcount ++;
+	  printf("<A HREF=\"/jobs/%d\">%s-%d %s %dk</A><BR>\n", jobid, name,
+	         jobid, username, size);
+	}
+
+	if (attr == NULL)
+          break;
      }

-     /*
-      * Display the job if it matches the current printer...
-      */
-
-      if (username != NULL)
-      {
-	jobcount ++;
-	printf("<A HREF=\"/jobs/%d\">%s-%d %s %dk</A><BR>\n", jobid, name,
-	       jobid, username, size);
-      }
-
-      if (attr == NULL)
-        break;
+      ippDelete(jobs);
    }
+      
+    if (jobcount == 0)
+      puts("None");
+    puts("</TD>");
+    puts("</TR>");

-    ippDelete(jobs);
+    ippDelete(response);
  }
-
-  if (jobcount == 0)
-    puts("None");
-  puts("</TD>");
-  puts("</TR>");
-
-  ippDelete(response);
 }


@@ -28,8 +28,7 @@ include ../Makedefs
 # Config files...
 #

-KEEP	=	classes.conf cupsd.conf printers.conf
-REPLACE	=	mime.convs mime.types
+FILES	=	classes.conf cupsd.conf mime.convs mime.types printers.conf

 #
 # Make everything...
@@ -49,19 +48,13 @@ clean:

 install:
 	-$(MKDIR) $(SERVERROOT)/conf
-	for file in $(KEEP); do \
+	for file in $(FILES); do \
 		if test -e $(SERVERROOT)/conf/$$file ; then \
 			$(CP) $$file $(SERVERROOT)/conf/$$file.N ; \
 		else \
 			$(CP) $$file $(SERVERROOT)/conf ; \
 		fi ; \
 	done
-	for file in $(REPLACE); do \
-		if test -e $(SERVERROOT)/conf/$$file ; then \
-			$(MV) $(SERVERROOT)/conf/$$file $(SERVERROOT)/conf/$$file.O ; \
-		fi ; \
-		$(CP) $$file $(SERVERROOT)/conf ; \
-	done

 #
 # End of "$Id$".
@@ -1,5 +1,5 @@
 #
-# "$Id: cupsd.conf 510 1999-07-09 14:20:15Z mike $"
+# "$Id: cupsd.conf 349 1999-05-21 20:53:02Z mike $"
 #
 #   Sample configuration file for the Common UNIX Printing System (CUPS)
 #   scheduler.
@@ -53,13 +53,6 @@
 #Port 80
 Port 631

-#
-# MaxClients: controls the maximum number of simultaneous clients that
-# will be handled.  Defaults to 100.
-#
-
-#MaxClients 100
-
 #
 # User/Group: the user and group the server runs under.  Normally this
 # must be lp and sys, however you can configure things for another user
@@ -271,18 +264,10 @@ LogLevel info
 # RIPCache: the amount of memory that each RIP should use to cache
 # bitmaps.  The value can be any real number followed by "k" for
 # kilobytes, "m" for megabytes, "g" for gigabytes, or "t" for tiles
-# (1 tile = 256x256 pixels.)  Defaults to "8m" (8 megabytes).
+# (1 tile = 256x256 pixels.)  Defaults to "32m" (32 megabytes).
 #

-#RIPCache 8m
-
-#
-# TempDir: the directory to put temporary files in. This directory must be
-# writable by the user defined above!  Defaults to "/var/tmp" or the value
-# of the TMPDIR environment variable.
-#
-
-#TempDir /var/tmp
+#RIPCache: 32m

 #
 # Access permissions for each directory served by the scheduler.
@@ -343,5 +328,5 @@ Allow From 127.0.0.1
 </Location>

 #
-# End of "$Id: cupsd.conf 510 1999-07-09 14:20:15Z mike $".
+# End of "$Id: cupsd.conf 349 1999-05-21 20:53:02Z mike $".
 #
@@ -1,250 +0,0 @@
-#
-# "$Id: cupsd.conf-personal 407 1999-06-17 20:02:43Z mike $"
-#
-#   Scheduler configuration file for ESP Print Personal.
-#
-
-########################################################################
-#                                                                      #
-# This is the CUPS configuration file.  If you are familiar with       #
-# Apache or any of the other popular web servers, we've followed the   #
-# same format.  Any configuration variable used here has the same      #
-# semantics as the corresponding variable in Apache.  If we need       #
-# different functionality then a different name is used to avoid       #
-# confusion...                                                         #
-#                                                                      #
-########################################################################
-
-#
-# Ports/addresses that we listen to.  The default port 631 is reserved
-# for the Internet Printing Protocol (IPP) and is what we use here.
-#
-# You can have multiple Listen lines to listen to more than one
-# port:
-#
-#    Listen 127.0.0.1:80
-#    Listen 127.0.0.1:631
-# 
-# For ESP Print Personal, we can only listen on the local host...
-#
-
-#Listen 127.0.0.1:80
-Listen 127.0.0.1:631
-
-#
-# User/Group: the user and group the server runs under.  Normally this
-# must be lp and sys, however you can configure things for another user
-# or group as needed.
-#
-# Note: the server must be run initially as root to support the
-# default IPP port of 631.  It changes users whenever an external
-# program is run...
-#
-
-User lp
-Group sys
-
-#
-# SystemGroup: the group name for "System" (printer administration)
-# access.
-#
-
-SystemGroup sys
-
-#
-# ServerName: the hostname of your server, as advertised to the world.
-# By default CUPS will use the hostname of the system.
-#
-
-#ServerName myhost.domain.com
-
-#
-# ServerAdmin: the email address to send all complaints/problems to.
-# By default CUPS will use "root@hostname".
-#
-
-#ServerAdmin root@your.domain.com
-
-#
-# ServerRoot: the root directory for the scheduler.
-# By default the compiled-in value.
-#
-
-#ServerRoot /var/cups
-
-#
-# AccessLog: the access log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "logs/access_log"
-#
-
-#AccessLog logs/access_log
-
-#
-# ErrorLog: the error log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "logs/error_log"
-#
-
-#ErrorLog logs/error_log
-
-#
-# PageLog: the page log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "logs/page_log"
-#
-
-#PageLog logs/page_log
-
-#
-# LogLevel: controls the number of messages logged to the ErrorLog
-# file and can be one of the following:
-#
-#     debug	Log everything.
-#     info      Log all requests and state changes.
-#     warn      Log errors and warnings.
-#     error     Log only errors.
-#     none      Log nothing.
-#
-
-LogLevel info
-
-#
-# MaxLogSize: controls the maximum size of each log file before they are
-# rotated.  Defaults to 1048576 (1MB).  Set to 0 to disable log rotating.
-#
-
-#MaxLogSize 0
-
-#
-# MaxRequestSize: controls the maximum size of print files.  Set to 0 to
-# disable this feature (defaults to 0.)
-#
-
-#MaxRequestSize 0
-
-#
-# HostNameLookups: whether or not to do lookups on IP addresses to get a
-# fully-qualified hostname.  This defaults to Off for performance reasons...
-#
-
-#HostNameLookups On
-
-#
-# Timeout: the timeout before requests time out.  Default is 300 seconds.
-#
-
-#Timeout 300
-
-#
-# KeepAlive: whether or not to support the Keep-Alive connection
-# option.  Default is on.
-#
-
-#KeepAlive On
-
-#
-# KeepAliveTimeout: the timeout before Keep-Alive connections are
-# automatically closed.  Default is 60 seconds.
-#
-
-#KeepAliveTimeout 60
-
-#
-# Browsing: not available in ESP Print Personal.
-#
-
-Browsing Off
-
-#
-# DocumentRoot: the root directory for HTTP documents that are served.
-# By default the compiled in directory.
-#
-
-#DocumentRoot /usr/share/cups/doc
-
-#
-# DefaultLanguage: the default language if not specified by the browser.
-# If not specified, the current locale is used.
-#
-
-#DefaultLanguage en
-
-#
-# DefaultCharset: the default character set to use. If not specified,
-# defaults to iso-8859-1.  Note that this can also be overridden in
-# HTML documents...
-#
-
-#DefaultCharset iso-8859-1
-
-#
-# RIPCache: the amount of memory that each RIP should use to cache
-# bitmaps.  The value can be any real number followed by "k" for
-# kilobytes, "m" for megabytes, "g" for gigabytes, or "t" for tiles
-# (1 tile = 256x256 pixels.)  Defaults to "32m" (32 megabytes).
-#
-
-#RIPCache: 32m
-
-#
-# Access permissions for each directory served by the scheduler.
-# Locations are relative to DocumentRoot...
-#
-# AuthType: the authorization to use; currently only "Basic" authorization is
-# supported.
-#
-# AuthClass: the authorization class; currently only "Anonymous", "User",
-# "System" (valid user belonging to group SystemGroup), and "Group"
-# (valid user belonging to the specified group) are supported.
-#
-# AuthGroupName: the group name for "Group" authorization.
-#
-# Order: the order of Allow/Deny processing.
-#
-# Allow: allows access from the specified hostname, domain, IP address, or
-# network.
-#
-# Deny: denies access from the specified hostname, domain, IP address, or
-# network.
-#
-
-<Location />
-</Location>
-
-<Location /printers>
-#
-# You may wish to limit access to printers and classes, either with Allow
-# and Deny lines, or by requiring a username and password.
-#
-
-## Require a username and password
-#AuthType Basic
-#AuthClass User
-
-## Restrict access to local domain
-#Order Deny,Allow
-#Deny From All
-#Allow From .mydomain.com
-</Location>
-
-<Location /admin>
-#
-# You definitely will want to limit access to the administration tools.
-# The default configuration requires a local connection from a user who
-# is a member of group "sys" to do any admin tasks.  You can change the
-# group name using the SystemGroup directive.
-#
-
-AuthType Basic
-AuthClass System
-
-## Restrict access to local domain
-Order Deny,Allow
-Deny From All
-Allow From 127.0.0.1
-</Location>
-
-#
-# End of "$Id: cupsd.conf-personal 407 1999-06-17 20:02:43Z mike $".
-#
@@ -1,313 +0,0 @@
-#
-# "$Id: cupsd.conf-professional 407 1999-06-17 20:02:43Z mike $"
-#
-#   Scheduler configuration file for ESP Print Professional.
-#
-
-########################################################################
-#                                                                      #
-# This is the CUPS configuration file.  If you are familiar with       #
-# Apache or any of the other popular web servers, we've followed the   #
-# same format.  Any configuration variable used here has the same      #
-# semantics as the corresponding variable in Apache.  If we need       #
-# different functionality then a different name is used to avoid       #
-# confusion...                                                         #
-#                                                                      #
-########################################################################
-
-#
-# Ports/addresses that we listen to.  The default port 631 is reserved
-# for the Internet Printing Protocol (IPP) and is what we use here.
-#
-# You can have multiple Port/Listen lines to listen to more than one
-# port or address, or to restrict access:
-#
-#    Port 80
-#    Port 631
-#    Listen hostname
-#    Listen hostname:80
-#    Listen hostname:631
-#    Listen 1.2.3.4
-#    Listen 1.2.3.4:631
-# 
-
-#Port 80
-Port 631
-
-#
-# User/Group: the user and group the server runs under.  Normally this
-# must be lp and sys, however you can configure things for another user
-# or group as needed.
-#
-# Note: the server must be run initially as root to support the
-# default IPP port of 631.  It changes users whenever an external
-# program is run...
-#
-
-User lp
-Group sys
-
-#
-# SystemGroup: the group name for "System" (printer administration)
-# access.
-#
-
-SystemGroup sys
-
-#
-# ServerName: the hostname of your server, as advertised to the world.
-# By default CUPS will use the hostname of the system.
-#
-
-#ServerName myhost.domain.com
-
-#
-# ServerAdmin: the email address to send all complaints/problems to.
-# By default CUPS will use "root@hostname".
-#
-
-#ServerAdmin root@your.domain.com
-
-#
-# ServerRoot: the root directory for the scheduler.
-# By default the compiled-in value.
-#
-
-#ServerRoot /var/cups
-
-#
-# AccessLog: the access log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "logs/access_log"
-#
-
-#AccessLog logs/access_log
-
-#
-# ErrorLog: the error log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "logs/error_log"
-#
-
-#ErrorLog logs/error_log
-
-#
-# PageLog: the page log file; if this does not start with a leading /
-# then it is assumed to be relative to ServerRoot.  By default set to
-# "logs/page_log"
-#
-
-#PageLog logs/page_log
-
-#
-# LogLevel: controls the number of messages logged to the ErrorLog
-# file and can be one of the following:
-#
-#     debug	Log everything.
-#     info      Log all requests and state changes.
-#     warn      Log errors and warnings.
-#     error     Log only errors.
-#     none      Log nothing.
-#
-
-LogLevel info
-
-#
-# MaxLogSize: controls the maximum size of each log file before they are
-# rotated.  Defaults to 1048576 (1MB).  Set to 0 to disable log rotating.
-#
-
-#MaxLogSize 0
-
-#
-# MaxRequestSize: controls the maximum size of print files.  Set to 0 to
-# disable this feature (defaults to 0.)
-#
-
-#MaxRequestSize 0
-
-#
-# HostNameLookups: whether or not to do lookups on IP addresses to get a
-# fully-qualified hostname.  This defaults to Off for performance reasons...
-#
-
-#HostNameLookups On
-
-#
-# Timeout: the timeout before requests time out.  Default is 300 seconds.
-#
-
-#Timeout 300
-
-#
-# KeepAlive: whether or not to support the Keep-Alive connection
-# option.  Default is on.
-#
-
-#KeepAlive On
-
-#
-# KeepAliveTimeout: the timeout before Keep-Alive connections are
-# automatically closed.  Default is 60 seconds.
-#
-
-#KeepAliveTimeout 60
-
-#
-# ImplicitClasses: whether or not to use implicit classes.
-#
-# Printer classes can be specified explicitly in the classes.conf
-# file, implicitly based upon the printers available on the LAN, or
-# both.
-#
-# When ImplicitClasses is On, printers on the LAN with the same name
-# (e.g. Acme-LaserPrint-1000) will be put into a class with the same
-# name. This allows you to setup multiple redundant queues on a LAN
-# without a lot of administrative difficulties.  If a user sends a
-# job to Acme-LaserPrint-1000, the job will go to the first available
-# queue.
-#
-# Enabled by default.
-#
-
-#ImplicitClasses On
-
-#
-# Browsing: whether or not to broadcast printer information to
-# other CUPS servers.  Enabled by default.
-#
-
-#Browsing On
-
-#
-# BrowseInterval: the time between browsing updates in seconds.  Default
-# is 30 seconds.
-#
-# Note that browsing information is sent whenever a printer's state changes
-# as well, so this represents the maximum time between updates.
-#
-
-#BrowseInterval 30
-
-#
-# BrowseTimeout: the timeout for network printers - if we don't
-# get an update within this time the printer will be removed
-# from the printer list.  This number definitely should not be
-# less the BrowseInterval value for obvious reasons.  Defaults
-# to 300 seconds.
-#
-
-#BrowseTimeout 300
-
-#
-# BrowsePort: the port used for UDP broadcasts.  By default this is
-# the IPP port; if you change this you need to do it on all servers.
-# Only one BrowsePort is recognized.
-#
-
-#BrowsePort 631
-
-#
-# BrowseAddress: specifies a broadcast address to be used.  By
-# default browsing information is broadcast to all active interfaces.
-#
-# Note: HP-UX 10.20 and earlier do not properly handle broadcast unless
-# you have a Class A, B, C, or D netmask (i.e. no CIDR support).
-#
-
-#BrowseAddress x.y.z.255
-#BrowseAddress x.y.255.255
-#BrowseAddress x.255.255.255
-
-#
-# DocumentRoot: the root directory for HTTP documents that are served.
-# By default the compiled in directory.
-#
-
-#DocumentRoot /usr/share/cups/doc
-
-#
-# DefaultLanguage: the default language if not specified by the browser.
-# If not specified, the current locale is used.
-#
-
-#DefaultLanguage en
-
-#
-# DefaultCharset: the default character set to use. If not specified,
-# defaults to iso-8859-1.  Note that this can also be overridden in
-# HTML documents...
-#
-
-#DefaultCharset iso-8859-1
-
-#
-# RIPCache: the amount of memory that each RIP should use to cache
-# bitmaps.  The value can be any real number followed by "k" for
-# kilobytes, "m" for megabytes, "g" for gigabytes, or "t" for tiles
-# (1 tile = 256x256 pixels.)  Defaults to "32m" (32 megabytes).
-#
-
-#RIPCache: 32m
-
-#
-# Access permissions for each directory served by the scheduler.
-# Locations are relative to DocumentRoot...
-#
-# AuthType: the authorization to use; currently only "Basic" authorization is
-# supported.
-#
-# AuthClass: the authorization class; currently only "Anonymous", "User",
-# "System" (valid user belonging to group SystemGroup), and "Group"
-# (valid user belonging to the specified group) are supported.
-#
-# AuthGroupName: the group name for "Group" authorization.
-#
-# Order: the order of Allow/Deny processing.
-#
-# Allow: allows access from the specified hostname, domain, IP address, or
-# network.
-#
-# Deny: denies access from the specified hostname, domain, IP address, or
-# network.
-#
-
-<Location />
-</Location>
-
-<Location /printers>
-#
-# You may wish to limit access to printers and classes, either with Allow
-# and Deny lines, or by requiring a username and password.
-#
-
-## Require a username and password
-#AuthType Basic
-#AuthClass User
-
-## Restrict access to local domain
-#Order Deny,Allow
-#Deny From All
-#Allow From .mydomain.com
-</Location>
-
-<Location /admin>
-#
-# You definitely will want to limit access to the administration tools.
-# The default configuration requires a local connection from a user who
-# is a member of group "sys" to do any admin tasks.  You can change the
-# group name using the SystemGroup directive.
-#
-
-AuthType Basic
-AuthClass System
-
-## Restrict access to local domain
-Order Deny,Allow
-Deny From All
-Allow From 127.0.0.1
-</Location>
-
-#
-# End of "$Id: cupsd.conf-professional 407 1999-06-17 20:02:43Z mike $".
-#
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.convs 575 1999-07-30 13:57:16Z mike $"
+# "$Id: mime.convs 237 1999-04-21 19:29:35Z mike $"
 #
 #   MIME converts file for the Common UNIX Printing System (CUPS).
 #
@@ -41,12 +41,12 @@
 # PostScript filters
 #

-#application/msword	application/postscript	50	mswordtops
+application/msword	application/postscript	50	mswordtops
 application/pdf		application/postscript	50	pdftops
 application/postscript	application/vnd.cups-postscript	50	pstops
 application/vnd.hp-HPGL	application/postscript	50	hpgltops
 image/*			application/vnd.cups-postscript	50	imagetops
-#text/html		application/postscript	50	htmltops
+text/html		application/postscript	50	htmltops
 text/plain		application/postscript	50	texttops

 ########################################################################
@@ -58,5 +58,5 @@ image/*			application/vnd.cups-raster	50	imagetoraster
 application/vnd.cups-postscript	application/vnd.cups-raster	50	pstoraster

 #
-# End of "$Id: mime.convs 575 1999-07-30 13:57:16Z mike $".
+# End of "$Id: mime.convs 237 1999-04-21 19:29:35Z mike $".
 #
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.types 575 1999-07-30 13:57:16Z mike $"
+# "$Id: mime.types 185 1999-03-24 18:38:50Z mike $"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
@@ -92,9 +92,10 @@ image/x-sgi-rgb			rgb sgi bw icon short(0,474)
 image/x-xbitmap			xbm
 image/x-xpixmap			xpm ascii(0,1024) + string(3,"XPM")
 image/x-xwindowdump		xwd
-image/x-sun-raster		ras

-# TODO: Add Alias, SoftImage, GIMP??? files
+# TODO: Add Sun Raster, Alias, SoftImage, GIMP??? files
+
+image/x-sun-raster		ras
 #image/x-alias			pix
 #image/x-softimage
 #image/x-gimp-xcf		xcf xcf.gz
@@ -113,10 +114,10 @@ text/plain			txt printable(0,1024)
 # CUPS-specific types...
 #

-application/vnd.cups-postscript	string(0,<1B>%-12345X)
+application/vnd.cups-postscript
 application/vnd.cups-raster	string(0,"RaSt") string(0,"tSaR")
 application/vnd.cups-raw

 #
-# End of "$Id: mime.types 575 1999-07-30 13:57:16Z mike $".
+# End of "$Id: mime.types 185 1999-03-24 18:38:50Z mike $".
 #
@@ -16,7 +16,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
+ *       44145 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -14,7 +14,7 @@ dnl   at:
 dnl
 dnl       Attn: CUPS Licensing Information
 dnl       Easy Software Products
-dnl       44141 Airport View Drive, Suite 204
+dnl       44145 Airport View Drive, Suite 204
 dnl       Hollywood, Maryland 20636-3111 USA
 dnl
 dnl       Voice: (301) 373-9603
@@ -26,62 +26,18 @@ AC_INIT(cups/cups.h)
 AC_CONFIG_HEADER(config.h)
 AC_PREFIX_DEFAULT(/usr)

-dnl Get the operating system and version number...
+dnl Clear default debugging options and set normal optimization by
+dnl default unless the user asks for debugging specifically.

-uname=`uname`
-uversion=`uname -r | sed -e '1,$s/\.//g'`
-if test "$uname" = "IRIX64"; then
-    uname="IRIX"
-fi
-
-dnl Clear the debugging and non-shared library options unless the user asks
-dnl for them...
-
-OPTIM=""
-AC_SUBST(OPTIM)
-PICFLAG=1
 CFLAGS="${CFLAGS:=}"
+CXXFLAGS="${CXXFLAGS:=}"
+OPTIM="-O"
+AC_SUBST(OPTIM)

-AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],[if eval "test x$enable_debug = xyes"; then
-	OPTIM="-g "
-fi])
-AC_ARG_ENABLE(shared, [  --disable-shared         turn off shared libraries [default=no]])
-if eval "test x$disable_shared = xyes"; then
-	PICFLAG=0
-	LIBCUPS="libcups.a"
-	LIBCUPSIMAGE="libcupsimage.a"
-	DSO=":"
-else
-	case "$uname" in
-		SunOS* | UNIX_S*)
-			LIBCUPS="libcups.so.1"
-			LIBCUPSIMAGE="libcupsimage.so.1"
-			DSO="\$(CC) -Wl,-h,\$@ -G \$(OPTIM) -o"
-			;;
-		HP-UX*)
-			LIBCUPS="libcups.sl.1"
-			LIBCUPSIMAGE="libcupsimage.sl.1"
-			DSO="ld -b -z +h \$@ -o"
-			;;
-		OSF1* | Linux*)
-			LIBCUPS="libcups.so.1"
-			LIBCUPSIMAGE="libcupsimage.so.1"
-			DSO="\$(CC) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
-			;;
-		IRIX*)
-			LIBCUPS="libcups.so.1"
-			LIBCUPSIMAGE="libcupsimage.so.1"
-			DSO="\$(CC) -soname \$@ -shared \$(OPTIM) -o"
-			;;
-		*)
-			echo "Warning: shared libraries may not be supported.  Trying -shared"
-			echo "         option with compiler."
-			LIBCUPS="libcups.so.1"
-			LIBCUPSIMAGE="libcupsimage.so.1"
-			DSO="\$(CC) -Wl,-soname,\$@ -shared \$(OPTIM) -o"
-			;;
-	esac
-fi
+AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],
+if eval "test x$enable_debug = xyes"; then
+	OPTIM="-g"
+fi)

 dnl Checks for programs...
 AC_PROG_AWK
@@ -89,88 +45,50 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
-AC_PATH_PROG(CHMOD,chmod)
 AC_PATH_PROG(CP,cp)
-AC_PATH_PROG(NROFF,nroff)
-if test "$NROFF" = ""; then
-    AC_PATH_PROG(NROFF,groff)
-    if test "$NROFF" = ""; then
-        NROFF="echo"
-    else
-        NROFF="$NROFF -T ascii"
-    fi
-fi
-AC_PATH_PROG(HTMLDOC,htmldoc)
 AC_PATH_PROG(MKDIR,mkdir)
-AC_PATH_PROG(PACK,pack)
-if test "$PACK" = ""; then
-    AC_PATH_PROG(PACK,gzip)
-    if test "$PACK" = ""; then
-        PACK="echo"
-	CAT="dummy"
-    else
-        PACK="$PACK -fv9"
-	CAT="gz"
-    fi
-else
-    PACK="$PACK -f"
-    CAT="z"
-fi
-AC_SUBST(CAT)
 AC_PATH_PROG(RM,rm)
-AC_PATH_PROG(SED,sed)
-AC_PATH_PROG(SMBCLIENT,smbclient)
-if test "$SMBCLIENT" = ""; then
-    echo "Looking for smbclient in standard locations..."
-    AC_PATH_PROG(SMBCLIENT,smbclient,samba_not_detected,
-	/usr/samba/bin:/usr/local/samba/bin:/usr/freeware/samba/bin:/opt/samba/bin)
-fi
+AC_PATH_PROG(GROFF,groff)
+AC_PATH_PROG(HTMLDOC,htmldoc)

 dnl Architecture checks...
 AC_C_BIGENDIAN
+uname=`uname`
+if test "$uname" = "IRIX64"; then
+	uname=IRIX
+fi

 dnl Check for libraries...
 AC_CHECK_LIB(c,crypt,LIBS="$LIBS",AC_CHECK_LIB(crypt,crypt))
 AC_CHECK_HEADER(crypt.h, AC_DEFINE(HAVE_CRYPT_H))
 AC_CHECK_LIB(sec,getspent)
-
-NETLIBS=""
-AC_SUBST(NETLIBS)
 AC_CHECK_LIB(socket,socket,
 if test "$uname" != "IRIX"; then
-	NETLIBS="-lsocket"
+	LIBS="$LIBS -lsocket"
 else
 	echo "Not using -lsocket since you are running IRIX."
 fi)
 AC_CHECK_LIB(nsl,gethostbyaddr,
 if test "$uname" != "IRIX"; then
-	NETLIBS="$NETLIBS -lnsl"
+	LIBS="$LIBS -lnsl"
 else
 	echo "Not using -lnsl since you are running IRIX."
 fi)

-LIBJPEG=""
-LIBPNG=""
-LIBTIFF=""
-LIBZ=""
-
-AC_SUBST(LIBJPEG)
-AC_SUBST(LIBPNG)
-AC_SUBST(LIBTIFF)
-AC_SUBST(LIBZ)
-
+IMGLIBS=""
+AC_SUBST(IMGLIBS)
 AC_CHECK_HEADER(jpeglib.h,
    AC_DEFINE(HAVE_LIBJPEG)
-    LIBJPEG="-ljpeg")
-AC_CHECK_HEADER(png.h,
-    AC_DEFINE(HAVE_LIBPNG)
-    LIBPNG="-lpng")
-AC_CHECK_HEADER(tiff.h,
-    AC_DEFINE(HAVE_LIBTIFF)
-    LIBTIFF="-ltiff")
+    IMGLIBS="$IMGLIBS -ljpeg")
 AC_CHECK_HEADER(zlib.h,
    AC_DEFINE(HAVE_LIBZ)
-    LIBZ="-lz")
+    IMGLIBS="$IMGLIBS -lz")
+AC_CHECK_HEADER(png.h,
+    AC_DEFINE(HAVE_LIBPNG)
+    IMGLIBS="$IMGLIBS -lpng")
+AC_CHECK_HEADER(tiff.h,
+    AC_DEFINE(HAVE_LIBTIFF)
+    IMGLIBS="$IMGLIBS -ltiff")

 dnl Checks for header files.
 AC_HEADER_STDC
@@ -190,91 +108,11 @@ dnl Checks for wait functions.
 AC_CHECK_FUNCS(waitpid)
 AC_CHECK_FUNCS(wait3)

-dnl Update compiler options...
-if test -n "$GXX"; then
-	if test -z "$OPTIM"; then
-        	OPTIM="-O2"
-	fi
-	if test $PICFLAG = 1; then
-    		OPTIM="-fPIC $OPTIM"
-	fi
-else
-	case $uname in
-        	IRIX*)
-			if test -z "$OPTIM"; then
-        			OPTIM="-O2"
-			fi
-			if test $uversion -ge 62; then
-				OPTIM="$OPTIM -n32 -mips3"
-			fi
-			;;
-		HP-UX*)
-			if test -z "$OPTIM"; then
-				OPTIM="+O2"
-			fi
-			;;
-		SunOS*)
-			# Solaris
-			if test -z "$OPTIM"; then
-				OPTIM="-O"
-			fi
-			if test $PICFLAG = 1; then
-				OPTIM="-KPIC $OPTIM"
-			fi
-			;;
-		*)
-			# Running some other operating system; inform the user they
-			# should contribute the necessary options to
-			# cups-support@cups.org...
-			echo "Building CUPS with default compiler optimizations; contact"
-			echo "cups-support@cups.org with uname and compiler options needed"
-			echo "for your platform, or set the CFLAGS environment variable"
-			echo "before running configure."
-			;;
-	esac
-fi
-
-if test "$DSO" != ":"; then
-	# When using DSOs the image libraries are linked to libcupsimage.so
-	# rather than to the executables.  This makes things smaller if you
-	# are using any static libraries, and it also allows us to distribute
-	# a single DSO rather than a bunch...
-	DSOLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)"
-	IMGLIBS=""
-
-	# The HP-UX and Solaris run-time linkers are EXTREMELY stupid when
-	# it comes to deciding where to find a DSO.  Add linker options to
-	# tell them where to find the DSO (usually in /usr/lib...  duh!)
-	case $uname in
-		HP-UX*)
-			LDFLAGS="$LDFLAGS -Wl,+b,$libdir,+fb"
-			;;
-		SunOS*)
-			# Solaris
-			LDFLAGS="-R$libdir"
-			;;
-	esac
-else
-	DSOLIBS=""
-	IMGLIBS="\$(LIBJPEG) \$(LIBPNG) \$(LIBTIFF) \$(LIBZ)"
-fi
-
-AC_SUBST(DSO)
-AC_SUBST(DSOLIBS)
-AC_SUBST(IMGLIBS)
-AC_SUBST(LIBCUPS)
-AC_SUBST(LIBCUPSIMAGE)
-
 dnl Fix "prefix" variable if it hasn't been specified...
 if test "$prefix" = "NONE"; then
 	prefix="/usr"
 fi

-dnl Fix "libdir" variable for IRIX 6.x...
-if test "$uname" = "IRIX" -a $uversion -ge 62; then
-	libdir="/usr/lib32"
-fi
-
 dnl CUPS_SERVERROOT needs special attention for the default location...
 if test "$prefix" = "/usr"; then
 	CUPS_SERVERROOT="/var/cups"
@@ -285,21 +123,7 @@ AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT")
 AC_SUBST(CUPS_SERVERROOT)

 dnl Set the CUPS_LOCALE directory...
-case "$uname" in
-	Linux)
-		CUPS_LOCALEDIR="$prefix/share/locale"
-		;;
-
-	OSF1)
-		CUPS_LOCALEDIR="$prefix/lib/nls/msg"
-		;;
-
-	*)
-		# This is the standard System V location...
-		CUPS_LOCALEDIR="$prefix/lib/locale"
-		;;
-esac
-
+CUPS_LOCALEDIR="$prefix/lib/locale"
 AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
 AC_SUBST(CUPS_LOCALEDIR)

@@ -1,112 +0,0 @@
-#!/bin/sh
-#
-# "$Id$"
-#
-#   Startup/shutdown script for the Common UNIX Printing System (CUPS).
-#
-#   Linux chkconfig stuff:
-#
-#   chkconfig: 2345 60 60
-#   description: Startup/shutdown script for the Common UNIX \
-#                Printing System (CUPS).
-#
-#   Copyright 1997-1999 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-3111 USA
-#
-#       Voice: (301) 373-9603
-#       EMail: cups-info@cups.org
-#         WWW: http://www.cups.org
-#
-
-# See what program to use for configuration stuff...
-case "`uname`" in
-	IRIX*)
-		IS_ON=/sbin/chkconfig
-		;;
-
-	*)
-		IS_ON=/bin/true
-		;;
-esac
-
-# The verbose flag controls the printing of the names of
-# daemons as they are started.
-if $IS_ON verbose; then
-	ECHO=echo
-else
-	ECHO=:
-fi
-
-# See if the CUPS server is running...
-case "`uname`" in
-	IRIX* | HP-UX | SunOS)
-		pid=`ps -e | awk '{print $1,$4}' | grep cupsd | awk '{print $1}'`
-		;;
-	OSF1)
-		pid=`ps -e | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'`
-		;;
-	Linux)
-		pid=`ps ax | awk '{print $1,$5}' | grep cupsd | awk '{print $1}'`
-		;;
-	*)
-		pid=""
-		;;
-esac
-
-# Start or stop the CUPS server based upon the first argument to the script.
-case $1 in
-	start | restart | reload)
-		if test "$pid" != ""; then
-			if $IS_ON cups; then
-				kill -HUP $pid
-				$ECHO "cups: scheduler restarted."
-			else
-				kill $pid
-				$ECHO "cups: scheduler stopped."
-			fi
-		else
-			if $IS_ON cups; then
-				/usr/sbin/cupsd 2>&1 >/dev/null &
-				$ECHO "cups: scheduler started."
-			fi
-		fi
-		;;
-
-	stop)
-		if test "$pid" != ""; then
-			kill $pid
-			$ECHO "cups: scheduler stopped."
-		fi
-		;;
-
-	status)
-		if test "$pid" != ""; then
-			echo "cups: Scheduler is running."
-		else
-			echo "cups: Scheduler is not running."
-		fi
-		;;
-
-	*)
-		echo "Usage: cups {reload|restart|start|status|stop}"
-		exit 1
-		;;
-esac
-
-exit 0
-
-
-#
-# End of "$Id$".
-#
@@ -0,0 +1,130 @@
+#
+# "$Id$"
+#
+#   Support library Makefile for the Common UNIX Printing System (CUPS).
+#
+#   Copyright 1997-1999 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
+#       44145 Airport View Drive, Suite 204
+#       Hollywood, Maryland 20636-3111 USA
+#
+#       Voice: (301) 373-9603
+#       EMail: cups-info@cups.org
+#         WWW: http://www.cups.org
+#
+
+include ../Makedefs
+
+#
+# Object files...
+#
+
+OBJS	=	emit.o filter.o http.o ipp.o language.o mark.o mime.o \
+		options.o page.o ppd.o raster.o string.o type.o util.o
+
+#
+# Header files to install...
+#
+
+HEADERS	=	cups.h http.h ipp.h language.h mime.h ppd.h raster.h
+
+#
+# Targets in this directory...
+#
+
+TARGETS	=	libcups.a testmime testppd testhttp
+
+#
+# Make all targets...
+#
+
+all:	$(TARGETS)
+
+#
+# Remove object and target files...
+#
+
+clean:
+	rm -f $(OBJS) $(TARGETS)
+
+#
+# Install object and target files...
+#
+
+install:	all
+	-$(MKDIR) $(LIBDIR)
+	$(CP) libcups.a $(LIBDIR)
+	-$(MKDIR) $(INCLUDEDIR)/cups
+	$(CP) $(HEADERS) $(INCLUDEDIR)/cups
+
+#
+# libcups.a
+#
+
+libcups.a:	$(OBJS)
+	$(RM) $@
+	$(AR) $(ARFLAGS) $@ $(OBJS)
+	$(RANLIB) $@
+
+#
+# cups_C.h - the default POSIX locale that is compiled in.
+#
+
+cups_C.h:	../locale/C/cups_C
+	$(RM) cups_C.h
+	$(AWK) '{print "\"" $$0 "\","}' < ../locale/C/cups_C > cups_C.h
+
+emit.o:		ppd.h ../config.h ../Makedefs
+filter.o:	mime.h ../config.h ../Makedefs
+http.o:		http.h ipp.h string.h ../config.h ../Makedefs
+ipp.o:		http.h ipp.h ../config.h ../Makedefs
+language.o:	cups_C.h language.h string.h ../config.h ../Makedefs
+mark.o:		ppd.h ../config.h ../Makedefs
+mime.o:		mime.h ../config.h ../Makedefs
+options.o:	cups.h ../config.h ../Makedefs
+page.o:		ppd.h ../config.h ../Makedefs
+ppd.o:		ppd.h ../config.h ../Makedefs
+raster.o:	raster.h ../config.h ../Makedefs
+string.o:	string.h ../config.h ../Makedefs
+type.o:		mime.h ../config.h ../Makedefs
+util.o:		cups.h http.h ipp.h ../config.h ../Makedefs
+
+#
+# testhttp
+#
+
+testhttp:	testhttp.o libcups.a
+	$(CC) $(LDFLAGS) -o $@ testhttp.o $(LIBS)
+
+testhttp.o:	http.h ../Makedefs
+
+#
+# testmime
+#
+
+testmime:	testmime.o libcups.a
+	$(CC) $(LDFLAGS) -o $@ testmime.o $(LIBS)
+
+testmime.o:	mime.h ../Makedefs
+
+#
+# testppd
+#
+
+testppd:	testppd.o libcups.a
+	$(CC) $(LDFLAGS) -o $@ testppd.o $(LIBS)
+
+testppd.o:	ppd.h ../Makedefs
+
+#
+# End of "$Id$".
+#
@@ -0,0 +1,136 @@
+/*
+ * "$Id$"
+ *
+ *   API definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ */
+
+#ifndef _CUPS_CUPS_H_
+#  define _CUPS_CUPS_H_
+
+/*
+ * Include necessary headers...
+ */
+
+#  include <cups/ipp.h>
+#  include <cups/mime.h>
+#  include <cups/ppd.h>
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+
+/*
+ * Constants...
+ */
+
+#  define CUPS_VERSION		1.0
+#  define CUPS_DATE_ANY		-1
+
+
+/*
+ * Types and structures...
+ */
+
+typedef unsigned cups_ptype_t;		/**** Printer Type/Capability Bits ****/
+enum					/* Not a typedef'd enum so we can OR */
+{
+  CUPS_PRINTER_LOCAL = 0x0000,		/* Local printer or class */
+  CUPS_PRINTER_CLASS = 0x0001,		/* Printer class */
+  CUPS_PRINTER_REMOTE = 0x0002,		/* Remote printer or class */
+  CUPS_PRINTER_BW = 0x0004,		/* Can do B&W printing */
+  CUPS_PRINTER_COLOR = 0x0008,		/* Can do color printing */
+  CUPS_PRINTER_DUPLEX = 0x0010,		/* Can do duplexing */
+  CUPS_PRINTER_STAPLE = 0x0020,		/* Can staple output */
+  CUPS_PRINTER_COPIES = 0x0040,		/* Can do copies */
+  CUPS_PRINTER_COLLATE = 0x0080,	/* Can collage copies */
+  CUPS_PRINTER_PUNCH = 0x0100,		/* Can punch output */
+  CUPS_PRINTER_COVER = 0x0200,		/* Can cover output */
+  CUPS_PRINTER_BIND = 0x0400,		/* Can bind output */
+  CUPS_PRINTER_SORT = 0x0800,		/* Can sort output */
+  CUPS_PRINTER_SMALL = 0x1000,		/* Can do Letter/Legal/A4 */
+  CUPS_PRINTER_MEDIUM = 0x2000,		/* Can do Tabloid/B/C/A3/A2 */
+  CUPS_PRINTER_LARGE = 0x4000,		/* Can do D/E/A1/A0 */
+  CUPS_PRINTER_VARIABLE = 0x8000	/* Can do variable sizes */
+};
+
+
+/*
+ * Types & structures...
+ */
+
+typedef struct				/**** Printer Information ****/
+{
+  char		name[IPP_MAX_NAME],	/* Printer or class name */
+		uri[HTTP_MAX_URI];	/* Universal resource identifier */
+  unsigned char	info[IPP_MAX_NAME],	/* Printer or class info/description */
+		location[IPP_MAX_NAME];	/* Location text */
+  ipp_pstate_t	state;			/* Printer state */
+  unsigned char	message[IPP_MAX_NAME];	/* State text */
+  cups_ptype_t	type;			/* Printer type/capability codes */
+} cups_browse_t;
+
+typedef struct				/**** Printer Options ****/
+{
+  char		*name;			/* Name of option */
+  char		*value;			/* Value of option */
+} cups_option_t;
+
+
+/*
+ * Functions...
+ */
+
+extern int		cupsCancelJob(char *printer, int job);
+#define			cupsDoRequest(http,request,resource) cupsDoFileRequest((http),(request),(resource),NULL)
+extern ipp_t		*cupsDoFileRequest(http_t *http, ipp_t *request,
+			                   char *resource, char *filename);
+extern int		cupsGetClasses(char ***classes);
+extern char		*cupsGetPPD(char *printer);
+extern char		*cupsGetDefault(void);
+extern int		cupsGetPrinters(char ***printers);
+extern int		cupsPrintFile(char *printer, char *filename, char *title,
+			              int num_options, cups_option_t *options);
+
+extern int		cupsAddOption(char *name, char *value, int num_options,
+			              cups_option_t **options);
+extern void		cupsFreeOptions(int num_options, cups_option_t *options);
+extern char		*cupsGetOption(char *name, int num_options,
+			               cups_option_t *options);
+extern int		cupsParseOptions(char *arg, int num_options,
+			                 cups_option_t **options);
+extern int		cupsMarkOptions(ppd_file_t *ppd, int num_options,
+			                cups_option_t *options);
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+
+#endif /* !_CUPS_CUPS_H_ */
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,57 @@
+/*
+ * "$Id$"
+ *
+ *   Debugging macros for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   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
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ */
+
+#ifndef _CUPS_DEBUG_H_
+#  define _CUPS_DEBUG_H_
+
+/*
+ * Include necessary headers...
+ */
+
+#  include <stdio.h>
+
+/*
+ * The debug macros are used if you compile with DEBUG defined.
+ *
+ * Usage:
+ *
+ *   DEBUG_puts("string")
+ *   DEBUG_printf(("format string", arg, arg, ...));
+ *
+ * Note the extra parenthesis around the DEBUG_printf macro...
+ */
+
+#  ifdef DEBUG
+#    define DEBUG_puts(x) puts(x)
+#    define DEBUG_printf(x) printf x
+#  else
+#    define DEBUG_puts(x)
+#    define DEBUG_printf(x)
+#  endif /* DEBUG */
+
+#endif /* !_CUPS_DEBUG_H_ */
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,301 @@
+/*
+ * "$Id$"
+ *
+ *   PPD code emission routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   PostScript is a trademark of Adobe Systems, Inc.
+ *
+ * Contents:
+ *
+ *   ppdEmit()     - Emit code for marked options to a file.
+ *   ppdEmitFd()   - Emit code for marked options to a file.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "ppd.h"
+#include <stdlib.h>
+#include "string.h"
+
+#if defined(WIN32) || defined(__EMX__)
+#  include <io.h>
+#else
+#  include <unistd.h>
+#endif /* WIN32 || __EMX__ */
+
+
+/*
+ * Local functions...
+ */
+
+static int	ppd_sort(ppd_choice_t **c1, ppd_choice_t **c2);
+static int	ppd_collect(ppd_file_t *ppd, ppd_section_t section,
+		            ppd_choice_t ***choices);
+
+
+/*
+ * 'ppdEmit()' - Emit code for marked options to a file.
+ */
+
+int					/* O - 0 on success, -1 on failure */
+ppdEmit(ppd_file_t    *ppd,		/* I - PPD file record */
+        FILE          *fp,		/* I - File to write to */
+        ppd_section_t section)		/* I - Section to write */
+{
+  int		i,			/* Looping var */
+		count;			/* Number of choices */
+  ppd_choice_t	**choices;		/* Choices */
+  ppd_size_t	*size;			/* Custom page size */
+
+
+  if ((count = ppd_collect(ppd, section, &choices)) == 0)
+    return (0);
+
+  for (i = 0; i < count; i ++)
+    if (section != PPD_ORDER_EXIT && section != PPD_ORDER_JCL)
+    {
+     /*
+      * Send DSC comments with option...
+      */
+
+      if (fprintf(fp, "%%%%BeginFeature: %s %s\n",
+                  ((ppd_option_t *)choices[i]->option)->keyword,
+		  choices[i]->choice) < 0)
+      {
+        free(choices);
+        return (-1);
+      }
+
+      if (strcmp(((ppd_option_t *)choices[i]->option)->keyword, "PageSize") == 0 &&
+          strcmp(choices[i]->choice, "Custom") == 0)
+      {
+       /*
+        * Variable size; write out standard size options (this should
+	* eventually be changed to use the parameter positions defined
+	* in the PPD file...)
+	*/
+
+        size = ppdPageSize(ppd, "Custom");
+        fprintf(fp, "%.0f %.0f 0 0 0\n", size->width, size->length);
+
+	if (choices[i]->code == NULL)
+	{
+	 /*
+	  * This can happen with certain buggy PPD files that don't include
+	  * a CustomPageSize command sequence...  We just use a generic
+	  * Level 2 command sequence...
+	  */
+
+	  fputs("pop pop pop\n", fp);
+	  fputs("<</PageSize[7 -2 roll]/ImagingBBox null>>setpagedevice\n", fp);
+	}
+      }
+
+      if (choices[i]->code != NULL && choices[i]->code[0] != '\0')
+      {
+        if (fputs(choices[i]->code, fp) < 0)
+        {
+          free(choices);
+          return (-1);
+        }
+
+        if (choices[i]->code[strlen(choices[i]->code) - 1] != '\n')
+          putc('\n', fp);
+      }
+
+      if (fputs("%%EndFeature\n", fp) < 0)
+      {
+        free(choices);
+        return (-1);
+      }
+    }
+    else if (fputs(choices[i]->code, fp) < 0)
+    {
+      free(choices);
+      return (-1);
+    }
+
+  free(choices);
+  return (0);
+}
+
+
+/*
+ * 'ppdEmitFd()' - Emit code for marked options to a file.
+ */
+
+int					/* O - 0 on success, -1 on failure */
+ppdEmitFd(ppd_file_t    *ppd,		/* I - PPD file record */
+          int           fd,		/* I - File to write to */
+          ppd_section_t section)	/* I - Section to write */
+{
+  int		i,			/* Looping var */
+		count;			/* Number of choices */
+  ppd_choice_t	**choices;		/* Choices */
+  char		buf[1024];		/* Output buffer for feature */
+
+
+  if ((count = ppd_collect(ppd, section, &choices)) == 0)
+    return (0);
+
+  for (i = 0; i < count; i ++)
+    if (section != PPD_ORDER_EXIT && section != PPD_ORDER_JCL)
+    {
+     /*
+      * Send DSC comments with option...
+      */
+
+      sprintf(buf, "%%%%BeginFeature: %s %s\n",
+              ((ppd_option_t *)choices[i]->option)->keyword, choices[i]->choice);
+
+      if (write(fd, buf, strlen(buf)) < 1)
+      {
+        free(choices);
+        return (-1);
+      }
+
+      if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
+      {
+        free(choices);
+        return (-1);
+      }
+
+      if (write(fd, "%%EndFeature\n", 13) < 1)
+      {
+        free(choices);
+        return (-1);
+      }
+    }
+    else if (write(fd, choices[i]->code, strlen(choices[i]->code)) < 1)
+    {
+      free(choices);
+      return (-1);
+    }
+
+  free(choices);
+  return (0);
+}
+
+
+/*
+ * 'ppd_sort()' - Sort options by ordering numbers...
+ */
+
+static int			/* O - -1 if c1 < c2, 0 if equal, 1 otherwise */
+ppd_sort(ppd_choice_t **c1,	/* I - First choice */
+         ppd_choice_t **c2)	/* I - Second choice */
+{
+  if (((ppd_option_t *)(*c1)->option)->order < ((ppd_option_t *)(*c2)->option)->order)
+    return (-1);
+  else if (((ppd_option_t *)(*c1)->option)->order > ((ppd_option_t *)(*c2)->option)->order)
+    return (1);
+  else
+    return (0);
+}
+
+
+/*
+ * 'ppd_collect()' - Collect all marked options that reside in the specified
+ *                   section.
+ */
+
+static int				/* O - Number of options marked */
+ppd_collect(ppd_file_t    *ppd,		/* I - PPD file data */
+            ppd_section_t section,	/* I - Section to collect */
+            ppd_choice_t  ***choices)	/* O - Pointers to choices */
+{
+  int		i, j, k, m;		/* Looping vars */
+  ppd_group_t	*g,			/* Current group */
+		*sg;			/* Current sub-group */
+  ppd_option_t	*o;			/* Current option */
+  ppd_choice_t	*c;			/* Current choice */
+  int		count;			/* Number of choices collected */
+  ppd_choice_t	**collect;		/* Collected choices */
+
+
+  if (ppd == NULL)
+    return (0);
+
+ /*
+  * Allocate memory for up to 1000 selected choices...
+  */
+
+  count   = 0;
+  collect = calloc(sizeof(ppd_choice_t *), 1000);
+
+ /*
+  * Loop through all options and add choices as needed...
+  */
+
+  for (i = ppd->num_groups, g = ppd->groups; i > 0; i --, g ++)
+  {
+    for (j = g->num_options, o = g->options; j > 0; j --, o ++)
+      if (o->section == section)
+	for (k = o->num_choices, c = o->choices; k > 0; k --, c ++)
+	  if (c->marked && count < 1000)
+	  {
+            collect[count] = c;
+	    count ++;
+	  }
+
+    for (j = g->num_subgroups, sg = g->subgroups; j > 0; j --, sg ++)
+      for (k = sg->num_options, o = sg->options; k > 0; k --, o ++)
+	if (o->section == section)
+	  for (m = o->num_choices, c = o->choices; m > 0; m --, c ++)
+	    if (c->marked && count < 1000)
+	    {
+              collect[count] = c;
+	      count ++;
+	    }
+  }
+
+ /*
+  * If we have more than 1 marked choice, sort them...
+  */
+
+  if (count > 1)
+    qsort(collect, count, sizeof(ppd_choice_t *),
+          (int (*)(const void *, const void *))ppd_sort);
+
+ /*
+  * Return the array and number of choices; if 0, free the array since
+  * it isn't needed.
+  */
+
+  if (count > 0)
+  {
+    *choices = collect;
+    return (count);
+  }
+  else
+  {
+    *choices = NULL;
+    free(collect);
+    return (0);
+  }
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,297 @@
+/*
+ * "$Id$"
+ *
+ *   File type conversion routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 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
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   mimeAddFilter() - Add a filter to the current MIME database.
+ *   mimeFilter()    - Find the fastest way to convert from one type to another.
+ *   compare()       - Compare two filter types...
+ *   lookup()        - Lookup a filter...
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "string.h"
+#include "mime.h"
+
+
+/*
+ * Local functions...
+ */
+
+static int		compare(mime_filter_t *, mime_filter_t *);
+static mime_filter_t	*lookup(mime_t *, mime_type_t *, mime_type_t *);
+
+
+/*
+ * 'mimeAddFilter()' - Add a filter to the current MIME database.
+ */
+
+mime_filter_t *				/* O - New filter */
+mimeAddFilter(mime_t      *mime,	/* I - MIME database */
+              mime_type_t *src,		/* I - Source type */
+	      mime_type_t *dst,		/* I - Destination type */
+              int         cost,		/* I - Relative time/resource cost */
+	      char        *filter)	/* I - Filter program to run */
+{
+  mime_filter_t	*temp;			/* New filter */
+
+
+ /*
+  * Range-check the input...
+  */
+
+  if (mime == NULL || src == NULL || dst == NULL || filter == NULL)
+    return (NULL);
+
+  if (strlen(filter) > (MIME_MAX_FILTER - 1))
+    return (NULL);
+
+ /*
+  * See if we already have an existing filter for the given source and
+  * destination...
+  */
+
+  if ((temp = lookup(mime, src, dst)) != NULL)
+  {
+   /*
+    * Yup, does the existing filter have a higher cost?  If so, copy the
+    * filter and cost to the existing filter entry and return it...
+    */
+
+    if (temp->cost > cost)
+    {
+      temp->cost = cost;
+      strcpy(temp->filter, filter);
+    }
+  }
+  else
+  {
+   /*
+    * Nope, add a new one...
+    */
+
+    if (mime->num_filters == 0)
+      temp = malloc(sizeof(mime_filter_t));
+    else
+      temp = realloc(mime->filters, sizeof(mime_filter_t) * (mime->num_filters + 1));
+
+    if (temp == NULL)
+      return (NULL);
+
+    mime->filters = temp;
+    temp += mime->num_filters;
+    mime->num_filters ++;
+
+   /*
+    * Copy the information over and sort if necessary...
+    */
+
+    temp->src  = src;
+    temp->dst  = dst;
+    temp->cost = cost;
+    strcpy(temp->filter, filter);
+
+    if (mime->num_filters > 1)
+      qsort(mime->filters, mime->num_filters, sizeof(mime_filter_t),
+            (int (*)(const void *, const void *))compare);
+  }
+
+ /*
+  * Return the new/updated filter...
+  */
+
+  return (temp);
+}
+
+
+/*
+ * 'mimeFilter()' - Find the fastest way to convert from one type to another.
+ */
+
+mime_filter_t *				/* O - Array of filters to run */
+mimeFilter(mime_t      *mime,		/* I - MIME database */
+           mime_type_t *src,		/* I - Source file type */
+	   mime_type_t *dst,		/* I - Destination file type */
+           int         *num_filters)	/* O - Number of filters to run */
+{
+  int		i, j,			/* Looping vars */
+		num_temp,		/* Number of temporary filters */
+		num_mintemp,		/* Number of filters in the minimum */
+		cost,			/* Current cost */
+		mincost;		/* Current minimum */
+  mime_filter_t	*temp,			/* Temporary filter */
+		*mintemp,		/* Current minimum */
+		*mincurrent,		/* Current filter for minimum */
+		*current,		/* Current filter */
+		*filters;		/* Filters to use */
+
+
+ /*
+  * Range-check the input...
+  */
+
+  if (mime == NULL || src == NULL || dst == NULL || num_filters == NULL)
+    return (NULL);
+
+  *num_filters = 0;
+
+ /*
+  * See if there is a filter that can convert the files directly...
+  */
+
+  if ((temp = lookup(mime, src, dst)) != NULL)
+  {
+   /*
+    * Got a direct filter!
+    */
+
+    if ((filters = (mime_filter_t *)malloc(sizeof(mime_filter_t))) == NULL)
+      return (NULL);
+
+    memcpy(filters, temp, sizeof(mime_filter_t));
+    *num_filters = 1;
+    return (filters);
+  }
+
+ /*
+  * OK, now look for filters from the source type to any other type...
+  */
+
+  mincost = 9999999;
+  mintemp = NULL;
+
+  for (i = mime->num_filters, current = mime->filters; i > 0; i --, current ++)
+    if (current->src == src)
+    {
+     /*
+      * See if we have any filters that can convert from the destination type
+      * of this filter to the final type...
+      */
+
+      if ((temp = mimeFilter(mime, current->dst, dst, &num_temp)) == NULL)
+        continue;
+
+     /*
+      * Found a match; see if this one is less costly than the last (if
+      * any...)
+      */
+
+      for (j = 0, cost = 0; j < num_temp; j ++)
+        cost += temp->cost;
+
+      if (cost < mincost)
+      {
+        if (mintemp != NULL)
+	  free(mintemp);
+
+	mincost     = cost;
+	mintemp     = temp;
+	num_mintemp = num_temp;
+	mincurrent  = current;
+      }
+      else
+        free(temp);
+    }
+
+  if (mintemp != NULL)
+  {
+   /*
+    * Hey, we got a match!  Add the current filter to the beginning of the
+    * filter list...
+    */
+
+    filters = (mime_filter_t *)realloc(mintemp, sizeof(mime_filter_t) *
+                                                (num_mintemp + 1));
+
+    if (filters == NULL)
+    {
+      *num_filters = 0;
+      return (NULL);
+    }
+
+    memmove(filters + 1, filters, num_mintemp * sizeof(mime_filter_t));
+    memcpy(filters, mincurrent, sizeof(mime_filter_t));
+
+    *num_filters = num_mintemp + 1;
+
+    return (filters);
+  }
+
+  return (NULL);
+}
+
+
+/*
+ * 'compare()' - Compare two filter types...
+ */
+
+static int			/* O - Comparison result */
+compare(mime_filter_t *f0,	/* I - First filter */
+        mime_filter_t *f1)	/* I - Second filter */
+{
+  int	i;			/* Result of comparison */
+
+
+  if ((i = strcmp(f0->src->super, f1->src->super)) == 0)
+    if ((i = strcmp(f0->src->type, f1->src->type)) == 0)
+      if ((i = strcmp(f0->dst->super, f1->dst->super)) == 0)
+        i = strcmp(f0->dst->type, f1->dst->type);
+
+  return (i);
+}
+
+
+/*
+ * 'lookup()' - Lookup a filter...
+ */
+
+static mime_filter_t *		/* O - Filter for src->dst */
+lookup(mime_t      *mime,	/* I - MIME database */
+       mime_type_t *src,	/* I - Source type */
+       mime_type_t *dst)	/* I - Destination type */
+{
+  mime_filter_t	key;		/* Key record for filter search */
+
+
+  if (mime->num_filters == 0)
+    return (NULL);
+
+  key.src = src;
+  key.dst = dst;
+
+  return ((mime_filter_t *)bsearch(&key, mime->filters, mime->num_filters,
+                                   sizeof(mime_filter_t),
+				   (int (*)(const void *, const void *))compare));
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,316 @@
+/*
+ * "$Id$"
+ *
+ *   Hyper-Text Transport Protocol definitions for the Common UNIX Printing
+ *   System (CUPS).
+ *
+ *   Copyright 1997-1999 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
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ */
+
+#ifndef _CUPS_HTTP_H_
+#  define _CUPS_HTTP_H_
+
+/*
+ * Include necessary headers...
+ */
+
+#  include <string.h>
+#  include <time.h>
+#  if defined(WIN32) || defined(__EMX__)
+#    include <winsock.h>
+#  else
+#    include <unistd.h>
+#    include <sys/time.h>
+#    include <sys/types.h>
+#    include <sys/socket.h>
+#    include <netdb.h>
+#    include <netinet/in.h>
+#    include <arpa/inet.h>
+#    include <netinet/in_systm.h>
+#    include <netinet/ip.h>
+#    include <netinet/tcp.h>
+#  endif /* WIN32 || __EMX__ */
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+
+/*
+ * Limits...
+ */
+
+#  define HTTP_MAX_URI		1024	/* Max length of URI string */
+#  define HTTP_MAX_HOST		256	/* Max length of hostname string */
+#  define HTTP_MAX_BUFFER	8192	/* Max length of data buffer */
+#  define HTTP_MAX_VALUE	256	/* Max header field value length */
+
+
+/*
+ * HTTP state values...
+ */
+
+typedef enum			/* States are server-oriented */
+{
+  HTTP_WAITING,			/* Waiting for command */
+  HTTP_OPTIONS,			/* OPTIONS command, waiting for blank line */
+  HTTP_GET,			/* GET command, waiting for blank line */
+  HTTP_GET_SEND,		/* GET command, sending data */
+  HTTP_HEAD,			/* HEAD command, waiting for blank line */
+  HTTP_POST,			/* POST command, waiting for blank line */
+  HTTP_POST_RECV,		/* POST command, receiving data */
+  HTTP_POST_SEND,		/* POST command, sending data */
+  HTTP_PUT,			/* PUT command, waiting for blank line */
+  HTTP_PUT_RECV,		/* PUT command, receiving data */
+  HTTP_DELETE,			/* DELETE command, waiting for blank line */
+  HTTP_TRACE,			/* TRACE command, waiting for blank line */
+  HTTP_CLOSE,			/* CLOSE command, waiting for blank line */
+  HTTP_STATUS			/* Command complete, sending status */
+} http_state_t;
+
+
+/*
+ * HTTP version numbers...
+ */
+
+typedef enum
+{
+  HTTP_0_9 = 9,			/* HTTP/0.9 */
+  HTTP_1_0 = 100,		/* HTTP/1.0 */
+  HTTP_1_1 = 101		/* HTTP/1.1 */
+} http_version_t;
+
+
+/*
+ * HTTP keep-alive values...
+ */
+
+typedef enum
+{
+  HTTP_KEEPALIVE_OFF = 0,
+  HTTP_KEEPALIVE_ON
+} http_keepalive_t;
+
+
+/*
+ * HTTP transfer encoding values...
+ */
+
+typedef enum
+{
+  HTTP_ENCODE_LENGTH,		/* Data is sent with Content-Length */
+  HTTP_ENCODE_CHUNKED		/* Data is chunked */
+} http_encoding_t;
+
+
+/*
+ * HTTP status codes...
+ */
+
+typedef enum
+{
+  HTTP_ERROR = -1,		/* An error response from httpXxxx() */
+  HTTP_CONTINUE,		/* Everything OK, keep going... */
+
+  HTTP_OK = 200,		/* OPTIONS/GET/HEAD/POST/TRACE command was successful */
+  HTTP_CREATED,			/* PUT command was successful */
+  HTTP_ACCEPTED,		/* DELETE command was successful */
+  HTTP_NOT_AUTHORITATIVE,	/* Information isn't authoritative */
+  HTTP_NO_CONTENT,		/* Successful command, no new data */
+  HTTP_RESET_CONTENT,		/* Content was reset/recreated */
+  HTTP_PARTIAL_CONTENT,		/* Only a partial file was recieved/sent */
+
+  HTTP_MULTIPLE_CHOICES = 300,	/* Multiple files match request */
+  HTTP_MOVED_PERMANENTLY,	/* Document has moved permanently */
+  HTTP_MOVED_TEMPORARILY,	/* Document has moved temporarily */
+  HTTP_SEE_OTHER,		/* See this other link... */
+  HTTP_NOT_MODIFIED,		/* File not modified */
+  HTTP_USE_PROXY,		/* Must use a proxy to access this URI */
+
+  HTTP_BAD_REQUEST = 400,	/* Bad request */
+  HTTP_UNAUTHORIZED,		/* Unauthorized to access host */
+  HTTP_PAYMENT_REQUIRED,	/* Payment required */
+  HTTP_FORBIDDEN,		/* Forbidden to access this URI */
+  HTTP_NOT_FOUND,		/* URI was not found */
+  HTTP_METHOD_NOT_ALLOWED,	/* Method is not allowed */
+  HTTP_NOT_ACCEPTABLE,		/* Not Acceptable */
+  HTTP_PROXY_AUTHENTICATION,	/* Proxy Authentication is Required */
+  HTTP_REQUEST_TIMEOUT,		/* Request timed out */
+  HTTP_CONFLICT,		/* Request is self-conflicting */
+  HTTP_GONE,			/* Server has gone away */
+  HTTP_LENGTH_REQUIRED,		/* A content length or encoding is required */
+  HTTP_PRECONDITION,		/* Precondition failed */
+  HTTP_REQUEST_TOO_LARGE,	/* Request entity too large */
+  HTTP_URI_TOO_LONG,		/* URI too long */
+  HTTP_UNSUPPORTED_MEDIATYPE,	/* The requested media type is unsupported */
+
+  HTTP_SERVER_ERROR = 500,	/* Internal server error */
+  HTTP_NOT_IMPLEMENTED,		/* Feature not implemented */
+  HTTP_BAD_GATEWAY,		/* Bad gateway */
+  HTTP_SERVICE_UNAVAILABLE,	/* Service is unavailable */
+  HTTP_GATEWAY_TIMEOUT,		/* Gateway connection timed out */
+  HTTP_NOT_SUPPORTED		/* HTTP version not supported */
+} http_status_t;
+
+
+/*
+ * HTTP field names...
+ */
+
+typedef enum
+{
+  HTTP_FIELD_UNKNOWN = -1,
+  HTTP_FIELD_ACCEPT = 0,
+  HTTP_FIELD_ACCEPT_CHARSET,
+  HTTP_FIELD_ACCEPT_ENCODING,
+  HTTP_FIELD_ACCEPT_LANGUAGE,
+  HTTP_FIELD_ACCEPT_RANGES,
+  HTTP_FIELD_AGE,
+  HTTP_FIELD_ALLOW,
+  HTTP_FIELD_ALTERNATES,
+  HTTP_FIELD_AUTHORIZATION,
+  HTTP_FIELD_CACHE_CONTROL,
+  HTTP_FIELD_CONNECTION,
+  HTTP_FIELD_CONTENT_BASE,
+  HTTP_FIELD_CONTENT_ENCODING,
+  HTTP_FIELD_CONTENT_LANGUAGE,
+  HTTP_FIELD_CONTENT_LENGTH,
+  HTTP_FIELD_CONTENT_LOCATION,
+  HTTP_FIELD_CONTENT_MD5,
+  HTTP_FIELD_CONTENT_RANGE,
+  HTTP_FIELD_CONTENT_TYPE,
+  HTTP_FIELD_CONTENT_VERSION,
+  HTTP_FIELD_DATE,
+  HTTP_FIELD_DERIVED_FROM,
+  HTTP_FIELD_ETAG,
+  HTTP_FIELD_EXPIRES,
+  HTTP_FIELD_FROM,
+  HTTP_FIELD_HOST,
+  HTTP_FIELD_IF_MATCH,
+  HTTP_FIELD_IF_MODIFIED_SINCE,
+  HTTP_FIELD_IF_NONE_MATCH,
+  HTTP_FIELD_IF_RANGE,
+  HTTP_FIELD_IF_UNMODIFIED_SINCE,
+  HTTP_FIELD_KEEP_ALIVE,
+  HTTP_FIELD_LAST_MODIFIED,
+  HTTP_FIELD_LINK,
+  HTTP_FIELD_LOCATION,
+  HTTP_FIELD_MAX_FORWARDS,
+  HTTP_FIELD_MESSAGE_ID,
+  HTTP_FIELD_MIME_VERSION,
+  HTTP_FIELD_PRAGMA,
+  HTTP_FIELD_PROXY_AUTHENTICATE,
+  HTTP_FIELD_PROXY_AUTHORIZATION,
+  HTTP_FIELD_PUBLIC,
+  HTTP_FIELD_RANGE,
+  HTTP_FIELD_REFERER,
+  HTTP_FIELD_RETRY_AFTER,
+  HTTP_FIELD_SERVER,
+  HTTP_FIELD_TRANSFER_ENCODING,
+  HTTP_FIELD_UPGRADE,
+  HTTP_FIELD_URI,
+  HTTP_FIELD_USER_AGENT,
+  HTTP_FIELD_VARY,
+  HTTP_FIELD_VIA,
+  HTTP_FIELD_WARNING,
+  HTTP_FIELD_WWW_AUTHENTICATE,
+  HTTP_FIELD_MAX
+} http_field_t;
+  
+
+/*
+ * HTTP connection structure...
+ */
+
+typedef struct
+{
+  int			fd;		/* File descriptor for this socket */
+  int			blocking;	/* To block or not to block */
+  time_t		activity;	/* Time since last read/write */
+  http_state_t		state;		/* State of client */
+  http_status_t		status;		/* Status of last request */
+  http_version_t	version;	/* Protocol version */
+  http_keepalive_t	keep_alive;	/* Keep-alive supported? */
+  struct sockaddr_in	hostaddr;	/* Address of connected host */
+  char			hostname[HTTP_MAX_HOST],
+  					/* Name of connected host */
+			fields[HTTP_FIELD_MAX][HTTP_MAX_VALUE];
+					/* Field values */
+  char			*data;		/* Pointer to data buffer */
+  http_encoding_t	data_encoding;	/* Chunked or not */
+  int			data_remaining;	/* Number of bytes left */
+  int			used;		/* Number of bytes used in buffer */
+  char			buffer[HTTP_MAX_BUFFER];
+					/* Buffer for messages */
+} http_t;
+
+
+/*
+ * Prototypes...
+ */
+
+#  define		httpBlocking(http,b)	(http)->blocking = (b)
+#  define		httpClearFields(http)	memset((http)->fields, 0, sizeof((http)->fields)),\
+						httpSetField((http), HTTP_FIELD_HOST, (http)->hostname)
+extern void		httpClose(http_t *http);
+extern http_t		*httpConnect(char *host, int port);
+extern int		httpDelete(http_t *http, char *uri);
+extern void		httpFlush(http_t *http);
+extern int		httpGet(http_t *http, char *uri);
+extern char		*httpGets(char *line, int length, http_t *http);
+extern char		*httpGetDateString(time_t t);
+extern time_t		httpGetDateTime(char *s);
+#  define		httpGetField(http,field)	(http)->fields[field]
+extern int		httpHead(http_t *http, char *uri);
+extern void		httpInitialize(void);
+extern int		httpOptions(http_t *http, char *uri);
+extern int		httpPost(http_t *http, char *uri);
+extern int		httpPrintf(http_t *http, const char *format, ...);
+extern int		httpPut(http_t *http, char *uri);
+extern int		httpRead(http_t *http, char *buffer, int length);
+extern int		httpReconnect(http_t *http);
+extern void		httpSeparate(char *uri, char *method, char *username,
+			             char *host, int *port, char *resource);
+extern void		httpSetField(http_t *http, http_field_t field, char *value);
+extern char		*httpStatus(http_status_t status);
+extern int		httpTrace(http_t *http, char *uri);
+extern http_status_t	httpUpdate(http_t *http);
+extern int		httpWrite(http_t *http, char *buffer, int length);
+extern char		*httpEncode64(char *out, char *in);
+extern char		*httpDecode64(char *out, char *in);
+extern int		httpGetLength(http_t *http);
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+#endif /* !_CUPS_HTTP_H_ */
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,342 @@
+/*
+ * "$Id$"
+ *
+ *   Internet Printing Protocol definitions for the Common UNIX Printing
+ *   System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ */
+
+#ifndef _CUPS_IPP_H_
+#  define _CUPS_IPP_H_
+
+/*
+ * Include necessary headers...
+ */
+
+#  include <cups/http.h>
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+
+/*
+ * IPP version string...
+ */
+
+#  define IPP_VERSION		"\001\000"
+
+/*
+ * IPP registered port number...  This is the default value - applications
+ * should use the ippPort() function so that you can customize things in
+ * /etc/services if needed!
+ */
+
+#  define IPP_PORT		631
+
+/*
+ * Common limits...
+ */
+
+#  define IPP_MAX_NAME		256
+#  define IPP_MAX_VALUES	100
+
+
+/*
+ * Types and structures...
+ */
+
+typedef enum			/**** Format tags for attribute formats... ****/
+{
+  IPP_TAG_ZERO = 0x00,
+  IPP_TAG_OPERATION,
+  IPP_TAG_JOB,
+  IPP_TAG_END,
+  IPP_TAG_PRINTER,
+  IPP_TAG_EXTENSION,
+  IPP_TAG_UNSUPPORTED = 0x10,
+  IPP_TAG_DEFAULT,
+  IPP_TAG_UNKNOWN,
+  IPP_TAG_NOVALUE,
+  IPP_TAG_INTEGER = 0x21,
+  IPP_TAG_BOOLEAN,
+  IPP_TAG_ENUM,
+  IPP_TAG_STRING = 0x30,
+  IPP_TAG_DATE,
+  IPP_TAG_RESOLUTION,
+  IPP_TAG_RANGE,
+  IPP_TAG_TEXTLANG,
+  IPP_TAG_NAMELANG,
+  IPP_TAG_TEXT = 0x41,
+  IPP_TAG_NAME,
+  IPP_TAG_KEYWORD,
+  IPP_TAG_URI,
+  IPP_TAG_URISCHEME,
+  IPP_TAG_CHARSET,
+  IPP_TAG_LANGUAGE,
+  IPP_TAG_MIMETYPE
+} ipp_tag_t;
+
+typedef enum			/**** Resolution units... ****/
+{
+  IPP_RES_PER_INCH = 3,
+  IPP_RES_PER_CM
+} ipp_res_t;
+
+typedef enum			/**** Multiple Document Handling ****/
+{
+  IPP_DOC_SINGLE,
+  IPP_DOC_UNCOLLATED,
+  IPP_DOC_COLLATED,
+  IPP_DOC_SEPARATE
+} ipp_doc_t;
+
+typedef enum			/**** Finishings... ****/
+{
+  IPP_FINISH_NONE = 3,
+  IPP_FINISH_STAPLE,
+  IPP_FINISH_PUNCH,
+  IPP_FINISH_COVER,
+  IPP_FINISH_BIND
+} ipp_finish_t;
+
+typedef enum			/**** Orientation... ****/
+{
+  IPP_PORTRAIT = 3,		/* No rotation */
+  IPP_LANDSCAPE,		/* 90 degrees counter-clockwise */
+  IPP_REVERSE_LANDSCAPE,	/* 90 degrees clockwise */
+  IPP_REVERSE_PORTRAIT		/* 180 degrees */
+} ipp_orient_t;
+
+typedef enum			/**** Qualities... ****/
+{
+  IPP_QUALITY_DRAFT = 3,
+  IPP_QUALITY_NORMAL,
+  IPP_QUALITY_HIGH
+} ipp_quality_t;
+
+typedef enum			/**** Job States.... */
+{
+  IPP_JOB_PENDING = 3,
+  IPP_JOB_HELD,
+  IPP_JOB_PROCESSING,
+  IPP_JOB_STOPPED,
+  IPP_JOB_CANCELED,
+  IPP_JOB_ABORTED,
+  IPP_JOB_COMPLETED
+} ipp_jstate_t;
+
+typedef enum			/**** Printer States.... */
+{
+  IPP_PRINTER_IDLE = 3,
+  IPP_PRINTER_PROCESSING,
+  IPP_PRINTER_STOPPED
+} ipp_pstate_t;
+
+typedef enum			/**** IPP states... ****/
+{
+  IPP_ERROR = -1,		/* An error occurred */
+  IPP_IDLE,			/* Nothing is happening/request completed */
+  IPP_HEADER,			/* The request header needs to be sent/received */
+  IPP_ATTRIBUTE,		/* One or more attributes need to be sent/received */
+  IPP_DATA			/* IPP request data needs to be sent/received */
+} ipp_state_t;
+
+typedef enum			/**** IPP operations... ****/
+{
+  IPP_PRINT_JOB = 0x0002,
+  IPP_PRINT_URI,
+  IPP_VALIDATE_JOB,
+  IPP_CREATE_JOB,
+  IPP_SEND_DOCUMENT,
+  IPP_SEND_URI,
+  IPP_CANCEL_JOB,
+  IPP_GET_JOB_ATTRIBUTES,
+  IPP_GET_JOBS,
+  IPP_GET_PRINTER_ATTRIBUTES,
+  IPP_HOLD_JOB = 0x000c,
+  IPP_RELEASE_JOB,
+  IPP_RESTART_JOB,
+  IPP_PAUSE_PRINTER = 0x0010,
+  IPP_RESUME_PRINTER,
+  IPP_PURGE_JOBS,
+  IPP_PRIVATE = 0x4000,
+  CUPS_GET_DEFAULT,
+  CUPS_GET_PRINTERS,
+  CUPS_ADD_PRINTER,
+  CUPS_DELETE_PRINTER,
+  CUPS_GET_CLASSES,
+  CUPS_ADD_CLASS,
+  CUPS_DELETE_CLASS,
+  CUPS_ACCEPT_JOBS,
+  CUPS_REJECT_JOBS,
+  CUPS_SET_DEFAULT
+} ipp_op_t;
+
+typedef enum			/**** IPP status codes... ****/
+{
+  IPP_OK = 0x0000,
+  IPP_OK_SUBST,
+  IPP_OK_CONFLICT,
+  IPP_BAD_REQUEST = 0x0400,
+  IPP_FORBIDDEN,
+  IPP_NOT_AUTHENTICATED,
+  IPP_NOT_AUTHORIZED,
+  IPP_NOT_POSSIBLE,
+  IPP_TIMEOUT,
+  IPP_NOT_FOUND,
+  IPP_GONE,
+  IPP_REQUEST_ENTITY,
+  IPP_REQUEST_VALUE,
+  IPP_DOCUMENT_FORMAT,
+  IPP_ATTRIBUTES,
+  IPP_URI_SCHEME,
+  IPP_CHARSET,
+  IPP_CONFLICT,
+  IPP_INTERNAL_ERROR = 0x0500,
+  IPP_OPERATION_NOT_SUPPORTED,
+  IPP_SERVICE_UNAVAILABLE,
+  IPP_VERSION_NOT_SUPPORTED,
+  IPP_DEVICE_UNAVAILABLE,
+  IPP_TEMPORARY_ERROR,
+  IPP_NOT_ACCEPTING,
+  IPP_PRINTER_BUSY
+} ipp_status_t;
+
+typedef unsigned char ipp_uchar_t;/**** Unsigned 8-bit integer/character ****/
+
+typedef union			/**** Request Header ****/
+{
+  struct			/* Any Header */
+  {
+    ipp_uchar_t	version[2];	/* Protocol version number */
+    int		op_status;	/* Operation ID or status code*/
+    int		request_id;	/* Request ID */
+  }		any;
+
+  struct			/* Operation Header */
+  {
+    ipp_uchar_t	version[2];	/* Protocol version number */
+    ipp_op_t	operation_id;	/* Operation ID */
+    int		request_id;	/* Request ID */
+  }		op;
+
+  struct			/* Status Header */
+  {
+    ipp_uchar_t	version[2];	/* Protocol version number */
+    ipp_status_t status_code;	/* Status code */
+    int		request_id;	/* Request ID */
+  }		status;
+} ipp_request_t;
+
+
+typedef union			/**** Attribute Value ****/
+{
+  int		integer;	/* Integer/enumerated value */
+
+  char		boolean;	/* Boolean value */
+
+  ipp_uchar_t	date[11];	/* Date/time value */
+
+  struct
+  {
+    int		xres,		/* Horizontal resolution */
+		yres;		/* Vertical resolution */
+    ipp_res_t	units;		/* Resolution units */
+  }		resolution;	/* Resolution value */
+
+  struct
+  {
+    int		lower,		/* Lower value */
+		upper;		/* Upper value */
+  }		range;		/* Range of integers value */
+
+  struct
+  {
+    char	*charset;	/* Character set */
+    char	*text;		/* String */
+  }		string;		/* String with language value */
+} ipp_value_t;
+
+typedef struct ipp_attribute_s	/**** Attribute ****/
+{
+  struct ipp_attribute_s	*next;
+  				/* Next atrtribute in list */
+  ipp_tag_t	group_tag,	/* Job/Printer/Operation group tag */
+		value_tag;	/* What type of value is it? */
+  char		*name;		/* Name of attribute */
+  int		num_values;	/* Number of values */
+  ipp_value_t	values[1];	/* Values */
+} ipp_attribute_t;
+
+typedef struct			/**** Request State ****/
+{
+  ipp_state_t	state;		/* State of request */
+  ipp_request_t	request;	/* Request header */
+  ipp_attribute_t *attrs,	/* Attributes */
+		*last,		/* Last attribute in list */
+		*current;	/* Current attribute (for read/write) */
+  ipp_tag_t	curtag;		/* Current attribute group tag */
+} ipp_t;
+
+
+/*
+ * Prototypes...
+ */
+
+extern time_t		ippDateToTime(ipp_uchar_t *date);
+extern ipp_attribute_t	*ippAddBoolean(ipp_t *ipp, ipp_tag_t group, char *name, char value);
+extern ipp_attribute_t	*ippAddBooleans(ipp_t *ipp, ipp_tag_t group, char *name, int num_values, char *values);
+extern ipp_attribute_t	*ippAddDate(ipp_t *ipp, ipp_tag_t group, char *name, ipp_uchar_t *value);
+extern ipp_attribute_t	*ippAddInteger(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, char *name, int value);
+extern ipp_attribute_t	*ippAddIntegers(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, char *name, int num_values, int *values);
+extern ipp_attribute_t	*ippAddRange(ipp_t *ipp, ipp_tag_t group, char *name, int lower, int upper);
+extern ipp_attribute_t	*ippAddRanges(ipp_t *ipp, ipp_tag_t group, char *name, int num_values, int *lower, int *upper);
+extern ipp_attribute_t	*ippAddResolution(ipp_t *ipp, ipp_tag_t group, char *name, ipp_res_t units, int xres, int yres);
+extern ipp_attribute_t	*ippAddResolutions(ipp_t *ipp, ipp_tag_t group, char *name, int num_values, ipp_res_t units, int *xres, int *yres);
+extern ipp_attribute_t	*ippAddSeparator(ipp_t *ipp);
+extern ipp_attribute_t	*ippAddString(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, char *name, char *charset, char *value);
+extern ipp_attribute_t	*ippAddStrings(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, char *name, int num_values, char *charset, char **values);
+extern void		ippDelete(ipp_t *ipp);
+extern ipp_attribute_t	*ippFindAttribute(ipp_t *ipp, char *name, ipp_tag_t type);
+extern size_t		ippLength(ipp_t *ipp);
+extern ipp_t		*ippNew(void);
+extern ipp_state_t	ippRead(http_t *http, ipp_t *ipp);
+extern ipp_uchar_t	*ippTimeToDate(time_t t);
+extern ipp_state_t	ippWrite(http_t *http, ipp_t *ipp);
+extern int		ippPort(void);
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+#endif /* !_CUPS_IPP_H_ */
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,370 @@
+/*
+ * "$Id$"
+ *
+ *   I18N/language support for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   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
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   cupsLangEncoding() - Return the character encoding (us-ascii, etc.)
+ *                        for the given language.
+ *   cupsLangFlush()    - Flush all language data out of the cache.
+ *   cupsLangFree()     - Free language data.
+ *   cupsLangGet()      - Get a language.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include "string.h"
+#include "language.h"
+
+
+/*
+ * Local globals...
+ */
+
+static cups_lang_t	*lang_cache = NULL;	/* Language string cache */
+static char		*lang_blank = "";	/* Blank constant string */
+static char		*lang_encodings[] =	/* Encoding strings */
+			{
+			  "us-ascii",
+			  "iso8859-1",
+			  "iso8859-2",
+			  "iso8859-3",
+			  "iso8859-4",
+			  "iso8859-5",
+			  "iso8859-6",
+			  "iso8859-7",
+			  "iso8859-8",
+			  "iso8859-9",
+			  "iso8859-10",
+			  "utf8"
+			};
+static char		*lang_default[] =	/* Default POSIX locale */
+			{
+#include "cups_C.h"
+			  NULL
+			};
+
+
+/*
+ * 'cupsLangEncoding()' - Return the character encoding (us-ascii, etc.)
+ *                        for the given language.
+ */
+
+char *					/* O - Character encoding */
+cupsLangEncoding(cups_lang_t *lang)	/* I - Language data */
+{
+  if (lang == NULL)
+    return (lang_encodings[0]);
+  else
+    return (lang_encodings[lang->encoding]);
+}
+
+
+/*
+ * 'cupsLangFlush()' - Flush all language data out of the cache.
+ */
+
+void
+cupsLangFlush(void)
+{
+  int		i;	/* Looping var */
+  cups_lang_t	*lang,	/* Current language */
+		*next;	/* Next language */
+
+
+  for (lang = lang_cache; lang != NULL; lang = next)
+  {
+    for (i = 0; i < CUPS_MSG_MAX; i ++)
+      if (lang->messages[i] != NULL && lang->messages[i] != lang_blank)
+        free(lang->messages[i]);
+
+    next = lang->next;
+    free(lang);
+  }
+}
+
+
+/*
+ * 'cupsLangFree()' - Free language data.
+ *
+ * This does not actually free anything; use cupsLangFlush() for that.
+ */
+
+void
+cupsLangFree(cups_lang_t *lang)	/* I - Language to free */
+{
+  if (lang != NULL && lang->used > 0)
+    lang->used --;
+}
+
+
+/*
+ * 'cupsLangGet()' - Get a language.
+ */
+
+cups_lang_t *			/* O - Language data */
+cupsLangGet(char *language)	/* I - Language or locale */
+{
+  int		i, count;	/* Looping vars */
+  char		real[16],	/* Real language name */
+		filename[1024],	/* Filename for language locale file */
+		*localedir;	/* Directory for locale files */
+  FILE		*fp;		/* Language locale file pointer */
+  char		line[1024];	/* Line from file */
+  cups_msg_t	msg;		/* Message number */
+  char		*text;		/* Message text */
+  cups_lang_t	*lang;		/* Current language... */
+
+
+ /*
+  * Convert the language string passed in to a locale string. "C" is the
+  * standard POSIX locale and is copied unchanged.  Otherwise the
+  * language string is converted from ll-cc (language-country) to ll_CC
+  * to match the file naming convention used by all POSIX-compliant
+  * operating systems.
+  */
+
+  if (language == NULL || language[0] == '\0')
+    language = "C";
+
+  if (strlen(language) < 2)
+    strcpy(real, "C");
+  else
+  {
+    real[0] = tolower(language[0]);
+    real[1] = tolower(language[1]);
+
+    if (language[2] == '_' || language[2] == '-')
+    {
+      real[2]     = '_';
+      real[3]     = toupper(language[3]);
+      real[4]     = toupper(language[4]);
+      real[5]     = '\0';
+      language[5] = '\0';
+    }
+    else
+    {
+      language[2] = '\0';
+      real[2]     = '\0';
+    }
+  }
+
+ /*
+  * Next try to open a locale file; we will try the country-localized file
+  * first, and then look for generic language file.  If all else fails we
+  * will use the POSIX locale.
+  */
+
+  if ((localedir = getenv("LOCALEDIR")) == NULL)
+    localedir = CUPS_LOCALEDIR;
+
+  sprintf(filename, "%s/%s/cups_%s", localedir, real, real);
+
+  if ((fp = fopen(filename, "r")) == NULL)
+    if (strlen(real) > 2)
+    {
+     /*
+      * Nope, see if we can open a generic language file...
+      */
+
+      real[2] = '\0';
+      sprintf(filename, "%s/%s/cups_%s", localedir, real, real);
+      fp = fopen(filename, "r");
+    }
+
+ /*
+  * Then see if we already have this language loaded...
+  */
+
+  for (lang = lang_cache; lang != NULL; lang = lang->next)
+    if (strcmp(lang->language, language) == 0)
+    {
+      lang->used ++;
+
+      if (fp != NULL)
+        fclose(fp);
+
+      return (lang);
+    }
+
+ /*
+  * OK, we have an open messages file; the first line will contain the
+  * language encoding (us-ascii, iso-8859-1, etc.), and the rest will
+  * be messages consisting of:
+  *
+  *    #### SP message text
+  *
+  * or:
+  *
+  *    message text
+  *
+  * If the line starts with a number, then message processing picks up
+  * where the number indicates.  Otherwise the last message number is
+  * incremented.
+  *
+  * All leading whitespace is deleted.
+  */
+
+  if (fp == NULL)
+    strcpy(line, lang_default[0]);
+  else if (fgets(line, sizeof(line), fp) == NULL)
+  {
+   /*
+    * Can't read encoding!
+    */
+
+    fclose(fp);
+    return (NULL);
+  }
+
+  i = strlen(line) - 1;
+  if (line[i] == '\n')
+    line[i] = '\0';	/* Strip LF */
+
+ /*
+  * See if there is a free language available; if so, use that
+  * record...
+  */
+
+  for (lang = lang_cache; lang != NULL; lang = lang->next)
+    if (lang->used == 0)
+      break;
+
+  if (lang == NULL)
+  {
+   /*
+    * Allocate memory for the language and add it to the cache.
+    */
+
+    if ((lang = calloc(sizeof(cups_lang_t), 1)) == NULL)
+    {
+      fclose(fp);
+      return (NULL);
+    }
+
+    lang->next = lang_cache;
+    lang_cache = lang;
+  }
+
+
+ /*
+  * Free all old strings as needed...
+  */
+
+  for (i = 0; i < CUPS_MSG_MAX; i ++)
+  {
+    if (lang->messages[i] != NULL && lang->messages[i] != lang_blank)
+      free(lang->messages[i]);
+
+    lang->messages[i] = lang_blank;
+  }
+
+ /*
+  * Then assign the language and encoding fields...
+  */
+
+  lang->used ++;
+  strcpy(lang->language, language);
+
+  for (i = 0; i < (sizeof(lang_encodings) / sizeof(lang_encodings[0])); i ++)
+    if (strcmp(lang_encodings[i], line) == 0)
+    {
+      lang->encoding = (cups_encoding_t)i;
+      break;
+    }
+
+ /*
+  * Read the strings from the file...
+  */
+
+  msg   = (cups_msg_t)-1;
+  count = 1;
+
+  for (;;)
+  {
+   /*
+    * Read a line from memory or from a file...
+    */
+
+    if (fp == NULL)
+    {
+      if (lang_default[count] == NULL)
+        break;
+
+      strcpy(line, lang_default[count]);
+    }
+    else if (fgets(line, sizeof(line), fp) == NULL)
+      break;
+
+    count ++;
+
+   /*
+    * Ignore blank lines...
+    */
+
+    i = strlen(line) - 1;
+    if (line[i] == '\n')
+      line[i] = '\0';	/* Strip LF */
+
+    if (line[0] == '\0')
+      continue;
+
+   /*
+    * Grab the message number and text...
+    */
+
+    if (isdigit(line[0]))
+      msg = (cups_msg_t)atoi(line);
+    else
+      msg ++;
+
+    if (msg < 0 || msg >= CUPS_MSG_MAX)
+      continue;
+
+    text = line;
+    while (isdigit(*text))
+      text ++;
+    while (isspace(*text))
+      text ++;
+    
+    lang->messages[msg] = strdup(text);
+  }
+
+ /*
+  * Close the file and return...
+  */
+
+  if (fp != NULL)
+    fclose(fp);
+
+  return (lang);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,188 @@
+/*
+ * "$Id$"
+ *
+ *   Multi-language support for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   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
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ */
+
+#ifndef _CUPS_LANGUAGE_H_
+#  define _CUPS_LANGUAGE_H_
+
+/*
+ * Include necessary headers...
+ */
+
+#  include <locale.h>
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+/*
+ * Messages...
+ */
+
+typedef enum			/**** Message Indices ****/
+{
+  CUPS_MSG_OK,
+  CUPS_MSG_CANCEL,
+  CUPS_MSG_HELP,
+  CUPS_MSG_QUIT,
+  CUPS_MSG_CLOSE,
+  CUPS_MSG_YES,
+  CUPS_MSG_NO,
+  CUPS_MSG_AUTO,
+  CUPS_MSG_ON,
+  CUPS_MSG_OFF,
+  CUPS_MSG_SAVE,
+  CUPS_MSG_DISCARD,
+  CUPS_MSG_DEFAULT,
+  CUPS_MSG_USER_DEFINED,
+  CUPS_MSG_OPTIONS,
+  CUPS_MSG_MORE_INFO,
+  CUPS_MSG_BLACK,
+  CUPS_MSG_COLOR,
+  CUPS_MSG_CYAN,
+  CUPS_MSG_MAGENTA,
+  CUPS_MSG_YELLOW,
+  CUPS_MSG_COPYRIGHT,
+  CUPS_MSG_ALL_RIGHTS_RESERVED,
+  CUPS_MSG_GENERAL,
+  CUPS_MSG_PRINTER,
+  CUPS_MSG_POSTSCRIPT,
+  CUPS_MSG_IMAGE,
+  CUPS_MSG_TEXT,
+  CUPS_MSG_HPGL,
+  CUPS_MSG_ADVANCED,
+  CUPS_MSG_PRINT_BANNER_PAGE,
+  CUPS_MSG_VERBOSE_LOGGING,
+  CUPS_MSG_PRINT_PAGES,
+  CUPS_MSG_DOCUMENT,
+  CUPS_MSG_ENTIRE_DOCUMENT,
+  CUPS_MSG_PAGE_RANGE,
+  CUPS_MSG_REVERSE_ORDER,
+  CUPS_MSG_PAGE_FORMAT,
+  CUPS_MSG_1_UP,
+  CUPS_MSG_2_UP,
+  CUPS_MSG_4_UP,
+  CUPS_MSG_IMAGE_SCALING,
+  CUPS_MSG_USE_NATURAL_IMAGE_SIZE,
+  CUPS_MSG_ZOOM_BY_PERCENT,
+  CUPS_MSG_ZOOM_BY_PPI,
+  CUPS_MSG_MIRROR_IMAGE,
+  CUPS_MSG_ROTATE_IMAGE,
+  CUPS_MSG_BEST_FIT,
+  CUPS_MSG_COLOR_SATURATION,
+  CUPS_MSG_COLOR_HUE,
+  CUPS_MSG_NUMBER_OF_COLUMNS,
+  CUPS_MSG_MARGINS,
+  CUPS_MSG_WRAP_TEXT,
+  CUPS_MSG_FIT_TO_PAGE,
+  CUPS_MSG_SHADING,
+  CUPS_MSG_DEFAULT_PEN_WIDTH,
+  CUPS_MSG_GAMMA_CORRECTION,
+  CUPS_MSG_BRIGHTNESS,
+  CUPS_MSG_COLOR_PROFILE,
+  CUPS_MSG_ADD_PRINTER,
+  CUPS_MSG_DELETE_PRINTER,
+  CUPS_MSG_MODIFY_PRINTER,
+  CUPS_MSG_PRINTER_URI,
+  CUPS_MSG_PRINTER_NAME,
+  CUPS_MSG_PRINTER_LOCATION,
+  CUPS_MSG_PRINTER_INFO,
+  CUPS_MSG_PRINTER_MAKE_AND_MODEL,
+  CUPS_MSG_DEVICE_URI,
+  CUPS_MSG_FORMATTING_PAGE,
+  CUPS_MSG_PRINTING_PAGE,
+  CUPS_MSG_INITIALIZING_PRINTER,
+  CUPS_MSG_PRINTER_STATE,
+  CUPS_MSG_ACCEPTING_JOBS,
+  CUPS_MSG_NOT_ACCEPTING_JOBS,
+  CUPS_MSG_PRINT_JOBS,
+  CUPS_MSG_CLASS,
+  CUPS_MSG_LOCAL,
+  CUPS_MSG_REMOTE,
+  CUPS_MSG_DUPLEXING,
+  CUPS_MSG_STAPLING,
+  CUPS_MSG_FAST_COPIES,
+  CUPS_MSG_COLLATED_COPIES,
+  CUPS_MSG_PUNCHING,
+  CUPS_MSG_COVERING,
+  CUPS_MSG_BINDING,
+  CUPS_MSG_SORTING,
+  CUPS_MSG_SMALL,
+  CUPS_MSG_MEDIUM,
+  CUPS_MSG_LARGE,
+  CUPS_MSG_VARIABLE,
+  CUPS_MSG_IDLE,
+  CUPS_MSG_PROCESSING,
+  CUPS_MSG_STOPPED,
+  CUPS_MSG_HTTP_BASE = 200,
+  CUPS_MSG_HTTP_END = 505,
+  CUPS_MSG_MAX
+} cups_msg_t;
+
+typedef enum			/**** Language Encodings ****/
+{
+  CUPS_US_ASCII,
+  CUPS_ISO8859_1,
+  CUPS_ISO8859_2,
+  CUPS_ISO8859_3,
+  CUPS_ISO8859_4,
+  CUPS_ISO8859_5,
+  CUPS_ISO8859_6,
+  CUPS_ISO8859_7,
+  CUPS_ISO8859_8,
+  CUPS_ISO8859_9,
+  CUPS_ISO8859_10,
+  CUPS_UTF8
+} cups_encoding_t;
+
+typedef struct cups_lang_str	/**** Language Cache Structure ****/
+{
+  struct cups_lang_str	*next;		/* Next language in cache */
+  int			used;		/* Number of times this entry has been used. */
+  cups_encoding_t	encoding;	/* Text encoding */
+  char			language[16];	/* Language/locale name */
+  char			*messages[CUPS_MSG_MAX];
+					/* Message array */
+} cups_lang_t;
+
+
+/*
+ * Prototypes...
+ */
+
+#  define		cupsLangDefault() cupsLangGet(setlocale(LC_ALL, 0))
+extern char		*cupsLangEncoding(cups_lang_t *lang);
+extern void		cupsLangFlush(void);
+extern void		cupsLangFree(cups_lang_t *lang);
+extern cups_lang_t	*cupsLangGet(char *language);
+#  define		cupsLangString(lang,msg) (lang)->messages[(msg)]
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+
+#endif /* !_CUPS_LANGUAGE_H_ */
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,418 @@
+/*
+ * "$Id$"
+ *
+ *   Option marking routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   PostScript is a trademark of Adobe Systems, Inc.
+ *
+ * Contents:
+ *
+ *   ppdConflicts()        - Check to see if there are any conflicts.
+ *   ppdFindChoice()       - Return a pointer to an option choice.
+ *   ppdFindMarkedChoice() - Return the marked choice for the specified option.
+ *   ppdFindOption()       - Return a pointer to the specified option.
+ *   ppdIsMarked()         - Check to see if an option is marked...
+ *   ppdMarkDefaults()     - Mark all default options in the PPD file.
+ *   ppdMarkOption()       - Mark an option in a PPD file.
+ *   ppd_defaults()        - Set the defaults for this group and all sub-groups.
+ *   ppd_default()         - Set the default choice for an option.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "ppd.h"
+#include "string.h"
+
+
+/*
+ * Local functions...
+ */
+
+static void	ppd_defaults(ppd_group_t *g);
+static void	ppd_default(ppd_option_t *o);
+
+
+/*
+ * 'ppdConflicts()' - Check to see if there are any conflicts.
+ */
+
+int				/* O - Number of conflicts found */
+ppdConflicts(ppd_file_t *ppd)	/* I - PPD to check */
+{
+  int		i, j,		/* Looping variables */
+		conflicts;	/* Number of conflicts */
+  ppd_const_t	*c;		/* Current constraint */
+  ppd_option_t	*o1, *o2;	/* Options */
+  ppd_choice_t	*c1, *c2;	/* Choices */
+
+
+  if (ppd == NULL)
+    return (0);
+
+  conflicts = 0;
+
+ /*
+  * Loop through all of the UI constraints and flag any options
+  * that conflict...
+  */
+
+  for (i = ppd->num_consts, c = ppd->consts; i > 0; i --, c ++)
+  {
+   /*
+    * Grab pointers to the first option...
+    */
+
+    o1 = ppdFindOption(ppd, c->option1);
+
+    if (o1 == NULL)
+      continue;
+    else if (c->choice1[0] != '\0')
+    {
+     /*
+      * This constraint maps to a specific choice.
+      */
+
+      c1 = ppdFindChoice(o1, c->choice1);
+    }
+    else
+    {
+     /*
+      * This constraint applies to any choice for this option.
+      */
+
+      for (j = o1->num_choices, c1 = o1->choices; j > 0; j --, c1 ++)
+        if (c1->marked)
+	  break;
+
+      if (j == 0)
+        c1 = NULL;
+    }
+
+   /*
+    * Grab pointers to the second option...
+    */
+
+    o2 = ppdFindOption(ppd, c->option2);
+
+    if (o2 == NULL)
+      continue;
+    else if (c->choice2[0] != '\0')
+    {
+     /*
+      * This constraint maps to a specific choice.
+      */
+
+      c2 = ppdFindChoice(o2, c->choice2);
+    }
+    else
+    {
+     /*
+      * This constraint applies to any choice for this option.
+      */
+
+      for (j = o2->num_choices, c2 = o2->choices; j > 0; j --, c2 ++)
+        if (c2->marked)
+	  break;
+
+      if (j == 0)
+        c2 = NULL;
+    }
+
+   /*
+    * If both options are marked then there is a conflict...
+    */
+
+    if (c1 != NULL && c1->marked &&
+        c2 != NULL && c2->marked)
+    {
+      conflicts ++;
+      o1->conflicted = 1;
+      o2->conflicted = 1;
+    }
+    else
+    {
+      o1->conflicted = 0;
+      o2->conflicted = 0;
+    }
+  }
+
+ /*
+  * Return the number of conflicts found...
+  */
+
+  return (conflicts);
+}
+
+
+/*
+ * 'ppdFindChoice()' - Return a pointer to an option choice.
+ */
+
+ppd_choice_t *				/* O - Choice pointer or NULL */
+ppdFindChoice(ppd_option_t *o,		/* I - Pointer to option */
+              char         *choice)	/* I - Name of choice */
+{
+  int		i;		/* Looping var */
+  ppd_choice_t	*c;		/* Current choice */
+
+
+  if (o == NULL || choice == NULL)
+    return (NULL);
+
+  for (i = o->num_choices, c = o->choices; i > 0; i --, c ++)
+    if (strcmp(c->choice, choice) == 0)
+      return (c);
+
+  return (NULL);
+}
+
+
+/*
+ * 'ppdFindMarkedChoice()' - Return the marked choice for the specified option.
+ */
+
+ppd_choice_t *				/* O - Pointer to choice or NULL */
+ppdFindMarkedChoice(ppd_file_t *ppd,	/* I - PPD file */
+                    char       *option)	/* I - Keyword/option name */
+{
+  int		i;		/* Looping var */
+  ppd_option_t	*o;		/* Pointer to option */
+  ppd_choice_t	*c;		/* Pointer to choice */
+
+
+  if ((o = ppdFindOption(ppd, option)) == NULL)
+    return (NULL);
+
+  for (i = o->num_choices, c = o->choices; i > 0; i --, c ++)
+    if (c->marked)
+      return (c);
+
+  return (NULL);
+}
+
+
+/*
+ * 'ppdFindOption()' - Return a pointer to the specified option.
+ */
+
+ppd_option_t *				/* O - Pointer to option or NULL */
+ppdFindOption(ppd_file_t *ppd,		/* I - PPD file data */
+              char       *option)	/* I - Option/Keyword name */
+{
+  int		i, j, k;	/* Looping vars */
+  ppd_option_t	*o;		/* Pointer to option */
+  ppd_group_t	*g,		/* Pointer to group */
+		*sg;		/* Pointer to subgroup */
+
+
+  if (ppd == NULL || option == NULL)
+    return (NULL);
+
+  for (i = ppd->num_groups, g = ppd->groups; i > 0; i --, g ++)
+  {
+    for (j = g->num_options, o = g->options; j > 0; j --, o ++)
+      if (strcmp(o->keyword, option) == 0)
+	return (o);
+
+    for (j = g->num_subgroups, sg = g->subgroups; j > 0; j --, sg ++)
+      for (k = sg->num_options, o = sg->options; k > 0; k --, o ++)
+	if (strcmp(o->keyword, option) == 0)
+	  return (o);
+  }
+
+  return (NULL);
+}
+
+
+/*
+ * 'ppdIsMarked()' - Check to see if an option is marked...
+ */
+
+int				/* O - Non-zero if option is marked */
+ppdIsMarked(ppd_file_t *ppd,	/* I - PPD file data */
+            char       *option,	/* I - Option/Keyword name */
+            char       *choice)	/* I - Choice name */
+{
+  ppd_option_t	*o;		/* Option pointer */
+  ppd_choice_t	*c;		/* Choice pointer */
+
+
+  if (ppd == NULL)
+    return (0);
+
+  if ((o = ppdFindOption(ppd, option)) == NULL)
+    return (0);
+
+  if ((c = ppdFindChoice(o, choice)) == NULL)
+    return (0);
+
+  return (c->marked);
+}
+
+
+/*
+ * 'ppdMarkDefaults()' - Mark all default options in the PPD file.
+ */
+
+void
+ppdMarkDefaults(ppd_file_t *ppd)/* I - PPD file record */
+{
+  int		i;		/* Looping variables */
+  ppd_group_t	*g;		/* Current group */
+  ppd_option_t	*o;		/* PageSize option */
+
+
+  if (ppd == NULL)
+    return;
+
+  for (i = ppd->num_groups, g = ppd->groups; i > 0; i --, g ++)
+    ppd_defaults(g);
+
+  o = ppdFindOption(ppd, "PageSize");
+
+  for (i = 0; i < ppd->num_sizes; i ++)
+    ppd->sizes[i].marked = strcmp(ppd->sizes[i].name, o->defchoice) == 0;
+}
+
+
+/*
+ * 'ppdMarkOption()' - Mark an option in a PPD file.
+ *
+ * Notes:
+ *
+ *   -1 is returned if the given option would conflict with any currently
+ *   selected option.
+ */
+
+int					/* O - Number of conflicts */
+ppdMarkOption(ppd_file_t *ppd,		/* I - PPD file record */
+              char       *option,	/* I - Keyword */
+              char       *choice)	/* I - Option name */
+{
+  int		i;		/* Looping var */
+  ppd_option_t	*o;		/* Option pointer */
+  ppd_choice_t	*c;		/* Choice pointer */
+
+
+  if (ppd == NULL)
+    return (0);
+
+  if (strcmp(option, "PageSize") == 0 && strncmp(choice, "Custom.", 7) == 0)
+  {
+   /*
+    * Handle variable page sizes...
+    */
+
+    ppdPageSize(ppd, choice);
+    choice = "Custom";
+  }
+
+  if ((o = ppdFindOption(ppd, option)) == NULL)
+    return (0);
+
+  for (i = o->num_choices, c = o->choices; i > 0; i --, c ++)
+    if (strcmp(c->choice, choice) == 0)
+      c->marked = 1;
+    else if (o->ui != PPD_UI_PICKMANY)
+      c->marked = 0;
+
+  if (strcmp(option, "PageSize") == 0 || strcmp(option, "PageRegion") == 0)
+  {
+   /*
+    * Mark current page size...
+    */
+
+    for (i = 0; i < ppd->num_sizes; i ++)
+      ppd->sizes[i].marked = strcmp(ppd->sizes[i].name, choice) == 0;
+
+   /*
+    * Unmark the current PageSize or PageRegion setting, as appropriate...
+    */
+
+    if (strcmp(option, "PageSize") == 0)
+    {
+      o = ppdFindOption(ppd, "PageRegion");
+      for (i = 0; i < o->num_choices; i ++)
+        o->choices[i].marked = 0;
+    }
+    else
+    {
+      o = ppdFindOption(ppd, "PageSize");
+      for (i = 0; i < o->num_choices; i ++)
+        o->choices[i].marked = 0;
+    }
+  }
+
+  return (ppdConflicts(ppd));
+}
+
+
+/*
+ * 'ppd_defaults()' - Set the defaults for this group and all sub-groups.
+ */
+
+static void
+ppd_defaults(ppd_group_t *g)	/* I - Group to default */
+{
+  int		i;		/* Looping var */
+  ppd_option_t	*o;		/* Current option */
+  ppd_group_t	*sg;		/* Current sub-group */
+
+
+  if (g == NULL)
+    return;
+
+  for (i = g->num_options, o = g->options; i > 0; i --, o ++)
+    if (strcmp(o->keyword, "PageRegion") != 0)
+      ppd_default(o);
+
+  for (i = g->num_subgroups, sg = g->subgroups; i > 0; i --, sg ++)
+    ppd_defaults(sg);
+}
+
+
+/*
+ * 'ppd_default()' - Set the default choice for an option.
+ */
+
+static void
+ppd_default(ppd_option_t *o)	/* I - Option to default */
+{
+  int		i;		/* Looping var */
+  ppd_choice_t	*c;		/* Current choice */
+
+
+  if (o == NULL)
+    return;
+
+  for (i = o->num_choices, c = o->choices; i > 0; i --, c ++)
+    if (strcmp(c->choice, o->defchoice) == 0)
+      c->marked = 1;
+    else
+      c->marked = 0;
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,611 @@
+/*
+ * "$Id$"
+ *
+ *   MIME database file routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 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
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   mimeDelete()   - Delete (free) a MIME database.
+ *   mimeMerge()    - Merge a MIME database from disk with the current one.
+ *   mimeNew()      - Create a new, empty MIME database.
+ *   load_types()   - Load a xyz.types file...
+ *   delete_rules() - Free all memory for the given rule tree.
+ *   load_convs()   - Load a xyz.convs file...
+ *
+ * Revision History:
+ *
+ *   $Log: mime.c,v $
+ *   Revision 1.12  1999/04/21 21:19:33  mike
+ *   Changes for HP-UX.
+ *
+ *   Revision 1.11  1999/04/21 19:31:29  mike
+ *   Changed the directory header stuff to use the autoconf-recommended
+ *   sequence of #ifdef's.
+ *
+ *   Changed the language routines to look for the LOCALEDIR environment
+ *   variable, and if it is not defined to use the LOCALEDIR string defined
+ *   in config.h.
+ *
+ *   Revision 1.10  1999/03/01 20:51:53  mike
+ *   Code cleanup - removed extraneous semi-colons...
+ *
+ *   Revision 1.9  1999/02/26 22:00:51  mike
+ *   Added more debug statements.
+ *
+ *   Fixed bugs in cupsPrintFile() - wasn't setting the IPP_TAG_MIMETYPE
+ *   value tag for the file type.
+ *
+ *   Updated conversion filter code to handle wildcards for super-type.
+ *
+ *   Revision 1.8  1999/02/20 16:04:38  mike
+ *   Updated mime.c to scan directories under WIN32.
+ *
+ *   Fixed some compiler warnings under WIN32.
+ *
+ *   Updated VC++ project files.
+ *
+ *   Updated mime.types and mime.convs files for actual registered
+ *   MIME type names.
+ *
+ *   Revision 1.7  1999/02/05 17:40:53  mike
+ *   Added IPP client read/write code.
+ *
+ *   Added string functions missing from some UNIXs.
+ *
+ *   Added option parsing functions.
+ *
+ *   Added IPP convenience functions (not implemented yet).
+ *
+ *   Updated source files to use local string.h as needed (for
+ *   missing string functions)
+ *
+ *   Revision 1.6  1999/02/01 22:08:39  mike
+ *   Restored original directory-scanning functionality of mimeLoad().
+ *
+ *   Revision 1.4  1999/01/27 18:31:56  mike
+ *   Updated PPD routines to handle emulations and patch files.
+ *
+ *   Added DSC comments to emit output as appropriate.
+ *
+ *   Revision 1.3  1999/01/24 14:18:43  mike
+ *   Check-in prior to CVS use.
+ *
+ *   Revision 1.2  1998/08/06 14:38:38  mike
+ *   Finished coding and testing for CUPS 1.0.
+ *
+ *   Revision 1.1  1998/06/11 20:50:53  mike
+ *   Initial revision
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include "string.h"
+#include "mime.h"
+
+#if defined(WIN32) || defined(__EMX__)
+#  include <windows.h>
+#elif HAVE_DIRENT_H
+#  include <dirent.h>
+typedef struct dirent DIRENT;
+#  define NAMLEN(dirent) strlen((dirent)->d_name)
+#else
+#  if HAVE_SYS_NDIR_H
+#    include <sys/ndir.h>
+#  endif
+#  if HAVE_SYS_DIR_H
+#    include <sys/dir.h>
+#  endif
+#  if HAVE_NDIR_H
+#    include <ndir.h>
+#  endif
+typedef struct direct DIRENT;
+#  define NAMLEN(dirent) (dirent)->d_namlen
+#endif
+
+
+/*
+ * Local functions...
+ */
+
+static void	load_types(mime_t *mime, char *filename);
+static void	load_convs(mime_t *mime, char *filename);
+static void	delete_rules(mime_magic_t *rules);
+
+
+/*
+ * 'mimeDelete()' - Delete (free) a MIME database.
+ */
+
+void
+mimeDelete(mime_t *mime)	/* I - MIME database */
+{
+  int	i;			/* Looping var */
+
+
+  if (mime == NULL)
+    return;
+
+ /*
+  * Loop through the file types and delete any rules...
+  */
+
+  for (i = 0; i < mime->num_types; i ++)
+  {
+    delete_rules(mime->types[i]->rules);
+    free(mime->types[i]);
+  }
+
+ /*
+  * Free the types and filters arrays, and then the MIME database structure.
+  */
+
+  free(mime->types);
+  free(mime->filters);
+  free(mime);
+}
+
+
+/*
+ * 'mimeMerge()' - Merge a MIME database from disk with the current one.
+ */
+
+mime_t *			/* O - Updated MIME database */
+mimeMerge(mime_t *mime,		/* I - MIME database to add to */
+          char   *pathname)	/* I - Directory to load */
+{
+#if defined(WIN32) || defined(__EMX__)
+  HANDLE	dir;		/* Directory handle */
+  WIN32_FIND_DATA dent;		/* Directory entry */
+  char		filename[1024],	/* Full filename of types/converts file */
+		*pathsep;	/* Last character in path */
+
+
+ /*
+  * First open the directory specified by pathname...  Return NULL if nothing
+  * was read or if the pathname is NULL...
+  */
+
+  if (pathname == NULL)
+    return (NULL);
+
+  strcpy(filename, pathname);
+  pathsep = filename + strlen(filename);
+  if (pathsep == filename ||
+      (pathsep[-1] != '/' && pathsep[-1] != '\\'))
+  {
+    strcpy(pathsep, "/");
+    pathsep ++;
+  }
+
+  strcpy(pathsep, "*.types");
+  
+  if ((dir = FindFirstFile(filename, &dent)) == 0)
+    return (NULL);
+
+ /*
+  * If "mime" is NULL, make a new, blank database...
+  */
+
+  if (mime == NULL)
+    if ((mime = mimeNew()) == NULL)
+      return (NULL);
+
+ /*
+  * Read all the .types files...
+  */
+
+  do
+  {
+   /*
+    * Load a mime.types file...
+    */
+
+    strcpy(pathsep, dent.cFileName);
+    load_types(mime, filename);
+  }
+  while (FindNextFile(dir, &dent));
+
+  FindClose(dir);
+
+ /*
+  * Read all the .convs files...
+  */
+
+  strcpy(pathsep, "*.convs");
+  
+  if ((dir = FindFirstFile(filename, &dent)) == 0)
+    return (mime);
+
+  do
+  {
+   /*
+    * Load a mime.convs file...
+    */
+
+    strcpy(pathsep, dent.cFileName);
+    load_convs(mime, filename);
+  }
+  while (FindNextFile(dir, &dent));
+
+  FindClose(dir);
+
+  return (mime);
+#else
+  DIR		*dir;		/* Directory */
+  DIRENT	*dent;		/* Directory entry */
+  char		filename[1024];	/* Full filename of types/converts file */
+
+
+ /*
+  * First open the directory specified by pathname...  Return NULL if nothing
+  * was read or if the pathname is NULL...
+  */
+
+  if (pathname == NULL)
+    return (NULL);
+
+  if ((dir = opendir(pathname)) == NULL)
+    return (NULL);
+
+ /*
+  * If "mime" is NULL, make a new, blank database...
+  */
+
+  if (mime == NULL)
+    if ((mime = mimeNew()) == NULL)
+      return (NULL);
+
+ /*
+  * Read all the .types files...
+  */
+
+  while ((dent = readdir(dir)) != NULL)
+  {
+    if (NAMLEN(dent) > 6 &&
+        strcmp(dent->d_name + NAMLEN(dent) - 6, ".types") == 0)
+    {
+     /*
+      * Load a mime.types file...
+      */
+
+      sprintf(filename, "%s/%s", pathname, dent->d_name);
+      load_types(mime, filename);
+    }
+  }
+
+  rewinddir(dir);
+
+ /*
+  * Read all the .convs files...
+  */
+
+  while ((dent = readdir(dir)) != NULL)
+  {
+    if (NAMLEN(dent) > 6 &&
+        strcmp(dent->d_name + NAMLEN(dent) - 6, ".convs") == 0)
+    {
+     /*
+      * Load a mime.convs file...
+      */
+
+      sprintf(filename, "%s/%s", pathname, dent->d_name);
+      load_convs(mime, filename);
+    }
+  }
+
+  closedir(dir);
+
+  return (mime);
+#endif /* WIN32 || __EMX__ */
+}
+
+
+/*
+ * 'mimeNew()' - Create a new, empty MIME database.
+ */
+
+mime_t *			/* O - MIME database */
+mimeNew(void)
+{
+  return ((mime_t *)calloc(1, sizeof(mime_t)));
+}
+
+
+/*
+ * 'load_types()' - Load a xyz.types file...
+ */
+
+static void
+load_types(mime_t *mime,		/* I - MIME database */
+           char   *filename)		/* I - Types file to load */
+{
+  FILE		*fp;			/* Types file */
+  int		linelen;		/* Length of line */
+  char		line[65536],		/* Input line from file */
+		*lineptr,		/* Current position in line */
+		super[MIME_MAX_SUPER],	/* Super-type name */
+		type[MIME_MAX_TYPE],	/* Type name */
+		*temp;			/* Temporary pointer */
+  mime_type_t	*typeptr;		/* New MIME type */
+
+
+ /*
+  * First try to open the file...
+  */
+
+  if ((fp = fopen(filename, "r")) == NULL)
+    return;
+
+ /*
+  * Then read each line from the file, skipping any comments in the file...
+  */
+
+  while (fgets(line, sizeof(line), fp) != NULL)
+  {
+    linelen = strlen(line);
+
+   /*
+    * While the last character in the line is a backslash, continue on to the
+    * next line (and the next, etc.)
+    */
+
+    if (line[linelen - 1] == '\n')
+    {
+      line[linelen - 1] = '\0';
+      linelen --;
+    }
+
+    while (line[linelen - 1] == '\\')
+    {
+      linelen --;
+
+      if (fgets(line + linelen, sizeof(line) - linelen, fp) == NULL)
+        line[linelen] = '\0';
+      else
+      {
+        linelen += strlen(line + linelen);
+	if (line[linelen - 1] == '\n')
+	{
+	  line[linelen - 1] = '\0';
+	  linelen --;
+	}
+      }
+    }
+
+   /*
+    * Skip blank lines and lines starting with a #...
+    */
+
+    if (line[0] == '\n' || line[0] == '#')
+      continue;
+
+   /*
+    * Extract the super-type and type names from the beginning of the line.
+    */
+
+    lineptr = line;
+    temp    = super;
+
+    while (*lineptr != '/' && *lineptr != '\n' && *lineptr != '\0' &&
+           (temp - super + 1) < MIME_MAX_SUPER)
+      *temp++ = tolower(*lineptr++);
+
+    *temp = '\0';
+
+    if (*lineptr != '/')
+      continue;
+
+    lineptr ++;
+    temp = type;
+
+    while (*lineptr != ' ' && *lineptr != '\t' && *lineptr != '\n' &&
+           *lineptr != '\0' && (temp - type + 1) < MIME_MAX_TYPE)
+      *temp++ = tolower(*lineptr++);
+
+    *temp = '\0';
+
+   /*
+    * Add the type and rules to the MIME database...
+    */
+
+    typeptr = mimeAddType(mime, super, type);
+    mimeAddTypeRule(typeptr, lineptr);
+  }
+}
+
+
+/*
+ * 'load_convs()' - Load a xyz.convs file...
+ */
+
+static void
+load_convs(mime_t *mime,		/* I - MIME database */
+           char   *filename)		/* I - Convs file to load */
+{
+  int		i;			/* Looping var */
+  FILE		*fp;			/* Convs file */
+  char		line[1024],		/* Input line from file */
+		*lineptr,		/* Current position in line */
+		super[MIME_MAX_SUPER],	/* Super-type name */
+		type[MIME_MAX_TYPE],	/* Type name */
+		*temp,			/* Temporary pointer */
+		*filter;		/* Filter program */
+  mime_type_t	**temptype,		/* MIME type looping var */
+		*dsttype;		/* Destination MIME type */
+  int		cost;			/* Cost of filter */
+
+
+ /*
+  * First try to open the file...
+  */
+
+  if ((fp = fopen(filename, "r")) == NULL)
+    return;
+
+ /*
+  * Then read each line from the file, skipping any comments in the file...
+  */
+
+  while (fgets(line, sizeof(line), fp) != NULL)
+  {
+   /*
+    * Skip blank lines and lines starting with a #...
+    */
+
+    if (line[0] == '\n' || line[0] == '#')
+      continue;
+
+   /*
+    * Extract the destination super-type and type names from the middle of
+    * the line.
+    */
+
+    lineptr = line;
+    while (*lineptr != ' ' && *lineptr != '\t' && *lineptr != '\0')
+      lineptr ++;
+
+    while (*lineptr == ' ' || *lineptr == '\t')
+      lineptr ++;
+
+    temp = super;
+
+    while (*lineptr != '/' && *lineptr != '\n' && *lineptr != '\0' &&
+           (temp - super + 1) < MIME_MAX_SUPER)
+      *temp++ = tolower(*lineptr++);
+
+    *temp = '\0';
+
+    if (*lineptr != '/')
+      continue;
+
+    lineptr ++;
+    temp = type;
+
+    while (*lineptr != ' ' && *lineptr != '\t' && *lineptr != '\n' &&
+           *lineptr != '\0' && (temp - type + 1) < MIME_MAX_TYPE)
+      *temp++ = tolower(*lineptr++);
+
+    *temp = '\0';
+
+    if (*lineptr == '\0' || *lineptr == '\n')
+      continue;
+
+    if ((dsttype = mimeType(mime, super, type)) == NULL)
+      continue;
+
+   /*
+    * Then get the cost and filter program...
+    */
+
+    while (*lineptr == ' ' || *lineptr == '\t')
+      lineptr ++;
+
+    if (*lineptr < '0' || *lineptr > '9')
+      continue;
+
+    cost = atoi(lineptr);
+
+    while (*lineptr != ' ' && *lineptr != '\t' && *lineptr != '\0')
+      lineptr ++;
+    while (*lineptr == ' ' || *lineptr == '\t')
+      lineptr ++;
+
+    if (*lineptr == '\0' || *lineptr == '\n')
+      continue;
+
+    filter = lineptr;
+    if (filter[strlen(filter) - 1] == '\n')
+      filter[strlen(filter) - 1] = '\0';
+
+   /*
+    * Finally, get the source super-type and type names from the beginning of
+    * the line.  We do it here so we can support wildcards...
+    */
+
+    lineptr = line;
+    temp    = super;
+
+    while (*lineptr != '/' && *lineptr != '\n' && *lineptr != '\0' &&
+           (temp - super + 1) < MIME_MAX_SUPER)
+      *temp++ = tolower(*lineptr++);
+
+    *temp = '\0';
+
+    if (*lineptr != '/')
+      continue;
+
+    lineptr ++;
+    temp = type;
+
+    while (*lineptr != ' ' && *lineptr != '\t' && *lineptr != '\n' &&
+           *lineptr != '\0' && (temp - type + 1) < MIME_MAX_TYPE)
+      *temp++ = tolower(*lineptr++);
+
+    *temp = '\0';
+
+   /*
+    * Add the filter to the MIME database, supporting wildcards as needed...
+    */
+
+    for (temptype = mime->types, i = 0; i < mime->num_types; i ++, temptype ++)
+      if ((super[0] == '*' || strcmp((*temptype)->super, super) == 0) &&
+          (type[0] == '*' || strcmp((*temptype)->type, type) == 0))
+	mimeAddFilter(mime, *temptype, dsttype, cost, filter);
+  }
+}
+
+
+/*
+ * 'delete_rules()' - Free all memory for the given rule tree.
+ */
+
+static void
+delete_rules(mime_magic_t *rules)	/* I - Rules to free */
+{
+  mime_magic_t	*next;			/* Next rule to free */
+
+
+ /*
+  * Free the rules list, descending recursively to free any child rules.
+  */
+
+  while (rules != NULL)
+  {
+    next = rules->next;
+
+    if (rules->child != NULL)
+      delete_rules(rules->child);
+
+    free(rules);
+    rules = next;
+  }
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,137 @@
+/*
+ * "$Id$"
+ *
+ *   MIME type/conversion database definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 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
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ */
+
+#ifndef _MIME_H_
+#  define _MIME_H_
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef _cplusplus
+extern "C" {
+#  endif /* _cplusplus */
+
+
+/*
+ * Constants...
+ */
+
+#  define MIME_MAX_SUPER	16	/* Maximum size of supertype name */
+#  define MIME_MAX_TYPE		32	/* Maximum size of type name */
+#  define MIME_MAX_FILTER	256	/* Maximum size of filter pathname */
+#  define MIME_MAX_BUFFER	8192	/* Maximum size of file buffer */
+
+
+/*
+ * Types/structures...
+ */
+
+typedef enum
+{
+  MIME_MAGIC_NOP,	/* No operation */
+  MIME_MAGIC_AND,	/* Logical AND of all children */
+  MIME_MAGIC_OR,	/* Logical OR of all children */
+  MIME_MAGIC_MATCH,	/* Filename match */
+  MIME_MAGIC_ASCII,	/* ASCII characters in range */
+  MIME_MAGIC_PRINTABLE,	/* Printable characters (32-255) in range */
+  MIME_MAGIC_STRING,	/* String matches */
+  MIME_MAGIC_CHAR,	/* Character/byte matches */
+  MIME_MAGIC_SHORT,	/* Short/16-bit word matches */
+  MIME_MAGIC_INT,	/* Integer/32-bit word matches */
+  MIME_MAGIC_LOCALE	/* Current locale matches string */
+} mime_op_t;
+
+typedef struct mime_magic_str		/**** MIME Magic Data ****/
+{
+  struct mime_magic_str	*prev,		/* Previous rule */
+			*next,		/* Next rule */
+			*parent,	/* Parent rules */
+			*child;		/* Child rules */
+  short		op,			/* Operation code (see above) */
+		invert;			/* Invert the result */
+  int		offset,			/* Offset in file */
+		length;			/* Length of data */
+  union
+  {
+    char	matchv[64];		/* Match value */
+    char	localev[64];		/* Locale value */
+    char	stringv[64];		/* String value */
+    char	charv;			/* Byte value */
+    short	shortv;			/* Short value */
+    int		intv;			/* Integer value */
+  }		value;
+} mime_magic_t;
+
+typedef struct				/**** MIME Type Data ****/
+{
+  char		super[MIME_MAX_SUPER],	/* Super-type name ("image", "application", etc.) */
+		type[MIME_MAX_TYPE];	/* Type name ("png", "postscript", etc.) */
+  mime_magic_t	*rules;			/* Rules used to detect this type */
+} mime_type_t;
+
+typedef struct				/**** MIME Conversion Filter Data ****/
+{
+  mime_type_t	*src,			/* Source type */
+		*dst;			/* Destination type */
+  int		cost;			/* Relative cost */
+  char		filter[MIME_MAX_FILTER];/* Filter program to use */
+} mime_filter_t;
+
+typedef struct				/**** MIME Database ****/
+{
+  int		num_types;		/* Number of file types */
+  mime_type_t	**types;		/* File types */
+  int		num_filters;		/* Number of type conversion filters */
+  mime_filter_t	*filters;		/* Type conversion filters */
+} mime_t;
+
+
+/*
+ * Functions...
+ */
+
+extern void		mimeDelete(mime_t *mime);
+#define mimeLoad(pathname)	mimeMerge((mime_t *)0, (pathname));
+extern mime_t		*mimeMerge(mime_t *mime, char *pathname);
+extern mime_t		*mimeNew(void);
+
+extern mime_type_t	*mimeAddType(mime_t *mime, char *super, char *type);
+extern int		mimeAddTypeRule(mime_type_t *mt, char *rule);
+extern mime_type_t	*mimeFileType(mime_t *mime, char *pathname);
+extern mime_type_t	*mimeType(mime_t *mime, char *super, char *type);
+
+extern mime_filter_t	*mimeAddFilter(mime_t *mime, mime_type_t *src, mime_type_t *dst,
+			               int cost, char *filter);
+extern mime_filter_t	*mimeFilter(mime_t *mime, mime_type_t *src, mime_type_t *dst,
+			            int *num_filters);
+
+#  ifdef _cplusplus
+}
+#  endif /* _cplusplus */
+#endif /* !_MIME_H_ */
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,323 @@
+/*
+ * "$Id$"
+ *
+ *   Option routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   cupsAddOption()    - Add an option to an option array.
+ *   cupsFreeOptions()  - Free all memory used by options.
+ *   cupsGetOption()    - Get an option value.
+ *   cupsParseOptions() - Parse options from a command-line argument.
+ *   cupsMarkOptions()  - Mark command-line options in a PPD file.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cups.h"
+#include <stdlib.h>
+#include <ctype.h>
+#include "string.h"
+
+
+/*
+ * 'cupsAddOption()' - Add an option to an option array.
+ */
+
+int						/* O - Number of options */
+cupsAddOption(char          *name,		/* I - Name of option */
+              char          *value,		/* I - Value of option */
+	      int           num_options,	/* I - Number of options */
+              cups_option_t **options)		/* IO - Pointer to options */
+{
+  int		i;				/* Looping var */
+  cups_option_t	*temp;				/* Pointer to new option */
+
+
+  if (name == NULL || value == NULL || options == NULL)
+    return (0);
+
+ /*
+  * Look for an existing option with the same name...
+  */
+
+  for (i = 0, temp = *options; i < num_options; i ++, temp ++)
+    if (strcmp(temp->name, name) == 0)
+      break;
+
+  if (i >= num_options)
+  {
+   /*
+    * No matching option name...
+    */
+
+    if (num_options == 0)
+      temp = (cups_option_t *)malloc(sizeof(cups_option_t));
+    else
+      temp = (cups_option_t *)realloc(*options, sizeof(cups_option_t) *
+                                        	(num_options + 1));
+
+    if (temp == NULL)
+      return (0);
+
+    *options    = temp;
+    temp        += num_options;
+    temp->name  = strdup(name);
+    num_options ++;
+  }
+  else
+  {
+   /*
+    * Match found; free the old value...
+    */
+
+    free(temp->value);
+  }
+
+  temp->value = strdup(value);
+
+  return (num_options);
+}
+
+
+/*
+ * 'cupsFreeOptions()' - Free all memory used by options.
+ */
+
+void
+cupsFreeOptions(int           num_options,	/* I - Number of options */
+                cups_option_t *options)		/* I - Pointer to options */
+{
+  int	i;					/* Looping var */
+
+
+  if (num_options == 0 || options == NULL)
+    return;
+
+  for (i = 0; i < num_options; i ++)
+  {
+    free(options[i].name);
+    free(options[i].value);
+  }
+
+  free(options);
+}
+
+
+/*
+ * 'cupsGetOption()' - Get an option value.
+ */
+
+char *					/* O - Option value or NULL */
+cupsGetOption(char          *name,	/* I - Name of option */
+              int           num_options,/* I - Number of options */
+              cups_option_t *options)	/* I - Options */
+{
+  int	i;				/* Looping var */
+
+
+  if (name == NULL || num_options == 0 || options == NULL)
+    return (NULL);
+
+  for (i = 0; i < num_options; i ++)
+    if (strcmp(options[i].name, name) == 0)
+      return (options[i].value);
+
+  return (NULL);
+}
+
+
+/*
+ * 'cupsParseOptions()' - Parse options from a command-line argument.
+ */
+
+int						/* O - Number of options found */
+cupsParseOptions(char          *arg,		/* I - Argument to parse */
+                 int           num_options,	/* I - Number of options */
+                 cups_option_t **options)	/* O - Options found */
+{
+  char	*copyarg,				/* Copy of input string */
+	*ptr,					/* Pointer into string */
+	*name,					/* Pointer to name */
+	*value;					/* Pointer to value */
+
+
+  if (arg == NULL || options == NULL)
+    return (0);
+
+ /*
+  * Make a copy of the argument string and then divide it up...
+  */
+
+  copyarg     = strdup(arg);
+  ptr         = copyarg;
+
+  while (*ptr != '\0')
+  {
+   /*
+    * Get the name up to a SPACE, =, or end-of-string...
+    */
+
+    name = ptr;
+    while (!isspace(*ptr) && *ptr != '=' && *ptr != '\0')
+      ptr ++;
+
+   /*
+    * Skip trailing spaces...
+    */
+
+    while (isspace(*ptr))
+      *ptr++ = '\0';
+
+    if (*ptr != '=')
+    {
+     /*
+      * Start of another option...
+      */
+
+      num_options = cupsAddOption(name, "", num_options, options);
+      continue;
+    }
+
+   /*
+    * Remove = and parse the value...
+    */
+
+    *ptr++ = '\0';
+
+    if (*ptr == '\'')
+    {
+     /*
+      * Quoted string constant...
+      */
+
+      ptr ++;
+      value = ptr;
+
+      while (*ptr != '\'' && *ptr != '\0')
+        ptr ++;
+
+      if (*ptr != '\0')
+        *ptr++ = '\0';
+    }
+    else if (*ptr == '\"')
+    {
+     /*
+      * Double-quoted string constant...
+      */
+
+      ptr ++;
+      value = ptr;
+
+      while (*ptr != '\"' && *ptr != '\0')
+        ptr ++;
+
+      if (*ptr != '\0')
+        *ptr++ = '\0';
+    }
+    else
+    {
+     /*
+      * Normal space-delimited string...
+      */
+
+      value = ptr;
+
+      while (!isspace(*ptr) && *ptr != '\0')
+	ptr ++;
+
+      while (isspace(*ptr))
+        *ptr++ = '\0';
+    }
+
+   /*
+    * Add the string value...
+    */
+
+    num_options = cupsAddOption(name, value, num_options, options);
+  }
+
+ /*
+  * Free the copy of the argument we made and return the number of options
+  * found.
+  */
+
+  free(copyarg);
+
+  return (num_options);
+}
+
+
+/*
+ * 'cupsMarkOptions()' - Mark command-line options in a PPD file.
+ */
+
+int						/* O - 1 if conflicting */
+cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
+                int           num_options,	/* I - Number of options */
+                cups_option_t *options)		/* I - Options */
+{
+  int	i;					/* Looping var */
+  int	conflict;				/* Option conflicts */
+
+
+  conflict = 0;
+
+  for (i = num_options; i > 0; i --, options ++)
+    if (strcmp(options->name, "media") == 0)
+    {
+      if (ppdMarkOption(ppd, "PageSize", options->value))
+        conflict = 1;
+      if (ppdMarkOption(ppd, "InputSlot", options->value))
+        conflict = 1;
+      if (ppdMarkOption(ppd, "MediaType", options->value))
+        conflict = 1;
+    }
+    else if (strcmp(options->name, "sides") == 0)
+    {
+      if (strcmp(options->value, "one-sided") == 0)
+      {
+        if (ppdMarkOption(ppd, "Duplex", "None"))
+	  conflict = 1;
+      }
+      else if (strcmp(options->value, "two-sided-long-edge") == 0)
+      {
+        if (ppdMarkOption(ppd, "Duplex", "NoTumble"))
+	  conflict = 1;
+      }
+      else if (strcmp(options->value, "two-sided-short-edge") == 0)
+      {
+        if (ppdMarkOption(ppd, "Duplex", "Tumble"))
+	  conflict = 1;
+      }
+    }
+    else if (ppdMarkOption(ppd, options->name, options->value))
+      conflict = 1;
+
+  return (conflict);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,179 @@
+/*
+ * "$Id$"
+ *
+ *   Page size functions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   PostScript is a trademark of Adobe Systems, Inc.
+ *
+ * Contents:
+ *
+ *   ppdPageSize()   - Get the page size record for the given size.
+ *   ppdPageWidth()  - Get the page width for the given size.
+ *   ppdPageLength() - Get the page length for the given size.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "ppd.h"
+#include "string.h"
+#include <ctype.h>
+
+
+/*
+ * 'ppdPageSize()' - Get the page size record for the given size.
+ */
+
+ppd_size_t *			/* O - Size record for page or NULL */
+ppdPageSize(ppd_file_t *ppd,	/* I - PPD file record */
+            char       *name)	/* I - Size name */
+{
+  int	i;			/* Looping var */
+  float	w, l;			/* Width and length of page */
+  char	units[255];		/* Page size units... */
+
+
+  if (ppd == NULL)
+    return (NULL);
+
+  if (name != NULL)
+  {
+    if (strncmp(name, "Custom.", 7) == 0 &&
+        strcmp(ppd->sizes[0].name, "Custom") == 0)
+    {
+     /*
+      * Variable size; size name can be one of the following:
+      *
+      *    Custom.WIDTHxLENGTHin    - Size in inches
+      *    Custom.WIDTHxLENGTHcm    - Size in centimeters
+      *    Custom.WIDTHxLENGTHmm    - Size in millimeters
+      *    Custom.WIDTHxLENGTH[pt]  - Size in points
+      */
+
+      units[0] = '\0';
+      if (sscanf(name + 7, "%fx%f%s", &w, &l, units) < 2)
+        return (NULL);
+
+      if (strcasecmp(units, "in") == 0)
+      {
+        ppd->sizes[0].width  = w * 72.0;
+	ppd->sizes[0].length = l * 72.0;
+	ppd->sizes[0].left   = ppd->custom_margins[0];
+	ppd->sizes[0].bottom = ppd->custom_margins[1];
+	ppd->sizes[0].right  = w * 72.0 - ppd->custom_margins[2];
+	ppd->sizes[0].top    = l * 72.0 - ppd->custom_margins[3];
+      }
+      else if (strcasecmp(units, "cm") == 0)
+      {
+        ppd->sizes[0].width  = w * 2.54 * 72.0;
+	ppd->sizes[0].length = l * 2.54 * 72.0;
+	ppd->sizes[0].left   = ppd->custom_margins[0];
+	ppd->sizes[0].bottom = ppd->custom_margins[1];
+	ppd->sizes[0].right  = w * 2.54 * 72.0 - ppd->custom_margins[2];
+	ppd->sizes[0].top    = l * 2.54 * 72.0 - ppd->custom_margins[3];
+      }
+      else if (strcasecmp(units, "mm") == 0)
+      {
+        ppd->sizes[0].width  = w * 25.4 * 72.0;
+	ppd->sizes[0].length = l * 25.4 * 72.0;
+	ppd->sizes[0].left   = ppd->custom_margins[0];
+	ppd->sizes[0].bottom = ppd->custom_margins[1];
+	ppd->sizes[0].right  = w * 25.4 * 72.0 - ppd->custom_margins[2];
+	ppd->sizes[0].top    = l * 25.4 * 72.0 - ppd->custom_margins[3];
+      }
+      else
+      {
+        ppd->sizes[0].width  = w;
+	ppd->sizes[0].length = l;
+	ppd->sizes[0].left   = ppd->custom_margins[0];
+	ppd->sizes[0].bottom = ppd->custom_margins[1];
+	ppd->sizes[0].right  = w - ppd->custom_margins[2];
+	ppd->sizes[0].top    = l - ppd->custom_margins[3];
+      }
+
+      return (ppd->sizes);
+    }
+    else
+    {
+     /*
+      * Lookup by name...
+      */
+
+      for (i = 0; i < ppd->num_sizes; i ++)
+	if (strcmp(name, ppd->sizes[i].name) == 0)
+          return (ppd->sizes + i);
+    }
+  }
+  else
+  {
+   /*
+    * Find default...
+    */
+
+    for (i = 0; i < ppd->num_sizes; i ++)
+      if (ppd->sizes[i].marked)
+        return (ppd->sizes + i);
+  }
+
+  return (NULL);
+}
+
+
+/*
+ * 'ppdPageWidth()' - Get the page width for the given size.
+ */
+
+float				/* O - Width of page in points or 0.0 */
+ppdPageWidth(ppd_file_t *ppd,	/* I - PPD file record */
+             char       *name)	/* I - Size name */
+{
+  ppd_size_t	*size;		/* Page size */
+
+
+  if ((size = ppdPageSize(ppd, name)) == NULL)
+    return (0.0);
+  else
+    return (size->width);
+}
+
+
+/*
+ * 'ppdPageLength()' - Get the page length for the given size.
+ */
+
+float				/* O - Length of page in points or 0.0 */
+ppdPageLength(ppd_file_t *ppd,	/* I - PPD file */
+              char       *name)	/* I - Size name */
+{
+  ppd_size_t	*size;		/* Page size */
+
+
+  if ((size = ppdPageSize(ppd, name)) == NULL)
+    return (0.0);
+  else
+    return (size->length);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,238 @@
+/*
+ * "$Id$"
+ *
+ *   PostScript Printer Description definitions for the Common UNIX Printing
+ *   System (CUPS).
+ *
+ *   Copyright 1997-1999 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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   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.
+ */
+
+#ifndef _CUPS_PPD_H_
+#  define _CUPS_PPD_H_
+
+/*
+ * Include necessary headers...
+ */
+
+#  include <stdio.h>
+
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+
+/*
+ * PPD version...
+ */
+
+#  define PPD_VERSION	4.3	/* Kept in sync with Adobe version number */
+
+
+/*
+ * Types and structures...
+ */
+
+typedef enum			/**** UI types ****/
+{
+  PPD_UI_BOOLEAN,		/* True or False option */
+  PPD_UI_PICKONE,		/* Pick one from a list */
+  PPD_UI_PICKMANY		/* Pick zero or more from a list */
+} ppd_ui_t;
+
+typedef enum			/**** Order dependency sections ****/
+{
+  PPD_ORDER_ANY,		/* Option code can be anywhere in the file */
+  PPD_ORDER_DOCUMENT,		/* ... must be in the DocumentSetup section */
+  PPD_ORDER_EXIT,		/* ... must be sent prior to the document */
+  PPD_ORDER_JCL,		/* ... must be sent as a JCL command */
+  PPD_ORDER_PAGE,		/* ... must be in the PageSetup section */
+  PPD_ORDER_PROLOG		/* ... must be in the Prolog section */
+} ppd_section_t;
+
+typedef enum			/**** Colorspaces ****/
+{
+  PPD_CS_CMYK = -4,		/* CMYK colorspace */
+  PPD_CS_CMY,			/* CMY colorspace */
+  PPD_CS_GRAY = 1,		/* Grayscale colorspace */
+  PPD_CS_RGB = 3,		/* RGB colorspace */
+  PPD_CS_RGBK,			/* RGBK (K = gray) colorspace */
+  PPD_CS_N			/* DeviceN colorspace */
+} ppd_cs_t;
+
+typedef struct			/**** Option choices ****/
+{
+  char		marked,		/* 0 if not selected, 1 otherwise */
+		choice[41],	/* Computer-readable option name */
+		text[81],	/* Human-readable option name */
+		*code;		/* Code to send for this option */
+  void		*option;	/* Pointer to parent option structure */
+} ppd_choice_t;
+
+typedef struct			/**** Options ****/
+{
+  char		conflicted,	/* 0 if no conflicts exist, 1 otherwise */
+		keyword[41],	/* Option keyword name ("PageSize", etc.) */
+		defchoice[41],	/* Default option choice */
+		text[81];	/* Human-readable text */
+  ppd_ui_t	ui;		/* Type of UI option */
+  ppd_section_t	section;	/* Section for command */
+  float		order;		/* Order number */
+  int		num_choices;	/* Number of option choices */
+  ppd_choice_t	*choices;	/* Option choices */
+} ppd_option_t;
+
+typedef struct ppd_group_str	/**** Groups ****/
+{
+  char		text[81];	/* Human-readable group name */
+  int		num_options;	/* Number of options */
+  ppd_option_t	*options;	/* Options */
+  int		num_subgroups;	/* Number of sub-groups */
+  struct ppd_group_str	*subgroups;
+				/* Sub-groups (max depth = 1) */
+} ppd_group_t;
+
+typedef struct			/**** Constraints ****/
+{
+  char		option1[41],	/* First keyword */
+		choice1[41],	/* First option/choice (blank for all) */
+		option2[41],	/* Second keyword */
+		choice2[41];	/* Second option/choice (blank for all) */
+} ppd_const_t;
+
+typedef struct			/**** Page Sizes ****/
+{
+  int		marked;		/* Page size selected? */
+  char		name[41];	/* Media size option */
+  float		width,		/* Width of media in points */
+		length,		/* Length of media in points */
+		left,		/* Left printable margin in points */
+		bottom,		/* Bottom printable margin in points */
+		right,		/* Right printable margin in points */
+		top;		/* Top printable margin in points */
+} ppd_size_t;
+
+typedef struct			/**** Emulators ****/
+{
+  char		name[41],	/* Emulator name */
+		*start,		/* Code to switch to this emulation */
+		*stop;		/* Code to stop this emulation */
+} ppd_emul_t;
+
+typedef struct			/**** sRGB Color Profiles ****/
+{
+  char		resolution[41],	/* Resolution or "-" */
+		media_type[41];	/* Media type of "-" */
+  float		density,	/* Ink density to use */
+		matrix[3][3];	/* Transform matrix */
+} ppd_profile_t;
+
+typedef struct			/**** Files ****/
+{
+  int		language_level,	/* Language level of device */
+		color_device,	/* 1 = color device, 0 = grayscale */
+		variable_sizes,	/* 1 = supports variable sizes, 0 = doesn't */
+		accurate_screens,/* 1 = supports accurate screens, 0 = not */
+		contone_only,	/* 1 = continuous tone only, 0 = not */
+		landscape,	/* -90 or 90 */
+		model_number,	/* Device-specific model number */
+		manual_copies;	/* 1 = Copies done manually, 0 = hardware */
+  ppd_cs_t	colorspace;	/* Default colorspace */
+  char		*patches;	/* Patch commands to be sent to printer */
+  int		num_emulations;	/* Number of emulations supported */
+  ppd_emul_t	*emulations;	/* Emulations and the code to invoke them */
+  char		*jcl_begin,	/* Start JCL commands */
+		*jcl_ps,	/* Enter PostScript interpreter */
+		*jcl_end,	/* End JCL commands */
+		*lang_encoding,	/* Language encoding */
+		*lang_version,	/* Language version (English, Spanish, etc.) */
+		*modelname,	/* Model name (general) */
+		*ttrasterizer,	/* Truetype rasterizer */
+		*manufacturer,	/* Manufacturer name */
+		*product,	/* Product name (from PS RIP/interpreter) */
+		*nickname,	/* Nickname (specific) */
+		*shortnickname;	/* Short version of nickname */
+  int		num_groups;	/* Number of UI groups */
+  ppd_group_t	*groups;	/* UI groups */
+  int		num_sizes;	/* Number of page sizes */
+  ppd_size_t	*sizes;		/* Page sizes */
+  float		custom_min[2],	/* Minimum variable page size */
+		custom_max[2],	/* Maximum variable page size */
+		custom_margins[4];/* Margins around page */
+  int		num_consts;	/* Number of UI/Non-UI constraints */
+  ppd_const_t	*consts;	/* UI/Non-UI constraints */
+  int		num_fonts;	/* Number of pre-loaded fonts */
+  char		**fonts;	/* Pre-loaded fonts */
+  int		num_profiles;	/* Number of sRGB color profiles */
+  ppd_profile_t	*profiles;	/* sRGB color profiles */
+  int		num_filters;	/* Number of filters */
+  char		**filters;	/* Filter strings... */
+} ppd_file_t;
+
+
+/*
+ * Prototypes...
+ */
+
+extern void		ppdClose(ppd_file_t *ppd);
+extern int		ppdConflicts(ppd_file_t *ppd);
+extern int		ppdEmit(ppd_file_t *ppd, FILE *fp,
+			        ppd_section_t section);
+extern int		ppdEmitFd(ppd_file_t *ppd, int fd,
+			          ppd_section_t section);
+extern int		ppdIsMarked(ppd_file_t *ppd, char *keyword,
+			            char *option);
+extern void		ppdMarkDefaults(ppd_file_t *ppd);
+extern int		ppdMarkOption(ppd_file_t *ppd, char *keyword,
+			              char *option);
+extern ppd_choice_t	*ppdFindChoice(ppd_option_t *o, char *option);
+extern ppd_choice_t	*ppdFindMarkedChoice(ppd_file_t *ppd, char *keyword);
+extern ppd_option_t	*ppdFindOption(ppd_file_t *ppd, char *keyword);
+extern ppd_file_t	*ppdOpen(FILE *fp);
+extern ppd_file_t	*ppdOpenFd(int fd);
+extern ppd_file_t	*ppdOpenFile(char *filename);
+extern float		ppdPageLength(ppd_file_t *ppd, char *name);
+extern ppd_size_t	*ppdPageSize(ppd_file_t *ppd, char *name);
+extern float		ppdPageWidth(ppd_file_t *ppd, char *name);
+
+/*
+ * C++ magic...
+ */
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+#endif /* !_CUPS_PPD_H_ */
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,252 @@
+/*
+ * "$Id$"
+ *
+ *   Raster file routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   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 for the CUPS Raster source
+ *   files are outlined in the GNU Library General Public License, located
+ *   in the "pstoraster" directory.  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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   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.
+ *
+ * Contents:
+ *
+ *   cupsRasterClose()       - Close a raster stream.
+ *   cupsRasterOpen()        - Open a raster stream.
+ *   cupsRasterReadHeader()  - Read a raster page header.
+ *   cupsRasterReadPixels()  - Read raster pixels.
+ *   cupsRasterWriteHeader() - Write a raster page header.
+ *   cupsRasterWritePixels() - Write raster pixels.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "raster.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#if defined(WIN32) || defined(__EMX__)
+#  include <io.h>
+#else
+#  include <unistd.h>
+#endif /* WIN32 || __EMX__ */
+
+
+/*
+ * 'cupsRasterClose()' - Close a raster stream.
+ */
+
+void
+cupsRasterClose(cups_raster_t *r)	/* I - Stream to close */
+{
+  if (r != NULL)
+    free(r);
+}
+
+
+/*
+ * 'cupsRasterOpen()' - Open a raster stream.
+ */
+
+cups_raster_t *				/* O - New stream */
+cupsRasterOpen(int         fd,		/* I - File descriptor */
+               cups_mode_t mode)	/* I - Mode */
+{
+  cups_raster_t	*r;			/* New stream */
+
+
+  if ((r = calloc(sizeof(cups_raster_t), 1)) == NULL)
+    return (NULL);
+
+  r->fd   = fd;
+  r->mode = mode;
+
+  if (mode == CUPS_RASTER_READ)
+  {
+   /*
+    * Open for read - get sync word...
+    */
+
+    if (read(fd, &(r->sync), sizeof(r->sync)) < sizeof(r->sync))
+    {
+      free(r);
+      return (NULL);
+    }
+
+    if (r->sync != CUPS_RASTER_SYNC &&
+        r->sync != CUPS_RASTER_REVSYNC)
+    {
+      free(r);
+      return (NULL);
+    }
+  }
+  else
+  {
+   /*
+    * Open for write - put sync word...
+    */
+
+    r->sync = CUPS_RASTER_SYNC;
+    if (write(fd, &(r->sync), sizeof(r->sync)) < sizeof(r->sync))
+    {
+      free(r);
+      return (NULL);
+    }
+  }
+
+  return (r);
+}
+
+
+/*
+ * 'cupsRasterReadHeader()' - Read a raster page header.
+ */
+
+unsigned					/* O - 1 on success, 0 on fail */
+cupsRasterReadHeader(cups_raster_t      *r,	/* I - Raster stream */
+                     cups_page_header_t *h)	/* I - Pointer to header data */
+{
+  int		len;				/* Number of words to swap */
+  union swap_s					/* Swapping structure */
+  {
+    unsigned char	b[4];
+    unsigned		v;
+  }		*s;
+
+
+  if (r == NULL || r->mode != CUPS_RASTER_READ)
+    return (0);
+
+  if (cupsRasterReadPixels(r, (unsigned char *)h, sizeof(cups_page_header_t)) <
+          sizeof(cups_page_header_t))
+    return (0);
+
+  if (r->sync == CUPS_RASTER_REVSYNC)
+    for (len = (sizeof(cups_page_header_t) - 256) / 4,
+             s = (union swap_s *)&(h->AdvanceDistance);
+	 len > 0;
+	 len --, s ++)
+      s->v = (((((s->b[3] << 8) | s->b[2]) << 8) | s->b[1]) << 8) | s->b[0];
+
+  return (1);
+}
+
+
+/*
+ * 'cupsRasterReadPixels()' - Read raster pixels.
+ */
+
+unsigned				/* O - Number of bytes read */
+cupsRasterReadPixels(cups_raster_t *r,	/* I - Raster stream */
+                     unsigned char *p,	/* I - Pointer to pixel buffer */
+		     unsigned      len)	/* I - Number of bytes to read */
+{
+  int		bytes;			/* Bytes read */
+  unsigned	remaining;		/* Bytes remaining */
+
+
+  if (r == NULL || r->mode != CUPS_RASTER_READ)
+    return (0);
+
+  remaining = len;
+
+  while (remaining > 0)
+  {
+    bytes = read(r->fd, p, remaining);
+
+    if (bytes <= 0)
+    {
+      if (errno != EAGAIN && errno != EINTR)
+        return (0);
+      else
+        continue;
+    }
+
+    remaining -= bytes;
+    p += bytes;
+  }
+
+  return (len);
+}
+
+
+/*
+ * 'cupsRasterWriteHeader()' - Write a raster page header.
+ */
+ 
+unsigned
+cupsRasterWriteHeader(cups_raster_t *r,
+                      cups_page_header_t *h)
+{
+  if (r == NULL || r->mode != CUPS_RASTER_WRITE)
+    return (0);
+
+  return (cupsRasterWritePixels(r, (unsigned char *)h,
+                                sizeof(cups_page_header_t)) ==
+              sizeof(cups_page_header_t));
+}
+
+
+/*
+ * 'cupsRasterWritePixels()' - Write raster pixels.
+ */
+
+unsigned				/* O - Number of bytes written */
+cupsRasterWritePixels(cups_raster_t *r,	/* I - Raster stream */
+                      unsigned char *p,	/* I - Bytes to write */
+		      unsigned      len)/* I - Number of bytes to write */
+{
+  int		bytes;			/* Bytes read */
+  unsigned	remaining;		/* Bytes remaining */
+
+
+  if (r == NULL || r->mode != CUPS_RASTER_WRITE)
+    return (0);
+
+  remaining = len;
+
+  while (remaining > 0)
+  {
+    bytes = write(r->fd, p, remaining);
+
+    if (bytes <= 0)
+    {
+      if (errno != EAGAIN && errno != EINTR)
+        return (0);
+      else
+        continue;
+    }
+
+    remaining -= bytes;
+    p += bytes;
+  }
+
+  return (len);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,228 @@
+/*
+ * "$Id$"
+ *
+ *   Raster file definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   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 for the CUPS Raster source
+ *   files are outlined in the GNU Library General Public License, located
+ *   in the "pstoraster" directory.  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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   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.
+ */
+
+#ifndef _CUPS_RASTER_H_
+#  define _CUPS_RASTER_H_
+
+#  ifdef __cplusplus
+extern "C" {
+#  endif /* __cplusplus */
+
+/*
+ * Every non-PostScript printer driver that supports raster images should
+ * use the application/vnd.cups-raster image file format.  Since both the
+ * PostScript RIP (pstoraster, based on GNU Ghostscript 4.03) and Image RIP
+ * (imagetoraster, located in the filter directory) use it, using this format
+ * saves you a lot of work.  Also, the PostScript RIP passes any printer
+ * options that are in a PS file to your driver this way as well...
+ */
+
+/*
+ * Constants...
+ */
+
+#  define CUPS_RASTER_SYNC	0x52615374	/* RaSt */
+#  define CUPS_RASTER_REVSYNC	0x74536152	/* tSaR */
+
+
+/*
+ * Types...
+ */
+
+typedef enum
+{
+  CUPS_RASTER_READ,			/* Open stream for reading */
+  CUPS_RASTER_WRITE			/* Open stream for writing */
+} cups_mode_t;
+
+typedef enum
+{
+  CUPS_FALSE,				/* Logical false */
+  CUPS_TRUE				/* Logical true */
+} cups_bool_t;
+
+typedef enum
+{
+  CUPS_JOG_NONE,			/* Never move pages */
+  CUPS_JOG_FILE,			/* Move pages after this file */
+  CUPS_JOG_JOB,				/* Move pages after this job */
+  CUPS_JOG_SET				/* Move pages after this set */
+} cups_jog_t;
+
+typedef enum
+{
+  CUPS_ORIENT_0,			/* Don't rotate the page */
+  CUPS_ORIENT_90,			/* Rotate the page counter-clockwise */
+  CUPS_ORIENT_180,			/* Turn the page upside down */
+  CUPS_ORIENT_270			/* Rotate the page clockwise */
+} cups_orient_t;
+
+typedef enum
+{
+  CUPS_CUT_NONE,			/* Never cut the roll */
+  CUPS_CUT_FILE,			/* Cut the roll after this file */
+  CUPS_CUT_JOB,				/* Cut the roll after this job */
+  CUPS_CUT_SET,				/* Cut the roll after this set */
+  CUPS_CUT_PAGE				/* Cut the roll after this page */
+} cups_cut_t;
+
+typedef enum
+{
+  CUPS_ADVANCE_NONE,			/* Never advance the roll */
+  CUPS_ADVANCE_FILE,			/* Advance the roll after this file */
+  CUPS_ADVANCE_JOB,			/* Advance the roll after this job */
+  CUPS_ADVANCE_SET,			/* Advance the roll after this set */
+  CUPS_ADVANCE_PAGE			/* Advance the roll after this page */
+} cups_adv_t;
+
+typedef enum
+{
+  CUPS_EDGE_TOP,			/* Leading edge is the top of the page */
+  CUPS_EDGE_RIGHT,			/* Leading edge is the right of the page */
+  CUPS_EDGE_BOTTOM,			/* Leading edge is the bottom of the page */
+  CUPS_EDGE_LEFT			/* Leading edge is the left of the page */
+} cups_edge_t;
+
+typedef enum
+{
+  CUPS_ORDER_CHUNKED,			/* CMYK CMYK CMYK ... */
+  CUPS_ORDER_BANDED,			/* CCC MMM YYY KKK ... */
+  CUPS_ORDER_PLANAR			/* CCC ... MMM ... YYY ... KKK ... */
+} cups_order_t;
+
+typedef enum
+{
+  CUPS_CSPACE_W,			/* Luminance */
+  CUPS_CSPACE_RGB,			/* Red, green, blue */
+  CUPS_CSPACE_RGBA,			/* Red, green, blue, alpha */
+  CUPS_CSPACE_K,			/* Black */
+  CUPS_CSPACE_CMY,			/* Cyan, magenta, yellow */
+  CUPS_CSPACE_YMC,			/* Yellow, magenta, cyan */
+  CUPS_CSPACE_CMYK,			/* Cyan, magenta, yellow, black */
+  CUPS_CSPACE_YMCK,			/* Yellow, magenta, cyan, black */
+  CUPS_CSPACE_KCMY,			/* Black, cyan, magenta, yellow */
+  CUPS_CSPACE_KCMYcm			/* Black, cyan, magenta, yellow, *
+					 * light-cyan, light-magenta     */
+} cups_cspace_t;
+
+
+/*
+ * The page header structure contains the standard PostScript page device
+ * dictionary, along with some CUPS-specific parameters that are provided
+ * by the RIPs...
+ */
+
+typedef struct
+{
+  /**** Standard Page Device Dictionary String Values ****/
+  char		MediaClass[64];		/* MediaClass string */
+  char		MediaColor[64];		/* MediaColor string */
+  char		MediaType[64];		/* MediaType string */
+  char		OutputType[64];		/* OutputType string */
+
+  /**** Standard Page Device Dictionary Integer Values ****/
+  unsigned	AdvanceDistance;	/* AdvanceDistance value in points */
+  cups_adv_t	AdvanceMedia;		/* AdvanceMedia value (see above) */
+  cups_bool_t	Collate;		/* Collated copies value */
+  cups_cut_t	CutMedia;		/* CutMedia value (see above) */
+  cups_bool_t	Duplex;			/* Duplexed (double-sided) value */
+  unsigned	HWResolution[2];	/* Resolution in dots-per-inch */
+  unsigned	ImagingBoundingBox[4];	/* Pixel region that is painted (points) */
+  cups_bool_t	InsertSheet;		/* InsertSheet value */
+  cups_jog_t	Jog;			/* Jog value (see above) */
+  cups_edge_t	LeadingEdge;		/* LeadingEdge value (see above) */
+  unsigned	Margins[2];		/* Lower-lefthand margins in points */
+  cups_bool_t	ManualFeed;		/* ManualFeed value */
+  unsigned	MediaPosition;		/* MediaPosition value */
+  unsigned	MediaWeight;		/* MediaWeight value in grams/m^2 */
+  cups_bool_t	MirrorPrint;		/* MirrorPrint value */
+  cups_bool_t	NegativePrint;		/* NegativePrint value */
+  unsigned	NumCopies;		/* Number of copies to produce */
+  cups_orient_t	Orientation;		/* Orientation value (see above) */
+  cups_bool_t	OutputFaceUp;		/* OutputFaceUp value */
+  unsigned	PageSize[2];		/* Width and length of page in points */
+  cups_bool_t	Separations;		/* Separations value */
+  cups_bool_t	TraySwitch;		/* TraySwitch value */
+  cups_bool_t	Tumble;			/* Tumble value */
+
+  /**** CUPS Page Device Dictionary Values ****/
+  unsigned	cupsWidth;		/* Width of page image in pixels */
+  unsigned	cupsHeight;		/* Height of page image in pixels */
+  unsigned	cupsMediaType;		/* Media type code */
+  unsigned	cupsBitsPerColor;	/* Number of bits for each color */
+  unsigned	cupsBitsPerPixel;	/* Number of bits for each pixel */
+  unsigned	cupsBytesPerLine;	/* Number of bytes per line */
+  cups_order_t	cupsColorOrder;		/* Order of colors */
+  cups_cspace_t	cupsColorSpace;		/* True colorspace */
+  unsigned	cupsCompression;	/* Device compression to use */
+  unsigned	cupsRowCount;		/* Rows per band */
+  unsigned	cupsRowFeed;		/* Feed between bands */
+  unsigned	cupsRowStep;		/* Spacing between lines */
+} cups_page_header_t;
+
+
+/*
+ * The raster structure maintains information about a raster data
+ * stream...
+ */
+
+typedef struct
+{
+  unsigned	sync;			/* Sync word from start of stream */
+  int		fd;			/* File descriptor */
+  cups_mode_t	mode;			/* Read/write mode */
+} cups_raster_t;
+
+
+/*
+ * Prototypes...
+ */
+
+extern void		cupsRasterClose(cups_raster_t *r);
+extern cups_raster_t	*cupsRasterOpen(int fd, cups_mode_t mode);
+extern unsigned		cupsRasterReadHeader(cups_raster_t *r,
+			                     cups_page_header_t *h);
+extern unsigned		cupsRasterReadPixels(cups_raster_t *r,
+			                     unsigned char *p, unsigned len);
+extern unsigned		cupsRasterWriteHeader(cups_raster_t *r,
+			                      cups_page_header_t *h);
+extern unsigned		cupsRasterWritePixels(cups_raster_t *r,
+			                      unsigned char *p, unsigned len);
+
+#  ifdef __cplusplus
+}
+#  endif /* __cplusplus */
+
+#endif /* !_CUPS_RASTER_H_ */
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,125 @@
+/*
+ * "$Id$"
+ *
+ *   String functions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   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
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   strdup()      - Duplicate a string.
+ *   strcasecmp()  - Do a case-insensitive comparison.
+ *   strncasecmp() - Do a case-insensitive comparison on up to N chars.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "string.h"
+
+
+/*
+ * 'strdup()' - Duplicate a string.
+ */
+
+#  ifndef HAVE_STRDUP
+char *			/* O - New string pointer */
+strdup(const char *s)	/* I - String to duplicate */
+{
+  char	*t;		/* New string pointer */
+
+
+  if (s == NULL)
+    return (NULL);
+
+  if ((t = malloc(strlen(s) + 1)) == NULL)
+    return (NULL);
+
+  return (strcpy(t, s));
+}
+#  endif /* !HAVE_STRDUP */
+
+
+/*
+ * 'strcasecmp()' - Do a case-insensitive comparison.
+ */
+
+#  ifndef HAVE_STRCASECMP
+int				/* O - Result of comparison (-1, 0, or 1) */
+strcasecmp(const char *s,	/* I - First string */
+           const char *t)	/* I - Second string */
+{
+  while (*s != '\0' && *t != '\0')
+  {
+    if (tolower(*s) < tolower(*t))
+      return (-1);
+    else if (tolower(*s) > tolower(*t))
+      return (1);
+
+    s ++;
+    t ++;
+  }
+
+  if (*s == '\0' && *t == '\0')
+    return (0);
+  else if (*s != '\0')
+    return (1);
+  else
+    return (-1);
+}
+#  endif /* !HAVE_STRCASECMP */
+
+/*
+ * 'strncasecmp()' - Do a case-insensitive comparison on up to N chars.
+ */
+
+#  ifndef HAVE_STRNCASECMP
+int				/* O - Result of comparison (-1, 0, or 1) */
+strncasecmp(const char *s,	/* I - First string */
+            const char *t,	/* I - Second string */
+	    size_t     n)	/* I - Maximum number of characters to compare */
+{
+  while (*s != '\0' && *t != '\0' && n > 0)
+  {
+    if (tolower(*s) < tolower(*t))
+      return (-1);
+    else if (tolower(*s) > tolower(*t))
+      return (1);
+
+    s ++;
+    t ++;
+    n --;
+  }
+
+  if (n == 0)
+    return (0);
+  else if (*s == '\0' && *t == '\0')
+    return (0);
+  else if (*s != '\0')
+    return (1);
+  else
+    return (-1);
+}
+#  endif /* !HAVE_STRNCASECMP */
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,66 @@
+/*
+ * "$Id$"
+ *
+ *   String definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   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
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ */
+
+#ifndef _CUPS_STRING_H_
+#  define _CUPS_STRING_H_
+
+/*
+ * Include necessary headers...
+ */
+
+#  include <config.h>
+#  include <string.h>
+
+
+/*
+ * Stuff for WIN32 and OS/2...
+ */
+
+#  if defined(WIN32) || defined(__EMX__)
+#    define strcasecmp	stricmp
+#    define strncasecmp	strnicmp
+#  endif /* WIN32 || __EMX__ */
+
+
+/*
+ * Prototypes...
+ */
+
+#  ifndef HAVE_STRDUP
+extern char	*strdup(const char *);
+#  endif /* !HAVE_STRDUP */
+
+#  ifndef HAVE_STRCASECMP
+extern int	strcasecmp(const char *, const char *);
+#  endif /* !HAVE_STRCASECMP */
+
+#  ifndef HAVE_STRNCASECMP
+extern int	strncasecmp(const char *, const char *, size_t n);
+#  endif /* !HAVE_STRNCASECMP */
+
+#endif /* !_CUPS_STRING_H_ */
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,109 @@
+/*
+ * "$Id$"
+ *
+ *   HTTP test program for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   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
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   main() - Main entry.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <stdio.h>
+#include "http.h"
+
+
+/*
+ * 'main()' - Main entry.
+ */
+
+int				/* O - Exit status */
+main(int  argc,			/* I - Number of command-line arguments */
+     char *argv[])		/* I - Command-line arguments */
+{
+  int		i;		/* Looping var */
+  http_t	*http;		/* HTTP connection */
+  http_status_t	status;		/* Status of GET command */
+  char		buffer[1024];	/* Input buffer */
+  int		bytes;		/* Number of bytes read */
+  FILE		*out;		/* Output file */
+
+#define HOST "dns.easysw.com"
+#define PORT 80
+
+  puts("Connecting to " HOST "...");
+
+  httpInitialize();
+  http = httpConnect(HOST, PORT);
+  if (http == NULL)
+  {
+    puts("Unable to connect to " HOST "!");
+    return (1);
+  }
+
+  puts("Connected to " HOST "...");
+
+  out = stdout;
+
+  for (i = 1; i < argc; i ++)
+  {
+    if (strcmp(argv[i], "-o") == 0)
+    {
+      i ++;
+      out = fopen(argv[i], "wb");
+      continue;
+    }
+
+    printf("Requesting file \"%s\"...\n", argv[i]);
+    httpClearFields(http);
+    httpSetField(http, HTTP_FIELD_ACCEPT_LANGUAGE, "en");
+    httpGet(http, argv[i]);
+    status = httpUpdate(http);
+
+    if (status == HTTP_OK)
+      puts("GET OK:");
+    else
+      printf("GET failed with status %d...\n", status);
+
+    while ((bytes = httpRead(http, buffer, sizeof(buffer))) > 0)
+    {
+      fwrite(buffer, bytes, 1, out);
+      if (out != stdout)
+        printf("Read %d bytes, %d total...\n", bytes, ftell(out));
+    }
+  }
+
+  puts("Closing connection to server...");
+  httpClose(http);
+
+  if (out != stdout)
+    fclose(out);
+
+  return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,199 @@
+/*
+ * "$Id$"
+ *
+ *   MIME test program for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 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
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   main() - Main entry for the test program.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <stdio.h>
+#include "mime.h"
+
+
+/*
+ * Local functions...
+ */
+
+static void print_rules(mime_magic_t *rules);
+
+
+/*
+ * 'main()' - Main entry for the test program.
+ */
+
+int					/* O - Exit status */
+main(int  argc,				/* I - Number of command-line args */
+     char *argv[])			/* I - Command-line arguments */
+{
+  int		i;			/* Looping var */
+  char		super[MIME_MAX_SUPER],	/* Super-type name */
+		type[MIME_MAX_TYPE];	/* Type name */
+  mime_t	*mime;			/* MIME database */
+  mime_type_t	*src,			/* Source type */
+		*dst,			/* Destination type */
+		**types;		/* File type array pointer */
+  mime_filter_t	*filters;		/* Filters for the file */
+  int		num_filters;		/* Number of filters for the file */
+
+
+  mime = mimeLoad("../conf");
+
+  puts("MIME database types:");
+  for (i = 0, types = mime->types; i < mime->num_types; i ++, types ++)
+  {
+    printf("\t%s/%s: ", (*types)->super, (*types)->type);
+    print_rules((*types)->rules);
+    puts("");
+  }
+
+  puts("");
+
+  puts("MIME database filters:");
+  for (i = 0, filters = mime->filters; i < mime->num_filters; i ++, filters ++)
+    printf("\t%s/%s to %s/%s: %s (%d)\n",
+           filters->src->super, filters->src->type,
+	   filters->dst->super, filters->dst->type,
+	   filters->filter, filters->cost);
+
+  puts("");
+
+  switch (argc)
+  {
+    default :
+        fputs("Usage: testmime source-file [destination-type]\n", stderr);
+	return (1);
+
+    case 2 :
+        src = mimeFileType(mime, argv[1]);
+
+	if (src != NULL)
+	{
+	  printf("%s: %s/%s\n", argv[1], src->super, src->type);
+	  return (0);
+	}
+	else
+	{
+	  printf("%s: unknown\n", argv[1]);
+	  return (1);
+	}
+
+    case 3 :
+        src = mimeFileType(mime, argv[1]);
+
+	sscanf(argv[2], "%[^/]/%s", super, type);
+        dst = mimeType(mime, super, type);
+
+        filters = mimeFilter(mime, src, dst, &num_filters);
+
+        if (filters == NULL)
+	{
+	  printf("No filters to convert from %s to %s.\n", argv[1], argv[2]);
+	  return (1);
+	}
+	else
+	{
+	  for (i = 0; i < num_filters; i ++)
+	    if (i < (num_filters - 1))
+	      printf("%s | ", filters[i].filter);
+	    else
+	      puts(filters[i].filter);
+
+          return (0);
+	}
+  }
+}
+
+
+/*
+ * 'print_rules()' - Print the rules for a file type...
+ */
+
+static void
+print_rules(mime_magic_t *rules)	/* I - Rules to print */
+{
+  char	logic;				/* Logic separator */
+
+
+  if (rules == NULL)
+    return;
+
+  if (rules->parent == NULL ||
+      rules->parent->op == MIME_MAGIC_OR)
+    logic = ',';
+  else
+    logic = '+';
+
+  while (rules != NULL)
+  {
+    if (rules->prev != NULL)
+      putchar(logic);
+
+    switch (rules->op)
+    {
+      case MIME_MAGIC_MATCH :
+          printf("match(%s)", rules->value.matchv);
+	  break;
+      case MIME_MAGIC_LOCALE :
+          printf("locale(%s)", rules->value.localev);
+	  break;
+      case MIME_MAGIC_ASCII :
+          printf("ascii(%d,%d)", rules->offset, rules->length);
+	  break;
+      case MIME_MAGIC_PRINTABLE :
+          printf("printable(%d,%d)", rules->offset, rules->length);
+	  break;
+      case MIME_MAGIC_STRING :
+          printf("string(%d,%s)", rules->offset, rules->value.stringv);
+	  break;
+      case MIME_MAGIC_CHAR :
+          printf("char(%d,%d)", rules->offset, rules->value.charv);
+	  break;
+      case MIME_MAGIC_SHORT :
+          printf("short(%d,%d)", rules->offset, rules->value.shortv);
+	  break;
+      case MIME_MAGIC_INT :
+          printf("int(%d,%d)", rules->offset, rules->value.intv);
+	  break;
+      default :
+          if (rules->child != NULL)
+	  {
+	    putchar('(');
+	    print_rules(rules->child);
+	    putchar(')');
+	  }
+	  break;
+    }
+
+    rules = rules->next;
+  }
+}
+
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,102 @@
+# Microsoft Developer Studio Project File - Name="testmime" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=testmime - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "testmime.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "testmime.mak" CFG="testmime - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "testmime - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "testmime - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "testmime - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 cups.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"testmime.exe"
+
+!ELSEIF  "$(CFG)" == "testmime - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "testmime___Win32_Debug"
+# PROP BASE Intermediate_Dir "testmime___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 cupsd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"testmimed.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "testmime - Win32 Release"
+# Name "testmime - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\testmime.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\mime.h
+# End Source File
+# End Group
+# End Target
+# End Project
@@ -0,0 +1,183 @@
+/*
+ * "$Id$"
+ *
+ *   PPD test program for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 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
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ *   PostScript is a trademark of Adobe Systems, Inc.
+ *
+ * Contents:
+ *
+ *   main() - Main entry for test program.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cups.h"
+#include "string.h"
+
+
+/*
+ * 'main()' - Main entry for test program.
+ */
+
+int				/* O - Exit status */
+main(int  argc,			/* I - Number of command-line arguments */
+     char *argv[])		/* I - Command-line arguments */
+{
+  int		i, j, k, m, n;	/* Looping vars */
+  char		*filename;	/* File to load */
+  ppd_file_t	*ppd;		/* PPD file record */
+  ppd_size_t	*size;		/* Size record */
+  ppd_group_t	*group;		/* UI group */
+  ppd_option_t	*option;	/* Standard UI option */
+  ppd_choice_t	*choice;	/* Standard UI option choice */
+  static char	*uis[] = { "BOOLEAN", "PICKONE", "PICKMANY" };
+  static char	*sections[] = { "ANY", "DOCUMENT", "EXIT",
+                                "JCL", "PAGE", "PROLOG" };
+
+
+ /*
+  * Display PPD files for each file listed on the command-line...
+  */
+
+  if (argc == 1)
+  {
+    fputs("Usage: ppdtest filename1.ppd [... filenameN.ppd]\n", stderr);
+    return (1);
+  }
+
+  for (i = 1; i < argc; i ++)
+  {
+    if (strstr(argv[i], ".ppd"))
+      filename = argv[i];
+    else
+      filename = cupsGetPPD(argv[i]);
+
+    if ((ppd = ppdOpenFile(filename)) == NULL)
+    {
+      fprintf(stderr, "Unable to open \'%s\' as a PPD file!\n", filename);
+      continue;
+    }
+
+    printf("FILE: %s\n", filename);
+    printf("    language_level = %d\n", ppd->language_level);
+    printf("    color_device = %s\n", ppd->color_device ? "TRUE" : "FALSE");
+    printf("    variable_sizes = %s\n", ppd->variable_sizes ? "TRUE" : "FALSE");
+    printf("    landscape = %d\n", ppd->landscape);
+
+    switch (ppd->colorspace)
+    {
+      case PPD_CS_CMYK :
+          puts("    colorspace = PPD_CS_CMYK");
+	  break;
+      case PPD_CS_CMY :
+          puts("    colorspace = PPD_CS_CMY");
+	  break;
+      case PPD_CS_GRAY :
+          puts("    colorspace = PPD_CS_GRAY");
+	  break;
+      case PPD_CS_RGB :
+          puts("    colorspace = PPD_CS_RGB");
+	  break;
+      default :
+          puts("    colorspace = <unknown>");
+	  break;
+    }
+
+    printf("    num_emulations = %d\n", ppd->num_emulations);
+    for (j = 0; j < ppd->num_emulations; j ++)
+      printf("        emulations[%d] = %s\n", j, ppd->emulations[j].name);
+
+    printf("    lang_encoding = %s\n", ppd->lang_encoding);
+    printf("    lang_version = %s\n", ppd->lang_version);
+    printf("    modelname = %s\n", ppd->modelname);
+    printf("    ttrasterizer = %s\n",
+           ppd->ttrasterizer == NULL ? "None" : ppd->ttrasterizer);
+    printf("    manufacturer = %s\n", ppd->manufacturer);
+    printf("    product = %s\n", ppd->product);
+    printf("    nickname = %s\n", ppd->nickname);
+    printf("    shortnickname = %s\n", ppd->shortnickname);
+    printf("    patches = %d bytes\n",
+           ppd->patches == NULL ? 0 : strlen(ppd->patches));
+
+    printf("    num_groups = %d\n", ppd->num_groups);
+    for (j = 0, group = ppd->groups; j < ppd->num_groups; j ++, group ++)
+    {
+      printf("        group[%d] = %s\n", j, group->text);
+
+      for (k = 0, option = group->options; k < group->num_options; k ++, option ++)
+      {
+	printf("            options[%d] = %s (%s) %s %s %.0f\n", k,
+	       option->keyword, option->text, uis[option->ui],
+	       sections[option->section], option->order);
+
+        if (strcmp(option->keyword, "PageSize") == 0 ||
+            strcmp(option->keyword, "PageRegion") == 0)
+        {
+          for (m = option->num_choices, choice = option->choices;
+	       m > 0;
+	       m --, choice ++)
+	  {
+	    size = ppdPageSize(ppd, choice->choice);
+
+	    if (size == NULL)
+	      printf("                %s (%s) = ERROR", choice->choice, choice->text);
+            else
+	      printf("                %s (%s) = %.2fx%.2fin (%.1f,%.1f,%.1f,%.1f)", choice->choice,
+	             choice->text, size->width / 72.0, size->length / 72.0,
+		     size->left / 72.0, size->bottom / 72.0,
+		     size->right / 72.0, size->top / 72.0);
+
+            if (strcmp(option->defchoice, choice->choice) == 0)
+	      puts(" *");
+	    else
+	      putchar('\n');
+          }
+	}
+	else
+	{
+	  for (m = option->num_choices, choice = option->choices;
+	       m > 0;
+	       m --, choice ++)
+	  {
+	    printf("                %s (%s)", choice->choice, choice->text);
+
+            if (strcmp(option->defchoice, choice->choice) == 0)
+	      puts(" *");
+	    else
+	      putchar('\n');
+	  }
+        }
+      }
+    }
+
+    ppdClose(ppd);
+  }
+
+  return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,102 @@
+# Microsoft Developer Studio Project File - Name="testppd" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=testppd - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "testppd.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "testppd.mak" CFG="testppd - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "testppd - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "testppd - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "testppd - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 cups.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"testppd.exe"
+
+!ELSEIF  "$(CFG)" == "testppd - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "testppd___Win32_Debug"
+# PROP BASE Intermediate_Dir "testppd___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 cupsd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"testppdd.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "testppd - Win32 Release"
+# Name "testppd - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\testppd.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\ppd.h
+# End Source File
+# End Group
+# End Target
+# End Project
@@ -0,0 +1,949 @@
+/*
+ * "$Id$"
+ *
+ *   Printing utilities for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   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
+ *       44145 Airport View Drive, Suite 204
+ *       Hollywood, Maryland 20636-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   cupsCancelJob()     - Cancel a print job.
+ *   cupsDoFileRequest() - Do an IPP request...
+ *   cupsGetClasses()    - Get a list of printer classes.
+ *   cupsGetDefault()    - Get the default printer or class.
+ *   cupsGetPPD()        - Get the PPD file for a printer.
+ *   cupsGetPrinters()   - Get a list of printers.
+ *   cupsPrintFile()     - Print a file to a printer or class.
+ *   cups_connect()      - Connect to the specified host...
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cups.h"
+#include "ipp.h"
+#include "language.h"
+#include "string.h"
+#include "debug.h"
+#include <stdlib.h>
+#include <ctype.h>
+#include <errno.h>
+#include <sys/stat.h>
+#if defined(WIN32) || defined(__EMX__)
+#  include <io.h>
+#else
+#  include <unistd.h>
+#endif /* WIN32 || __EMX__ */
+
+
+/*
+ * Local globals...
+ */
+
+static http_t	*cups_server = NULL;
+
+
+/*
+ * Local functions...
+ */
+
+static char	*cups_connect(char *name, char *printer, char *hostname);
+
+
+/*
+ * 'cupsCancelJob()' - Cancel a print job.
+ */
+
+int				/* O - 1 on success, 0 on failure */
+cupsCancelJob(char *name,	/* I - Name of printer or class */
+              int  job)		/* I - Job ID */
+{
+  char		printer[HTTP_MAX_URI],	/* Printer name */
+		hostname[HTTP_MAX_URI],	/* Hostname */
+		uri[HTTP_MAX_URI];	/* Printer URI */
+  ipp_t		*request,		/* IPP request */
+		*response;		/* IPP response */
+  cups_lang_t	*language;		/* Language info */
+
+
+ /*
+  * See if we can connect to the server...
+  */
+
+  if (!cups_connect(name, printer, hostname))
+    return (0);
+
+ /*
+  * Build an IPP_CANCEL_JOB request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  *    printer-uri
+  *    job-id
+  */
+
+  request = ippNew();
+
+  request->request.op.operation_id = IPP_CANCEL_JOB;
+  request->request.op.request_id   = 1;
+
+  language = cupsLangDefault();
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL,
+               language != NULL ? language->language : "C");
+
+  sprintf(uri, "ipp://%s:%d/printers/%s", hostname, ippPort(), printer);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+               NULL, uri);
+
+  ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", job);
+
+ /*
+  * Do the request...
+  */
+
+  if ((response = cupsDoRequest(cups_server, request, "/jobs/")) == NULL)
+    return (0);
+
+  ippDelete(response);
+  return (1);
+}
+
+
+/*
+ * 'cupsDoFileRequest()' - Do an IPP request...
+ */
+
+ipp_t *					/* O - Response data */
+cupsDoFileRequest(http_t *http,		/* I - HTTP connection to server */
+                  ipp_t  *request,	/* I - IPP request */
+                  char   *resource,	/* I - HTTP resource for POST */
+		  char   *filename)	/* I - File to send or NULL */
+{
+  ipp_t		*response;	/* IPP response data */
+  char		length[255];	/* Content-Length field */
+  http_status_t	status;		/* Status of HTTP request */
+  FILE		*file;		/* File to send */
+  struct stat	fileinfo;	/* File information */
+  int		bytes;		/* Number of bytes read/written */
+  char		buffer[8192];	/* Output buffer */
+#if !defined(WIN32) && !defined(__EMX__)
+  char		*password,	/* Password string */
+		plain[255],	/* Plaintext username:password */
+		encode[255];	/* Encoded username:password */
+  char		junk[8192];	/* Junk buffer for error data */
+#endif /* !WIN32 && !__EMX__ */
+  static char	authstring[255] = "";
+				/* Authorization string */
+
+
+  DEBUG_printf(("cupsDoFileRequest(%08x, %08s, \'%s\', \'%s\')\n",
+                http, request, resource, filename ? filename : "(null)"));
+
+ /*
+  * See if we have a file to send...
+  */
+
+  if (filename != NULL)
+  {
+    if (stat(filename, &fileinfo))
+    {
+     /*
+      * Can't get file information!
+      */
+
+      ippDelete(request);
+      return (NULL);
+    }
+
+    if ((file = fopen(filename, "rb")) == NULL)
+    {
+     /*
+      * Can't open file!
+      */
+
+      ippDelete(request);
+      return (NULL);
+    }
+  }
+
+ /*
+  * Loop until we can send the request without authorization problems.
+  */
+
+  response = NULL;
+
+  while (response == NULL)
+  {
+    DEBUG_puts("cupsDoFileRequest: setup...");
+
+   /*
+    * Setup the HTTP variables needed...
+    */
+
+    if (filename != NULL)
+      sprintf(length, "%u", ippLength(request) + fileinfo.st_size);
+    else
+      sprintf(length, "%u", ippLength(request));
+
+    httpClearFields(http);
+    httpSetField(http, HTTP_FIELD_CONTENT_LENGTH, length);
+    httpSetField(http, HTTP_FIELD_CONTENT_TYPE, "application/ipp");
+    httpSetField(http, HTTP_FIELD_AUTHORIZATION, authstring);
+
+   /*
+    * Try the request...
+    */
+
+    DEBUG_puts("cupsDoFileRequest: post...");
+
+    if (httpPost(http, resource))
+      if (httpPost(http, resource))
+        break;
+
+   /*
+    * Send the IPP data and wait for the response...
+    */
+
+    DEBUG_puts("cupsDoFileRequest: ipp write...");
+
+    request->state = IPP_IDLE;
+    if (ippWrite(http, request) != IPP_ERROR)
+      if (filename != NULL)
+      {
+        DEBUG_puts("cupsDoFileRequest: file write...");
+
+       /*
+        * Send the file...
+        */
+
+        rewind(file);
+
+        while ((bytes = fread(buffer, 1, sizeof(buffer), file)) > 0)
+  	  if (httpWrite(http, buffer, bytes) < bytes)
+            break;
+      }
+
+   /*
+    * Get the server's return status...
+    */
+
+    DEBUG_puts("cupsDoFileRequest: update...");
+
+    while ((status = httpUpdate(http)) == HTTP_CONTINUE);
+
+#if !defined(WIN32) && !defined(__EMX__)
+    if (status == HTTP_UNAUTHORIZED)
+    {
+      DEBUG_puts("cupsDoFileRequest: unauthorized...");
+
+     /*
+      * Flush any error message...
+      */
+
+      httpFlush(http);
+
+      if ((password = getpass("Password:")) != NULL)
+      {
+       /*
+	* Got a password; send it to the server...
+	*/
+
+        if (!password[0])
+          break;
+	sprintf(plain, "%s:%s", cuserid(NULL), password);
+	httpEncode64(encode, plain);
+	sprintf(authstring, "Basic %s", encode);
+
+        continue;
+      }
+      else
+        break;
+    }
+#endif /* !WIN32 && !__EMX__ */
+
+    if (status != HTTP_OK)
+    {
+      DEBUG_printf(("cupsDoFileRequest: error %d...\n", status));
+
+     /*
+      * Flush any error message...
+      */
+
+      httpFlush(http);
+      break;
+    }
+    else
+    {
+     /*
+      * Read the response...
+      */
+
+      DEBUG_puts("cupsDoFileRequest: response...");
+
+      response = ippNew();
+
+      if (ippRead(http, response) == IPP_ERROR)
+      {
+       /*
+        * Delete the response...
+	*/
+
+	ippDelete(response);
+	response = NULL;
+
+       /*
+	* Flush any remaining data...
+	*/
+
+	httpFlush(http);
+	break;
+      }
+    }
+  }
+
+ /*
+  * Close the file if needed...
+  */
+
+  if (filename != NULL)
+    fclose(file);
+
+ /*
+  * Delete the original request and return the response...
+  */
+  
+  ippDelete(request);
+
+  return (response);
+}
+
+
+/*
+ * 'cupsGetClasses()' - Get a list of printer classes.
+ */
+
+int				/* O - Number of classes */
+cupsGetClasses(char ***classes)	/* O - Classes */
+{
+  int		n;		/* Number of classes */
+  ipp_t		*request,	/* IPP Request */
+		*response;	/* IPP Response */
+  ipp_attribute_t *attr;	/* Current attribute */
+  cups_lang_t	*language;	/* Default language */
+
+
+ /*
+  * Try to connect to the server...
+  */
+
+  if (!cups_connect("default", NULL, NULL))
+    return (0);
+
+ /*
+  * Build a CUPS_GET_CLASSES request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  */
+
+  request = ippNew();
+
+  request->request.op.operation_id = CUPS_GET_CLASSES;
+  request->request.op.request_id   = 1;
+
+  language = cupsLangDefault();
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                      "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+                      "attributes-natural-language", NULL, language->language);
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  n        = 0;
+  *classes = NULL;
+
+  if ((response = cupsDoRequest(cups_server, request, "/classes/")) != NULL)
+  {
+    for (attr = response->attrs; attr != NULL; attr = attr->next)
+      if (strcmp(attr->name, "printer-name") == 0 &&
+          attr->value_tag == IPP_TAG_NAME)
+      {
+        if (n == 0)
+	  *classes = malloc(sizeof(char *));
+	else
+	  *classes = realloc(*classes, sizeof(char *) * (n + 1));
+
+	if (*classes == NULL)
+	{
+	  ippDelete(response);
+	  return (0);
+	}
+
+        (*classes)[n] = strdup(attr->values[0].string.text);
+	n ++;
+      }
+
+    ippDelete(response);
+  }
+
+  return (n);
+}
+
+
+/*
+ * 'cupsGetDefault()' - Get the default printer or class.
+ */
+
+char *				/* O - Default printer or NULL */
+cupsGetDefault(void)
+{
+  ipp_t		*request,	/* IPP Request */
+		*response;	/* IPP Response */
+  ipp_attribute_t *attr;	/* Current attribute */
+  cups_lang_t	*language;	/* Default language */
+  static char	def_printer[64];/* Default printer */
+
+
+ /*
+  * First see if the LPDEST or PRINTER environment variables are
+  * set...
+  */
+
+  if (getenv("LPDEST") != NULL)
+    return (getenv("LPDEST"));
+  else if (getenv("PRINTER") != NULL)
+    return (getenv("PRINTER"));
+
+ /*
+  * Try to connect to the server...
+  */
+
+  if (!cups_connect("default", NULL, NULL))
+    return (NULL);
+
+ /*
+  * Build a CUPS_GET_DEFAULT request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  */
+
+  request = ippNew();
+
+  request->request.op.operation_id = CUPS_GET_DEFAULT;
+  request->request.op.request_id   = 1;
+
+  language = cupsLangDefault();
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  if ((response = cupsDoRequest(cups_server, request, "/printers/")) != NULL)
+  {
+    if ((attr = ippFindAttribute(response, "printer-name", IPP_TAG_NAME)) != NULL)
+    {
+      strcpy(def_printer, attr->values[0].string.text);
+      ippDelete(response);
+      return (def_printer);
+    }
+
+    ippDelete(response);
+  }
+
+  return (NULL);
+}
+
+
+/*
+ * 'cupsGetPPD()' - Get the PPD file for a printer.
+ */
+
+char *				/* O - Filename for PPD file */
+cupsGetPPD(char *name)		/* I - Printer name */
+{
+  FILE		*fp;			/* PPD file */
+  int		bytes;			/* Number of bytes read */
+  char		buffer[8192];		/* Buffer for file */
+  char		printer[HTTP_MAX_URI],	/* Printer name */
+		hostname[HTTP_MAX_URI],	/* Hostname */
+		resource[HTTP_MAX_URI];	/* Resource name */
+  static char	filename[HTTP_MAX_URI];	/* Local filename */
+  char		*tempdir;		/* Temporary file directory */
+  struct stat	fileinfo;		/* File information */
+
+
+ /*
+  * See if we can connect to the server...
+  */
+
+  if (!cups_connect(name, printer, hostname))
+    return (NULL);
+
+ /*
+  * Then check for the cache file...
+  */
+
+#if defined(WIN32) || defined(__EMX__)
+  tempdir = "C:/WINDOWS/TEMP";
+#else
+  if ((tempdir = getenv("TMPDIR")) == NULL)
+    tempdir = "/tmp";
+#endif /* WIN32 || __EMX__ */
+
+  sprintf(filename, "%s/%s.ppd", tempdir, printer);
+  if (stat(filename, &fileinfo))
+    memset(&fileinfo, 0, sizeof(fileinfo));
+
+ /*
+  * And send a request to the HTTP server using "if-modified-since"...
+  */
+
+  sprintf(resource, "/printers/%s.ppd", printer);
+
+  httpClearFields(cups_server);
+  httpSetField(cups_server, HTTP_FIELD_HOST, hostname);
+  httpSetField(cups_server, HTTP_FIELD_IF_MODIFIED_SINCE,
+               httpGetDateString(fileinfo.st_mtime));
+  httpGet(cups_server, resource);
+
+  switch (httpUpdate(cups_server))
+  {
+    case HTTP_OK : /* New file - get it! */
+        break;
+    case HTTP_NOT_MODIFIED : /* File hasn't been modified; use the current copy */
+        return (filename);
+    default :
+        return (NULL);
+  }
+
+ /*
+  * OK, we need to copy the file; open the file and copy it...
+  */
+
+  unlink(filename);
+  if ((fp = fopen(filename, "w")) == NULL)
+  {
+   /*
+    * Can't open file; close the server connection and return NULL...
+    */
+
+    httpClose(cups_server);
+    cups_server = NULL;
+    return (NULL);
+  }
+
+  while ((bytes = httpRead(cups_server, buffer, sizeof(buffer))) > 0)
+    fwrite(buffer, bytes, 1, fp);
+
+  fclose(fp);
+
+  return (filename);
+}
+
+
+/*
+ * 'cupsGetPrinters()' - Get a list of printers.
+ */
+
+int					/* O - Number of printers */
+cupsGetPrinters(char ***printers)	/* O - Printers */
+{
+  int		n;		/* Number of printers */
+  ipp_t		*request,	/* IPP Request */
+		*response;	/* IPP Response */
+  ipp_attribute_t *attr;	/* Current attribute */
+  cups_lang_t	*language;	/* Default language */
+
+
+ /*
+  * Try to connect to the server...
+  */
+
+  if (!cups_connect("default", NULL, NULL))
+    return (0);
+
+ /*
+  * Build a CUPS_GET_PRINTERS request, which requires the following
+  * attributes:
+  *
+  *    attributes-charset
+  *    attributes-natural-language
+  */
+
+  request = ippNew();
+
+  request->request.op.operation_id = CUPS_GET_PRINTERS;
+  request->request.op.request_id   = 1;
+
+  language = cupsLangDefault();
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                      "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+                      "attributes-natural-language", NULL, language->language);
+
+ /*
+  * Do the request and get back a response...
+  */
+
+  n         = 0;
+  *printers = NULL;
+
+  if ((response = cupsDoRequest(cups_server, request, "/printers/")) != NULL)
+  {
+    for (attr = response->attrs; attr != NULL; attr = attr->next)
+      if (strcmp(attr->name, "printer-name") == 0 &&
+          attr->value_tag == IPP_TAG_NAME)
+      {
+        if (n == 0)
+	  *printers = malloc(sizeof(char *));
+	else
+	  *printers = realloc(*printers, sizeof(char *) * (n + 1));
+
+	if (*printers == NULL)
+	{
+	  ippDelete(response);
+	  return (0);
+	}
+
+        (*printers)[n] = strdup(attr->values[0].string.text);
+	n ++;
+      }
+
+    ippDelete(response);
+  }
+
+  return (n);
+}
+
+
+/*
+ * 'cupsPrintFile()' - Print a file to a printer or class.
+ */
+
+int					/* O - Job ID */
+cupsPrintFile(char          *name,	/* I - Printer or class name */
+              char          *filename,	/* I - File to print */
+	      char          *title,	/* I - Title of job */
+              int           num_options,/* I - Number of options */
+	      cups_option_t *options)	/* I - Options */
+{
+  int		i;			/* Looping var */
+  int		n, n2;			/* Attribute values */
+  char		*option,		/* Name of option */
+		*val,			/* Pointer to option value */
+		*s;			/* Pointer into option value */
+  ipp_t		*request;		/* IPP request */
+  ipp_t		*response;		/* IPP response */
+  ipp_attribute_t *attr;		/* IPP job-id attribute */
+  char		hostname[HTTP_MAX_URI],	/* Hostname */
+		printer[HTTP_MAX_URI],	/* Printer or class name */
+		uri[HTTP_MAX_URI];	/* Printer URI */
+  cups_lang_t	*language;		/* Language to use */
+  int		jobid;			/* New job ID */
+
+
+  DEBUG_printf(("cupsPrintFile(\'%s\', \'%s\', %d, %08x)\n",
+                printer, filename, num_options, options));
+
+  if (name == NULL || filename == NULL)
+    return (0);
+
+ /*
+  * Setup a connection and request data...
+  */
+
+  if ((request = ippNew()) == NULL)
+    return (0);
+
+  if (!cups_connect(name, printer, hostname))
+  {
+    DEBUG_printf(("cupsPrintFile: Unable to open connection - %s.\n",
+                  strerror(errno)));
+    ippDelete(request);
+    return (0);
+  }
+
+ /*
+  * Build a standard CUPS URI for the printer and fill the standard IPP
+  * attributes...
+  */
+
+  request->request.op.operation_id = IPP_PRINT_JOB;
+  request->request.op.request_id   = 1;
+
+  sprintf(uri, "ipp://%s:%d/printers/%s", hostname, ippPort(), printer);
+
+  language = cupsLangDefault();
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+               "attributes-charset", NULL, cupsLangEncoding(language));
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL,
+               language != NULL ? language->language : "C");
+
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
+               NULL, uri);
+
+ /*
+  * Handle raw print files...
+  */
+
+  if (cupsGetOption("raw", num_options, options))
+    ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
+        	 NULL, "application/vnd.cups-raw");
+  else
+    ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
+        	 NULL, "application/octet-stream");
+
+#if defined(WIN32) || defined(__EMX__)
+  ippAddString(request, IPP_TAG_JOB, IPP_TAG_NAME, "requesting-user-name",
+               NULL, "WindowsUser");
+#else
+  ippAddString(request, IPP_TAG_JOB, IPP_TAG_NAME, "requesting-user-name",
+               NULL, cuserid(NULL));
+#endif /* WIN32 || __EMX__ */
+
+  if (title)
+    ippAddString(request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, title);
+
+ /*
+  * Then add all options on the command-line...
+  */
+
+  for (i = 0; i < num_options; i ++)
+  {
+   /*
+    * Skip the "raw" option - handled above...
+    */
+
+    if (strcmp(options[i].name, "raw") == 0)
+      continue;
+
+   /*
+    * See what the option value is; for compatibility with older interface
+    * scripts, we have to support single-argument options as well as
+    * option=value, option=low-high, and option=MxN.
+    */
+
+    option = options[i].name;
+    val    = options[i].value;
+
+    if (*val == '\0')
+      val = NULL;
+
+    if (val != NULL)
+    {
+      if (strcasecmp(val, "true") == 0 ||
+          strcasecmp(val, "on") == 0 ||
+	  strcasecmp(val, "yes") == 0)
+      {
+       /*
+	* Boolean value - true...
+	*/
+
+	n   = 1;
+	val = "";
+      }
+      else if (strcasecmp(val, "false") == 0 ||
+               strcasecmp(val, "off") == 0 ||
+	       strcasecmp(val, "no") == 0)
+      {
+       /*
+	* Boolean value - false...
+	*/
+
+	n   = 0;
+	val = "";
+      }
+
+      n = strtol(val, &s, 0);
+    }
+    else
+    {
+      if (strncmp(option, "no", 2) == 0)
+      {
+	option += 2;
+	n      = 0;
+      }
+      else
+        n = 1;
+
+      s = "";
+    }
+
+    if (*s != '\0' && *s != '-' && (*s != 'x' || s == val))
+    {
+     /*
+      * String value(s)...
+      */
+
+      DEBUG_printf(("cupsPrintJob: Adding string option \'%s\' with value \'%s\'...\n",
+                    option, val));
+
+      ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, option, NULL, val);
+    }
+    else if (val != NULL)
+    {
+     /*
+      * Numeric value, range, or resolution...
+      */
+
+      if (*s == '-')
+      {
+        n2 = strtol(s + 1, NULL, 0);
+        ippAddRange(request, IPP_TAG_JOB, option, n, n2);
+
+	DEBUG_printf(("cupsPrintJob: Adding range option \'%s\' with value %d-%d...\n",
+                      option, n, n2));
+      }
+      else if (*s == 'x')
+      {
+        n2 = strtol(s + 1, &s, 0);
+
+	if (strcmp(s, "dpc") == 0)
+          ippAddResolution(request, IPP_TAG_JOB, option, IPP_RES_PER_CM, n, n2);
+        else if (strcmp(s, "dpi") == 0)
+          ippAddResolution(request, IPP_TAG_JOB, option, IPP_RES_PER_INCH, n, n2);
+        else
+          ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, option, NULL, val);
+
+	DEBUG_printf(("cupsPrintJob: Adding resolution option \'%s\' with value %s...\n",
+                      option, val));
+      }
+      else
+      {
+        ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, option, n);
+
+	DEBUG_printf(("cupsPrintJob: Adding integer option \'%s\' with value %d...\n",
+                      option, n));
+      }
+    }
+    else
+    {
+     /*
+      * Boolean value...
+      */
+
+      DEBUG_printf(("cupsPrintJob: Adding boolean option \'%s\' with value %d...\n",
+                    option, n));
+      ippAddBoolean(request, IPP_TAG_JOB, option, (char)n);
+    }
+  }
+
+ /*
+  * Try printing the file...
+  */
+
+  sprintf(uri, "/printers/%s", printer);
+
+  if ((response = cupsDoFileRequest(cups_server, request, uri, filename)) == NULL)
+    jobid = 0;
+  else if (response->request.status.status_code > IPP_OK_CONFLICT)
+  {
+    DEBUG_printf(("IPP response code was 0x%x!\n",
+                  response->request.status.status_code));
+    jobid = 0;
+  }
+  else if ((attr = ippFindAttribute(response, "job-id", IPP_TAG_INTEGER)) == NULL)
+  {
+    DEBUG_puts("No job ID!");
+    jobid = 0;
+  }
+  else
+    jobid = attr->values[0].integer;
+
+  if (response != NULL)
+    ippDelete(response);
+
+  return (jobid);
+}
+
+
+/*
+ * 'cups_connect()' - Connect to the specified host...
+ */
+
+static char *			/* I - Printer name if success, NULL if fail */
+cups_connect(char *name,	/* I - Destination (printer[@host]) */
+	     char *printer,	/* O - Printer name */
+             char *hostname)	/* O - Hostname */
+{
+  char		hostbuf[HTTP_MAX_URI];
+				/* Name of host */
+  static char	printerbuf[HTTP_MAX_URI];
+				/* Name of printer or class */
+
+
+  if (name == NULL)
+    return (NULL);
+
+  if (sscanf(name, "%[^@]@%s", printerbuf, hostbuf) == 1)
+    strcpy(hostbuf, "localhost");
+
+  if (hostname != NULL)
+    strcpy(hostname, hostbuf);
+  else
+    hostname = hostbuf;
+
+  if (printer != NULL)
+    strcpy(printer, printerbuf);
+  else
+    printer = printerbuf;
+
+  if (cups_server != NULL)
+  {
+    if (strcasecmp(cups_server->hostname, hostname) == 0)
+      return (printer);
+
+    httpClose(cups_server);
+  }
+
+  if ((cups_server = httpConnect(hostname, ippPort())) == NULL)
+    return (NULL);
+  else
+    return (printer);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,62 @@
+%%BeginResource: procset hpgltops 1.0 0
+%
+% "$Id: HPGLprolog 312 1999-05-11 19:45:40Z mike $"
+%
+%   HP-GL/2 filter procset for the Common UNIX Printing System (CUPS).
+%
+%   This procset contains the basic drawing commands that are used to
+%   reduce output size.  Note the 'MP' (make newpath) definition - this
+%   should be called 'NP' (newpath), but GhostScript uses the 'NP' name
+%   for 'noaccess put' in some of its font files...
+%
+%   Copyright 1993-1999 Easy Software Products
+%
+%   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-3111 USA
+%
+%       Voice: (301) 373-9603
+%       EMail: cups-info@cups.org
+%         WWW: http://www.cups.org
+%
+/MO { moveto } bind def
+/LI { lineto } bind def
+/FI { fill } bind def
+/ST { stroke } bind def
+/CP { closepath } bind def
+/MP { newpath } bind def
+%
+% If you have more than 8 pens defined for your HP-GL/2 output you'll
+% need to add P# definitions (# = pen number) to set the appropriate color.
+% If you don't you'll get errors.  The default 8 pens cover the primary
+% colors (white, black, red, green, yellow, blue, magenta, cyan).  Ditto
+% for pen widths (W#).
+%
+% PC and PW commands in the input stream will define/redefine these
+% appropriately, but some packages don't generate them...
+%
+/P0 { 1.0 1.0 1.0 setrgbcolor } bind def
+/P1 { 0.0 0.0 0.0 setrgbcolor } bind def
+/P2 { 1.0 0.0 0.0 setrgbcolor } bind def
+/P3 { 0.0 1.0 0.0 setrgbcolor } bind def
+/P4 { 1.0 1.0 0.0 setrgbcolor } bind def
+/P5 { 0.0 0.0 1.0 setrgbcolor } bind def
+/P6 { 1.0 0.0 1.0 setrgbcolor } bind def
+/P7 { 0.0 1.0 1.0 setrgbcolor } bind def
+/W0 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+/W1 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+/W2 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+/W3 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+/W4 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+/W5 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+/W6 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+/W7 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+%%EndResource
@@ -48,8 +48,8 @@ clean:
 #

 install:
-	-$(MKDIR) $(DATADIR)/data
-	$(CP) $(FILES) $(DATADIR)/data
+	-$(MKDIR) $(DATADIR)
+	$(CP) $(FILES) $(DATADIR)

 #
 # End of "$Id$".
@@ -30,10 +30,8 @@ include ../Makedefs

 .SUFFIXES:	.html .pdf .shtml
 .shtml.html:
-	echo Formatting $@...
 	htmldoc --title images/cups-large.gif --numbered -f $@ $<
 .shtml.pdf:
-	echo Formatting $@...
 	htmldoc --title images/cups-large.gif --duplex --compression=9 \
 		--numbered --jpeg -f $@ $<

@@ -46,7 +44,7 @@ DOCUMENTS	=	cmp.shtml idd.shtml sam.shtml sdd.shtml ssr.shtml \
 DOCIMAGES	=	images/cups-block-diagram.gif images/cups-large.gif \
 			images/cups-medium.gif images/cups-small.gif
 WEBPAGES	=	cups.css cupsdoc.css index.html documentation.html
-WEBIMAGES	=	images/classes.gif images/logo.gif images/navbar.gif \
+WEBIMAGES	=	images/logo.gif images/navbar.gif \
 			images/printer-idle.gif	images/printer-processing.gif \
 			images/printer-stopped.gif

@@ -85,22 +83,17 @@ install:
 #

 overview.pdf:	overview.html
-	echo Formatting $@...
 	htmldoc --duplex --compression=9 --jpeg --webpage -f $@ $<

 sam.html:	sam.shtml
-	echo Formatting $@...
 	htmldoc --title images/cups-large.gif -f $@ $<
 sam.pdf:	sam.shtml
-	echo Formatting $@...
 	htmldoc --title images/cups-large.gif --duplex --compression=9 \
 		--jpeg -f $@ $<

 sum.html:	sum.shtml
-	echo Formatting $@...
 	htmldoc --title images/cups-large.gif -f $@ $<
 sum.pdf:	sum.shtml
-	echo Formatting $@...
 	htmldoc --title images/cups-large.gif --duplex --compression=9 \
 		--jpeg -f $@ $<

@@ -32,8 +32,8 @@ The following documentation for CUPS is available on this server:
 	<A HREF="sum.pdf">PDF</A> )

 	<LI>Software Administrators Manual (
-	<A HREF="sam.html">HTML</A> |
-	<A HREF="sam.pdf">PDF</A> )
+	<A HREF="sum.html">HTML</A> |
+	<A HREF="sum.pdf">PDF</A> )

 	<LI>Configuration Management Plan (
 	<A HREF="cmp.html">HTML</A> |
@@ -202,9 +202,6 @@ operator := &quot;+&quot; |	[ logical AND ]
 	    &quot;!&quot;         [ unary NOT ]
 </PRE>
 </UL>
-<P>The <CODE>int</CODE> and <CODE>short</CODE> rules match look for 
-integers in network byte order (a.k.a. big-endian) with the 
-most-significant byte first. </P>
 <H3><A NAME=3_3_2>3.3.2 mime.convs</A></H3>
 <P>The mime.types file defines the recognized file filters and consists 
 of 1 or more lines of ASCII text. Comment lines start with the pound 
@@ -230,7 +227,7 @@ source/type cost program
 </UL>
 <P>The destination type is assumed to the printer's type. If a printer 
 supports the source type directly the special filter program &quot;-&quot; may be 
-specified. </P>
+used. </P>
 <H4>3.4.1.2 cupsManualCopies</H4>
 <P>This boolean attribute notifies the RIP filters that the destination 
 printer does not support copy generation in hardware. The default value 
@@ -243,17 +240,17 @@ specific model of printer. </P>
 <P>This string attribute specifies a color profile of the form: </P>
 <UL>
 <PRE>
-resolution/type density gamma m00 m01 m02 m10 m11 m12 m20 m21 m22
+resolution/type density m00 m01 m02 m10 m11 m12 m20 m21 m22
 </PRE>
 </UL>
 <P>The <I>resolution</I> and <I>type</I> values may be &quot;-&quot; to act as a 
 wildcard. Otherwise they must match one of the <CODE>Resolution</CODE>
 or <CODE>MediaType</CODE> attributes defined in the PPD file. </P>
-<P>The <I>density</I> and <I>gamma</I> values define gamma and density 
-adjustment function such that: </P>
+<P>The <I>density</I> value defines a gamma and density adjustment 
+function such that: </P>
 <UL>
 <PRE>
-f(x) = density * x<SUP>gamma</SUP>
+f(x) = d * x<SUP>1/d</SUP>
 </PRE>
 </UL>
 <P>The <I>m00</I> through <I>m22</I> values define a 3x3 transformation 
@@ -303,44 +300,42 @@ directive followed by its value. The following directives are
 understood: 
 <CENTER>
 <TABLE BORDER=1 WIDTH=90%>
-<TR><TH WIDTH=25%>Directive</TH><TH>Default</TH><TH>Description</TH></TR>
-<TR><TD>AccessLog</TD><TD><TD>Specifies the location of the access log 
-file (default  &quot;logs/access_log&quot;).</TD></TR>
-<TR><TD>Allow</TD><TD><TD></TR>
-<TR><TD>AuthClass</TD><TD><TD></TR>
-<TR><TD>AuthType</TD><TD><TD></TR>
-<TR><TD>BrowseAddress</TD><TD><TD></TR>
-<TR><TD>BrowseInterval</TD><TD><TD></TR>
-<TR><TD>BrowsePort</TD><TD><TD></TR>
-<TR><TD>BrowseTimeout</TD><TD><TD></TR>
-<TR><TD>Browsing</TD><TD><TD></TR>
-<TR><TD>DefaultCharset</TD><TD><TD></TR>
-<TR><TD>DefaultLanguage</TD><TD><TD></TR>
-<TR><TD>Deny</TD><TD><TD></TR>
-<TR><TD>DocumentRoot</TD><TD><TD></TR>
-<TR><TD>ErrorLog</TD><TD><TD></TR>
-<TR><TD>Group</TD><TD><TD></TR>
-<TR><TD>HostNameLookups</TD><TD><TD></TR>
-<TR><TD>ImplicitClasses</TD><TD><TD></TR>
-<TR><TD>KeepAlive</TD><TD><TD></TR>
-<TR><TD>KeepAliveTimeout</TD><TD><TD></TR>
+<TR><TH WIDTH=25%>Directive</TH><TH>Description</TH></TR>
+<TR><TD>AccessLog</TD><TD>Specifies the location of the access log file 
+(default  &quot;logs/access_log&quot;).</TD></TR>
+<TR><TD>Allow</TD><TD></TR>
+<TR><TD>AuthClass</TD><TD></TR>
+<TR><TD>AuthType</TD><TD></TR>
+<TR><TD>BrowseAddress</TD><TD></TR>
+<TR><TD>BrowseInterval</TD><TD></TR>
+<TR><TD>BrowsePort</TD><TD></TR>
+<TR><TD>BrowseTimeout</TD><TD></TR>
+<TR><TD>Browsing</TD><TD></TR>
+<TR><TD>DefaultCharset</TD><TD></TR>
+<TR><TD>DefaultLanguage</TD><TD></TR>
+<TR><TD>Deny</TD><TD></TR>
+<TR><TD>DocumentRoot</TD><TD></TR>
+<TR><TD>ErrorLog</TD><TD></TR>
+<TR><TD>Group</TD><TD></TR>
+<TR><TD>HostNameLookups</TD><TD></TR>
+<TR><TD>ImplicitClasses</TD><TD></TR>
+<TR><TD>KeepAlive</TD><TD></TR>
+<TR><TD>KeepAliveTimeout</TD><TD></TR>
 <TR><TD>&lt;Location path&gt;
-<BR> &lt;/Location&gt;</TD><TD><TD></TR>
-<TR><TD>LogLevel</TD><TD><TD></TR>
-<TR><TD>MaxClients</TD><TD><TD></TR>
-<TR><TD>MaxLogSize</TD><TD><TD></TR>
-<TR><TD>MaxRequestSize</TD><TD><TD></TR>
-<TR><TD>Order</TD><TD><TD></TR>
-<TR><TD>PageLog</TD><TD><TD></TR>
-<TR><TD>Port</TD><TD><TD></TR>
-<TR><TD>RIPCache</TD><TD><TD></TR>
-<TR><TD>ServerAdmin</TD><TD><TD></TR>
-<TR><TD>ServerName</TD><TD><TD></TR>
-<TR><TD>ServerRoot</TD><TD><TD></TR>
-<TR><TD>SystemGroup</TD><TD><TD></TR>
-<TR><TD>TempDir</TD><TD><TD></TR>
-<TR><TD>Timeout</TD><TD><TD></TR>
-<TR><TD>User</TD><TD><TD></TR>
+<BR> &lt;/Location&gt;</TD><TD></TR>
+<TR><TD>LogLevel</TD><TD></TR>
+<TR><TD>MaxLogSize</TD><TD></TR>
+<TR><TD>MaxRequestSize</TD><TD></TR>
+<TR><TD>Order</TD><TD></TR>
+<TR><TD>PageLog</TD><TD></TR>
+<TR><TD>Port</TD><TD></TR>
+<TR><TD>RIPCache</TD><TD></TR>
+<TR><TD>ServerAdmin</TD><TD></TR>
+<TR><TD>ServerName</TD><TD></TR>
+<TR><TD>ServerRoot</TD><TD></TR>
+<TR><TD>SystemGroup</TD><TD></TR>
+<TR><TD>Timeout</TD><TD></TR>
+<TR><TD>User</TD><TD></TR>
 </TABLE>
 </CENTER>
 </P>
@@ -390,8 +385,7 @@ capability/type bits:
 <TR><TD>0</TD><TD>0 = printer
 <BR> 1 = class</TD></TR>
 <TR><TD>1</TD><TD>0 = local
-<BR> 1 = remote
-<BR> (always 1)</TD></TR>
+<BR> 1 = remote</TD></TR>
 <TR><TD>2</TD><TD>1 = can print B</TD></TR>
 <TR><TD>3</TD><TD>1 = can print color</TD></TR>
 <TR><TD>4</TD><TD>1 = can duplex</TD></TR>
@@ -585,8 +579,8 @@ printer-more-info</CODE>, and <CODE>device-uri</CODE> attributes are
 required when initially adding a printer and optional when modifying a 
 printer. </P>
 <P>A PPD file or System V interface script may follow the IPP request 
-body. If a valid interface script or PPD file is not provided then the 
-printer is treated as a generic PostScript device. </P>
+body. Note that the printer will be disabled until a valid interface 
+script or PPD file is sent. </P>
 <P>Add printer will return <CODE>ipp-ok</CODE>, <CODE>ipp-not-authorized</CODE>
 , <CODE>ipp-bad-request</CODE>, or <CODE>ipp-attributes</CODE>. </P>
 <H3><A NAME=4_7_4>4.7.4 Delete Printer (CUPS_DELETE_PRINTER = 0x4004)</A>
@@ -662,8 +656,6 @@ lpadmin</CODE>, and <CODE>reject</CODE> commands reside here. </DD>
 <DT>/usr/sbin </DT>
 <DD>The <CODE>lpc</CODE> and <CODE>cupsd</CODE> commands resize here. </DD>
 <DT>/usr/share/cups </DT>
-<DD>This is the root directory of the CUPS static data. </DD>
-<DT>/usr/share/cups/data </DT>
 <DD>The character set and filter data files reside here. </DD>
 <DT>/usr/share/cups/fonts </DT>
 <DD>The <CODE>pstoraster</CODE> font files reside here. </DD>
@@ -1,6 +1,6 @@
 %PDF-1.2
 %âãÏÓ
-1 0 obj<</Producer(htmldoc 2.0b1 Copyright 1997-1999 Michael Sweet, All Rights Reserved.)/CreationDate(D:19990730151722Z)/Title(DRAFT - CUPS Interface Design Description)/Author(Easy Software Products)>>endobj
+1 0 obj<</Producer(htmldoc 2.0b1 Copyright 1997-1999 Michael Sweet, All Rights Reserved.)/CreationDate(D:19990521210311Z)/Title(DRAFT - CUPS Interface Design Description)/Author(Easy Software Products)>>endobj
 2 0 obj<</Type/Encoding/BaseEncoding/WinAnsiEncoding>>endobj
 3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier/Encoding 2 0 R>>endobj
 4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Times-Roman/Encoding 2 0 R>>endobj
@@ -10,27 +10,27 @@
 8 0 obj<</Type/Font/Subtype/Type1/BaseFont/Helvetica-Bold/Encoding 2 0 R>>endobj
 9 0 obj<</Type/Font/Subtype/Type1/BaseFont/Symbol>>endobj
 10 0 obj<</S/URI/URI(http://partners.adobe.com/supportservice/devrelations/PDFS/TN/5003.PPD_Spec_v4.3.pdf)>>endobj
-11 0 obj<</Subtype/Link/Rect[336.6 152.4 368.7 163.4]/Border[0 0 0]/A 10 0 R>>endobj
+11 0 obj<</Subtype/Link/Rect[336.6 205.2 368.7 216.2]/Border[0 0 0]/A 10 0 R>>endobj
 12 0 obj<</S/URI/URI(http://partners.adobe.com/supportservice/devrelations/PDFS/TN/5003.PPD_Spec_v4.3.pdf)>>endobj
-13 0 obj<</Subtype/Link/Rect[368.7 152.4 414.8 163.4]/Border[0 0 0]/A 12 0 R>>endobj
+13 0 obj<</Subtype/Link/Rect[368.7 205.2 414.8 216.2]/Border[0 0 0]/A 12 0 R>>endobj
 14 0 obj<</S/URI/URI(http://partners.adobe.com/supportservice/devrelations/PDFS/TN/5003.PPD_Spec_v4.3.pdf)>>endobj
-15 0 obj<</Subtype/Link/Rect[414.8 152.4 448.1 163.4]/Border[0 0 0]/A 14 0 R>>endobj
+15 0 obj<</Subtype/Link/Rect[414.8 205.2 448.1 216.2]/Border[0 0 0]/A 14 0 R>>endobj
 16 0 obj<</S/URI/URI(http://partners.adobe.com/supportservice/devrelations/PDFS/TN/5003.PPD_Spec_v4.3.pdf)>>endobj
-17 0 obj<</Subtype/Link/Rect[448.1 152.4 493.4 163.4]/Border[0 0 0]/A 16 0 R>>endobj
+17 0 obj<</Subtype/Link/Rect[448.1 205.2 493.4 216.2]/Border[0 0 0]/A 16 0 R>>endobj
 18 0 obj<</S/URI/URI(http://partners.adobe.com/supportservice/devrelations/PDFS/TN/5003.PPD_Spec_v4.3.pdf)>>endobj
-19 0 obj<</Subtype/Link/Rect[36.0 139.2 68.7 150.2]/Border[0 0 0]/A 18 0 R>>endobj
+19 0 obj<</Subtype/Link/Rect[36.0 192.0 68.7 203.0]/Border[0 0 0]/A 18 0 R>>endobj
 20 0 obj<</S/URI/URI(http://partners.adobe.com/supportservice/devrelations/PDFS/TN/5003.PPD_Spec_v4.3.pdf)>>endobj
-21 0 obj<</Subtype/Link/Rect[68.7 139.2 122.8 150.2]/Border[0 0 0]/A 20 0 R>>endobj
+21 0 obj<</Subtype/Link/Rect[68.7 192.0 122.8 203.0]/Border[0 0 0]/A 20 0 R>>endobj
 22 0 obj<</S/URI/URI(http://partners.adobe.com/supportservice/devrelations/PDFS/TN/5003.PPD_Spec_v4.3.pdf)>>endobj
-23 0 obj<</Subtype/Link/Rect[122.8 139.2 142.6 150.2]/Border[0 0 0]/A 22 0 R>>endobj
+23 0 obj<</Subtype/Link/Rect[122.8 192.0 142.6 203.0]/Border[0 0 0]/A 22 0 R>>endobj
 24 0 obj<</S/URI/URI(http://partners.adobe.com/supportservice/devrelations/PDFS/TN/5003.PPD_Spec_v4.3.pdf)>>endobj
-25 0 obj<</Subtype/Link/Rect[142.6 139.2 177.2 150.2]/Border[0 0 0]/A 24 0 R>>endobj
+25 0 obj<</Subtype/Link/Rect[142.6 192.0 177.2 203.0]/Border[0 0 0]/A 24 0 R>>endobj
 26 0 obj<</S/URI/URI(http://partners.adobe.com/supportservice/devrelations/PDFS/TN/5003.PPD_Spec_v4.3.pdf)>>endobj
-27 0 obj<</Subtype/Link/Rect[177.2 139.2 238.0 150.2]/Border[0 0 0]/A 26 0 R>>endobj
+27 0 obj<</Subtype/Link/Rect[177.2 192.0 238.0 203.0]/Border[0 0 0]/A 26 0 R>>endobj
 28 0 obj<</S/URI/URI(http://partners.adobe.com/supportservice/devrelations/PDFS/TN/5003.PPD_Spec_v4.3.pdf)>>endobj
-29 0 obj<</Subtype/Link/Rect[238.0 139.2 275.5 150.2]/Border[0 0 0]/A 28 0 R>>endobj
+29 0 obj<</Subtype/Link/Rect[238.0 192.0 275.5 203.0]/Border[0 0 0]/A 28 0 R>>endobj
 30 0 obj<</S/URI/URI(http://partners.adobe.com/supportservice/devrelations/PDFS/TN/5003.PPD_Spec_v4.3.pdf)>>endobj
-31 0 obj<</Subtype/Link/Rect[275.5 139.2 289.3 150.2]/Border[0 0 0]/A 30 0 R>>endobj
+31 0 obj<</Subtype/Link/Rect[275.5 192.0 289.3 203.0]/Border[0 0 0]/A 30 0 R>>endobj
 32 0 obj[11 0 R
 13 0 R
 15 0 R
@@ -304,19 +304,19 @@
 216 0 obj<</Subtype/Link/Rect[157.2 514.8 178.6 527.8]/Border[0 0 0]/Dest[427 0 R/XYZ null 249 0]>>endobj
 217 0 obj<</Subtype/Link/Rect[144.0 501.6 168.8 514.6]/Border[0 0 0]/Dest[430 0 R/XYZ null 782 0]>>endobj
 218 0 obj<</Subtype/Link/Rect[168.8 501.6 219.8 514.6]/Border[0 0 0]/Dest[430 0 R/XYZ null 782 0]>>endobj
-219 0 obj<</Subtype/Link/Rect[144.0 488.4 168.8 501.4]/Border[0 0 0]/Dest[430 0 R/XYZ null 401 0]>>endobj
-220 0 obj<</Subtype/Link/Rect[168.8 488.4 222.2 501.4]/Border[0 0 0]/Dest[430 0 R/XYZ null 401 0]>>endobj
-221 0 obj<</Subtype/Link/Rect[108.0 475.2 124.5 488.2]/Border[0 0 0]/Dest[430 0 R/XYZ null 278 0]>>endobj
-222 0 obj<</Subtype/Link/Rect[124.5 475.2 172.5 488.2]/Border[0 0 0]/Dest[430 0 R/XYZ null 278 0]>>endobj
-223 0 obj<</Subtype/Link/Rect[172.5 475.2 205.2 488.2]/Border[0 0 0]/Dest[430 0 R/XYZ null 278 0]>>endobj
-224 0 obj<</Subtype/Link/Rect[205.2 475.2 259.2 488.2]/Border[0 0 0]/Dest[430 0 R/XYZ null 278 0]>>endobj
-225 0 obj<</Subtype/Link/Rect[259.2 475.2 280.6 488.2]/Border[0 0 0]/Dest[430 0 R/XYZ null 278 0]>>endobj
-226 0 obj<</Subtype/Link/Rect[144.0 462.0 168.8 475.0]/Border[0 0 0]/Dest[430 0 R/XYZ null 171 0]>>endobj
-227 0 obj<</Subtype/Link/Rect[168.8 462.0 199.0 475.0]/Border[0 0 0]/Dest[430 0 R/XYZ null 171 0]>>endobj
-228 0 obj<</Subtype/Link/Rect[199.0 462.0 250.0 475.0]/Border[0 0 0]/Dest[430 0 R/XYZ null 171 0]>>endobj
-229 0 obj<</Subtype/Link/Rect[250.0 462.0 261.3 475.0]/Border[0 0 0]/Dest[430 0 R/XYZ null 171 0]>>endobj
-230 0 obj<</Subtype/Link/Rect[261.3 462.0 284.3 475.0]/Border[0 0 0]/Dest[430 0 R/XYZ null 171 0]>>endobj
-231 0 obj<</Subtype/Link/Rect[284.3 462.0 305.7 475.0]/Border[0 0 0]/Dest[430 0 R/XYZ null 171 0]>>endobj
+219 0 obj<</Subtype/Link/Rect[144.0 488.4 168.8 501.4]/Border[0 0 0]/Dest[430 0 R/XYZ null 454 0]>>endobj
+220 0 obj<</Subtype/Link/Rect[168.8 488.4 222.2 501.4]/Border[0 0 0]/Dest[430 0 R/XYZ null 454 0]>>endobj
+221 0 obj<</Subtype/Link/Rect[108.0 475.2 124.5 488.2]/Border[0 0 0]/Dest[430 0 R/XYZ null 331 0]>>endobj
+222 0 obj<</Subtype/Link/Rect[124.5 475.2 172.5 488.2]/Border[0 0 0]/Dest[430 0 R/XYZ null 331 0]>>endobj
+223 0 obj<</Subtype/Link/Rect[172.5 475.2 205.2 488.2]/Border[0 0 0]/Dest[430 0 R/XYZ null 331 0]>>endobj
+224 0 obj<</Subtype/Link/Rect[205.2 475.2 259.2 488.2]/Border[0 0 0]/Dest[430 0 R/XYZ null 331 0]>>endobj
+225 0 obj<</Subtype/Link/Rect[259.2 475.2 280.6 488.2]/Border[0 0 0]/Dest[430 0 R/XYZ null 331 0]>>endobj
+226 0 obj<</Subtype/Link/Rect[144.0 462.0 168.8 475.0]/Border[0 0 0]/Dest[430 0 R/XYZ null 224 0]>>endobj
+227 0 obj<</Subtype/Link/Rect[168.8 462.0 199.0 475.0]/Border[0 0 0]/Dest[430 0 R/XYZ null 224 0]>>endobj
+228 0 obj<</Subtype/Link/Rect[199.0 462.0 250.0 475.0]/Border[0 0 0]/Dest[430 0 R/XYZ null 224 0]>>endobj
+229 0 obj<</Subtype/Link/Rect[250.0 462.0 261.3 475.0]/Border[0 0 0]/Dest[430 0 R/XYZ null 224 0]>>endobj
+230 0 obj<</Subtype/Link/Rect[261.3 462.0 284.3 475.0]/Border[0 0 0]/Dest[430 0 R/XYZ null 224 0]>>endobj
+231 0 obj<</Subtype/Link/Rect[284.3 462.0 305.7 475.0]/Border[0 0 0]/Dest[430 0 R/XYZ null 224 0]>>endobj
 232 0 obj<</Subtype/Link/Rect[108.0 448.8 124.5 461.8]/Border[0 0 0]/Dest[436 0 R/XYZ null 800 0]>>endobj
 233 0 obj<</Subtype/Link/Rect[124.5 448.8 171.2 461.8]/Border[0 0 0]/Dest[436 0 R/XYZ null 800 0]>>endobj
 234 0 obj<</Subtype/Link/Rect[171.2 448.8 235.7 461.8]/Border[0 0 0]/Dest[436 0 R/XYZ null 800 0]>>endobj
@@ -325,8 +325,8 @@
 237 0 obj<</Subtype/Link/Rect[168.8 435.6 221.6 448.6]/Border[0 0 0]/Dest[436 0 R/XYZ null 547 0]>>endobj
 238 0 obj<</Subtype/Link/Rect[144.0 422.4 168.8 435.4]/Border[0 0 0]/Dest[436 0 R/XYZ null 215 0]>>endobj
 239 0 obj<</Subtype/Link/Rect[168.8 422.4 216.7 435.4]/Border[0 0 0]/Dest[436 0 R/XYZ null 215 0]>>endobj
-240 0 obj<</Subtype/Link/Rect[144.0 409.2 168.8 422.2]/Border[0 0 0]/Dest[442 0 R/XYZ null 641 0]>>endobj
-241 0 obj<</Subtype/Link/Rect[168.8 409.2 224.7 422.2]/Border[0 0 0]/Dest[442 0 R/XYZ null 641 0]>>endobj
+240 0 obj<</Subtype/Link/Rect[144.0 409.2 168.8 422.2]/Border[0 0 0]/Dest[442 0 R/XYZ null 702 0]>>endobj
+241 0 obj<</Subtype/Link/Rect[168.8 409.2 224.7 422.2]/Border[0 0 0]/Dest[442 0 R/XYZ null 702 0]>>endobj
 242 0 obj<</Subtype/Link/Rect[72.0 382.8 80.2 395.8]/Border[0 0 0]/Dest[445 0 R/XYZ null 818 0]>>endobj
 243 0 obj<</Subtype/Link/Rect[80.2 382.8 123.9 395.8]/Border[0 0 0]/Dest[445 0 R/XYZ null 818 0]>>endobj
 244 0 obj<</Subtype/Link/Rect[123.9 382.8 171.0 395.8]/Border[0 0 0]/Dest[445 0 R/XYZ null 818 0]>>endobj
@@ -634,13 +634,13 @@
 373 0 obj<</D[427 0 R/XYZ null 619 null]>>endobj
 374 0 obj<</D[427 0 R/XYZ null 249 null]>>endobj
 375 0 obj<</D[430 0 R/XYZ null 782 null]>>endobj
-376 0 obj<</D[430 0 R/XYZ null 401 null]>>endobj
-377 0 obj<</D[430 0 R/XYZ null 278 null]>>endobj
-378 0 obj<</D[430 0 R/XYZ null 171 null]>>endobj
+376 0 obj<</D[430 0 R/XYZ null 454 null]>>endobj
+377 0 obj<</D[430 0 R/XYZ null 331 null]>>endobj
+378 0 obj<</D[430 0 R/XYZ null 224 null]>>endobj
 379 0 obj<</D[436 0 R/XYZ null 800 null]>>endobj
 380 0 obj<</D[436 0 R/XYZ null 547 null]>>endobj
 381 0 obj<</D[436 0 R/XYZ null 215 null]>>endobj
-382 0 obj<</D[442 0 R/XYZ null 641 null]>>endobj
+382 0 obj<</D[442 0 R/XYZ null 702 null]>>endobj
 383 0 obj<</D[445 0 R/XYZ null 818 null]>>endobj
 384 0 obj<</D[445 0 R/XYZ null 737 null]>>endobj
 385 0 obj<</D[463 0 R/XYZ null 458 null]>>endobj
@@ -778,30 +778,25 @@ endobj
 áÒw³P04TIS046V072PIÑp	rtQÐUp
 VðÌ+I-JKLNUpI-ÎLÏQÉE™%™ùyš!Y\º �ºP�F 3=30ßP!89¿ $êÂÈ�V!õendstream
 endobj
-420 0 obj
-120
-endobj
-421 0 obj<</Type/Page/Parent 408 0 R/Contents 422 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R/F9 8 0 R/Fc 9 0 R>>>>>>endobj
-422 0 obj<</Length 423 0 R/Filter/FlateDecode>>stream
-xÚ•AsÚ0…ïüŠ=’™ØÁ†`Ã�é0S&69qQ5¨cKT“òï+!C ¥�âf|°Á«ï´ïÁ÷Vs…ÐíC^µ>e‡§È
-ó¦õ £íX Dž£ºË¾¹’G?vEÞcì»2?€ñ2Ia"ò]…\Íwzuywà÷my¶A(DYŠ7Æ×n!=_L�<êRøº½1_k†œ×à0öCðÂ¾keö#¸Tn[o<O¼Àï�ÞXð‚wÒéÍ	'k´lHJÂ/ù¦ñ k$þŸM&gðt¯4V0ãeAr„	*¶æö–K¶}?›[$ÒÑÜJø?Ž"¢ÐoD"ŒhÅ8SÚìEHe÷²#eþåŽôi=™_C'R¬%©*k‚Æ]§‹kèó�dzoì»R7àfÉ5n†ª©EÒåæ·Tø?c{�\Ç¾ªõöo“{O°ç¢cbY§8„g½AyŠ±úÇsÁ½‹+°-|d†gÓé‚nù½ûcÀÎœov74†b\Û~Vm*I¡Ww7�ç,I3QÊ,‘”ð¼== “Qà{iš±§<ÔöH8…L®n6è‰5«¶åáWËèóŽQlÆ™Šå¡¡+bŽ0W7�Ocó
-îáãèÆ`]D°241×"µ·ãzQí½0
-�¡~ý§éÅ`„Í«®ý<ÍZ/Ÿ²6Úbendstream
-endobj
+420 0 obj
+120
+endobj
+421 0 obj<</Type/Page/Parent 408 0 R/Contents 422 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R/F9 8 0 R/Fc 9 0 R>>>>>>endobj
 422 0 obj<</Length 423 0 R/Filter/FlateDecode>>stream
 xÚ•AsÚ0…ïüŠ=’™ØÁ†`Ã�é0S&69qQ5¨cKT“òï+!C ¥�âf|°Á«ï´ïÁ÷Vs…ÐíC^µ>e‡§È
-endobj
+ó¦õ £íX Dž£ºË¾¹’G?vEÞcì»2?€ñ2Ia"ò]…\Íwzuywà÷my¶A(DYŠ7Æ×n!=_L�<êRøº½1_k†œ×à0öCðÂ¾keö#¸Tn[o<O¼Àï�ÞXð‚wÒéÍ	'k´lHJÂ/ù¦ñ k$þŸM&gðt¯4V0ãeAr„	*¶æö–K¶}?›[$ÒÑÜJø?Ž"¢ÐoD"ŒhÅ8SÚìEHe÷²#eþåŽôi=™_C'R¬%©*k‚Æ]§‹kèó�dzoì»R7àfÉ5n†ª©EÒåæ·Tø?c{�\Ç¾ªõöo“{O°ç¢cbY§8„g½AyŠ±úÇsÁ½‹+°-|d†gÓé‚nù½ûcÀÎœov74†b\Û~Vm*I¡Ww7�ç,I3QÊ,‘”ð¼== “Qà{iš±§<ÔöH8…L®n6è‰5«¶åáWËèóŽQlÆ™Šå¡¡+bŽ0W7�Ocó
 îáãèÆ`]D°241×"µ·ãzQí½0
 �¡~ý§éÅ`„Í«®ý<ÍZ/Ÿ²6Úbendstream
 endobj
-Â0DïûsÔC´›”êµZÞ´® q#ŒšöÿÑˆÌÀ03¼71ª¯®)öÚ-û5˜!ìV¶‚\gÝÐöƒíùpÂ>MšÃÅ+:ã-•ð9¾¦øLs¹“) ù“uYjË‹¿n1hÐ¬ÉëX®�Ð‘>H.#ùendstream
-endobj
-426 0 obj
-123
-endobj
+423 0 obj
+529
+endobj
+424 0 obj<</Type/Page/Parent 408 0 R/Contents 425 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 7 0 R>>>>>>endobj
+425 0 obj<</Length 426 0 R/Filter/FlateDecode>>stream
+xÚ-‹Á
 Â0DïûsÔC´›”êµZÞ´® q#ŒšöÿÑˆÌÀ03¼71ª¯®)öÚ-û5˜!ìV¶‚\gÝÐöƒíùpÂ>MšÃÅ+:ã-•ð9¾¦øLs¹“) ù“uYjË‹¿n1hÐ¬ÉëX®�Ð‘>H.#ùendstream
 endobj
-xÚ�VÑn›0}ÏW\õ©•
+426 0 obj
 123
 endobj
 427 0 obj<</Type/Page/Parent 408 0 R/Contents 428 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R/F9 8 0 R/Fc 9 0 R>>>>>>endobj
@@ -814,45 +809,34 @@ endobj
 ŠÉ«ÛæÈ™¡þöfÐþ²½¬7ÐŽy¡Xg0èYª!	#§vÒ9¦v™H™4v ýÒÐöKv¯DÏñhµF@+¥Ÿ=ƒB‹ì¥øƒ¥¿HV!Ê÷Þ-’6‹cüŽn�m-á|Ó×•öˆ¦Bœãz\îÅÿ…ºðâx±ò‚q°pl66[ŒƒEã`Ëq°‘{[�\÷H)ƒZKÏù·ŸEM0ÚˆÑ¥Œ¥6Ü-lƒ©5>¬yÿ¹·¨(”¥.\H¤·¶òbl»[×‘œr¹*SbXÚwMO¸½Ïö×^!Þé×3y�ëÇû7òøîéëÆré:…j€KeŒT�ñÔýýD™¸ØWŠØnÇ'¾8~õ?‹y<õWX‡5õ&î“É·É__�ˆ–endstream
 endobj
 429 0 obj
-¢„JUÊÈ>,¤y=ùÐ!%‰†ƒãhÄÀÉ\¶`”«BR&sUáÁb–©žUê‹Ìüš‡‰*£TWFkHçðI×TêZRá$ñj|ýöâ‚¬ül#z«ËRV–�€iïnÖóPcEmé^Ù¹³·ÐKè¾é¯‚›×”ÎE-R+ëˆØÑ©HoM!Ìœ77JEESIKW…uÊ$TÁá¼"«; «ª%Væh0N°b·t
-}&Ò9Uº
-§…¨n=Ü9o¼÷‚Þ]¼;s‘Ê®ÊÜ‚§f¹�õ>/°ÇÂ€Ô˜“5<}
-üb|9Žh\Ž³Ž§¹.
-}¯ª™ƒ¶ì`“j),‡Œ]!#kåéwËÍæY¥+ª—…4'>b:öƒ4z²±2™ð§DètœüLÎ
-ö¯õ+]_9uôÏ�B�¯ˆðK@�ŒÃ?ƒ.n¥·Ã=t×È]ãðøQgÖ‰‚$‰Dd�T
-‹½y$
-ûÂ"!
-Þ½“àü5káínl3í�¸oN¿œÉÏoáqL«O Lªƒuži)xP!«¶}§Ü¢V•ÓBþYc!<ëú—»¹š:bw¢XÊï˜›ëÚ¾\ñ½\¨Ð©ðœ´âÙÀ>%oÕO¼�þó‘
-=S�¦ñå)ýµ]?›xÃ2Hñ
-™÷v‰ü<}ÿHËJÔtù~â%Öm7ärk7ÞU5úåžò-r-Ðs�¶ƒrlwq®º›:(´¾¥@´6ø‚Žfïu}KÓ+Ñ¬3×™Dt‰ˆ¦j¢U*Q¡=R§•ÚØÐ(t“|TÖ+ÊUm|£ÜœCá ï£ä9Ô÷Ýöîÿ›C¸Xíe“¨T3—èE“è…c´oæÛÉPËE-
+717
+endobj
+430 0 obj<</Type/Page/Parent 408 0 R/Contents 431 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 4 0 R/F8 7 0 R/F9 8 0 R>>>>/Annots 32 0 R>>endobj
+431 0 obj<</Length 432 0 R/Filter/FlateDecode>>stream
+xÚWMsâF½ûWt´6Yd	�Œ]•ñGŠÃz‰!9dÉa�PVÒ°šÁ^ï:ÿ=¯gø³åTl—@š÷¦_÷ô<�?Ÿ„à7¤(æ¿¤8ùetrzsNaä·h4ÅXÜ
+ùkÚˆüÈ©È
+é›Ç…ÔoGÚ¦0tÀftîÇÍe
+FÓ,—”ÊiVâÆ`¬’‰š•ÙW™º1eJ‰*u¦�&5…&UQ¡*I¹eâQoxÙï“‘_ŒO—ª(diXB;¹iÃAµ•¡‡ÌÌm¼…ZbîqÃ{ã�ßR2•HŒ¬|b¡‘|Ò¹ÐsŒÇ;JDIIK
 ©ÂØÉ$¦‚aU‘Q{��ÉÊ%Fæ ¬0–X²ìºûmF_‹dN¥*›“\”ŸÜŠ×N½ ÷ý÷×¶@”¥H7›f�¥z¹�Õ)°b¡QÔ*'+(Ý$ÞïÝö|êå¹ÙžÒ©Êsõ�•3ÅÁ"URN«BZV™+¿^-žÉTIÕ2—úÂõA@ç®cÐF›ë�!ßpK4í?“ÕOÞ©çfýFÃ��Žþùq‡äp |#O4¿zôD^¯ù§·�[Ï»ÃgÓ^}{
 šçÏ¨6¬¥¢H
-jòó^µü€W‡G|íÕ|QÒ0éãÄ·ßFp
+ˆÌž¨kóD
 ñ…A+‚�º;‘¨ù³i¶äÃ2…vA€÷ì7;¿œÉ/áiLëOè$Ë¬¦S-
 yï<Êe9Ã²å-ª¬4b’ËÿÀÕäÙÑ=<NäÝ´G»ùR~'Ü\Uæõ4ä÷zR®ájRËg»i^ªŸx9ÝÏGÊÕ,›z·Wô×áù9Ä;æ Åw8îŽQ~ð6ß?Ò²Õ#Ý~9FÝ¡›¼á¢–³^öè–3_8ÑýÿçÑ¸À\^ëÒ{–³òlz•K¿Ò2Íƒ:hšú¹kVrQIÍ€•	jµ¬É9î	O¥HXÓ³óéæ°}¢B¨…@�´YõÞ¸ð; vjäÈWOZTjV‰‚Çñ’ñ©?åÑ}§ÞÅÂ KeH/dÂ™¥`®eL—ðú…p-)3T,¡Y¢”•tùû`¸ŽŸfXh4ö£¿i«ŽßÝöJÛ5U›Èg˜TÙÂÐ€]Ü+©í.Ê
 zÄ6Ûõè$ðœ)øòåîWŠ‚]Æ]îMŠÐ¬g«»œ†îÄ±mÑ0>wis‹~'ì¸1\¡ª®EUåò¤2Ai�òËªj: ê¬‹Ä·ªàkˆ‚Úa§¡cø:øÎÊ¸“õ¥šm
-endobj
-432 0 obj
-1236
-endobj
+µª@/U8}Œd2¿UFÒ›NDµš¼˜n°�\‘˜ÍÒÞ¼�×PP7æ� k€=³Þ#ð:ø6Ÿ%�âkˆ‚ZAk“Éa|<Z¶s_Cß�aÖð¼(¸µùR›cçÛ>ºý—8WøÃŸm?²»w8X-mÃß7î nÛm´ŠÝ˜×ëc„fS@{o÷ÖA#·$‘¦ðSy�·TŽƒæ«x“M–Æº9Ä²)mwÅDÂºVzº«)Ã(¢8ŠQLzu×»QÓ)ês¦ÆˆRd³²^ž£ÉÔæY+`fÌOÚ§¼ôOZö·“o1t=endstream
+endobj
 432 0 obj
 1153
-xÚ�Vß�ÚF~ç¯ÝKI%;Øæàˆ”‡äÈI÷p-½ÒJ•ò²ØkØÈÞuöÇÿ}gvmNr¤B¬½3»ß|óÍ_G	Lð“À<…ly=ú¸½}X@’ÀºÄ�ÙÝ4¾ƒu1ÎâiœÄ	ä®1¢²\¿YAÓioe‹xF¦ë�0`¬rÌâïÆY�V/¢àäJ¾pm„’ ]ÅA•`wJ¥ëwáÔ	,â”ŽEPQ’ÑºÓ^C÷c£œÎù[{l8žg,�¿Õ¬¾D‘ÿ	`…d–îö¾•ãj^€UFƒÀ1¼_Œ7ˆá±DÈíK0®i”¶Æ[áœBhžÛê6žVu€[ü¥§
+endobj
 433 0 obj<</Type/Page/Parent 408 0 R/Contents 434 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 4 0 R/F6 6 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
 434 0 obj<</Length 435 0 R/Filter/FlateDecode>>stream
 xÚ�VMoã6½ûWrYo)úpœ¤@m¼rHëÍº
-oæÿ±ÐÎƒÎU¥<n:çÕ™æFUŽrjàÒ‹¹guÍ žLð›à7…:Á5:Õ	®S\§¸NÓ+¶gíöÙu—~c`² ¡™W˜é
-‹jŒò“[¬räc/ª"GeÆð;2¡÷Âp¢ä5å¯f6ß�’SG=ñCÏ?D‰l_z�Ÿx!Øú;HûŒ*!QlBúVK’\¨�3m|‡¯6?A–OØØ
-÷·9%ß.ËAØ5—¨h's_êÆ!IÔ-~ZCåçñáóxßû+:ß9I¡„Åý&d|†³?9�†½�–’[òzMN¨ÏaÈv§•Ûî¾±*uHƒì��ÕL* ÐöðG‹ƒ¯vJÜýÓ?mÉß®ùõ9:ŸŸ4�š¦Âî?ÄÄÊoÆì¸¿çÉµ†rëÊßaê¾ÞP4ÿêp˜g-GBŽK$c¿˜ýnz·
-åþ¯ÕŸð¸\Â‹ÌwÍŽ�NÉÀ–XPÒÄî�Ö¨/œœÂ†2Üð0DCc»IâÉMÞ]9É2˜e·áŸÉòùÃÃ¢u×’áT^r#¶’~zÓÕjD®Ñ<�ôÔ¿O=>êÿä„é:½›Ä‹ ¿9=Z�þý®æÂÊendstream
-endobj
-435 0 obj
-916
-endobj
-436 0 obj<</Type/Page/Parent 408 0 R/Contents 437 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F5 5 0 R/F6 6 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
+ì…–(›‰Ôò#¶ÿ}gHI±•lÜ†!Jš¾yóf¨ï“ü¥p�A>‡¢™ü¶š\ÞßBšÂªÂ7ó›Y|«ršÇ³8�S(\kîEm¹þ¸ú†¦³Á4Êoã9™®¶Â€±ZÈ
+0‹×µ³ZžEÉ
+0(”|æÚ%A»šƒªÀn9TJ7?‡¨	ÜÆ…EPQšÓºœÒ+Ü†ö+§F9]ðK{h9Æ3–âo4kNQEäÿ‚‹°B2K{{_„ÊŒq
 /Á*£Eà˜Þã
 bx¨r÷Œk[¥ñ–CˆS
-ž§%Al	ûÀêc¾·ÊFB;ˆF^«*P¥ÃhÄÒð"Õ\‚QnQ¿iÃÇÁ:@{�`:ÑÅ‡õíÞ.*çPˆšçFÕÂþ˜ Ã\Õ¹É˜j^ÀÓ›gYDzÎ"”ÿ "ûB�…DƒÈ©§DËR
+Í[Â‹–‚Õ=àåië�ÂEt
 ;Àšƒ3¼Œòê£lÏ^¨Ï<õ�L:Vß©Vpó~ÖJÕœÉ£
 HeE…~âÓÃ ºgÖ?<f§Ï¸Tè�®}êÈv{€
 —\C!Gyn™.wL#u�ñŠ¹ÚÂ3«�§»bµáç²ÍC¶ªäõï®YŸSAÝ Ø—d}	|¶Cñ¢îY
@@ -887,16 +871,14 @@ endobj
 ^¿«ôC&ëu¥|ƒ±0Òº¤à-Ðï�ªî³Òƒ2À1H;ðœ‚c€Ÿëªñ ™
 Ò4¥  WÅ^é“�n¸Ãeƒ´ƒŽ_ØÅa{ËS ¤û±<!Ý$
 Ìt—UµòŒšÇ"À6H;ð’€m~–¶§lëù¯q!tƒ´ƒÏ	èv¥�(¢AÚ¥D»Òùi¯ÍBkß'"À3H;à˜´èëªÒU·(¹±,žAºËžÝVútôPc ¤TÛ(ê{]7Ÿ²½šiýótôL¦Lð½ íà›„Õën,‹¼hìú¥||ÆLƒ´ƒoþ¥Ž“²k‘Î�	ÐÒ2ÆÿpÍ¦4åºAºOãt{3{jŽY³{Ûò1º$]Kñfütú§2+TÆÚ.è|e6
-<´ÿ´}IF§×>P
-I,‚0æ^Éòx!«¬æZ›“äÇè*� íî1¿æ{Â(BJC|gÄcPIXtˆ©Oöê�ö¨9¡ïªÙ‚†ÜÐçÚÈâ¦Ò›ui¡Å`R§JÚ©nI}îù–4‘ÅzªªJyþpJ§JÙ©n)ÇK©
-©7}·N#T¦tê¡”�ê–’pËxWËž4“ŸC[õ@ÀnuÓI M3ì²À§–•{�Ça]©ÒÈªöR]f}ßuÆ|âj9YÉ¿•�©\¾Õª65è{WWPh™«R6K‹ËÙŒüm<¸ÔE!KÓnÖFTž”Y�±®õ¦\ÂýñÑ§£û�¡i{íéJT"ÅÀ^»ÁBWµW"]A©ËñC.ÊŸ�cç·Þ;.E!-‰°¨™zÜTÂ(]ÂRU25j+!Óy®ŸäžA¡éVäé�=°ÛRåã¢�q
-�‹è˜£õò³Ë_Ðæ/$˜¼1'wújeE}E˜`».ë´Rk‹õqåø”PÚNÍ±yþ©…?¦*Ÿ43õl*3±ÉÍ»â&mçoN}vÚîžŒÉ£x7w¹0b:µÃÜ«]OñÐwÕ7•[•Ê»ù¬'r0G�º#A6²ï»K›•™î	ÊãÆ¢S¿ý5™þªSÑ_œÆ”ƒS¿˜4gý†½Û^6‰˜_NÝ–½~ÑÏþGÙ±¦X†–�Sw—ÚŽ]adOÔ¦Pg£QwödÜö$å"æÃüâ:�1\ÞÝ.`fS�‰TÎõXÂ›±1¶†ãÖ’»ä“ç;yõÒÍº^îæ<êûè-$/Šendstream
-endobj
-444 0 obj
-695
+•½¤»Ê¸%ÌŸo¦î•ge¥Ö Á�Ä¦�„JôÇì·a/‹?¨½Ã`´�8ÐXvà…úuRu3Žqˆ
+6Ý'‰>WkU�§«ÍP*¤T)`æ™›ÕÌ;Ï‘Ì8�vp¹½ü�ai€Z�v@©µwói–ï<¿-!i€X�v€±°›)Ó¢ªj²Þž�^šHeÃýÜ„ƒRn–óÜ8	ÐÊ†];0�
+¸þ¶A$!myr¦M©–�u£öC–ð$dKúÍß$Ý~š0†b
+›úÅäf….Ñôë|‰ìîd“å
+™½~±= ÿ¶ü—í…—Ý•,j-ÍÍò¿Žr}Ø´nÚ’väi7¢/£¿�S˜xendstream
 endobj
 441 0 obj
-446 0 obj<</Length 447 0 R/Filter/FlateDecode>>stream
+891
 endobj
 442 0 obj<</Type/Page/Parent 408 0 R/Contents 443 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F5 5 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
 443 0 obj<</Length 444 0 R/Filter/FlateDecode>>stream
@@ -927,21 +909,19 @@ endobj
 Ûÿr«•yÄÍx�vg<Ã
 …®ÎíÚA«!=°zßA ~”àï‹øb4ÝÑE|�ø$t½Ëøb>¡˜öKø.ñApÀÿö(Dr±‹{Ú£Ä~ß¥nÂç\ò"åðÄŠ†å_0ÉBfpŸ	%ÊB§ W¹hüÚÕ×ãÃ¡‘-L]O�O÷ ¶‡y)átå‰lzm^³ªÊEÊ´¿›u‘¹iSÕN…ÏÕæ¹ÃÊ¶¾›C×zÛ�õ:aµâr@cH¼Ð-B¬t¸,N-™‚´,ÃJe
 £AÖd"Õ’˜Üš(‚CÚAÃŠì²¹5ñã,]Z‹mCdeÚ¬l:±æÖM�mƒTIVÔ˜ÑÖ\ÏqÆƒ¹,WÆZ‡¶fô&&�Ïµ¶vDï¢Õ·¬¹TÆVËÞ8ÀYÏ±¢f~¢®Sn{W;ãn`Æ¢¨a#Ô£;/	³ÂÙ»Å“A–…ømj6¥Ìþï5¤	ý8€Ÿ×Ÿ&ìE}úùÙÄo&8Å™L—BñT5ÒŽï^:¼×8}4CµõÂ&;#¹P*ç'íØ�¸‘B3/çÝ@‘ç:3æF�œ×ÜpîùÇ+\~1908Ët!ÔøW]•E-Ú¸a:´gQ,0*’cìuÒµA0&¬Sm¦Þ`KiœH
-451 0 obj<</Type/Page/Parent 408 0 R/Contents 452 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R>>>>>>endobj
-452 0 obj<</Length 453 0 R/Filter/FlateDecode>>stream
+çÏÜžgMßtÁc�¤ç‹ö»˜I¬Ø½Ž¦0E\C…ÌRDf»ËÀUb>±{ó|ÛÏêC™çåFóÐºNeÏÔ.ƒšK�<1„[]ôÞû}ÔŠIµ/‰N—õ+|ßs°´q4¥�Œ
+}¶¬VS©x¾Åð¯Ž³©ní£5a;;ÂÄ�q|xVÝŽDzÈš�á·«œ$¡8¡Ì�YÞ\Ø½	P¢çz¿³6ŒÂ=–xá;`Š§ÄMýäxÇØÍÅ�¬Qæ9‘Y%ƒØ’Ò»ËYm S{ùG“;·•ÀÒÆÀŽ_î1QØê‹ËBÉHÏéaB-v¨P‹>!å‘Ä³5¡ñ±À2/å	Œt5P ÁhÐgFvq¥‰CFäHß�å’‡»¨7TžÁ–gÐgäá¹m_ÃFÔ¡aØøW£ªF} B_¿ò
 Th°ƒô…¤ÝLh¡ÂQWá8[3ÜÒ¾	œ„Ez(ÓÓG.Ýí9úUš†.Z´
 íÓÃ%(Á�iï€ƒ¯¾U‰§ó;Ã‰ðp²ØÁ1èÓµ{�<<Uü1¥Ý‹ÆWø¡OG`gïœÐowãÎm`óÝ±ÝCÒÓÈ_å¬ôOk®zÀà4P8—sx»˜·ÅK)0P›�KX›¶	x›Ó!Ù}âûøFaÏ¸ÉøaŠeÓÛðè‹z' £tÚ'íÇ'~ ·ÏnëÔš¹•å¦Ö{Â³,U™–y‡¿¯þ»È�^endstream
-Gf»—Õ‚tskF:sáVg¥¥ÏÁ�tC£ô7º‘ÎÚ�‰ dÖëSñ7Ç8�Ç{©êlo^ûE°Qu"+‘ˆ¢$‰|†T/‚¤âP½#ÏªªÔñ)dòµK•Ê5’«Rj³J¢æ\=AàTüFxóSÛ˜+øš…”ò]û”BÖºrÜé”òÖMJq×u¸Û«�›¬„ªx|½És�9-
+endobj
 450 0 obj
 1407
 endobj
-)`srm'EP¨JÿÐîH‡MÂÛ(ÙA;�àìRµûï‡,Çº¯m]dH×¹ÞçÁÖçG6Ò/ô®{z½wiWb‹-²¶-Òã-Ãº«0T¿¨_ê
-ˆM¼_ó3wq�`tÌ:@ê|^¼Ù—ÛM/ƒÚÎ.OüòÒ>.²Õï¥Ë=<¶Gù»ßw>É}õbº¥Td	¼µÝ±…mr.ïwÃ.8-¶»a—›Ã)ãq#,€Ðz¡ñˆû*½�ø¡c§Ž¦ØNþÖ±S©Þ�õ¯7³~pëø4¨õêÁÇÃóý&jŽrNB†¿ð<ü½ÙBÌ]}½„ð‡¹njóZ”2ÉôË®�y›%Ž>ÑiÎôàÒæ¬‡¸Ô=Ã¦Ù›y¡ß�ÉËþ½ø×Àþ[endstream
-endobj
-453 0 obj
+451 0 obj<</Type/Page/Parent 408 0 R/Contents 452 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R>>>>>>endobj
+452 0 obj<</Length 453 0 R/Filter/FlateDecode>>stream
 xÚ�˜Ks£8…÷ùZÎT5n$ñòb“¤=�®N:“¸+kbËD=Ñ<Ò�_?Wº@æ¡JUl£Ì9\]ùû%.üQ2Â²;^\n/Þo<B)ÙˆOIñUD¶û?Xà9,ÿÜ~»ðB8]©4�+¡Q×Çc.ù‹ìÉTEv8¯¹¥¦\âP¾bš£À�¶îÊ…[êþ=üC¼hå’ ðVñBxËùÊ#… �#ìÚïX¸¥˜¹nG3õhðA«÷]8`ÔGiO}]ÝŠ½ŒÏäß‰WQ�]]‘c;>§’Ä“øPz�©Pìœú¦ž?‡JQ
 ïÊãDÌ»í¯iëvÈáßœÛÈ¢Ûs0º�4ºýF£Û~6n‡ÜöOÝ¾®óTü<óú¾�YEJ™%©pJ¹û»Ú«úùšQïGp²]!k[kH�×šï5Ú‡EüTûÇ§Qª´®¤Êz|T…ü²*†'›í	”]%wð¡èp"3^•N.
-454 0 obj<</Type/Page/Parent 408 0 R/Contents 455 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 4 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
+Gf»—Õ‚tskF:sáVg¥¥ÏÁ�tC£ô7º‘ÎÚ�‰ dÖëSñ7Ç8�Ç{©êlo^ûE°Qu"+‘ˆ¢$‰|†T/‚¤âP½#ÏªªÔñ)dòµK•Ê5’«Rj³J¢æ\=AàTüFxóSÛ˜+øš…”ò]û”BÖºrÜé”òÖMJq×u¸Û«�›¬„ªx|½És�9-
 Ñ‘ÇE\)M�öÍ49í‰RëÙ„¬'HOxâ‡èˆŽôVO*w61�~Lú§vl>³‡Øxh©&µg<¤äý5L•Y
 ‹ÎÁ�‡†Fßhô�¯ÃæžÝÈá´·ú}±žöÉùú¿U90@d	>e5âçƒž�³”¶óÒLßYLûùæú94m'÷»åmÑNdmíDzÂNÞ,oœ2°³—r·q)Wö¬4ªtbaˆ{`tFÉ£(ËLâ¼«�ÅHGÖ6Ò‘�tNÛÚa�IŒ÷Åfuœn®Ãc‘t4Dú‹šl£nÇ©i+Øº[Ý£YÛ(Bz<ŠXÛBsaÄzad:Èûfýé¹q“åÐµ•)¸Ñ®OäP@¸°‚‘»¡ÐIE–ÏYÛgŽôø3g‡â7B!/8=ú$ô¬ïÉ4ÇÉ3 +:)âcI [�çi¢ñ{K
 óÃv>/Ë5¬µ\COÈõx3Ÿ9ÌgÞkWoeQ¨Â4ž“5n’íV÷p|F?ó¬—XdëÚÐuM]T€ú^šÝ‰$®ä«˜Õ/3Ý¯Në¿ŽOë§ÐE–ú‘µÕ�ô¸~M¹{q^/âîêãU·«íÔS=u™>¤÷Øº²`“Íü\«©¤n7àX‚#Ä!tÁ„ÐµžÈÚN¤Ç'õƒæÖ=7¯n_
@@ -1001,13 +981,13 @@ endobj
 C¤í™®BÎ¸üoRk”NÅ‚.
 Å.fR#ÏÆzÏéú Ñ®š¨RM®–hîyÂ`R´~HÙ«ŸˆT¦Q+ÓQØ"&ÁiUK=¦?Àîºf\ÏCUnÀö{&)V1Ì>Ï²ëùñÖ…›·ï'Ãù
 P‡ž©fD¨Ùâšó¨DÞ€CT‰‡<NñUâížéŸÇWˆ÷,äí,¾‚Ø€K¬=Kõø*ñÎq>ý“’ÅzO}Áét<@¢ýàúb#®HáêT†ö^H€˜xG�,Ëp¡§Ñë‘ãÆ�ªÖrÞž=ô±Ù8¿8`1•ØâAºQÙÞªÔœÈ1�ÑZïN¸OÞŽguè½f¯�FmXÉt|×t�ZË&¦U¬JjqÙÅ%&K%3T’Ý~–r{ÝéÐ$73ºYP3ëNÄWÙW=š6<BÁß9�u‰¡ I¶BŠ¾0p¶Âº»jìÁ.éUÍÀÙ�§ëRM8é
-467 0 obj<</Length 468 0 R/Filter/FlateDecode>>stream
-xÚ-ŒÁ
-‚@„ïûsÔƒ¶«’zè�ºB^*ý½	RÛ
+ÇáéýúÌU‚«™ëáû�JÝÌzæ¬óø
+ñ]5
+gñâƒ‹ø Šw]ûB>Uâ»ÖQ½
 3ª»U´a7£N—\Ã®!Èw•ÿ){ç™:sl}î7«ªWtØ°lý»øô•ÿáôf‚êB¡‡hE#¦n|�¨vu«Ž5å
 ß&å%€âŽu§îXÅµd:º
 Â§»ŸýYy-	tz®¯N��µå"ùÕú%Œ$endstream
-endobj
+endobj
 465 0 obj
 864
 endobj
@@ -1468,110 +1448,110 @@ xref
 0000028108 00000 n 
 0000028214 00000 n 
 0000028320 00000 n 
-0000029168 00000 n 
-0000029274 00000 n 
-0000029380 00000 n 
-0000029486 00000 n 
-0000029592 00000 n 
-0000029698 00000 n 
-0000029804 00000 n 
-0000029910 00000 n 
-0000030016 00000 n 
-0000030122 00000 n 
-0000030228 00000 n 
-0000030334 00000 n 
-0000030440 00000 n 
-0000030546 00000 n 
-0000030652 00000 n 
-0000030758 00000 n 
-0000030864 00000 n 
-0000030970 00000 n 
-0000031076 00000 n 
-0000031182 00000 n 
-0000031288 00000 n 
-0000031394 00000 n 
-0000031500 00000 n 
-0000031606 00000 n 
-0000031712 00000 n 
-0000031818 00000 n 
-0000031924 00000 n 
-0000032030 00000 n 
-0000032136 00000 n 
-0000032242 00000 n 
-0000032348 00000 n 
-0000032454 00000 n 
-0000032560 00000 n 
-0000032666 00000 n 
-0000032769 00000 n 
-0000032872 00000 n 
-0000032975 00000 n 
-0000033079 00000 n 
-0000033181 00000 n 
-0000033284 00000 n 
-0000034654 00000 n 
-0000034758 00000 n 
-0000034863 00000 n 
-0000034967 00000 n 
-0000035072 00000 n 
-0000035122 00000 n 
-0000035156 00000 n 
-0000035190 00000 n 
-0000035785 00000 n 
-0000035834 00000 n 
-0000035883 00000 n 
-0000035932 00000 n 
-0000035981 00000 n 
-0000036030 00000 n 
-0000036079 00000 n 
-0000036128 00000 n 
-0000036177 00000 n 
-0000036226 00000 n 
-0000036275 00000 n 
-0000036324 00000 n 
-0000036373 00000 n 
-0000036422 00000 n 
-0000036471 00000 n 
-0000036520 00000 n 
-0000036569 00000 n 
-0000036618 00000 n 
-0000036667 00000 n 
-0000036716 00000 n 
-0000036765 00000 n 
-0000036814 00000 n 
-0000036863 00000 n 
-0000036912 00000 n 
-0000036961 00000 n 
-0000037010 00000 n 
-0000037059 00000 n 
-0000037108 00000 n 
-0000037157 00000 n 
-0000037206 00000 n 
-0000037255 00000 n 
-0000037304 00000 n 
-0000037353 00000 n 
-0000037402 00000 n 
-0000037451 00000 n 
-0000037500 00000 n 
-0000037549 00000 n 
-0000037598 00000 n 
-0000037647 00000 n 
-0000037696 00000 n 
-0000037745 00000 n 
-0000037794 00000 n 
-0000037843 00000 n 
-0000037892 00000 n 
-0000037941 00000 n 
-0000038218 00000 n 
-0000038370 00000 n 
-0000044766 00000 n 
-0000044788 00000 n 
-0000044901 00000 n 
-0000045003 00000 n 
-0000045023 00000 n 
-0000045163 00000 n 
-0000046071 00000 n 
+0000028426 00000 n 
+0000028532 00000 n 
+0000028638 00000 n 
+0000028744 00000 n 
+0000028850 00000 n 
+0000028956 00000 n 
+0000029062 00000 n 
+0000029168 00000 n 
+0000029274 00000 n 
+0000029380 00000 n 
+0000029486 00000 n 
+0000029592 00000 n 
+0000029698 00000 n 
+0000029804 00000 n 
+0000029910 00000 n 
+0000030016 00000 n 
+0000030122 00000 n 
+0000030228 00000 n 
+0000030334 00000 n 
+0000030440 00000 n 
+0000030546 00000 n 
+0000030652 00000 n 
+0000030758 00000 n 
+0000030864 00000 n 
+0000030970 00000 n 
+0000031076 00000 n 
+0000031182 00000 n 
+0000031288 00000 n 
+0000031394 00000 n 
+0000031500 00000 n 
+0000031606 00000 n 
+0000031712 00000 n 
+0000031818 00000 n 
+0000031924 00000 n 
+0000032030 00000 n 
+0000032136 00000 n 
+0000032242 00000 n 
+0000032348 00000 n 
+0000032454 00000 n 
+0000032560 00000 n 
+0000032666 00000 n 
+0000032769 00000 n 
+0000032872 00000 n 
+0000032975 00000 n 
+0000033079 00000 n 
+0000033181 00000 n 
+0000033284 00000 n 
+0000034654 00000 n 
+0000034758 00000 n 
+0000034863 00000 n 
+0000034967 00000 n 
+0000035072 00000 n 
+0000035122 00000 n 
+0000035156 00000 n 
+0000035190 00000 n 
+0000035785 00000 n 
+0000035834 00000 n 
+0000035883 00000 n 
+0000035932 00000 n 
+0000035981 00000 n 
+0000036030 00000 n 
+0000036079 00000 n 
+0000036128 00000 n 
+0000036177 00000 n 
+0000036226 00000 n 
+0000036275 00000 n 
+0000036324 00000 n 
+0000036373 00000 n 
+0000036422 00000 n 
+0000036471 00000 n 
+0000036520 00000 n 
+0000036569 00000 n 
+0000036618 00000 n 
+0000036667 00000 n 
+0000036716 00000 n 
+0000036765 00000 n 
+0000036814 00000 n 
+0000036863 00000 n 
+0000036912 00000 n 
+0000036961 00000 n 
+0000037010 00000 n 
+0000037059 00000 n 
+0000037108 00000 n 
+0000037157 00000 n 
+0000037206 00000 n 
+0000037255 00000 n 
+0000037304 00000 n 
+0000037353 00000 n 
+0000037402 00000 n 
+0000037451 00000 n 
+0000037500 00000 n 
+0000037549 00000 n 
+0000037598 00000 n 
+0000037647 00000 n 
+0000037696 00000 n 
+0000037745 00000 n 
+0000037794 00000 n 
+0000037843 00000 n 
+0000037892 00000 n 
+0000037941 00000 n 
+0000038218 00000 n 
+0000038370 00000 n 
 0000044766 00000 n 
 0000044788 00000 n 
 0000044901 00000 n 
-0000046417 00000 n 
+0000045003 00000 n 
 0000045023 00000 n 
@@ -156,9 +156,6 @@ operator := "+" |	[ logical AND ]
 	    "!"         [ unary NOT ]
 </PRE></UL>

-<P>The <CODE>int</CODE> and <CODE>short</CODE> rules match look for integers
-in network byte order (a.k.a. big-endian) with the most-significant byte first.
-
 <H3>mime.convs</H3>

 <P>The mime.types file defines the recognized file filters and consists
@@ -191,8 +188,7 @@ source/type cost program
 </PRE></UL>

 <P>The destination type is assumed to the printer's type. If a printer
-supports the source type directly the special filter program "-" may be
-specified.
+supports the source type directly the special filter program "-" may be used.

 <H4>cupsManualCopies</H4>

@@ -210,18 +206,18 @@ printer.
 <P>This string attribute specifies a color profile of the form:

 <UL><PRE>
-resolution/type density gamma m00 m01 m02 m10 m11 m12 m20 m21 m22
+resolution/type density m00 m01 m02 m10 m11 m12 m20 m21 m22
 </PRE></UL>

 <P>The <I>resolution</I> and <I>type</I> values may be "-" to act as a
 wildcard. Otherwise they must match one of the <CODE>Resolution</CODE> or
 <CODE>MediaType</CODE> attributes defined in the PPD file.

-<P>The <I>density</I> and <I>gamma</I> values define gamma and density
-adjustment function such that:
+<P>The <I>density</I> value defines a gamma and density adjustment function
+such that:

 <UL><PRE>
-f(x) = density * x<SUP>gamma</SUP>
+f(x) = d * x<SUP>1/d</SUP>
 </PRE></UL>

 <P>The <I>m00</I> through <I>m22</I> values define a 3x3 transformation
@@ -305,185 +301,141 @@ followed by its value. The following directives are understood:
 <CENTER><TABLE WIDTH="90%" BORDER="1">
 <TR>
 	<TH WIDTH="25%">Directive</TH>
-	<TH>Default</TH>
 	<TH>Description</TH>
 </TR>
 <TR>
 	<TD>AccessLog</TD>
-	<TD></TD>
 	<TD>Specifies the location of the access log file (default
 	"logs/access_log").</TD>
 </TR>
 <TR>
 	<TD>Allow</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>AuthClass</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>AuthType</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>BrowseAddress</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>BrowseInterval</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>BrowsePort</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>BrowseTimeout</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>Browsing</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>DefaultCharset</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>DefaultLanguage</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>Deny</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>DocumentRoot</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>ErrorLog</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>Group</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>HostNameLookups</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>ImplicitClasses</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>KeepAlive</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>KeepAliveTimeout</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>&lt;Location path&gt;<BR>
 	&lt;/Location&gt;</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>LogLevel</TD>
 	<TD></TD>
-	<TD></TD>
-</TR>
-<TR>
-	<TD>MaxClients</TD>
-	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>MaxLogSize</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>MaxRequestSize</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>Order</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>PageLog</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>Port</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>RIPCache</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>ServerAdmin</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>ServerName</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>ServerRoot</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>SystemGroup</TD>
 	<TD></TD>
-	<TD></TD>
-</TR>
-<TR>
-	<TD>TempDir</TD>
-	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>Timeout</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 <TR>
 	<TD>User</TD>
 	<TD></TD>
-	<TD></TD>
 </TR>
 </TABLE></CENTER>

@@ -571,8 +523,7 @@ capability/type bits:
 <TR>
 	<TD>1</TD>
 	<TD>0 = local<BR>
-	1 = remote<BR>
-	(always 1)</TD>
+	1 = remote</TD>
 </TR>
 <TR>
 	<TD>2</TD>
@@ -975,8 +926,8 @@ are required when initially adding a printer and optional when modifying
 a printer.

 <P>A PPD file or System V interface script may follow the IPP request
-body. If a valid interface script or PPD file is not provided then the
-printer is treated as a generic PostScript device.
+body. Note that the printer will be disabled until a valid interface script or
+PPD file is sent.

 <P>Add printer will return <CODE>ipp-ok</CODE>, <CODE>ipp-not-authorized</CODE>,
 <CODE>ipp-bad-request</CODE>, or <CODE>ipp-attributes</CODE>.
@@ -1091,9 +1042,6 @@ System (CIFS) protocols are described at
 	<DD>The <CODE>lpc</CODE> and <CODE>cupsd</CODE> commands resize here.

 	<DT>/usr/share/cups
-	<DD>This is the root directory of the CUPS static data.
-
-	<DT>/usr/share/cups/data
 	<DD>The character set and filter data files reside here.

 	<DT>/usr/share/cups/fonts
@@ -24,11 +24,8 @@ Copyright 1997-1999, All Rights Reserved<BR>
 <UL>
 <LI><A HREF=#2_1>The Printing Problem</A></LI>
 <LI><A HREF=#2_2>The Technology</A></LI>
-<LI><A HREF=#2_3>Jobs</A></LI>
-<LI><A HREF=#2_4>Classes</A></LI>
-<LI><A HREF=#2_5>Filters</A></LI>
-<LI><A HREF=#2_6>Printer Drivers</A></LI>
-<LI><A HREF=#2_7>Networking</A></LI>
+<LI><A HREF=#2_3>Filters</A></LI>
+<LI><A HREF=#2_4>Printer Drivers</A></LI>
 </UL>
 <B><A HREF=#3>2 - Building and Installing CUPS</A></B>
 <UL>
@@ -51,35 +48,31 @@ Copyright 1997-1999, All Rights Reserved<BR>
 <LI><A HREF=#4_3>Removing Printers</A></LI>
 <LI><A HREF=#4_4>Printer Classes</A></LI>
 <LI><A HREF=#4_5>Setting the Default Printer</A></LI>
-<LI><A HREF=#4_6>Starting and Stopping Printers</A></LI>
-<LI><A HREF=#4_7>Accepting and Rejecting Print Jobs</A></LI>
 </UL>
 <B><A HREF=#5>4 - Printing System Management</A></B>
 <UL>
-<LI><A HREF=#5_1>Changing the Configuration Files</A></LI>
-<LI><A HREF=#5_2>Temporary Files</A></LI>
-<LI><A HREF=#5_3>Network Configuration</A></LI>
+<LI><A HREF=#5_1>Network Configuration</A></LI>
 <UL>
-<LI><A HREF=#5_3_1>Port</A></LI>
-<LI><A HREF=#5_3_2>Listen</A></LI>
-<LI><A HREF=#5_3_3>BrowsePort</A></LI>
-<LI><A HREF=#5_3_4>BrowseAddress</A></LI>
+<LI><A HREF=#5_1_1>Port</A></LI>
+<LI><A HREF=#5_1_2>Listen</A></LI>
+<LI><A HREF=#5_1_3>BrowsePort</A></LI>
+<LI><A HREF=#5_1_4>BrowseAddress</A></LI>
 </UL>
-<LI><A HREF=#5_4>Printer Security</A></LI>
+<LI><A HREF=#5_2>Printer Security</A></LI>
 <UL>
-<LI><A HREF=#5_4_1>Location</A></LI>
-<LI><A HREF=#5_4_2>Order</A></LI>
-<LI><A HREF=#5_4_3>Allow</A></LI>
-<LI><A HREF=#5_4_4>Deny</A></LI>
-<LI><A HREF=#5_4_5>AuthType</A></LI>
-<LI><A HREF=#5_4_6>AuthClass</A></LI>
-<LI><A HREF=#5_4_7>AuthGroupName</A></LI>
-<LI><A HREF=#5_4_8>SystemGroup</A></LI>
+<LI><A HREF=#5_2_1>Location</A></LI>
+<LI><A HREF=#5_2_2>Order</A></LI>
+<LI><A HREF=#5_2_3>Allow</A></LI>
+<LI><A HREF=#5_2_4>Deny</A></LI>
+<LI><A HREF=#5_2_5>AuthType</A></LI>
+<LI><A HREF=#5_2_6>AuthClass</A></LI>
+<LI><A HREF=#5_2_7>AuthGroupName</A></LI>
+<LI><A HREF=#5_2_8>SystemGroup</A></LI>
 </UL>
-<LI><A HREF=#5_5>File Formats</A></LI>
+<LI><A HREF=#5_3>File Formats</A></LI>
 <UL>
-<LI><A HREF=#5_5_1>mime.types</A></LI>
-<LI><A HREF=#5_5_2>mime.convs</A></LI>
+<LI><A HREF=#5_3_1>mime.types</A></LI>
+<LI><A HREF=#5_3_2>mime.convs</A></LI>
 </UL>
 </UL>
 <B><A HREF=#6>5 - Printer Accounting</A></B>
@@ -164,17 +157,7 @@ using their web browser. </P>
 Basic authentication and domain or IP-based access control. Digest 
 authentication and TLS encryption will be available in future versions 
 of CUPS. </P>
-<H2><A NAME=2_3>Jobs</A></H2>
-<P>Each file that is submitted for printing is called a <I>job</I>. 
- Jobs are identified by a unique number starting at 1 and are assigned 
-to a particular destination (usually a printer). Jobs can also have 
-options associated with them such as media size, number of copies, and 
-priority. </P>
-<H2><A NAME=2_4>Classes</A></H2>
-<P>CUPS supports collections of printers known as <I>classes</I>. Jobs 
-sent to a class are forwarded to the first available printer in the 
-class. </P>
-<H2><A NAME=2_5>Filters</A></H2>
+<H2><A NAME=2_3>Filters</A></H2>
 <P>Filters allow a user or application to print many types of files 
 without extra effort. Print jobs sent to a CUPS server are filtered 
 before sending them to a printer. Some filters convert job files to 
@@ -190,28 +173,12 @@ printer. </P>
 <P>CUPS provides backends for printing over parallel and serial ports, 
 and over the network via the JetDirect (AppSocket), Server Message 
 Block, and Line Printer Daemon protocols. </P>
-<H2><A NAME=2_6>Printer Drivers</A></H2>
+<H2><A NAME=2_4>Printer Drivers</A></H2>
 <P>Printer drivers in CUPS consist of one of more filters specific to a 
 printer. CUPS includes a sample printer driver for Hewlett-Packard 
 LaserJet and DeskJet printers. While this driver does not generate 
 optimal output for different printer models, it does demonstrate how 
 you can write your own printer drivers and incorporate them into CUPS. </P>
-<H2><A NAME=2_7>Networking</A></H2>
-<P>Printers and classes on the local system are automatically shared 
-with other systems on the network. This allows you to setup one system 
-to print to a printer and use this system as a printer server or spool 
-host for all of the others.  If there is only one occurrence of a 
-printer on a network, then that printer can be accessed using its name 
-alone. If more than one printer exists with the same name, users must 
-select the printer by specifying which server to use (e.g. 
-&quot;printer@host1&quot; or &quot;printer@host2&quot;.) </P>
-<P>CUPS also provides <I>implicit classes</I>, which are collections of 
-printers and/or classes with the same name. This allows you to setup 
-multiple servers pointing to the same physical network printer, for 
-example, so that you aren't relying on a single system for printing. 
-Because this also works with printer classes, you can setup multiple 
-servers and printers and never worry about a &quot;single point of failure&quot; 
-unless all of the printers and servers goes down! </P>
 <H1 ALIGN=RIGHT><A NAME=3>2 - Building and Installing CUPS</A></H1>
 <P>This chapter shows how to build and install the Common UNIX Printing 
 System. If you are installing a binary distribution from the CUPS web 
@@ -330,7 +297,7 @@ administration tasks from the command-line. Since <CODE>lpadmin</CODE>
 command with the &quot;-p&quot; option: </P>
 <UL>
 <PRE>
-% /usr/lib/lpadmin -p<I>printer</I> -E -v<I>device</I> -P<I>ppd</I> ENTER
+% /usr/lib/lpadmin -p<I>printer</I> -v<I>device</I> -P<I>ppd</I> ENTER
 </PRE>
 </UL>
 <P>Spaces between the option letter and value are optional. </P>
@@ -345,8 +312,7 @@ installation of CUPS: </P>
 <DT>file:/dev/filename </DT>
 <DT>/dev/filename </DT>
 <DD>Sends all output to the specified file. </DD>
-<DT>http://[username:password@]hostname[:port]/resource </DT>
-<DT>ipp://[username:password@]hostname[:port]/resource </DT>
+<DT>ipp://hostname[:port]/resource </DT>
 <DD>Sends all output to the specified IPP printer or server.  The <I>
 port</I> parameters defaults to 631. </DD>
 <DT>lpd://hostname/queue </DT>
@@ -365,9 +331,6 @@ character:
 <LI><CODE>parity=<I>none</I></CODE> - Turns parity  checking off. </LI>
 </UL>
 </DD>
-<DT>smb://[username:password@]hostname/queue </DT>
-<DD>Sends all output to the specified SMB (Windows) printer queue 
- using the SAMBA software. </DD>
 <DT>socket://hostname[:port] </DT>
 <DD>Sends all output to the specified printer using the  AppSocket 
 protocol. The <I>port</I> parameter defaults to 9100. </DD>
@@ -382,7 +345,7 @@ files and interface scripts located in the <CODE>/usr/share/cups/model</CODE>
 directory with the &quot;-m&quot; option: </P>
 <UL>
 <PRE>
-% /usr/lib/lpadmin -p<I>printer</I> -E -v<I>device</I> -m<I>model</I> ENTER
+% /usr/lib/lpadmin -p<I>printer</I> -v<I>device</I> -m<I>model</I> ENTER
 </PRE>
 </UL>
 <P>The <I>model</I> argument specifies the name of the PPD file or 
@@ -391,7 +354,7 @@ DeskJet series driver connected to parallel port 1 under Linux you
 would use: </P>
 <UL>
 <PRE>
-% /usr/lib/lpadmin -pDeskJet -E -vparallel:/dev/par1 -mdeskjet.ppd ENTER
+% /usr/lib/lpadmin -pDeskJet -vparallel:/dev/par1 -mdeskjet.ppd ENTER
 </PRE>
 </UL>
 <H2><A NAME=4_3>Removing Printers</A></H2>
@@ -429,82 +392,21 @@ remove a class just use the &quot;-x&quot; option: </P>
 </PRE>
 </UL>
 <P>The <I>destination</I> argument is the name of the printer or class. </P>
-<H2><A NAME=4_6>Starting and Stopping Printers</A></H2>
-<P>The <CODE>enable</CODE> and <CODE>disable</CODE> commands start and 
-stop printer queues, respectively: </P>
-<UL>
-<PRE>
-% /usr/bin/enable <I>printer</I> ENTER
-% /usr/bin/disable <I>printer</I> ENTER
-</PRE>
-</UL>
-<P>Printers that are disabled may still accept jobs for printing, but 
-won't actually print any files until they are restarted. This is useful 
-if the printer malfunctions and you need time to correct the problem. 
-Any queues jobs are printed after the printer is enabled (started). </P>
-<H2><A NAME=4_7>Accepting and Rejecting Print Jobs</A></H2>
-<P>The <CODE>accept</CODE> and <CODE>reject</CODE> commands accept and 
-reject print jobs for the named printer, respectively: </P>
-<UL>
-<PRE>
-% /usr/lib/accept <I>printer</I> ENTER
-% /usr/lib/reject <I>printer</I> ENTER
-</PRE>
-</UL>
-<P>As noted above, a printer can be stopped but accepting new print 
-jobs. A printer can also be rejecting new print jobs while it finishes 
-those that have been queued. This is useful for when you must perform 
-maintenance on the printer and will not have it available to users for 
-a long period of time. </P>
 <H1 ALIGN=RIGHT><A NAME=5>4 - Printing System Management</A></H1>
 <P>This chapter shows how you can configure the CUPS server. </P>
-<H2><A NAME=5_1>Changing the Configuration Files</A></H2>
-<P>All of the server configuration files are located in the <CODE>
-/var/cups/conf</CODE> directory. Once you have made a change to a file 
-you need to restart the CUPS server by sending it a HUP signal or using 
-the supplied script &quot;<CODE>cups.sh</CODE>&quot;: </P>
-<UL>
-<PRE>
-% ./cups.sh restart ENTER
-</PRE>
-</UL>
-<P>The binary distribution installs the script in the <CODE>init.d</CODE>
- directory with the name <CODE>lp</CODE> or <CODE>lpd</CODE> depending 
-on the vendor-supplied printing system. </P>
-<H2><A NAME=5_2>Temporary Files</A></H2>
-<P>Normally CUPS puts all of its temporary files in <CODE>/var/tmp</CODE>
-. If you'd like to change this directory you'll need to edit the <CODE>
-/var/cups/conf/cupsd.conf</CODE> file. </P>
-<P>Start by creating the new temporary directory and setting the 
-appropriate permissions: </P>
-<UL>
-<PRE>
-% mkdir <I>/foo/bar/tmp</I> ENTER
-% chmod a+rwxt <I>/foo/bar/tmp</I> ENTER
-</PRE>
-</UL>
-<P>Then change the line containing the <CODE>TempDir</CODE> directive 
-in the <CODE>cupsd.conf</CODE> to the directory that you've created: </P>
-<UL>
-<PRE>
-TempDir <I>/foo/bar/tmp</I>
-</PRE>
-</UL>
-<P>Finally, restart the server as outlined in the first section of this 
-chapter. </P>
-<H2><A NAME=5_3>Network Configuration</A></H2>
+<H2><A NAME=5_1>Network Configuration</A></H2>
 <P>The default configuration of the CUPS server listens for connections 
 from all network interfaces on port 631 (the standard IPP port). 
 Administration functions are limited to local connections with the 
 appropriate username and password. </P>
 <P>If you'd like to limit access to your system you'll need to edit the <CODE>
 /var/cups/conf/cupsd.conf</CODE> file. </P>
-<H3><A NAME=5_3_1>Port</A></H3>
+<H3><A NAME=5_1_1>Port</A></H3>
 <P>The <CODE>Port</CODE> directive specifies a port to listen on for 
 all interfaces. Besides the standard IPP port (631) you can also setup 
 your server to listen on the HTTP port (80) to use your CUPS server as 
 a standard web server as well. </P>
-<H3><A NAME=5_3_2>Listen</A></H3>
+<H3><A NAME=5_1_2>Listen</A></H3>
 <P>The <CODE>Listen</CODE> directive specifies a listening address and 
 port, extending the functionality of the <CODE>Port</CODE> directive. 
 If you want to allow connections only from the local machine you can 
@@ -516,9 +418,9 @@ Listen 127.0.0.1:631
 </UL>
 <P>instead of the <CODE>Port</CODE> directive. </P>
 <P>If you want to limit access to a specific network/subnet, make sure 
-you specify only the network address and not your system's network 
+you specific only the network address and not your system's network 
 address! </P>
-<H3><A NAME=5_3_3>BrowsePort</A></H3>
+<H3><A NAME=5_1_3>BrowsePort</A></H3>
 <P>The <CODE>BrowsePort</CODE> directive controls which port is 
 monitored for remote printers. By default it is set to the IPP port 
 (631), however you can change it as needed. </P>
@@ -526,7 +428,7 @@ monitored for remote printers. By default it is set to the IPP port
 <P>You must set the <CODE>BrowsePort</CODE> to the same value  on all 
 of the systems that you want to see. </P>
 </UL>
-<H3><A NAME=5_3_4>BrowseAddress</A></H3>
+<H3><A NAME=5_1_4>BrowseAddress</A></H3>
 <P>The <CODE>BrowseAddress</CODE> directive specifies a broadcast 
 address to use when sending printer status updates over the network. 
 The default browse address is <CODE>255.255.255.255</CODE> which will 
@@ -536,10 +438,10 @@ send printer information to all subnets. </P>
 bits, printer browsing (and in fact all broadcast  reception) will not 
 work. This problem appears to be fixed in  HP-UX 11.0. </P>
 </UL>
-<H2><A NAME=5_4>Printer Security</A></H2>
+<H2><A NAME=5_2>Printer Security</A></H2>
 <P>CUPS provides IP and domain-name based access control and Basic 
 authentication for authentication. </P>
-<H3><A NAME=5_4_1>Location</A></H3>
+<H3><A NAME=5_2_1>Location</A></H3>
 <P>The <CODE>Location</CODE> directive defines access control for a 
 specific HTTP directory. The following pseudo directories are provided 
 by the CUPS server: </P>
@@ -570,7 +472,7 @@ Allow From 127.0.0.1
 &lt;/Location&gt;
 </PRE>
 </UL>
-<H3><A NAME=5_4_2>Order</A></H3>
+<H3><A NAME=5_2_2>Order</A></H3>
 <P>The <CODE>Order</CODE> directive defines the default access control. 
 The following values are supported: </P>
 <UL>
@@ -581,7 +483,7 @@ listed in an <CODE>Allow</CODE> directive. </LI>
 </UL>
 <P>The <CODE>Order</CODE> directive must appear inside a <CODE>Location</CODE>
 directive. </P>
-<H3><A NAME=5_4_3>Allow</A></H3>
+<H3><A NAME=5_2_3>Allow</A></H3>
 <P>The <CODE>Allow</CODE> directive specifies a hostname, IP address, 
 or network that is allowed access to the server: </P>
 <UL>
@@ -601,24 +503,10 @@ Allow from nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
 </UL>
 <P><CODE>Allow</CODE> directives are cummulative, so multiple <CODE>
 Allow</CODE> directives can be used to allow access for multiple hosts 
-or networks.  The <CODE>/mm</CODE> notation specifies a CIDR netmask: 
-<CENTER>
-<TABLE BORDER=1 WIDTH=80%>
-<TR><TH>mm</TH><TH>netmask</TH></TR>
-<TR><TD>0</TD><TD>0.0.0.0</TD></TR>
-<TR><TD>1</TD><TD>128.0.0.0</TD></TR>
-<TR><TD>2</TD><TD>192.0.0.0</TD></TR>
-<TR><TD>...</TD><TD>...</TD></TR>
-<TR><TD>8</TD><TD>255.0.0.0</TD></TR>
-<TR><TD>16</TD><TD>255.255.0.0</TD></TR>
-<TR><TD>24</TD><TD>255.255.255.0</TD></TR>
-<TR><TD>32</TD><TD>255.255.255.255</TD></TR>
-</TABLE>
-</CENTER>
-</P>
+or networks. </P>
 <P>The <CODE>Allow</CODE> directive must appear inside a <CODE>Location</CODE>
 directive. </P>
-<H3><A NAME=5_4_4>Deny</A></H3>
+<H3><A NAME=5_2_4>Deny</A></H3>
 <P>The <CODE>Deny</CODE> directive specifies a hostname, IP address, or 
 network that is allowed access to the server: </P>
 <UL>
@@ -637,25 +525,10 @@ Deny from nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
 </PRE>
 </UL>
 <P><CODE>Deny</CODE> directives are cummulative, so multiple <CODE>Deny</CODE>
- directives can be used to allow access for multiple hosts or networks. 
- The <CODE>/mm</CODE> notation specifies a CIDR netmask: 
-<CENTER>
-<TABLE BORDER=1 WIDTH=80%>
-<TR><TH>mm</TH><TH>netmask</TH></TR>
-<TR><TD>0</TD><TD>0.0.0.0</TD></TR>
-<TR><TD>1</TD><TD>128.0.0.0</TD></TR>
-<TR><TD>2</TD><TD>192.0.0.0</TD></TR>
-<TR><TD>...</TD><TD>...</TD></TR>
-<TR><TD>8</TD><TD>255.0.0.0</TD></TR>
-<TR><TD>16</TD><TD>255.255.0.0</TD></TR>
-<TR><TD>24</TD><TD>255.255.255.0</TD></TR>
-<TR><TD>32</TD><TD>255.255.255.255</TD></TR>
-</TABLE>
-</CENTER>
-</P>
+ directives can be used to allow access for multiple hosts or networks. </P>
 <P>The <CODE>Deny</CODE> directive must appear inside a <CODE>Location</CODE>
 directive. </P>
-<H3><A NAME=5_4_5>AuthType</A></H3>
+<H3><A NAME=5_2_5>AuthType</A></H3>
 <P>The <CODE>AuthType</CODE> directive defines the type of 
 authentication to perform: </P>
 <UL>
@@ -666,7 +539,7 @@ using the UNIX password and group files. </LI>
 </UL>
 <P>The <CODE>AuthType</CODE> directive must appear inside a <CODE>
 Location</CODE> directive. </P>
-<H3><A NAME=5_4_6>AuthClass</A></H3>
+<H3><A NAME=5_2_6>AuthClass</A></H3>
 <P>The <CODE>AuthClass</CODE> directive defines what level of <CODE>
 Basic</CODE> access is required: </P>
 <UL>
@@ -682,21 +555,21 @@ AuthGroupName</CODE> directive. </LI>
 </UL>
 <P>The <CODE>AuthClass</CODE> directive must appear inside a <CODE>
 Location</CODE> directive. </P>
-<H3><A NAME=5_4_7>AuthGroupName</A></H3>
+<H3><A NAME=5_2_7>AuthGroupName</A></H3>
 <P>The <CODE>AuthGroupName</CODE> directive sets the group to use for <CODE>
 Group</CODE> authentication. </P>
 <P>The <CODE>AuthGroupName</CODE> directive must appear inside a <CODE>
 Location</CODE> directive. </P>
-<H3><A NAME=5_4_8>SystemGroup</A></H3>
+<H3><A NAME=5_2_8>SystemGroup</A></H3>
 <P>The <CODE>SystemGroup</CODE> directive sets the administration group 
 used when authenticating the <CODE>System</CODE> type. It defaults to 
 the &quot;sys&quot; group. </P>
-<H2><A NAME=5_5>File Formats</A></H2>
+<H2><A NAME=5_3>File Formats</A></H2>
 <P>CUPS provides a MIME-based file typing and filtering mechanism to 
 convert files to a printable format for each printer. The <CODE>
 mime.types</CODE> and <CODE>mime.convs</CODE> files define the file 
 type and filters that are available on the system. </P>
-<H3><A NAME=5_5_1>mime.types</A></H3>
+<H3><A NAME=5_3_1>mime.types</A></H3>
 <P>The <CODE>mime.types</CODE> defines the known file types. Each line 
 of the file starts with the MIME type and may be followed by one or 
 more file type recognition rules. For example, the <CODE>text/html</CODE>
@@ -732,13 +605,13 @@ the file type based upon the contents of the file instead. </P>
 to string </LI>
 <LI><CODE>char(offset,value)</CODE> - True if byte is identical </LI>
 <LI><CODE>short(offset,value)</CODE> - True if 16-bit integer  is 
-identical (network or &quot;big-endian&quot; byte order) </LI>
+identical </LI>
 <LI><CODE>int(offset,value)</CODE> - True if 32-bit integer is 
- identical (network or &quot;big-endian&quot; byte order) </LI>
+ identical </LI>
 <LI><CODE>locale(&quot;string&quot;)</CODE> - True if current locale  matches 
 string </LI>
 </UL>
-<H3><A NAME=5_5_2>mime.convs</A></H3>
+<H3><A NAME=5_3_2>mime.convs</A></H3>
 <P>The <CODE>mime.convs</CODE> file defines all of the filter programs 
 that are known to the system. Each line consists of: </P>
 <UL>
@@ -98,19 +98,6 @@ web browser.
 authentication and domain or IP-based access control. Digest authentication
 and TLS encryption will be available in future versions of CUPS.

-<H2>Jobs</H2>
-
-<P>Each file that is submitted for printing is called a <I>job</I>. 
-Jobs are identified by a unique number starting at 1 and are assigned
-to a particular destination (usually a printer). Jobs can also have
-options associated with them such as media size, number of copies, and
-priority.
-
-<H2>Classes</H2>
-
-<P>CUPS supports collections of printers known as <I>classes</I>. Jobs sent
-to a class are forwarded to the first available printer in the class.
-
 <H2>Filters</H2>

 <P>Filters allow a user or application to print many types of files
@@ -139,24 +126,6 @@ LaserJet and DeskJet printers. While this driver does not generate
 optimal output for different printer models, it does demonstrate how
 you can write your own printer drivers and incorporate them into CUPS.

-<H2>Networking</H2>
-
-<P>Printers and classes on the local system are automatically shared with
-other systems on the network. This allows you to setup one system to print
-to a printer and use this system as a printer server or spool host for all
-of the others.  If there is only one occurrence of a printer on a network,
-then that printer can be accessed using its name alone. If more than one
-printer exists with the same name, users must select the printer by specifying
-which server to use (e.g. "printer@host1" or "printer@host2".)
-
-<P>CUPS also provides <I>implicit classes</I>, which are collections of
-printers and/or classes with the same name. This allows you to setup multiple
-servers pointing to the same physical network printer, for example, so that
-you aren't relying on a single system for printing. Because this also works
-with printer classes, you can setup multiple servers and printers and never
-worry about a "single point of failure" unless all of the printers and servers
-goes down!
-
 <H1 ALIGN=RIGHT>2 - Building and Installing CUPS</H1>

 <P>This chapter shows how to build and install the Common UNIX Printing System.
@@ -295,7 +264,7 @@ is also a System V printing system command, it is located in the
 with the "-p" option:

 <UL><PRE>
-% /usr/lib/lpadmin -p<I>printer</I> -E -v<I>device</I> -P<I>ppd</I> ENTER
+% /usr/lib/lpadmin -p<I>printer</I> -v<I>device</I> -P<I>ppd</I> ENTER
 </PRE></UL>

 <P>Spaces between the option letter and value are optional.
@@ -315,8 +284,7 @@ CUPS:
 	<DT>/dev/filename
 	<DD>Sends all output to the specified file.

-	<DT>http://[username:password@]hostname[:port]/resource
-	<DT>ipp://[username:password@]hostname[:port]/resource
+	<DT>ipp://hostname[:port]/resource
 	<DD>Sends all output to the specified IPP printer or server.
 	The <I>port</I> parameters defaults to 631.

@@ -343,10 +311,6 @@ CUPS:
 		checking off.
 	</UL>

-	<DT>smb://[username:password@]hostname/queue
-	<DD>Sends all output to the specified SMB (Windows) printer queue
-	using the SAMBA software.
-
 	<DT>socket://hostname[:port]
 	<DD>Sends all output to the specified printer using the
 	AppSocket protocol. The <I>port</I> parameter defaults to 9100.
@@ -364,7 +328,7 @@ and interface scripts located in the <CODE>/usr/share/cups/model</CODE>
 directory with the "-m" option:

 <UL><PRE>
-% /usr/lib/lpadmin -p<I>printer</I> -E -v<I>device</I> -m<I>model</I> ENTER
+% /usr/lib/lpadmin -p<I>printer</I> -v<I>device</I> -m<I>model</I> ENTER
 </PRE></UL>

 <P>The <I>model</I> argument specifies the name of the PPD file or interface
@@ -372,7 +336,7 @@ script. For example, to add a printer using the sample HP DeskJet series
 driver connected to parallel port 1 under Linux you would use:

 <UL><PRE>
-% /usr/lib/lpadmin -pDeskJet -E -vparallel:/dev/par1 -mdeskjet.ppd ENTER
+% /usr/lib/lpadmin -pDeskJet -vparallel:/dev/par1 -mdeskjet.ppd ENTER
 </PRE></UL>

 <H2>Removing Printers</H2>
@@ -415,80 +379,10 @@ command with the "-d" option:

 <P>The <I>destination</I> argument is the name of the printer or class.

-<H2>Starting and Stopping Printers</H2>
-
-<P>The <CODE>enable</CODE> and <CODE>disable</CODE> commands start and stop
-printer queues, respectively:
-
-<UL><PRE>
-% /usr/bin/enable <I>printer</I> ENTER
-% /usr/bin/disable <I>printer</I> ENTER
-</PRE></UL>
-
-<P>Printers that are disabled may still accept jobs for printing, but won't
-actually print any files until they are restarted. This is useful if the
-printer malfunctions and you need time to correct the problem. Any queues
-jobs are printed after the printer is enabled (started).
-
-<H2>Accepting and Rejecting Print Jobs</H2>
-
-<P>The <CODE>accept</CODE> and <CODE>reject</CODE> commands accept and reject
-print jobs for the named printer, respectively:
-
-<UL><PRE>
-% /usr/lib/accept <I>printer</I> ENTER
-% /usr/lib/reject <I>printer</I> ENTER
-</PRE></UL>
-
-<P>As noted above, a printer can be stopped but accepting new print
-jobs. A printer can also be rejecting new print jobs while it finishes
-those that have been queued. This is useful for when you must perform
-maintenance on the printer and will not have it available to users for
-a long period of time.
-
 <H1 ALIGN=RIGHT>4 - Printing System Management</H1>

 <P>This chapter shows how you can configure the CUPS server.

-<H2>Changing the Configuration Files</H2>
-
-<P>All of the server configuration files are located in the
-<CODE>/var/cups/conf</CODE> directory. Once you have made a change to a
-file you need to restart the CUPS server by sending it a HUP signal or
-using the supplied script "<CODE>cups.sh</CODE>":
-
-<UL><PRE>
-% ./cups.sh restart ENTER
-</PRE></UL>
-
-<P>The binary distribution installs the script in the
-<CODE>init.d</CODE> directory with the name <CODE>lp</CODE> or
-<CODE>lpd</CODE> depending on the vendor-supplied printing system.
-
-<H2>Temporary Files</H2>
-
-<P>Normally CUPS puts all of its temporary files in <CODE>/var/tmp</CODE>.
-If you'd like to change this directory you'll need to edit the
-<CODE>/var/cups/conf/cupsd.conf</CODE> file.
-
-<P>Start by creating the new temporary directory and setting the appropriate
-permissions:
-
-<UL><PRE>
-% mkdir <I>/foo/bar/tmp</I> ENTER
-% chmod a+rwxt <I>/foo/bar/tmp</I> ENTER
-</PRE></UL>
-
-<P>Then change the line containing the <CODE>TempDir</CODE> directive in
-the <CODE>cupsd.conf</CODE> to the directory that you've created:
-
-<UL><PRE>
-TempDir <I>/foo/bar/tmp</I>
-</PRE></UL>
-
-<P>Finally, restart the server as outlined in the first section of this
-chapter.
-
 <H2>Network Configuration</H2>

 <P>The default configuration of the CUPS server listens for connections from
@@ -519,7 +413,7 @@ Listen 127.0.0.1:631
 <P>instead of the <CODE>Port</CODE> directive.

 <P>If you want to limit access to a specific network/subnet, make sure you
-specify only the network address and not your system's network address!
+specific only the network address and not your system's network address!

 <H3>BrowsePort</H3>

@@ -637,47 +531,7 @@ Allow from nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
 </PRE></UL>

 <P><CODE>Allow</CODE> directives are cummulative, so multiple <CODE>Allow</CODE>
-directives can be used to allow access for multiple hosts or networks.  The
-<CODE>/mm</CODE> notation specifies a CIDR netmask:
-
-<CENTER><TABLE WIDTH="80%" BORDER="1">
-<TR>
-	<TH>mm</TH>
-	<TH>netmask</TH>
-</TR>
-<TR>
-	<TD>0</TD>
-	<TD>0.0.0.0</TD>
-</TR>
-<TR>
-	<TD>1</TD>
-	<TD>128.0.0.0</TD>
-</TR>
-<TR>
-	<TD>2</TD>
-	<TD>192.0.0.0</TD>
-</TR>
-<TR>
-	<TD>...</TD>
-	<TD>...</TD>
-</TR>
-<TR>
-	<TD>8</TD>
-	<TD>255.0.0.0</TD>
-</TR>
-<TR>
-	<TD>16</TD>
-	<TD>255.255.0.0</TD>
-</TR>
-<TR>
-	<TD>24</TD>
-	<TD>255.255.255.0</TD>
-</TR>
-<TR>
-	<TD>32</TD>
-	<TD>255.255.255.255</TD>
-</TR>
-</TABLE></CENTER>
+directives can be used to allow access for multiple hosts or networks.

 <P>The <CODE>Allow</CODE> directive must appear inside a
 <CODE>Location</CODE> directive.
@@ -702,47 +556,7 @@ Deny from nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
 </PRE></UL>

 <P><CODE>Deny</CODE> directives are cummulative, so multiple <CODE>Deny</CODE>
-directives can be used to allow access for multiple hosts or networks.  The
-<CODE>/mm</CODE> notation specifies a CIDR netmask:
-
-<CENTER><TABLE WIDTH="80%" BORDER="1">
-<TR>
-	<TH>mm</TH>
-	<TH>netmask</TH>
-</TR>
-<TR>
-	<TD>0</TD>
-	<TD>0.0.0.0</TD>
-</TR>
-<TR>
-	<TD>1</TD>
-	<TD>128.0.0.0</TD>
-</TR>
-<TR>
-	<TD>2</TD>
-	<TD>192.0.0.0</TD>
-</TR>
-<TR>
-	<TD>...</TD>
-	<TD>...</TD>
-</TR>
-<TR>
-	<TD>8</TD>
-	<TD>255.0.0.0</TD>
-</TR>
-<TR>
-	<TD>16</TD>
-	<TD>255.255.0.0</TD>
-</TR>
-<TR>
-	<TD>24</TD>
-	<TD>255.255.255.0</TD>
-</TR>
-<TR>
-	<TD>32</TD>
-	<TD>255.255.255.255</TD>
-</TR>
-</TABLE></CENTER>
+directives can be used to allow access for multiple hosts or networks.

 <P>The <CODE>Deny</CODE> directive must appear inside a
 <CODE>Location</CODE> directive.
@@ -863,10 +677,10 @@ the file type based upon the contents of the file instead.
 	<LI><CODE>char(offset,value)</CODE> - True if byte is identical

 	<LI><CODE>short(offset,value)</CODE> - True if 16-bit integer
-	is identical (network or "big-endian" byte order)
+	is identical

 	<LI><CODE>int(offset,value)</CODE> - True if 32-bit integer is
-	identical (network or "big-endian" byte order)
+	identical

 	<LI><CODE>locale("string")</CODE> - True if current locale
 	matches string
@@ -1,6 +1,6 @@
 %PDF-1.2
 %âãÏÓ
-1 0 obj<</Producer(htmldoc 2.0b1 Copyright 1997-1999 Michael Sweet, All Rights Reserved.)/CreationDate(D:19990621185446Z)/Title(DRAFT - CUPS Software Design Description)/Author(Easy Software Products)>>endobj
+1 0 obj<</Producer(htmldoc 2.0b1 Copyright 1997-1999 Michael Sweet, All Rights Reserved.)/CreationDate(D:19990521210321Z)/Title(DRAFT - CUPS Software Design Description)/Author(Easy Software Products)>>endobj
 2 0 obj<</Type/Encoding/BaseEncoding/WinAnsiEncoding>>endobj
 3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier/Encoding 2 0 R>>endobj
 4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier-Oblique/Encoding 2 0 R>>endobj
@@ -26,14 +26,15 @@ Copyright 1997-1999, All Rights Reserved<BR>
 <LI><A HREF=#2_1>2.1 CUPS Documentation</A></LI>
 <LI><A HREF=#2_2>2.2 Other Documents</A></LI>
 </UL>
-<B><A HREF=#3>3 Local Access Risks</A></B>
+<B><A HREF=#3>3 Risk Identification</A></B>
 <UL>
-<LI><A HREF=#3_1>3.1 Security Breaches</A></LI>
+<LI><A HREF=#3_1>3.1 Local Access Risks</A></LI>
+<LI><A HREF=#3_2>3.2 Remote Access Risks</A></LI>
 </UL>
-<B><A HREF=#4>4 Remote Access Risks</A></B>
+<B><A HREF=#4>4 Risk Assessment</A></B>
 <UL>
-<LI><A HREF=#4_1>4.1 Denial of Service Attacks</A></LI>
-<LI><A HREF=#4_2>4.2 Security Breaches</A></LI>
+<LI><A HREF=#4_1>4.1 Local Access Risks</A></LI>
+<LI><A HREF=#4_2>4.2 Remote Access Risks</A></LI>
 </UL>
 <B><A HREF=#5>A Glossary</A></B>
 <UL>
@@ -68,8 +69,8 @@ sections:</P>
 <UL>
 <LI>1 - Scope</LI>
 <LI>2 - References</LI>
-<LI>3 - Local Access Risks</LI>
-<LI>4 - Remote Access Risks</LI>
+<LI>3 - Risk Identification</LI>
+<LI>4 - Risk Assessment</LI>
 <LI>A - Glossary</LI>
 </UL>
 <H1><A NAME=2>2 References</A></H1>
@@ -96,78 +97,12 @@ sections:</P>
 <LI>IPP/1.0: Model and Semantics </LI>
 <LI>RFC 1179, Line Printer Daemon Protocol </LI>
 </UL>
-<H1><A NAME=3>3 Local Access Risks</A></H1>
-<P>Local access risks are those that can be exploited only with a local 
-user account. This section does not address issues related to 
-dissemination of the root password or other security issues associated 
-with the UNIX operating system. </P>
-<H2><A NAME=3_1>3.1 Security Breaches</A></H2>
-<P>Since the default installation creates a world-readable request 
-directory, it is possible for local users to read the contents of print 
-files before they are printed. </P>
-<P>This problem can be alleviated by making the request directory 
-readable only by the user specified in the CUPS configuration file. </P>
-<H1><A NAME=4>4 Remote Access Risks</A></H1>
-<P>Remote access risks are those that can be exploited without a local 
-user account and/or from a remote system. This section does not address 
-issues related to network or firewall security. </P>
-<H2><A NAME=4_1>4.1 Denial of Service Attacks</A></H2>
-<P>Like all internet services, the CUPS server is vulnerable to denial 
-of service attacks, including: </P>
-<OL>
-<LI>Establishing multiple connections to the server until the server 
- will accept no more. 
-<P>This cannot be protected against by the current software. It  is 
-possible that future versions of the CUPS software could be  configured 
-to limit the number of connections allowed from a  single host, however 
-that still would not prevent a determined  attack. </P>
-</LI>
-<LI>Repeatedly opening and closing connections to the server as fast 
- as possible. 
-<P>There is no easy way of protecting against this in the CUPS 
- software. If the attack is coming from outside the local  network it 
-might be possible to filter such an attack, however  once the 
-connection request has been received by the server it  must at least 
-accept the connection to find out who is  connecting. </P>
-</LI>
-<LI>Flooding the network with broadcast packets on port 631. 
-<P>It might be possible to disable browsing if this condition  is 
-detected by the CUPS software, however if there are large  numbers of 
-printers available on the network such an algorithm  might think that 
-an attack was occurring when instead a valid  update was being 
-received. </P>
-</LI>
-<LI>Sending partial IPP requests; specifically, sending part of an 
- attribute value and then stopping transmission. 
-<P>The current code is structured to read and write the IPP  request 
-data on-the-fly, so there is no easy way to protect  against this for 
-large attribute values. </P>
-</LI>
-<LI>Sending large/long print jobs to printers, preventing other users 
- from printing. 
-<P>There are limited facilities for protecting against large print 
- jobs (the <CODE>MaxRequestSize</CODE> attribute), however this will 
- not protect printers from malicious users and print files that 
- generate hundreds or thousands of pages. In general, we recommend 
- restricting printer access to known hosts or networks, and adding 
- user-level access control as needed for expensive printers. </P>
-</LI>
-</OL>
-<H2><A NAME=4_2>4.2 Security Breaches</A></H2>
-<P>The current CUPS server only supports Basic authentication with 
-usernames and passwords. This essentially places the clear text of the 
-username and password on the network. Since CUPS uses the UNIX username 
-and password account information, the authentication information could 
-be used to gain access to accounts (possibly priviledged accounts) on 
-the server. </P>
-<P>The default CUPS configuration disables remote administration. We do 
-not recommend that remote administration be enabled for all hosts, 
-however if you have a trusted network or subnet access can be 
-restricted accordingly. </P>
-<P>The next minor release of CUPS will support Digest authentication of 
-the entire message body using separate MD5-based username and password 
-files. This will protect password information and prevent unauthorized 
-access due to compromised account passwords. </P>
+<H1><A NAME=3>3 Risk Identification</A></H1>
+<H2><A NAME=3_1>3.1 Local Access Risks</A></H2>
+<H2><A NAME=3_2>3.2 Remote Access Risks</A></H2>
+<H1><A NAME=4>4 Risk Assessment</A></H1>
+<H2><A NAME=4_1>4.1 Local Access Risks</A></H2>
+<H2><A NAME=4_2>4.2 Remote Access Risks</A></H2>
 <H1 TYPE=A VALUE=1><A NAME=5>A Glossary</A></H1>
 <H2><A NAME=5_1>A.1 Terms</A></H2>
 <DL>
@@ -1,58 +1,61 @@
 %PDF-1.2
 %âãÏÓ
-1 0 obj<</Producer(htmldoc 2.0b1 Copyright 1997-1999 Michael Sweet, All Rights Reserved.)/CreationDate(D:19990709142834Z)/Title(DRAFT - CUPS Software Security Report)/Author(Easy Software Products)>>endobj
+1 0 obj<</Producer(htmldoc 2.0b1 Copyright 1997-1999 Michael Sweet, All Rights Reserved.)/CreationDate(D:19990521210323Z)/Title(DRAFT - CUPS Software Security Report)/Author(Easy Software Products)>>endobj
 2 0 obj<</Type/Encoding/BaseEncoding/WinAnsiEncoding>>endobj
-3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Courier/Encoding 2 0 R>>endobj
-4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Times-Roman/Encoding 2 0 R>>endobj
-5 0 obj<</Type/Font/Subtype/Type1/BaseFont/Times-Bold/Encoding 2 0 R>>endobj
-6 0 obj<</Type/Font/Subtype/Type1/BaseFont/Times-Italic/Encoding 2 0 R>>endobj
-7 0 obj<</Type/Font/Subtype/Type1/BaseFont/Helvetica/Encoding 2 0 R>>endobj
-8 0 obj<</Type/Font/Subtype/Type1/BaseFont/Helvetica-Bold/Encoding 2 0 R>>endobj
-9 0 obj<</Type/Font/Subtype/Type1/BaseFont/Symbol>>endobj
-10 0 obj<</Subtype/Link/Rect[72.0 673.2 80.2 686.2]/Border[0 0 0]/Dest[79 0 R/XYZ null 818 0]>>endobj
-11 0 obj<</Subtype/Link/Rect[80.2 673.2 107.8 686.2]/Border[0 0 0]/Dest[79 0 R/XYZ null 818 0]>>endobj
-12 0 obj<</Subtype/Link/Rect[108.0 660.0 124.5 673.0]/Border[0 0 0]/Dest[79 0 R/XYZ null 737 0]>>endobj
-13 0 obj<</Subtype/Link/Rect[124.5 660.0 183.8 673.0]/Border[0 0 0]/Dest[79 0 R/XYZ null 737 0]>>endobj
-14 0 obj<</Subtype/Link/Rect[108.0 646.8 124.5 659.8]/Border[0 0 0]/Dest[79 0 R/XYZ null 658 0]>>endobj
-15 0 obj<</Subtype/Link/Rect[124.5 646.8 159.6 659.8]/Border[0 0 0]/Dest[79 0 R/XYZ null 658 0]>>endobj
-16 0 obj<</Subtype/Link/Rect[159.6 646.8 203.0 659.8]/Border[0 0 0]/Dest[79 0 R/XYZ null 658 0]>>endobj
-17 0 obj<</Subtype/Link/Rect[108.0 633.6 124.5 646.6]/Border[0 0 0]/Dest[79 0 R/XYZ null 434 0]>>endobj
-18 0 obj<</Subtype/Link/Rect[124.5 633.6 173.1 646.6]/Border[0 0 0]/Dest[79 0 R/XYZ null 434 0]>>endobj
-19 0 obj<</Subtype/Link/Rect[173.1 633.6 216.4 646.6]/Border[0 0 0]/Dest[79 0 R/XYZ null 434 0]>>endobj
-20 0 obj<</Subtype/Link/Rect[72.0 607.2 80.2 620.2]/Border[0 0 0]/Dest[85 0 R/XYZ null 818 0]>>endobj
-21 0 obj<</Subtype/Link/Rect[80.2 607.2 131.6 620.2]/Border[0 0 0]/Dest[85 0 R/XYZ null 818 0]>>endobj
-22 0 obj<</Subtype/Link/Rect[108.0 594.0 124.5 607.0]/Border[0 0 0]/Dest[85 0 R/XYZ null 737 0]>>endobj
-23 0 obj<</Subtype/Link/Rect[124.5 594.0 154.8 607.0]/Border[0 0 0]/Dest[85 0 R/XYZ null 737 0]>>endobj
-24 0 obj<</Subtype/Link/Rect[154.8 594.0 222.6 607.0]/Border[0 0 0]/Dest[85 0 R/XYZ null 737 0]>>endobj
-25 0 obj<</Subtype/Link/Rect[108.0 580.8 124.5 593.8]/Border[0 0 0]/Dest[85 0 R/XYZ null 540 0]>>endobj
-26 0 obj<</Subtype/Link/Rect[124.5 580.8 152.3 593.8]/Border[0 0 0]/Dest[85 0 R/XYZ null 540 0]>>endobj
-27 0 obj<</Subtype/Link/Rect[152.3 580.8 202.4 593.8]/Border[0 0 0]/Dest[85 0 R/XYZ null 540 0]>>endobj
-28 0 obj<</Subtype/Link/Rect[72.0 554.4 80.2 567.4]/Border[0 0 0]/Dest[91 0 R/XYZ null 818 0]>>endobj
-29 0 obj<</Subtype/Link/Rect[80.2 554.4 109.3 567.4]/Border[0 0 0]/Dest[91 0 R/XYZ null 818 0]>>endobj
-30 0 obj<</Subtype/Link/Rect[109.3 554.4 143.2 567.4]/Border[0 0 0]/Dest[91 0 R/XYZ null 818 0]>>endobj
-31 0 obj<</Subtype/Link/Rect[143.2 554.4 168.9 567.4]/Border[0 0 0]/Dest[91 0 R/XYZ null 818 0]>>endobj
-32 0 obj<</Subtype/Link/Rect[108.0 541.2 124.5 554.2]/Border[0 0 0]/Dest[91 0 R/XYZ null 690 0]>>endobj
-33 0 obj<</Subtype/Link/Rect[124.5 541.2 163.9 554.2]/Border[0 0 0]/Dest[91 0 R/XYZ null 690 0]>>endobj
-34 0 obj<</Subtype/Link/Rect[163.9 541.2 204.2 554.2]/Border[0 0 0]/Dest[91 0 R/XYZ null 690 0]>>endobj
-35 0 obj<</Subtype/Link/Rect[72.0 514.8 80.2 527.8]/Border[0 0 0]/Dest[97 0 R/XYZ null 818 0]>>endobj
-36 0 obj<</Subtype/Link/Rect[80.2 514.8 119.0 527.8]/Border[0 0 0]/Dest[97 0 R/XYZ null 818 0]>>endobj
-37 0 obj<</Subtype/Link/Rect[119.0 514.8 152.9 527.8]/Border[0 0 0]/Dest[97 0 R/XYZ null 818 0]>>endobj
-38 0 obj<</Subtype/Link/Rect[152.9 514.8 178.6 527.8]/Border[0 0 0]/Dest[97 0 R/XYZ null 818 0]>>endobj
-39 0 obj<</Subtype/Link/Rect[108.0 501.6 124.5 514.6]/Border[0 0 0]/Dest[97 0 R/XYZ null 704 0]>>endobj
-40 0 obj<</Subtype/Link/Rect[124.5 501.6 156.6 514.6]/Border[0 0 0]/Dest[97 0 R/XYZ null 704 0]>>endobj
-41 0 obj<</Subtype/Link/Rect[156.6 501.6 168.5 514.6]/Border[0 0 0]/Dest[97 0 R/XYZ null 704 0]>>endobj
-42 0 obj<</Subtype/Link/Rect[168.5 501.6 204.2 514.6]/Border[0 0 0]/Dest[97 0 R/XYZ null 704 0]>>endobj
-43 0 obj<</Subtype/Link/Rect[204.2 501.6 237.8 514.6]/Border[0 0 0]/Dest[97 0 R/XYZ null 704 0]>>endobj
-44 0 obj<</Subtype/Link/Rect[108.0 488.4 124.5 501.4]/Border[0 0 0]/Dest[97 0 R/XYZ null 255 0]>>endobj
-45 0 obj<</Subtype/Link/Rect[124.5 488.4 163.9 501.4]/Border[0 0 0]/Dest[97 0 R/XYZ null 255 0]>>endobj
-46 0 obj<</Subtype/Link/Rect[163.9 488.4 204.2 501.4]/Border[0 0 0]/Dest[97 0 R/XYZ null 255 0]>>endobj
-47 0 obj<</Subtype/Link/Rect[72.0 462.0 82.7 475.0]/Border[0 0 0]/Dest[103 0 R/XYZ null 818 0]>>endobj
-48 0 obj<</Subtype/Link/Rect[82.7 462.0 124.2 475.0]/Border[0 0 0]/Dest[103 0 R/XYZ null 818 0]>>endobj
-49 0 obj<</Subtype/Link/Rect[108.0 448.8 126.9 461.8]/Border[0 0 0]/Dest[103 0 R/XYZ null 737 0]>>endobj
-50 0 obj<</Subtype/Link/Rect[126.9 448.8 155.0 461.8]/Border[0 0 0]/Dest[103 0 R/XYZ null 737 0]>>endobj
-51 0 obj<</Subtype/Link/Rect[108.0 435.6 126.9 448.6]/Border[0 0 0]/Dest[103 0 R/XYZ null 434 0]>>endobj
-52 0 obj<</Subtype/Link/Rect[126.9 435.6 172.8 448.6]/Border[0 0 0]/Dest[103 0 R/XYZ null 434 0]>>endobj
-53 0 obj[10 0 R
+3 0 obj<</Type/Font/Subtype/Type1/BaseFont/Times-Roman/Encoding 2 0 R>>endobj
+4 0 obj<</Type/Font/Subtype/Type1/BaseFont/Times-Bold/Encoding 2 0 R>>endobj
+5 0 obj<</Type/Font/Subtype/Type1/BaseFont/Times-Italic/Encoding 2 0 R>>endobj
+6 0 obj<</Type/Font/Subtype/Type1/BaseFont/Helvetica/Encoding 2 0 R>>endobj
+7 0 obj<</Type/Font/Subtype/Type1/BaseFont/Helvetica-Bold/Encoding 2 0 R>>endobj
+8 0 obj<</Type/Font/Subtype/Type1/BaseFont/Symbol>>endobj
+9 0 obj<</Subtype/Link/Rect[72.0 673.2 80.2 686.2]/Border[0 0 0]/Dest[82 0 R/XYZ null 818 0]>>endobj
+10 0 obj<</Subtype/Link/Rect[80.2 673.2 107.8 686.2]/Border[0 0 0]/Dest[82 0 R/XYZ null 818 0]>>endobj
+11 0 obj<</Subtype/Link/Rect[108.0 660.0 124.5 673.0]/Border[0 0 0]/Dest[82 0 R/XYZ null 737 0]>>endobj
+12 0 obj<</Subtype/Link/Rect[124.5 660.0 183.8 673.0]/Border[0 0 0]/Dest[82 0 R/XYZ null 737 0]>>endobj
+13 0 obj<</Subtype/Link/Rect[108.0 646.8 124.5 659.8]/Border[0 0 0]/Dest[82 0 R/XYZ null 658 0]>>endobj
+14 0 obj<</Subtype/Link/Rect[124.5 646.8 159.6 659.8]/Border[0 0 0]/Dest[82 0 R/XYZ null 658 0]>>endobj
+15 0 obj<</Subtype/Link/Rect[159.6 646.8 203.0 659.8]/Border[0 0 0]/Dest[82 0 R/XYZ null 658 0]>>endobj
+16 0 obj<</Subtype/Link/Rect[108.0 633.6 124.5 646.6]/Border[0 0 0]/Dest[82 0 R/XYZ null 434 0]>>endobj
+17 0 obj<</Subtype/Link/Rect[124.5 633.6 173.1 646.6]/Border[0 0 0]/Dest[82 0 R/XYZ null 434 0]>>endobj
+18 0 obj<</Subtype/Link/Rect[173.1 633.6 216.4 646.6]/Border[0 0 0]/Dest[82 0 R/XYZ null 434 0]>>endobj
+19 0 obj<</Subtype/Link/Rect[72.0 607.2 80.2 620.2]/Border[0 0 0]/Dest[88 0 R/XYZ null 818 0]>>endobj
+20 0 obj<</Subtype/Link/Rect[80.2 607.2 131.6 620.2]/Border[0 0 0]/Dest[88 0 R/XYZ null 818 0]>>endobj
+21 0 obj<</Subtype/Link/Rect[108.0 594.0 124.5 607.0]/Border[0 0 0]/Dest[88 0 R/XYZ null 737 0]>>endobj
+22 0 obj<</Subtype/Link/Rect[124.5 594.0 154.8 607.0]/Border[0 0 0]/Dest[88 0 R/XYZ null 737 0]>>endobj
+23 0 obj<</Subtype/Link/Rect[154.8 594.0 222.6 607.0]/Border[0 0 0]/Dest[88 0 R/XYZ null 737 0]>>endobj
+24 0 obj<</Subtype/Link/Rect[108.0 580.8 124.5 593.8]/Border[0 0 0]/Dest[88 0 R/XYZ null 540 0]>>endobj
+25 0 obj<</Subtype/Link/Rect[124.5 580.8 152.3 593.8]/Border[0 0 0]/Dest[88 0 R/XYZ null 540 0]>>endobj
+26 0 obj<</Subtype/Link/Rect[152.3 580.8 202.4 593.8]/Border[0 0 0]/Dest[88 0 R/XYZ null 540 0]>>endobj
+27 0 obj<</Subtype/Link/Rect[72.0 554.4 80.2 567.4]/Border[0 0 0]/Dest[94 0 R/XYZ null 818 0]>>endobj
+28 0 obj<</Subtype/Link/Rect[80.2 554.4 104.4 567.4]/Border[0 0 0]/Dest[94 0 R/XYZ null 818 0]>>endobj
+29 0 obj<</Subtype/Link/Rect[104.4 554.4 168.0 567.4]/Border[0 0 0]/Dest[94 0 R/XYZ null 818 0]>>endobj
+30 0 obj<</Subtype/Link/Rect[108.0 541.2 124.5 554.2]/Border[0 0 0]/Dest[94 0 R/XYZ null 737 0]>>endobj
+31 0 obj<</Subtype/Link/Rect[124.5 541.2 152.3 554.2]/Border[0 0 0]/Dest[94 0 R/XYZ null 737 0]>>endobj
+32 0 obj<</Subtype/Link/Rect[152.3 541.2 186.2 554.2]/Border[0 0 0]/Dest[94 0 R/XYZ null 737 0]>>endobj
+33 0 obj<</Subtype/Link/Rect[186.2 541.2 210.7 554.2]/Border[0 0 0]/Dest[94 0 R/XYZ null 737 0]>>endobj
+34 0 obj<</Subtype/Link/Rect[108.0 528.0 124.5 541.0]/Border[0 0 0]/Dest[94 0 R/XYZ null 679 0]>>endobj
+35 0 obj<</Subtype/Link/Rect[124.5 528.0 161.5 541.0]/Border[0 0 0]/Dest[94 0 R/XYZ null 679 0]>>endobj
+36 0 obj<</Subtype/Link/Rect[161.5 528.0 195.4 541.0]/Border[0 0 0]/Dest[94 0 R/XYZ null 679 0]>>endobj
+37 0 obj<</Subtype/Link/Rect[195.4 528.0 219.8 541.0]/Border[0 0 0]/Dest[94 0 R/XYZ null 679 0]>>endobj
+38 0 obj<</Subtype/Link/Rect[72.0 501.6 80.2 514.6]/Border[0 0 0]/Dest[100 0 R/XYZ null 818 0]>>endobj
+39 0 obj<</Subtype/Link/Rect[80.2 501.6 104.4 514.6]/Border[0 0 0]/Dest[100 0 R/XYZ null 818 0]>>endobj
+40 0 obj<</Subtype/Link/Rect[104.4 501.6 158.2 514.6]/Border[0 0 0]/Dest[100 0 R/XYZ null 818 0]>>endobj
+41 0 obj<</Subtype/Link/Rect[108.0 488.4 124.5 501.4]/Border[0 0 0]/Dest[100 0 R/XYZ null 737 0]>>endobj
+42 0 obj<</Subtype/Link/Rect[124.5 488.4 152.3 501.4]/Border[0 0 0]/Dest[100 0 R/XYZ null 737 0]>>endobj
+43 0 obj<</Subtype/Link/Rect[152.3 488.4 186.2 501.4]/Border[0 0 0]/Dest[100 0 R/XYZ null 737 0]>>endobj
+44 0 obj<</Subtype/Link/Rect[186.2 488.4 210.7 501.4]/Border[0 0 0]/Dest[100 0 R/XYZ null 737 0]>>endobj
+45 0 obj<</Subtype/Link/Rect[108.0 475.2 124.5 488.2]/Border[0 0 0]/Dest[100 0 R/XYZ null 679 0]>>endobj
+46 0 obj<</Subtype/Link/Rect[124.5 475.2 161.5 488.2]/Border[0 0 0]/Dest[100 0 R/XYZ null 679 0]>>endobj
+47 0 obj<</Subtype/Link/Rect[161.5 475.2 195.4 488.2]/Border[0 0 0]/Dest[100 0 R/XYZ null 679 0]>>endobj
+48 0 obj<</Subtype/Link/Rect[195.4 475.2 219.8 488.2]/Border[0 0 0]/Dest[100 0 R/XYZ null 679 0]>>endobj
+49 0 obj<</Subtype/Link/Rect[72.0 448.8 82.7 461.8]/Border[0 0 0]/Dest[106 0 R/XYZ null 818 0]>>endobj
+50 0 obj<</Subtype/Link/Rect[82.7 448.8 124.2 461.8]/Border[0 0 0]/Dest[106 0 R/XYZ null 818 0]>>endobj
+51 0 obj<</Subtype/Link/Rect[108.0 435.6 126.9 448.6]/Border[0 0 0]/Dest[106 0 R/XYZ null 737 0]>>endobj
+52 0 obj<</Subtype/Link/Rect[126.9 435.6 155.0 448.6]/Border[0 0 0]/Dest[106 0 R/XYZ null 737 0]>>endobj
+53 0 obj<</Subtype/Link/Rect[108.0 422.4 126.9 435.4]/Border[0 0 0]/Dest[106 0 R/XYZ null 434 0]>>endobj
+54 0 obj<</Subtype/Link/Rect[126.9 422.4 172.8 435.4]/Border[0 0 0]/Dest[106 0 R/XYZ null 434 0]>>endobj
+55 0 obj[9 0 R
+10 0 R
 11 0 R
 12 0 R
 13 0 R
@@ -95,30 +98,32 @@
 50 0 R
 51 0 R
 52 0 R
+53 0 R
+54 0 R
 ]endobj
-54 0 obj<</Dests 55 0 R>>endobj
-55 0 obj<</Kids[56 0 R]>>endobj
-56 0 obj<</Limits[(1)(5_2)]/Names[(1)57 0 R(1_1)58 0 R(1_2)59 0 R(1_3)60 0 R(2)61 0 R(2_1)62 0 R(2_2)63 0 R(3)64 0 R(3_1)65 0 R(4)66 0 R(4_1)67 0 R(4_2)68 0 R(5)69 0 R(5_1)70 0 R(5_2)71 0 R]>>endobj
-57 0 obj<</D[79 0 R/XYZ null 818 null]>>endobj
-58 0 obj<</D[79 0 R/XYZ null 737 null]>>endobj
-59 0 obj<</D[79 0 R/XYZ null 658 null]>>endobj
-60 0 obj<</D[79 0 R/XYZ null 434 null]>>endobj
-61 0 obj<</D[85 0 R/XYZ null 818 null]>>endobj
-62 0 obj<</D[85 0 R/XYZ null 737 null]>>endobj
-63 0 obj<</D[85 0 R/XYZ null 540 null]>>endobj
-64 0 obj<</D[91 0 R/XYZ null 818 null]>>endobj
-65 0 obj<</D[91 0 R/XYZ null 690 null]>>endobj
-66 0 obj<</D[97 0 R/XYZ null 818 null]>>endobj
-67 0 obj<</D[97 0 R/XYZ null 704 null]>>endobj
-68 0 obj<</D[97 0 R/XYZ null 255 null]>>endobj
-69 0 obj<</D[103 0 R/XYZ null 818 null]>>endobj
-70 0 obj<</D[103 0 R/XYZ null 737 null]>>endobj
-71 0 obj<</D[103 0 R/XYZ null 434 null]>>endobj
-72 0 obj<</Type/Pages/MediaBox[0 0 595 792]/Count 14/Kids[73 0 R
-76 0 R
-109 0 R
-112 0 R
+56 0 obj<</Dests 57 0 R>>endobj
+57 0 obj<</Kids[58 0 R]>>endobj
+58 0 obj<</Limits[(1)(5_2)]/Names[(1)59 0 R(1_1)60 0 R(1_2)61 0 R(1_3)62 0 R(2)63 0 R(2_1)64 0 R(2_2)65 0 R(3)66 0 R(3_1)67 0 R(3_2)68 0 R(4)69 0 R(4_1)70 0 R(4_2)71 0 R(5)72 0 R(5_1)73 0 R(5_2)74 0 R]>>endobj
+59 0 obj<</D[82 0 R/XYZ null 818 null]>>endobj
+60 0 obj<</D[82 0 R/XYZ null 737 null]>>endobj
+61 0 obj<</D[82 0 R/XYZ null 658 null]>>endobj
+62 0 obj<</D[82 0 R/XYZ null 434 null]>>endobj
+63 0 obj<</D[88 0 R/XYZ null 818 null]>>endobj
+64 0 obj<</D[88 0 R/XYZ null 737 null]>>endobj
+65 0 obj<</D[88 0 R/XYZ null 540 null]>>endobj
+66 0 obj<</D[94 0 R/XYZ null 818 null]>>endobj
+67 0 obj<</D[94 0 R/XYZ null 737 null]>>endobj
+68 0 obj<</D[94 0 R/XYZ null 679 null]>>endobj
+69 0 obj<</D[100 0 R/XYZ null 818 null]>>endobj
+70 0 obj<</D[100 0 R/XYZ null 737 null]>>endobj
+71 0 obj<</D[100 0 R/XYZ null 679 null]>>endobj
+72 0 obj<</D[106 0 R/XYZ null 818 null]>>endobj
+73 0 obj<</D[106 0 R/XYZ null 737 null]>>endobj
+74 0 obj<</D[106 0 R/XYZ null 434 null]>>endobj
+75 0 obj<</Type/Pages/MediaBox[0 0 595 792]/Count 14/Kids[76 0 R
 79 0 R
+112 0 R
+115 0 R
 82 0 R
 85 0 R
 88 0 R
@@ -128,9 +133,10 @@
 100 0 R
 103 0 R
 106 0 R
+109 0 R
 ]>>endobj
-73 0 obj<</Type/Page/Parent 72 0 R/Contents 74 0 R/Resources<</ProcSet[/PDF/Text/ImageB/ImageC/ImageI]/Font<</F4 4 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
-74 0 obj<</Length 75 0 R/Filter/FlateDecode>>stream
+76 0 obj<</Type/Page/Parent 75 0 R/Contents 77 0 R/Resources<</ProcSet[/PDF/Text/ImageB/ImageC/ImageI]/Font<</F4 3 0 R/F8 6 0 R/F9 7 0 R>>>>>>endobj
+77 0 obj<</Length 78 0 R/Filter/FlateDecode>>stream
 xÚí�ß�Ü8rÇ%µúÅOšÙíwN�H€ØîO{Ï@p�gF›ì[I¢�‡ ‡]_r‡öÎë½`ÿûô¯éÖRª*R57<à°¶Én~Äâ·ŠdQý·W7b½ýß�øîV¼ÿ ~üßW÷òU"_ýM¼_ÿîíwû|ÿáÃÛµøÝÇ··âööæíÝ¾Öïòÿ|÷Ã»ìßîÅæ_×ûò~_>ìËÇ}yØ—ï÷å÷ÿõîñõË¯Ÿßý‡¸{óîßÅæææÝ=<ˆ;ñÃã«âyxá2+òñv¹\^]ìÊö?–w�Sç’Ë‹ÈS•‹ËëÇirÉÛ+5R	ny71.yÛÅôT.¯“©pá¡ŽhwSàz¸òÈÅ_&ŽsÝG¯\næºåRÙ4Gpf¬ìŽ™e®á™—oÇ¸ò+ÏJñ¯�âºõ¬•`ã—žÍrí—±^Ø2K\òÊ³^ü×£så‘×Gùfd®{¯§$crÝx½3—e´ncmËëQ¸däy.‚�“BX-ßÎ5&€Åƒ)`1ÀÀiÉà‹LËóVqõî·Ì4›k`¬-X2×Ú¼p}òF(³Þ¹2o”òmÏ\y4AÁ}…giLA
 ÚÑê£såÞ¨eÓW4.rŠÁ2Ç‹Á4<Yì‰\r|,Ïï�K8Àå…Ö¹2Ï‰²±Ì%#7¸Ë\kÏ‘²°Ê•yÎ”Ä"—+Vˆrb®Øs¨l¬qå.auJLO4PQLP40QL*ÒÀk=–+u
 «cÀ`z�0˜ Æcœ3ŽKºˆÕ×Ã51Ã`z.5Ã`¸áº¸\._?îÊýîâC¿ƒ—ùº9Éw÷ z0è¸ü–¤ùpÕÏ€AßÃuÙ¹Tº7@[pûªò¨-‡õÐãpÒ�%77xÃæb‡´tq&ÙŒËÅ
@@ -163,284 +169,285 @@ w
 N�#îâ2‰ç+ÿgµ8M°¬š¤ªKâš�ÇöÉ„Ãp¥ç?�R` š¤ªKâ
 Ë�nnÆÕ‘~xúçüb[%±JJw¤ôuI\»û_§Ç´è•+ÐýÃŽ§”TÜ¶Õ�çÇIº›Â«Þ¸"]:ÎñL9/ÁD-©;x®õñóvŸ¼é�ë	n4qcP™FÚº$®ø(C;KOzã:žu^nÔÖ>“âIÎµuI\pÎ~õ‹Þ¸N!z£·‡~ˆJ¾X_WÉÕLìÜS¤Çùºs_ýq•òAj½�Ÿ¼ÍÉëëR¸²£¬wlÆÕv®W®Wy/qÚÌ¢ÕÖ¥påÇ?îÜ²!WÛ9l¬¼ÇQY'�u)\Ò;½}ÞÎet¾,µ™¥¢‘Õ¢¯Kà*ŽŽyÿ·ýqÕ²hý¤1’!¢.…ëà˜÷n¹O®Ò‹¶ªª™ÓÕ¥ps¶÷ñ}r=]„mäR©’M[ëâ¸Ž9Û×7ãêÌûº�T³F(Šº.Þ/ïÝ`²û¿ƒËF>ÛÃUsQ“j9ªº®to�{·Ü?×¹·³Z(µAÕ%póÞ-Áõ$
 �vÒ´Õ%póÞ-raß-šµ‹A[]—|òbó¡¸Î‰×Ý\µº®ƒc>ˆd+—I>öîU2«ª+ÖrµÕ¥pmM0ÈÏû§½pUÝ+tnvêêR¸¶’ágÇhÈ•àö;¸ÚêR¸v#�z§ÕõÆTlËoåÒÕ¥pÁá2¬ßÅerïFTþY´ê|[]
-Wz¸Y˜sÚ—_‹ò:d¦åj«KáÊÎN½7®´<žëÚ×Ô:ÛV—Â•ŸW\&÷mý»ó¡ÖJËÕV·#ž¯¼mKVO
+Wz¸Y˜sÚ—_‹ò:d¦åj«KáÊÎN½7®´<žëÚ×Ô:ÛV—Â•ŸW\&÷mý»ó¡ÖJËÕV·#ž¯¼mKVO
 ¸�ç°çCHýb±.…«ô^Øþ¸â–µZ�«¥.‰Kà¸Œîeç-Uë\-u\‰9×—nSý±Š¾.‰+nüM\¹^a\9w?ªJ§§ÒÊeôþ�ê^Ì·E+—¾.‰K÷~V»\¥Î^\Úº$®ìäÓÛ¹Œ6²wÞè*Ò”˜Ô5*†ïí9ÊÏë
 óS|†ïYr¶¾ë…kx®î×-O“+þ‡åJ&ÉÕ½Á±™$—É‚ù…kx.£…å¤¹æ“ä’ÿ°\á$¹º`³gÊL“+z†�¯áïq¼p�Àµ~†�/îw|V“ä‚gÊ•>ÃÑðwÍÆ*]/{]þÝX¥«Ë+Üï:H¥v¸œ¤º¤.1ü]Î±JŒâŠ&pt…Øß½u-à]ö…ü�b×vÚ¢.=@þ®´k‡‡â‚©²Óß"ßÜ±€#ÃqMî÷èÓÎaL´åœc†ÎisuÎ1¯;e0òâœ�n	0îÀ9uŽ ø]s`Ýa ìÕ1–w« ôÅ±•eÖÞ€òŽ9°´»³€zŽ9°¸Û¸e°ŽÀÖÝQ âHÇ˜è9À	§[B�è+à�SBŸ#lp#ë”Ðg-œÂ8%ô€ÒWÕ)¡�]äÐº$ôaZ€œŠ.EôQ·ûzâ’z‰‘n(°B?ŸŒ®J\b:‚˜bf C.‡1Æ(X¡÷¦"‡~™+›Ž ¢
-´Ð;!æ¨ˆ
-´Ð‡‘Ãy™!ôŽ ì
+´Ð;!æ¨ˆ
+´Ð‡‘Ãy™!ôŽ ì

 ´Ð;"k”Z=]Ž±ú*q¥‰¤:…àp”^èÃIÈFPåB}0	Ù«\ˆ²1¯q‰iG„SÀ?'"‰|ø€7\'„#CzY ´pA8bd¡ ¢›Ù�*0«s!ÑÏŒÝ®€‚"ˆs÷§×ªÁO`‚¡ï‚a?Ä��}×
 ’pŒ=ÁÐïh€‚$#O°îG?Sp	ç'>ñHÆ;ö[£'
 4áw‚á# 9‡‘'X†_J)Vy‚N�¤¢#‡ˆ„Sp(ˆÂ1â£ÒmœG]ƒQÎ€ØpÌMŽ˜Ð9 êè˜›”v NÌ•>§L ŽôˆJOÚ‘jÓñ”^PºT%m·M’4
-¨Ss4CDØÒLËµv×iÛ/PÐ'ØÂQ3,ÇB@vé#bJ3$ ¯pF2Ä5íyÝŠG1DI]�¼ÄÇSâã†‚1ÁFˆqz@Á™`¡‹fXYiçÁ¿XI©
+¨Ss4CDØÒLËµv×iÛ/PÐ'ØÂQ3,ÇB@vé#bJ3$ ¯pF2Ä5íyÝŠG1DI]�¼ÄÇSâã†‚1ÁFˆqz@Á™`¡‹fXYiçÁ¿XI©
 Î|Õ,¨jk‚
 œd™‘½¬	6°‹ÉsXC>°rHz�€5EVFÔ
-œåöÐ1‡ Ïàl�sdÞ$Tê×Œ	ÌÇ3 ÔKÎcîç$ÆÇÜi:Ü€±¦;peu°ÃõfŽàB*ý@±ž1ð?j˜c†	ÀŸ©ÃXÄë€í‡°”éL�/AƒÈ)Qà¸ÖX°•Ã5CreŽ˜Œ¸A8F†Xû©¥qB
-Õ*
-3Cìuá,ùV…™!öªõØ§»@sá
-±GéÈl
+œåöÐ1‡ Ïàl�sdÞ$Tê×Œ	ÌÇ3 ÔKÎcîç$ÆÇÜi:Ü€±¦;peu°ÃõfŽàB*ý@±ž1ð?j˜c†	ÀŸ©ÃXÄë€í‡°”éL�/AƒÈ)Qà¸ÖX°•Ã5CreŽ˜Œ¸A8F†Xû©¥qB
+Õ*
+3Cìuá,ùV…™!öªõØ§»@sá
+±GéÈl
+SCô“‘5^)^`&°}Zâ'�o†Z.é�m‰¹‘tAalˆ=i¢0ò¡`<i{òÎh+TïŒ�ñ¬íÇ;ç†ÖÆ¾¾—)&#CÙOÌþŠemúHÁÂÄµïÅî	_\P¹RÒ€ÙÔŠf…d.é�&#ó	vŒÜ&˜¾,™ƒÅ€Š4¯.Ú7lË7KaK¨vJVa®Š7vLl¬W-‚Ñ°ôñXÙ_(¹“Í�Xz©[QÚ	ìõ@JØ~µÉT=ÈX-·ÑÀžç?[ÏóˆúE!›«ˆ8`õ_:G•[ú×lø\)‹Ëóï¨ƒÅ°ø¶8 ‹‹9`žw™ô<Xík£N®Øãü�Î?Ö4.L¸¤Ç/—(kÌ¯xŸ¾2â2°Ý<»î2Ç&UÇò¡›ËdÀh�úÏ¾�ØŸ»0ä¢.Ã”yýØ7ù°ŒLWaÊ•{vÊÅår¹|ý¸-ËåUdøic.f½tå?b¸¤ƒ\\f’8Êpá¸Ü°•.ç¬{ëÇ%§6\H.Â©Í±¡‡ä*"—¸6ö¸²i
+š‹µÓÑ“Æ'6¹rg¸…M.g´w¼�ç’ÑT4žÆÅÝÂA4h\NHö¼—Â%'c…4.,}tHâÝñY4®|"VHå9þ%`¹FµDJî•kLïL9~¢r�Ø“’æÈ\£M1ZÚ�k¤)FL,cp�3Åˆg»®Q¦5Ë€ÃEIC3Ø\ƒk=UŽÇ5°v02™\R¸+…&\CŠ"+u˜Ë5/“ŒÍÅHûÄqs
+´cÞ80àÂ?ûÜ‹&\ý›"?KÓˆ«o0ƒäS3®~UÑ$YØ�«Om”mÊÕ˜Y2¾19‡º§…‰}®>–-†éêv¸ìË¢ù½	+\…´k‹×æ=²ÃµµE{Cl
 w¸
-š‹µÓÑ“Æ'6¹rg¸…M.g´w¼�ç’ÑT4žÆÅÝÂA4h\NHö¼—Â%'c…4.,}tHâÝñY4®|"VHå9þ%`¹FµDJî•kLïL9~¢r�Ø“’æÈ\£M1ZÚ�k¤)FL,cp�3Åˆg»®Q¦5Ë€ÃEIC3Ø\ƒk=UŽÇ5°v02™\R¸+…&\CŠ"+u˜Ë5/“ŒÍÅHûÄqs
+yåÎ`Ùä²4d—›Â5®BÞËàk[}±ÉÅO>R]Ûë‰].ƒôjDêö˜\\2»T}pqÈ._ÛîC\Ä¼xÙÃ{.úáÚ–G\v¼y×Ë×÷Æµµƒ¼X>öõÝ}rí‡ívy¡§ëÇ>¿·o®ÃÀín8,¯.vår¹¼~|ìý+á¡@òÃ«ôÕ½|õîû�âæ£�›ïÞ~wë·wBþôO�Ù§ï¥x#
 ÈEþó¿þß¾|ùçýò§¯¿‰ìó_þòõŸåŸ·íïÄÍÍ®ýÍÝGñææýÛÛ]û]»7yž½¹y»ÞU{s³Ù~ú›Û‡�OþðËoç�…/?ÿôë�_ÙW¼{ÿöCés~þëo_þôßÿóuÛÉ�ß½ÙþßÇŸþò‘íþò—mG~ùüåïŸÚ5MäéÿiÁñ½endstream
 endobj
-yåÎ`Ùä²4d—›Â5®BÞËàk[}±ÉÅO>R]Ûë‰].ƒôjDêö˜\\2»T}pqÈ._ÛîC\Ä¼xÙÃ{.úáÚ–G\v¼y×Ë×÷Æµµƒ¼X>öõÝ}rí‡ívy¡§ëÇ>¿·o®ÃÀín8,¯.vår¹¼~|ìý+á¡@òÃ«ôÕ½|õîû�âæ£�›ïÞ~wë·wBþôO�Ù§ï¥x#
-ÈEþó¿þß¾|ùçýò§¯¿‰ìó_þòõŸåŸ·íïÄÍÍ®ýÍÝGñææýÛÛ]û]»7yž½¹y»ÞU{s³Ù~ú›Û‡�OþðËoç�…/?ÿôë�_ÙW¼{ÿöCés~þëo_þôßÿóuÛÉ�ß½ÙþßÇŸþò‘íþò—mG~ùüåïŸÚ5MäéÿiÁñ½endstream
+78 0 obj
+6308
 endobj
 79 0 obj<</Type/Page/Parent 75 0 R/Contents 80 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 6 0 R>>>>>>endobj
 80 0 obj<</Length 81 0 R/Filter/FlateDecode>>stream
 xÚ+ä2T0BCc3JÎår
-76 0 obj<</Type/Page/Parent 72 0 R/Contents 77 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 7 0 R>>>>>>endobj
+ár
 á
 äHÉHendstream
-ár
-á
+endobj
+81 0 obj
 31
 endobj
 82 0 obj<</Type/Page/Parent 75 0 R/Contents 83 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 3 0 R/F8 6 0 R/F9 7 0 R/Fc 8 0 R>>>>>>endobj
 83 0 obj<</Length 84 0 R/Filter/FlateDecode>>stream
 xÚ•UKsÚH¾ó+º|²«‚ÖŒ!7¿‹ª<´§öÀeµÌÄ£ezE~ývK°–Í&e_˜~}ß×}ë¤pÉ)\÷ ?]vng�?Ç�ŽaV°ex=€Y~žÂTû
-79 0 obj<</Type/Page/Parent 72 0 R/Contents 80 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R/F9 8 0 R/Fc 9 0 R>>>>>>endobj
+/f_[ëU2jíÝ«QÒz$)LrtÑF«h¼k��¦[×Þ°u�-
 ù"®U@ Ôu0q+"TÁ¯LŽÊñ¿²bo_@å‰ÌÂhï4GPøq‰pçËÒ;xù4ùKŠsÉ´Ÿô¤d#s¯0ÝPÄæçgw/Ùôl~_0£…4¹LNðë�wüz»àÏ++ƒëŸüWßS¡¬„Uµó±jƒ¡¡$±óÞÕXù #5	(�I„¥¢#–D9®ÐrD‹
 <(ÚÀt'u|^ëH½`(}D†@Q¹\…|�¼¥ƒ
-}É÷êÖŽ5L (ºå²æû5ÄÀ%ÚÔúV–üÐÖÊ pI´…�è’uÖ�Š1§nR�‚ŸA¿“Ùx’¤¹™£›Ém{”eÜNÑ¸ÏD›€ŸK‰§àéÁ3Í"ø^cÍE�›µGç>àŠe¸×C§Ç÷Ùõ;x¸½JÓóáôäŒyØþ�O—šä»�?^k¨pQUc~Ä8Ó*Wæ6íh¯¤««0	Ü´¥òs^îÿ(j#C#„æy?¨�Ès,Ë’ìKÃ�1Í,-] PdäüXZUù-'tñAEbGYvÍ‹ÐfÉpg(ÚÃ¬ÆÊ …®«sU¥×[ï 696Ã{1³ç®K]7 kç©T?¸öb½Š¼íwŸán¾…>=æ¥·|^ô
- TüîÕKN»Ó“=¼A¾%ªm*ïÚÃ(ã!$¿Ï0YvbÃÌ�iïÈ¶–Õýý<tášd]2Ä?öîÿû†{gŸ„‰špiŠ]�Ö´Œë‰q(Ü‡&¿\çï˜ï/§�þ9¼ÀW¼½{ÇåØF«CQœ°@VŸ·ôM¡]½'Ésr!9ÖÁƒr/oKÑ‹Õã©úïœãNóÿ‡°«Æ4X›Ú�hé°Û4fç®78M†œ9¼†ß7“Ö—ÖOªÏ8˜endstream
+emËb….÷Aú’Õ‰5L@Ýs“†lù~‘¸Åð†¥oeÉ]k—ÄP(�”l³îTlÒqê6ÕDüÆ½˜Ì&zí-7sò0{ìN²ŒÛ©Z÷…’±ü\J½ŠC¾úEC¾ÕXsQàfÑù ¸š2Üˆ{…ÒÇùù‡ìþ<?Þ¥éõx~ñ¦<lÿˆDêáÖzýÆnÓ�·b•
+7U5åGlfº�Ê•¹
 Ê’?*Iu%“ÀM[›¸äUà>ñ�¢vZ¡,ÏûI}Tž°,kÞZ†Œiüš„² È<Å©¦Š{NHÍƒiˆ�eÙ=/B—%Ãƒ!ð�]få4V©,p]›ƒª*»Ýz‚ÚåØïiÄÌž»®mÝn€®)úÒ|çÚ«í*ò¶?}z�§åúüœ—>ðy±h�úâß^ƒä²?¿8Â+"ð-1¥´©0¼kÏ“Œ‡DEÐü¾@²\vbÇÌy×=�m++ýü<ôáÞëºdˆÿ} Ø{øÿPî]xU®Ñ„Kûf¢o_7ë‰ÍPÐû6¿Þæï�˜ï?ZÏ{Ãkø_ñîá×{`;NEqRxÆY}ÞÒß
 íK¨¡·“_†_Ì1Øå¸!¾$ÿVü
 Ç?Yþx¨°iM£©Û*–ŽûmW>rƒÑe2æÌò*¿f�?;\8Gendstream
 endobj
-82 0 obj<</Type/Page/Parent 72 0 R/Contents 83 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 7 0 R>>>>>>endobj
+84 0 obj
 824
 endobj
-áÒw³P04TIS041T072PIÑp	rtQÐUp
-VÎO+)O,JUNM.-Ê,©TJ-È/*ÑÉâÒiÒ…ê2‰˜˜˜é™)€ù†
-ÁÉù© Q×®@.ü7 £endstream
-endobj
-84 0 obj
-118
-endobj
-85 0 obj<</Type/Page/Parent 72 0 R/Contents 86 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R/F9 8 0 R/Fc 9 0 R>>>>>>endobj
-86 0 obj<</Length 87 0 R/Filter/FlateDecode>>stream
-xÚ•O�Ú0Åï|Š9²Ò&K	7
-l…T´)	{ââÆp•ØÔ6ÚòíkcÂ•V%]å�@Æ¿7ö¼?ZtÌÀ „nòªõ)k=½ÄÄ�æMÐƒŒ¶CX`�yŽê!ûîJžýÈyÏ‘ïÊüÆË$…‰ÈwrM4Ü-èAËÃ¾+Ï6…(KñÎøÚ-¤—�)�µ.…o{ÐóU]3tàü#?<³Wa×Êm«à�ç‰ø�¡Ó^°õN:½9ád�–
+85 0 obj<</Type/Page/Parent 75 0 R/Contents 86 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 6 0 R>>>>>>endobj
 86 0 obj<</Length 87 0 R/Filter/FlateDecode>>stream
-f\£,HŽ0AÅÖÜÞrÉ¶ç³¹G"Í„ÿ³…~'aD+Æ™Òf/B*»—)ð¯·PÓ?¤õd~�H±–¤ª¬	w�.n¡SÌw’é½±ïVHÝ€›%·¸ª¦I—˜ßRáÿŒímrûf¨ÖÛ¿Mîœ`ÏE§×)áUoPžb¬þ1Â\pï*Æ
-l™áÙt:… 
+xÚ+ä2T0BCc3JÎår
+áÒw³P04TIS041T072PIÑp	rtQÐUp
+VÎO+)O,JUNM.-Ê,©TJ-È/*ÑÉâÒiÒ…ê2‰˜˜˜é™)€ù†
+ÁÉù© Q×®@.ü7 £endstream
+endobj
 87 0 obj
 118
-zbÍªmyøÕ²ú¼c›qæ‚byh(ÅŠ˜#ÌÕ] ÅËØ<âGøÂ8º1X¬ŒMÌµÈÅÑÛÑqÑÑ{aßúŸéE?6²æU×~žf¯_Ð&Ùûendstream
+endobj
 88 0 obj<</Type/Page/Parent 75 0 R/Contents 89 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 3 0 R/F8 6 0 R/F9 7 0 R/Fc 8 0 R>>>>>>endobj
-87 0 obj
+89 0 obj<</Length 90 0 R/Filter/FlateDecode>>stream
 xÚ•O�Ú0Åï|Š9²Ò&K	7
-endobj
-88 0 obj<</Type/Page/Parent 72 0 R/Contents 89 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 7 0 R>>>>>>endobj
-89 0 obj<</Length 90 0 R/Filter/FlateDecode>>stream
-xÚ-‹Í1…÷÷)Î’E™[Í°5˜5Óë¤n3TE¼½©È9›óó=ˆQ�b,êâp£FhÞ®À‰`ÇXÚ
-ržl»u+0Ø÷~ˆù}J
-¯á•.ùƒNïCÊS¹’)�ùS®4Îò¬Æ/Ûñ5iôY¦�Ð�¾u"§endstream
-endobj
-90 0 obj
-121
+l…T´)	{ââÆp•ØÔ6ÚòíkcÂ•V%]å�@Æ¿7ö¼?ZtÌÀ „nòªõ)k=½ÄÄ�æMÐƒŒ¶CX`�yŽê!ûîJžýÈyÏ‘ïÊüÆË$…‰ÈwrM4Ü-èAËÃ¾+Ï6…(KñÎøÚ-¤—�)�µ.…o{ÐóU]3tàü#?<³Wa×Êm«à�ç‰ø�¡Ó^°õN:½9ád�–
 IIø5ß4t�Äßà³Éäžî•Æ
 f\£,HŽ0AÅÖÜÞrÉ¶ç³¹G"Í„ÿ³…~'aD+Æ™Òf/B*»—)ð¯·PÓ?¤õd~�H±–¤ª¬	w�.n¡SÌw’é½±ïVHÝ€›%·¸ª¦I—˜ßRáÿŒímrûf¨ÖÛ¿Mîœ`ÏE§×)áUoPžb¬þ1Â\pï*Æ
-92 0 obj<</Length 93 0 R/Filter/FlateDecode>>stream
+l™áÙt:… 
 üÞc°ç›Ý
-¥´]úª•ÆY%²ÆÑÈMý÷�‘³]Xƒå3ç6z®¸‘§�Í–k°}u×V¾ì ÙAÛÉŸõf{·„odM€�Ö"3üòüÄWí£@WÐ43ôz¹«×
+�¡×¶ŸU›JRèÕÃ]ç9K’§ÃÌG”2K$%¼nOèdxÆ^‚fì)Ïµ=N!“„«»
 zbÍªmyøÕ²ú¼c›qæ‚byh(ÅŠ˜#ÌÕ] ÅËØ<âGøÂ8º1X¬ŒMÌµÈÅÑÛÑqÑÑ{aßúŸéE?6²æU×~žf¯_Ð&Ùûendstream
- a0J�	œaï£)ãÔ‰	„D”a0Ì/”Ä@’Ó¤"còy:Ñ€¬/LÅŸŽÞÿúûBœLB€'ÎØ×s;Räm½=÷3—Y7°?ÉÜ%4öˆo·¹÷Ñb‘uØ™1dð‘³	aNce>«O�Á]Ë§3‡ ùðYüg	Ÿ¤7JÓ{ð2Ë0³WD'¡Ïe³6¥ÓÉTÙRÌ3kwCò1CçƒˆP8Š¹©¬¸üCW¿R,Ösà²½!‘ˆö§ÝKü3÷z˜ 7OÚ]ÙË¥oø©ÜA+¬ÜÐúÎ‡�zzaýÓý�½zïüÃ˜æºÔ÷ën¶ç®W›õ<ñÖ=_moê� r«ßŸÛêgõiã#endstream
-endobj
+endobj
+90 0 obj
 522
 endobj
-endobj
+91 0 obj<</Type/Page/Parent 75 0 R/Contents 92 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 6 0 R>>>>>>endobj
 92 0 obj<</Length 93 0 R/Filter/FlateDecode>>stream
-95 0 obj<</Length 96 0 R/Filter/FlateDecode>>stream
+xÚ-‹Í1…÷÷)Î’E™[Í°5˜5Óë¤n3TE¼½©È9›óó=ˆQ�b,êâp£FhÞ®À‰`ÇXÚ
 ržl»u+0Ø÷~ˆù}J
+¯á•.ùƒNïCÊS¹’)�ùS®4Îò¬Æ/Ûñ5iôY¦�Ð�¾u"§endstream
+endobj
+93 0 obj
+121
+endobj
+94 0 obj<</Type/Page/Parent 75 0 R/Contents 95 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 6 0 R/F9 7 0 R>>>>>>endobj
+95 0 obj<</Length 96 0 R/Filter/FlateDecode>>stream
+xÚ}ÎA
+Â0Ð}Nñ—º0mÚ¦I–
+7–\ ¤)¤ÚIî�©Á…2«Ï¼?Ì“0”iD…º…YÈI“¢S`
 zJ›V4Ðã®FïÂ—Ñ®ÑMÎÑùu¯çl9•Y¸¤ÙS†«7ÃGclïzØ
 _¨Boí�*:	Æ>G¹Hòß�,©J4¾å³&7ò×Ò:ßendstream
 endobj
-96 0 obj
+96 0 obj
 146
 endobj
-97 0 obj<</Type/Page/Parent 72 0 R/Contents 98 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 4 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
-98 0 obj<</Length 99 0 R/Filter/FlateDecode>>stream
+97 0 obj<</Type/Page/Parent 75 0 R/Contents 98 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 6 0 R>>>>>>endobj
+98 0 obj<</Length 99 0 R/Filter/FlateDecode>>stream
 xÚ-‹ËÂ D÷÷+f©´WLµK_MÜ)à44EŒñïcf6s2çNŒê†¬Kí•Ö†¦íÌ0<g,fL?ÚªUk °94tôùÕ%íì3…ü†r·˜òØœIIüºÙð¤ÆoK¨ð¸`ß»!l—CÊggèH]&endstream
 endobj
 99 0 obj
-`K½Âõ$²ÑµŽ)³mëÀ Ô>t(â:-àEÀq4H·Æ9f#"sÒ¥œ¹ñø�í
+130
 endobj
 100 0 obj<</Type/Page/Parent 75 0 R/Contents 101 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 6 0 R/F9 7 0 R>>>>>>endobj
-CØ�¤q\ÆO�–œŠoï¢ÀŠæ& %Â†:±aðE™”¬HY;m÷l¸'_�p4éj¾Êt
-øA]©t>7rß` Ö«u6ÆVg‡®3àŠB+×^’Œ¨'ÚY™£íˆ¤ôê;z:ÒD,”²èn©ô¨/nëû	´ÌW$£qÙÌ‡ÁsI€‡Q·v€;È×Ÿµ«·¢žQ?ç¸³ç
-<âhá�¨$§o€SEØÚ‚éê|úF¿ûH«tHSÑºd½Ì¢¸J'ø»0µ_!â@Ö-Åx)»†ûÉ¿ê›&dã¤É…–yÚ¤œ=@¹Ò¬†èº.Pž}Î}#†guPÐI©[CK¶¦è"zFWÔ6š%�\(>Õ‹ýV‹‹¢Å£²IŠFøÈóóþË*ž	¿Rh”ÔK
-§šÍVÙ�e¸Ù�^/Z$EJÍ¹´]Óàp¯YŸ7zaC�—*ô¯Ó^?n‡ŸtUjÍ}+c?ª|B‹ÈËÎß+˜€^€ñ1¾�—©bWäÚ5ù€\ny.-ØïK<{YãÌð–ÏËŸéÞ©qL»‚¾¹EÈ™²GFý@äÓŽ«L¯zÈc6�ê›èíÌJîã±ÍcYHmàj•~gxe{e<3sù>+ïðñ_âõ!óø¨¨ÃGúxÇÀÓÉÇSœ¥‡0�ûÌè¶'®>•Úµ¡€e-sa˜t@�:`¥ø]ÙëÖb3©àûaò:p9·�XAº·å¦Q§Øû®®!þéÌI)§_¿ È³u�MÏçé;5Qr¥X”8—>6Àlú0,Ñ;Ã¯�UªbU
-û›²ý·%áÍÎ4Æ^¹·5Í°+åíŠîàu¹VoKûÝ²¿9‹Ç2´
-�Í@w"hI¢å¦Œhä4ýÒ¬eVÔªˆ Bî
-<¦=¨ø7þ€ˆÆ™”Bz<Ð]½Æ²~lƒÄÁ	=j~·RÑ¸�c}ýûþ¿ƒëÃ´}°~íÕ×	P^ ÷~ßm>H�	wÆžJÌácöt\ž•
-+ø‡V+µ <�ôÈ2õïÍ³J-öÉ¶ß»rQå™
-ýÊ.*ì
-VM?Oè_Üv©—vVNý‘ÏgcÜìŒ1»ÎÆøðG.nÎ&·8‰3×üïOó£ŽþúYU»endstream
-endobj
+101 0 obj<</Length 102 0 R/Filter/FlateDecode>>stream
 xÚuÎ±
+Â0à=Oñ�:˜65i’±‚�\,y‰¬Æ"×÷Ç«ÁADn:þï?î)jÛ`Û"f±¢ê=”G¸pÒZ�p^iWº¡#JD9=æu‹3Ò¹1N+S<ÝÑÅÈü]¥¥ð…)OsúQUï Ôç¨±,ÿ} ]-=3Îí²ïƒ8Š¸ý7Ýendstream
+endobj
+102 0 obj
+140
+endobj
+103 0 obj<</Type/Page/Parent 75 0 R/Contents 104 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 6 0 R>>>>>>endobj
+104 0 obj<</Length 105 0 R/Filter/FlateDecode>>stream
+xÚ+ä2T0BCc3JÎår
 áÒw³P04TIS041T072PIÑp	rtQÐUp
 VÎO+)O,JUNM.-Ê,©TJ-È/*ÑÉâÒiÒ…ê²‰[ë™*€ù&
 A™ÅÙ
-101 0 obj<</Length 102 0 R/Filter/FlateDecode>>stream
+ŽÅÅ©ÅÅ¹©y`®!\�\g$‘endstream
 endobj
 105 0 obj
-Rž‹H.GôÁþ£î�é°.¢‡ñ“ˆN–o%÷¦Î×¦î»ÛïTµ‚Z©EfÿôåÐ \::ú>žµì~$“‚�<Qî+óËL+Ö«ÌÚå›ÍÃgiþ:×"öÊy¤Í@œ1ßšâgñ)Åõendstream
-endobj
-102 0 obj
-381
-endobj
-103 0 obj<</Type/Page/Parent 72 0 R/Contents 104 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F6 6 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
-104 0 obj<</Length 105 0 R/Filter/FlateDecode>>stream
-xÚ�T]o›0}çWÜÇíZÒ4…Ç%i¤ªc‚J}uÍ
-õâf;‹òïwZ©ÝŠ¥N „uçžã{ð¯$‡Kºr¸™ÁÕ¸J¾µÉÅº„¼„vG•ÅÍÚîË6Ò8Çìékûs\gÅI¯‹le9´h•1Èó€ Þt¶!ÕXšPZ7j8x´ ™î¬Çì=Qú>0Ë¤D9MØ î„îÁX°ÈQü‹ŽyÊXÿÌ4Ýà…Š7ÆÔ�é‘�‚uÐ‚3/ŒvÀ©�F	Oè�ˆüÑÀ`Mo™r±v`ÿåîžœá{ô1W$÷ìJ“|c÷î²¿S‘RžÒ«ò53Xrkô)�eSm·)Š6„ÓÈÏtÇl•évä«é©ÎŠè�Tõñ]=ÔÍt«Š<ÕÃýöj+´[ÛœœGá\5ÕE=Mºª›ï÷ˆ?7@ë"Ìë6Â»¡µL»6ã
-72Âv[§›»i¾[<Jô>ß¡Ë†gÁÜ½ü”ã§Å+uô¼ 	ÿsJÌ‹Ë¬¤ó�
-eX¯ÚäGò�E8%endstream
-endobj
-105 0 obj
-426
-endobj
-106 0 obj<</Type/Page/Parent 72 0 R/Contents 107 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F6 6 0 R/F8 7 0 R>>>>>>endobj
-107 0 obj<</Length 108 0 R/Filter/FlateDecode>>stream
-xÚ�’MSÂ0†ïý{ÔC+ÅRË‘�v„¡C¤ñÄj¤$˜½IU�“œö�}v÷Ý}õBè˜Âml?ÝxCìÝd1„!à•
+127
+endobj
+106 0 obj<</Type/Page/Parent 75 0 R/Contents 107 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 3 0 R/F6 5 0 R/F8 6 0 R/F9 7 0 R>>>>>>endobj
+107 0 obj<</Length 108 0 R/Filter/FlateDecode>>stream
+xÚ�T]o›0}çWÜÇíZÒ4…Ç%i¤ªc‚J}uÍ
+õâf;‹òïwZ©ÝŠ¥N „uçžã{ð¯$‡Kºr¸™ÁÕ¸J¾µÉÅº„¼„vG•ÅÍÚîË6Ò8Çìékûs\gÅI¯‹le9´h•1Èó€ Þt¶!ÕXšPZ7j8x´ ™î¬Çì=Qú>0Ë¤D9MØ î„îÁX°ÈQü‹ŽyÊXÿÌ4Ýà…Š7ÆÔ�é‘�‚uÐ‚3/ŒvÀ©�F	Oè�ˆüÑÀ`Mo™r±v`ÿåîžœá{ô1W$÷ìJ“|c÷î²¿S‘RžÒ«ò53Xrkô)�eSm·)Š6„ÓÈÏtÇl•évä«é©ÎŠè�Tõñ]=ÔÍt«Š<ÕÃýöj+´[ÛœœGá\5ÕE=Mºª›ï÷ˆ?7@ë"Ìë6Â»¡µL»6ã
+72Âv[§›»i¾[<Jô>ß¡Ë†gÁÜ½ü”ã§Å+uô¼ 	ÿsJÌ‹Ë¬¤ó�
+eX¯ÚäGò�E8%endstream
+endobj
+108 0 obj
+426
+endobj
+109 0 obj<</Type/Page/Parent 75 0 R/Contents 110 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 3 0 R/F6 5 0 R/F8 6 0 R>>>>>>endobj
+110 0 obj<</Length 111 0 R/Filter/FlateDecode>>stream
+xÚ�’MSÂ0†ïý{ÔC+ÅRË‘�v„¡C¤ñÄj¤$˜½IU�“œö�}v÷Ý}õBè˜Âml?ÝxCìÝd1„!à•
+ÅI$€—W÷ÈG£Ù5~1ztÖýnD�ÎÓÚG„®‰ZR\h¦`$…V²‚åŽ”ì“ð]Á¿@˜Ó”˜Ê§ßà')ÎÚá‹LC*J.3ì0©×�IE�\„~�mšµL¤¤–TV.b1ÿ‰H4—‚TPh"–ÆŒæª$‚¿7‚ƒ=CãvöÌL~²uLØÆ‰Ê'yÚÎÊw•æ¶äN&ä„W�¾Ñg³-—¥ÎKCfÍ9+äšÉZTñ>ÏÍê&àö±È‡íÔ‚©½!å¬®m³ÃJÒµƒ…3ì8!¬øž›Ug¼b€õÊ°/Ï(ùÊ‹ûÐKúAlóÆ‹A†Á‡Ñ#* �+} ŠAÁèNq}„ÛJ¥mºF!øwÝŽÍ
+;6…IÐƒ&0º0 JŠã¦¶RŠ½ïõG%¿endstream
+endobj
+111 0 obj
 383
-;6…IÐƒ&0º0 JŠã¦¶RŠ½ïõG%¿endstream
+endobj
 112 0 obj<</Type/Page/Parent 75 0 R/Contents 113 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 3 0 R/F5 4 0 R/F8 6 0 R/F9 7 0 R>>>>/Annots 55 0 R>>endobj
 113 0 obj<</Length 114 0 R/Filter/FlateDecode>>stream
 xÚÕ˜ÛnÛ8†ïý¼Ü^T�/ÓdS(Ð]Û}W¡wÝFVWr[äí—äu"RwVm@1äGiÿÐþoCIn¿”ŒpEªzón¿¹yÐ„j²?ªxÆˆ*¤½îÿØ¾<ÒÉ]s¾˜ó¥{³ÿºùs¿É³ÜRÜ…ºËö½ÅK»¬&î
 ÷Odçø/¦·ÿ�›I(u;ºev£d? kÂeVNù`EÊ®j¾(9îÊ¤ÝÎNÉVÿ¡³žàÊyšI{‰d™ÄAÄÕ]mã˜òžÎ"¾Ak»’:o�·@»}x´Yq:žªÃåÔœ_÷º,²bM~OùÖ¿qðÌúÖy”2;Ãû”¥|Šä²ÈÔ”Œf$íž»‹©#Å0¬·â´èP`GÚ§Ÿ¦ýy2¿^Ž ™^EpQ‘º´/…Q�A,*Rë3�'¢È4wU1A£Q÷Mõ£¶é>Ï#,PˆLL�a¡a6£®|Y°^ðá~‘àË‚ƒT³¸à¼tîšðÁŠ”9šÖœ+ÓÍøQ¯K^ùðDò[ôrƒer/•o–”û°CéDc²˜�s÷ù¯]$dÃZ›ü2wA“À¤PK‘¶¡Ôuƒ–Š‰�C›€AT�„9fÉ6ÈenµkBF3’>]þ5m$Ãr×%r§EcÚ2_Cl5Äã‚Dµ}M$¿L�˜óŽ}9ž$Äsæœ9æ{k lOÝ·yÐhqM´êŸI`¨%ç+EíÜÕé›L”O®@Û}JûÁBIË�}ž5Ü2}¼š‘ô±©O©BB¥Â…zC;Ân+ÛˆºÈapuYÚæ4Á…	ÈsÉ4S”Œgêú�OZh>ô.ÄtRh(Ä¤Jn©_rÑ¥hêæb"±Õ#µSÚÅ¢ÈŽ–»Ó_a•uD*®ìêq•Q™Jù®S=¸_$³Bpîq™
-109 0 obj<</Type/Page/Parent 72 0 R/Contents 110 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F5 5 0 R/F8 7 0 R/F9 8 0 R>>>>/Annots 53 0 R>>endobj
-110 0 obj<</Length 111 0 R/Filter/FlateDecode>>stream
-xÚÕ˜ÍnÔ0Çïû>Â�4þNŽ…R„„ì.°/,4ÈPßŒ»jìÜ¶RkâßÄ3žÿ8ýµÁ¨ÔI‚¨@M»y¹ß\ÝÖ×hDXÐ‚ !¹¾î¿<Û>ß)ÔÑ«î<¨ópy¾ÿ¾y½ß”E©)æ‚ÍeûÆ� •žÖ"su÷whgøï¿¢«[Ž06Í´ÚyÃh?![DyQÅ|gÊ®é~*š(%x%\»Ó�«ÿáÙHPa"M¸¾¶ˆ“‚Ã j¡ÖùDØH‰XÐVÏÄ&Ú¡°[ÐÛ/zWœŽ§æ0œºóãQç²�kŠ{.¶vÅ>¶v0[QLô6¦$S W²1Ì@ÚÝ_Õ&Šaš¯DñøÒ¾œhïÿ¨þÏIý}<9õ*’“É
-¯+½(ÈŠ¤²Âëº€�N3Yñd\šªˆÐ`ÔM×ünõvŸç…
-d¬`1Ð?ÄLjˆÞQOœœ|.É(øî~‘àsI�T“´à{<7áŠøÎ
-”:ª^�u™‰c½.ýyäG3›_G`”{7X&÷\Øu“¬Ü{•�Èƒ3;Î«Ov‰”Msõæç¥IZHrvGòµ”hB<mÒr9a|jn�$&œ“l›ðäªÔÚ‘Á¤÷Ã7Õ'Ò1M7]¢4ZÂÀ0Ÿ�ù"«¨!š$\ëe‚ Ùûe‚DLtôâhF�O¥	]È·VOy×5‡»yR0»E?|Ugö¬ëFëÚeÌoQ-t3�`ÎìaÛÓåÇeîh¬½®M$y¦Káúƒ-;X(‹¥tƒæ…|Ôæœù3�vªùÝŸ†ûy\@0õht â�x/{uh¾Íµ4jNxkÈO–#“µS2½&w¿¨™–&+J,]ŽÏäè+(Ç‘²Um7¨yT0ÝŠn³˜œP¹jf›¥ÐYŠßËÚÇK”#Õ�¬ªeº™ÓùÜ
-–Õ"Ò†Y¶½�Š™¸†>À¤u>¥8˜o5óÁƒ`Ý1QÒ"x+WÒ	ì@Ú™Ã~“Øˆ!Aó„iÖÏ?Àëa84s;ˆ>™œçv
-§¶Y¹œÙAêàÄ8sÍ‹eNžl•4"ƒHµÚã ê!ìÀûO´Z¦µšHwp/õ×’,kâ”1õU<mÖIŒ³¥¼¹ë.—C?ÉºÀëÿ^�Ùþ˜ºïf¶�,JÌ 	%…rÂj¡¤£C_Î¤½êÛ¹$×Ö€–Æ·,]#²+µƒ¤¼”Ä4)/ÌTˆéßìÕôÝù~.²Œï¤mczu[ÁncX—$Å•“·›íõí½@öë×‡¿‡^¡QD·êg×@Õx!‰]Ý	¢ùqóã×ï<endstream
-endobj
-111 0 obj
-1027
-endobj
-112 0 obj<</Type/Page/Parent 72 0 R/Contents 113 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 7 0 R>>>>>>endobj
-113 0 obj<</Length 114 0 R/Filter/FlateDecode>>stream
-xÚ+ä2T0BCc3JÎår
-áÒw³P04TIS041T072PIÑp	rtQÐUp
-VÎO+)O,JUNM.-Ê,©TJ-È/*ÑÉâÒiÒ…êÊÌ	¹†pr‡Âµendstream
-endobj
-114 0 obj
-103
-endobj
-115 0 obj<</Count 6/First 116 0 R/Last 129 0 R>>endobj
-116 0 obj<</Parent 115 0 R/Title(Table of Contents)/Dest[109 0 R/XYZ null 756 null]/Next 117 0 R>>endobj
-117 0 obj<</Parent 115 0 R/Count -3/First 118 0 R/Last 120 0 R/Title(1 Scope)/Dest[79 0 R/XYZ null 743 null]/Prev 116 0 R/Next 121 0 R>>endobj
-118 0 obj<</Parent 117 0 R/Title(1.1 Identification)/Dest[79 0 R/XYZ null 693 null]/Next 119 0 R>>endobj
-119 0 obj<</Parent 117 0 R/Title(1.2 System Overview)/Dest[79 0 R/XYZ null 613 null]/Prev 118 0 R/Next 120 0 R>>endobj
-120 0 obj<</Parent 117 0 R/Title(1.3 Document Overview)/Dest[79 0 R/XYZ null 389 null]/Prev 119 0 R>>endobj
-121 0 obj<</Parent 115 0 R/Count -2/First 122 0 R/Last 123 0 R/Title(2 References)/Dest[85 0 R/XYZ null 743 null]/Prev 117 0 R/Next 124 0 R>>endobj
-122 0 obj<</Parent 121 0 R/Title(2.1 CUPS Documentation)/Dest[85 0 R/XYZ null 693 null]/Next 123 0 R>>endobj
-123 0 obj<</Parent 121 0 R/Title(2.2 Other Documents)/Dest[85 0 R/XYZ null 495 null]/Prev 122 0 R>>endobj
-124 0 obj<</Parent 115 0 R/Count -1/First 125 0 R/Last 125 0 R/Title(3 Local Access Risks)/Dest[91 0 R/XYZ null 743 null]/Prev 121 0 R/Next 126 0 R>>endobj
-125 0 obj<</Parent 124 0 R/Title(3.1 Security Breaches)/Dest[91 0 R/XYZ null 646 null]>>endobj
-126 0 obj<</Parent 115 0 R/Count -2/First 127 0 R/Last 128 0 R/Title(4 Remote Access Risks)/Dest[97 0 R/XYZ null 743 null]/Prev 124 0 R/Next 129 0 R>>endobj
-127 0 obj<</Parent 126 0 R/Title(4.1 Denial of Service Attacks)/Dest[97 0 R/XYZ null 659 null]/Next 128 0 R>>endobj
-128 0 obj<</Parent 126 0 R/Title(4.2 Security Breaches)/Dest[97 0 R/XYZ null 210 null]/Prev 127 0 R>>endobj
-129 0 obj<</Parent 115 0 R/Count -2/First 130 0 R/Last 131 0 R/Title(A Glossary)/Dest[103 0 R/XYZ null 743 null]/Prev 126 0 R>>endobj
-130 0 obj<</Parent 129 0 R/Title(A.1 Terms)/Dest[103 0 R/XYZ null 693 null]/Next 131 0 R>>endobj
-131 0 obj<</Parent 129 0 R/Title(A.2 Acronyms)/Dest[103 0 R/XYZ null 389 null]/Prev 130 0 R>>endobj
-132 0 obj<</Type/Catalog/Pages 72 0 R/Names 54 0 R/ViewerPreferences<</PageLayout/TwoColumnRight>>/Outlines 115 0 R/PageMode/UseOutlines/OpenAction[79 0 R/XYZ null null null]>>endobj
-xref
-0 133 
-0000000000 65535 f 
-0000000015 00000 n 
-0000000221 00000 n 
-0000000282 00000 n 
-0000000356 00000 n 
-0000000434 00000 n 
-0000000511 00000 n 
-0000000590 00000 n 
-0000000666 00000 n 
-0000000747 00000 n 
-0000000805 00000 n 
-0000000907 00000 n 
-0000001010 00000 n 
-0000001114 00000 n 
-0000001218 00000 n 
-0000001322 00000 n 
-0000001426 00000 n 
-0000001530 00000 n 
-0000001634 00000 n 
-0000001738 00000 n 
-0000001842 00000 n 
-0000001944 00000 n 
-0000002047 00000 n 
-0000002151 00000 n 
-0000002255 00000 n 
-0000002359 00000 n 
-0000002463 00000 n 
-0000002567 00000 n 
-0000002671 00000 n 
-0000002773 00000 n 
-0000002876 00000 n 
-0000002980 00000 n 
-0000003084 00000 n 
-0000003188 00000 n 
-0000003292 00000 n 
-0000003396 00000 n 
-0000003498 00000 n 
-0000003601 00000 n 
-0000003705 00000 n 
-0000003809 00000 n 
-0000003913 00000 n 
-0000004017 00000 n 
-0000004121 00000 n 
-0000004225 00000 n 
-0000004329 00000 n 
-0000004433 00000 n 
-0000004537 00000 n 
-0000004641 00000 n 
-0000004744 00000 n 
+x/…>X‘²@fûU/ŸÍˆºí:Z×ÿf~Â:±Yã²HŸä¾Í@IøÁ2•R@I•
+{xœì�f$-QÙÀ
+œÀÐŽ°e*Ûã¼ÊNpa‚ÈÄo¡²©@‹|h§0ˆª¬ Ð]DZg‘J8&£™†_aK”a¨„cÚéÂ.:ôZ;Æ…	4ÝE¯¯¶E\m)‡3|î’Ø–ÉMq¶¿�ýcÑ3}ò°éhFÎû§¦ëíóë~äz¥9ùèDå9üÍ$2�ƒ…‚™Sl%QÁ°¶¢x¿a¨(0#ioÚz.g]¾¯Ò×	ÿò²€†äÞ1�âe‰zÕ©æª$·¾™ ÑPUÛœŸç<+„m3+ó¬÷éÍC‰Ùf5 œc–Üooöä-ñÿÍìšãå×¡5dgªíéòL¶æ{ÓúS
+®‘½-˜»zóïÍÿ®@�endstream
+endobj
+114 0 obj
+1058
+endobj
+115 0 obj<</Type/Page/Parent 75 0 R/Contents 116 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 6 0 R>>>>>>endobj
+116 0 obj<</Length 117 0 R/Filter/FlateDecode>>stream
+xÚ+ä2T0BCc3JÎår
+áÒw³P04TIS041T072PIÑp	rtQÐUp
+VÎO+)O,JUNM.-Ê,©TJ-È/*ÑÉâÒiÒ…êÊÌ	¹†pr‡Âµendstream
+endobj
+117 0 obj
+103
+endobj
+118 0 obj<</Count 6/First 119 0 R/Last 133 0 R>>endobj
+119 0 obj<</Parent 118 0 R/Title(Table of Contents)/Dest[112 0 R/XYZ null 756 null]/Next 120 0 R>>endobj
+120 0 obj<</Parent 118 0 R/Count -3/First 121 0 R/Last 123 0 R/Title(1 Scope)/Dest[82 0 R/XYZ null 743 null]/Prev 119 0 R/Next 124 0 R>>endobj
+121 0 obj<</Parent 120 0 R/Title(1.1 Identification)/Dest[82 0 R/XYZ null 693 null]/Next 122 0 R>>endobj
+122 0 obj<</Parent 120 0 R/Title(1.2 System Overview)/Dest[82 0 R/XYZ null 613 null]/Prev 121 0 R/Next 123 0 R>>endobj
+123 0 obj<</Parent 120 0 R/Title(1.3 Document Overview)/Dest[82 0 R/XYZ null 389 null]/Prev 122 0 R>>endobj
+124 0 obj<</Parent 118 0 R/Count -2/First 125 0 R/Last 126 0 R/Title(2 References)/Dest[88 0 R/XYZ null 743 null]/Prev 120 0 R/Next 127 0 R>>endobj
+125 0 obj<</Parent 124 0 R/Title(2.1 CUPS Documentation)/Dest[88 0 R/XYZ null 693 null]/Next 126 0 R>>endobj
+126 0 obj<</Parent 124 0 R/Title(2.2 Other Documents)/Dest[88 0 R/XYZ null 495 null]/Prev 125 0 R>>endobj
+127 0 obj<</Parent 118 0 R/Count -2/First 128 0 R/Last 129 0 R/Title(3 Risk Identification)/Dest[94 0 R/XYZ null 743 null]/Prev 124 0 R/Next 130 0 R>>endobj
+128 0 obj<</Parent 127 0 R/Title(3.1 Local Access Risks)/Dest[94 0 R/XYZ null 693 null]/Next 129 0 R>>endobj
+129 0 obj<</Parent 127 0 R/Title(3.2 Remote Access Risks)/Dest[94 0 R/XYZ null 634 null]/Prev 128 0 R>>endobj
+130 0 obj<</Parent 118 0 R/Count -2/First 131 0 R/Last 132 0 R/Title(4 Risk Assessment)/Dest[100 0 R/XYZ null 743 null]/Prev 127 0 R/Next 133 0 R>>endobj
+131 0 obj<</Parent 130 0 R/Title(4.1 Local Access Risks)/Dest[100 0 R/XYZ null 693 null]/Next 132 0 R>>endobj
+132 0 obj<</Parent 130 0 R/Title(4.2 Remote Access Risks)/Dest[100 0 R/XYZ null 634 null]/Prev 131 0 R>>endobj
+133 0 obj<</Parent 118 0 R/Count -2/First 134 0 R/Last 135 0 R/Title(A Glossary)/Dest[106 0 R/XYZ null 743 null]/Prev 130 0 R>>endobj
+134 0 obj<</Parent 133 0 R/Title(A.1 Terms)/Dest[106 0 R/XYZ null 693 null]/Next 135 0 R>>endobj
+135 0 obj<</Parent 133 0 R/Title(A.2 Acronyms)/Dest[106 0 R/XYZ null 389 null]/Prev 134 0 R>>endobj
+136 0 obj<</Type/Catalog/Pages 75 0 R/Names 56 0 R/ViewerPreferences<</PageLayout/TwoColumnRight>>/Outlines 118 0 R/PageMode/UseOutlines/OpenAction[82 0 R/XYZ null null null]>>endobj
+xref
+0 137 
+0000000000 65535 f 
+0000000015 00000 n 
+0000000221 00000 n 
+0000000282 00000 n 
+0000000360 00000 n 
+0000000437 00000 n 
+0000000516 00000 n 
+0000000592 00000 n 
+0000000673 00000 n 
+0000000731 00000 n 
+0000000832 00000 n 
+0000000935 00000 n 
+0000001039 00000 n 
+0000001143 00000 n 
+0000001247 00000 n 
+0000001351 00000 n 
+0000001455 00000 n 
+0000001559 00000 n 
+0000001663 00000 n 
+0000001767 00000 n 
+0000001869 00000 n 
+0000001972 00000 n 
+0000002076 00000 n 
+0000002180 00000 n 
+0000002284 00000 n 
+0000002388 00000 n 
+0000002492 00000 n 
+0000002596 00000 n 
+0000002698 00000 n 
+0000002801 00000 n 
+0000002905 00000 n 
+0000003009 00000 n 
+0000003113 00000 n 
+0000003217 00000 n 
+0000003321 00000 n 
+0000003425 00000 n 
+0000003529 00000 n 
+0000003633 00000 n 
+0000003737 00000 n 
+0000003840 00000 n 
+0000003944 00000 n 
+0000004049 00000 n 
+0000004154 00000 n 
+0000004259 00000 n 
+0000004364 00000 n 
+0000004469 00000 n 
+0000004574 00000 n 
+0000004679 00000 n 
+0000004784 00000 n 
+0000004889 00000 n 
+0000004992 00000 n 
+0000005096 00000 n 
+0000005201 00000 n 
+0000005306 00000 n 
 0000005411 00000 n 
-0000004953 00000 n 
-0000005058 00000 n 
-0000005163 00000 n 
-0000005268 00000 n 
-0000005586 00000 n 
-0000005618 00000 n 
-0000005650 00000 n 
-0000005849 00000 n 
-0000005896 00000 n 
-0000005943 00000 n 
-0000005990 00000 n 
-0000006037 00000 n 
-0000006084 00000 n 
-0000006131 00000 n 
-0000006178 00000 n 
-0000006225 00000 n 
-0000006272 00000 n 
-0000006319 00000 n 
-0000006366 00000 n 
-0000006413 00000 n 
-0000006461 00000 n 
-0000006509 00000 n 
-0000006557 00000 n 
-0000006728 00000 n 
-0000006877 00000 n 
-0000013254 00000 n 
-0000013275 00000 n 
-0000013385 00000 n 
-0000013485 00000 n 
-0000013504 00000 n 
-0000013641 00000 n 
-0000014534 00000 n 
-0000014554 00000 n 
-0000014664 00000 n 
-0000014851 00000 n 
-0000014871 00000 n 
-0000015008 00000 n 
-0000015599 00000 n 
+0000005516 00000 n 
+0000005854 00000 n 
+0000005886 00000 n 
+0000005918 00000 n 
+0000006128 00000 n 
+0000006175 00000 n 
+0000006222 00000 n 
+0000006269 00000 n 
+0000006316 00000 n 
+0000006363 00000 n 
+0000006410 00000 n 
+0000006457 00000 n 
+0000006504 00000 n 
+0000006551 00000 n 
+0000006598 00000 n 
+0000006646 00000 n 
+0000006694 00000 n 
+0000006742 00000 n 
+0000006790 00000 n 
+0000006838 00000 n 
+0000006886 00000 n 
+0000007058 00000 n 
+0000007207 00000 n 
+0000013584 00000 n 
+0000013605 00000 n 
+0000013715 00000 n 
+0000013815 00000 n 
+0000013834 00000 n 
+0000013971 00000 n 
+0000014864 00000 n 
+0000014884 00000 n 
+0000014994 00000 n 
+0000015181 00000 n 
+0000015201 00000 n 
+0000015338 00000 n 
+0000015929 00000 n 
+0000015949 00000 n 
+0000016059 00000 n 
+0000016249 00000 n 
+0000016269 00000 n 
 0000016388 00000 n 
-0000015729 00000 n 
+0000016603 00000 n 
 0000016623 00000 n 
-0000015939 00000 n 
+0000016733 00000 n 
 0000016932 00000 n 
@@ -41,8 +41,8 @@ can be used to support non-PostScript printers.
 <UL>
 	<LI>1 - Scope</LI>
 	<LI>2 - References</LI>
-	<LI>3 - Local Access Risks</LI>
-	<LI>4 - Remote Access Risks</LI>
+	<LI>3 - Risk Identification</LI>
+	<LI>4 - Risk Assessment</LI>
 	<LI>A - Glossary</LI>
 </UL>

@@ -77,99 +77,17 @@ The following non-CUPS documents are referenced by this document:
 	<LI>RFC 1179, Line Printer Daemon Protocol 
 </UL>

-<H1>Local Access Risks</H1>
+<H1>Risk Identification</H1>

-<P>Local access risks are those that can be exploited only with a local user
-account. This section does not address issues related to dissemination of the
-root password or other security issues associated with the UNIX operating
-system.
+<H2>Local Access Risks</H2>

-<H2>Security Breaches</H2>
+<H2>Remote Access Risks</H2>

-<P>Since the default installation creates a world-readable request directory,
-it is possible for local users to read the contents of print files before they
-are printed.
+<H1>Risk Assessment</H2>

-<P>This problem can be alleviated by making the request directory readable only
-by the user specified in the CUPS configuration file.
+<H2>Local Access Risks</H2>

-<H1>Remote Access Risks</H1>
-
-<P>Remote access risks are those that can be exploited without a local user
-account and/or from a remote system. This section does not address issues
-related to network or firewall security.
-
-<H2>Denial of Service Attacks</H2>
-
-<P>Like all internet services, the CUPS server is vulnerable to denial of
-service attacks, including:
-
-<OL>
-
-	<LI>Establishing multiple connections to the server until the server
-	will accept no more.
-
-	<P>This cannot be protected against by the current software. It
-	is possible that future versions of the CUPS software could be
-	configured to limit the number of connections allowed from a
-	single host, however that still would not prevent a determined
-	attack.
-
-	<LI>Repeatedly opening and closing connections to the server as fast
-	as possible.
-
-	<P>There is no easy way of protecting against this in the CUPS
-	software. If the attack is coming from outside the local
-	network it might be possible to filter such an attack, however
-	once the connection request has been received by the server it
-	must at least accept the connection to find out who is
-	connecting.
-
-	<LI>Flooding the network with broadcast packets on port 631.
-
-	<P>It might be possible to disable browsing if this condition
-	is detected by the CUPS software, however if there are large
-	numbers of printers available on the network such an algorithm
-	might think that an attack was occurring when instead a valid
-	update was being received.
-
-	<LI>Sending partial IPP requests; specifically, sending part of an
-	attribute value and then stopping transmission.
-
-	<P>The current code is structured to read and write the IPP
-	request data on-the-fly, so there is no easy way to protect
-	against this for large attribute values.
-
-	<LI>Sending large/long print jobs to printers, preventing other users
-	from printing.
-
-	<P>There are limited facilities for protecting against large print
-	jobs (the <CODE>MaxRequestSize</CODE> attribute), however this will
-	not protect printers from malicious users and print files that
-	generate hundreds or thousands of pages. In general, we recommend
-	restricting printer access to known hosts or networks, and adding
-	user-level access control as needed for expensive printers.
-
-</OL>
-
-<H2>Security Breaches</H2>
-
-<P>The current CUPS server only supports Basic authentication with
-usernames and passwords. This essentially places the clear text of the
-username and password on the network. Since CUPS uses the UNIX username
-and password account information, the authentication information could
-be used to gain access to accounts (possibly priviledged accounts) on
-the server.
-
-<P>The default CUPS configuration disables remote administration. We do
-not recommend that remote administration be enabled for all hosts,
-however if you have a trusted network or subnet access can be
-restricted accordingly.
-
-<P>The next minor release of CUPS will support Digest authentication of
-the entire message body using separate MD5-based username and password
-files. This will protect password information and prevent unauthorized
-access due to compromised account passwords.
+<H2>Remote Access Risks</H2>

 <H1 TYPE=A VALUE=1>Glossary</H1>

@@ -24,11 +24,8 @@ Copyright 1997-1999, All Rights Reserved<BR>
 <UL>
 <LI><A HREF=#2_1>The Printing Problem</A></LI>
 <LI><A HREF=#2_2>The Technology</A></LI>
-<LI><A HREF=#2_3>Jobs</A></LI>
-<LI><A HREF=#2_4>Classes</A></LI>
-<LI><A HREF=#2_5>Filters</A></LI>
-<LI><A HREF=#2_6>Printer Drivers</A></LI>
-<LI><A HREF=#2_7>Networking</A></LI>
+<LI><A HREF=#2_3>Filters</A></LI>
+<LI><A HREF=#2_4>Printer Drivers</A></LI>
 </UL>
 <B><A HREF=#3>2 - Using the Printing System</A></B>
 <UL>
@@ -44,7 +41,7 @@ Copyright 1997-1999, All Rights Reserved<BR>
 <UL>
 <LI><A HREF=#4_1>General Options</A></LI>
 <UL>
-<LI><A HREF=#4_1_1>Selecting the Media Size, Type, and Source</A></LI>
+<LI><A HREF=#4_1_1>Selecting the Media Size</A></LI>
 <LI><A HREF=#4_1_2>Setting the Orientation</A></LI>
 <LI><A HREF=#4_1_3>Printing On Both Sides of the Paper</A></LI>
 <LI><A HREF=#4_1_4>Selecting a Range of Pages</A></LI>
@@ -139,17 +136,7 @@ using their web browser. </P>
 Basic authentication and domain or IP-based access control. Digest 
 authentication and TLS encryption will be available in future versions 
 of CUPS. </P>
-<H2><A NAME=2_3>Jobs</A></H2>
-<P>Each file that is submitted for printing is called a <I>job</I>. 
- Jobs are identified by a unique number starting at 1 and are assigned 
-to a particular destination (usually a printer). Jobs can also have 
-options associated with them such as media size, number of copies, and 
-priority. </P>
-<H2><A NAME=2_4>Classes</A></H2>
-<P>CUPS supports collections of printers known as <I>classes</I>. Jobs 
-sent to a class are forwarded to the first available printer in the 
-class. </P>
-<H2><A NAME=2_5>Filters</A></H2>
+<H2><A NAME=2_3>Filters</A></H2>
 <P>Filters allow a user or application to print many types of files 
 without extra effort. Print jobs sent to a CUPS server are filtered 
 before sending them to a printer. Some filters convert job files to 
@@ -165,28 +152,12 @@ printer. </P>
 <P>CUPS provides backends for printing over parallel and serial ports, 
 and over the network via the JetDirect (AppSocket), Server Message 
 Block, and Line Printer Daemon protocols. </P>
-<H2><A NAME=2_6>Printer Drivers</A></H2>
+<H2><A NAME=2_4>Printer Drivers</A></H2>
 <P>Printer drivers in CUPS consist of one of more filters specific to a 
 printer. CUPS includes a sample printer driver for Hewlett-Packard 
 LaserJet and DeskJet printers. While this driver does not generate 
 optimal output for different printer models, it does demonstrate how 
 you can write your own printer drivers and incorporate them into CUPS. </P>
-<H2><A NAME=2_7>Networking</A></H2>
-<P>Printers and classes on the local system are automatically shared 
-with other systems on the network. This allows you to setup one system 
-to print to a printer and use this system as a printer server or spool 
-host for all of the others.  If there is only one occurrence of a 
-printer on a network, then that printer can be accessed using its name 
-alone. If more than one printer exists with the same name, users must 
-select the printer by specifying which server to use (e.g. 
-&quot;printer@host1&quot; or &quot;printer@host2&quot;.) </P>
-<P>CUPS also provides <I>implicit classes</I>, which are collections of 
-printers and/or classes with the same name. This allows you to setup 
-multiple servers pointing to the same physical network printer, for 
-example, so that you aren't relying on a single system for printing. 
-Because this also works with printer classes, you can setup multiple 
-servers and printers and never worry about a &quot;single point of failure&quot; 
-unless all of the printers and servers goes down! </P>
 <H1 ALIGN=RIGHT><A NAME=3>2 - Using the Printing System</A></H1>
 <P>This chapter shows you how to submit, query, and cancel print jobs 
 to different printers. </P>
@@ -317,18 +288,15 @@ lp</CODE> or <CODE>lpstat</CODE> commands. </P>
 available when printing with the <CODE>lp</CODE> command. </P>
 <H2><A NAME=4_1>General Options</A></H2>
 <P>The following options apply when printing all types of files. </P>
-<H3><A NAME=4_1_1>Selecting the Media Size, Type, and Source</A></H3>
-<P>The &quot;-o media=xyz&quot; option sets the media size, type, and/or source: </P>
+<H3><A NAME=4_1_1>Selecting the Media Size</A></H3>
+<P>The &quot;-o media=size&quot; option sets the media size: </P>
 <UL>
 <PRE>
 % lp -o media=Letter filename ENTER
-% lp -o media=Letter,MultiPurpose filename ENTER
-% lp -o media=Letter,Transparency filename ENTER
-% lp -o media=Letter,MultiPurpose,Transparency filename ENTER
 </PRE>
 </UL>
-<P>The available media sizes, types, and sources depend on the printer, 
-but most support the following options (case is significant): </P>
+<P>The available media sizes depend on the printer, but most support at 
+least the following sizes (case is significant): </P>
 <UL>
 <LI><CODE>Letter</CODE> - US Letter (8.5x11 inches, or 216x279mm) </LI>
 <LI><CODE>Legal</CODE> - US Legal (8.5x14 inches, or 216x356mm) </LI>
@@ -336,15 +304,7 @@ but most support the following options (case is significant): </P>
 <LI><CODE>COM10</CODE> - US #10 Envelope (9.5x4.125 inches, or 
 241x105mm) </LI>
 <LI><CODE>DL</CODE> - ISO DL Envelope (8.66x4.33 inches, or 220x110mm) </LI>
-<LI><CODE>Transparency</CODE> - Transparency media type or source </LI>
-<LI><CODE>Upper</CODE> - Upper paper tray </LI>
-<LI><CODE>Lower</CODE> - Lower paper tray </LI>
-<LI><CODE>MultiPurpose</CODE> - Multi-purpose paper tray </LI>
-<LI><CODE>LargeCapacity</CODE> - Large capacity paper tray </LI>
 </UL>
-<P>The actual options supported are defined in the printer's PPD file 
-in the <CODE>PageSize</CODE>, <CODE>InputSlot</CODE>, and <CODE>
-MediaType</CODE> options. </P>
 <H3><A NAME=4_1_2>Setting the Orientation</A></H3>
 <P>The &quot;-o landscape&quot; option will rotate the page 90 degrees to print 
 in landscape orientation: </P>
@@ -365,13 +325,13 @@ will enable duplexing on the printer (if the printer supports it.) The
 </PRE>
 </UL>
 <H3><A NAME=4_1_4>Selecting a Range of Pages</A></H3>
-<P>The &quot;-o page-ranges=pages&quot; option selects a range of pages for 
+<P>The &quot;-o page-range=pages&quot; option selects a range of pages for 
 printing: </P>
 <UL>
 <PRE>
-% lp -o page-ranges=1 filename ENTER
-% lp -o page-ranges=1-4 filename ENTER
-% lp -o page-ranges=1-4,7,9-12 filename ENTER
+% lp -o page-range=1 filename ENTER
+% lp -o page-range=1-4 filename ENTER
+% lp -o page-range=1-4,7,9-12 filename ENTER
 </PRE>
 </UL>
 <P>As shown above, the <I>pages</I> value can be a single page, a range 
@@ -98,19 +98,6 @@ web browser.
 authentication and domain or IP-based access control. Digest authentication
 and TLS encryption will be available in future versions of CUPS.

-<H2>Jobs</H2>
-
-<P>Each file that is submitted for printing is called a <I>job</I>. 
-Jobs are identified by a unique number starting at 1 and are assigned
-to a particular destination (usually a printer). Jobs can also have
-options associated with them such as media size, number of copies, and
-priority.
-
-<H2>Classes</H2>
-
-<P>CUPS supports collections of printers known as <I>classes</I>. Jobs sent
-to a class are forwarded to the first available printer in the class.
-
 <H2>Filters</H2>

 <P>Filters allow a user or application to print many types of files
@@ -139,24 +126,6 @@ LaserJet and DeskJet printers. While this driver does not generate
 optimal output for different printer models, it does demonstrate how
 you can write your own printer drivers and incorporate them into CUPS.

-<H2>Networking</H2>
-
-<P>Printers and classes on the local system are automatically shared with
-other systems on the network. This allows you to setup one system to print
-to a printer and use this system as a printer server or spool host for all
-of the others.  If there is only one occurrence of a printer on a network,
-then that printer can be accessed using its name alone. If more than one
-printer exists with the same name, users must select the printer by specifying
-which server to use (e.g. "printer@host1" or "printer@host2".)
-
-<P>CUPS also provides <I>implicit classes</I>, which are collections of
-printers and/or classes with the same name. This allows you to setup multiple
-servers pointing to the same physical network printer, for example, so that
-you aren't relying on a single system for printing. Because this also works
-with printer classes, you can setup multiple servers and printers and never
-worry about a "single point of failure" unless all of the printers and servers
-goes down!
-
 <H1 ALIGN=RIGHT>2 - Using the Printing System</H1>

 <P>This chapter shows you how to submit, query, and cancel print jobs to
@@ -305,19 +274,16 @@ when printing with the <CODE>lp</CODE> command.

 <P>The following options apply when printing all types of files.

-<H3>Selecting the Media Size, Type, and Source</H3>
+<H3>Selecting the Media Size</H3>

-<P>The "-o media=xyz" option sets the media size, type, and/or source:
+<P>The "-o media=size" option sets the media size:

 <UL><PRE>
 % lp -o media=Letter filename ENTER
-% lp -o media=Letter,MultiPurpose filename ENTER
-% lp -o media=Letter,Transparency filename ENTER
-% lp -o media=Letter,MultiPurpose,Transparency filename ENTER
 </PRE></UL>

-<P>The available media sizes, types, and sources depend on the printer, but
-most support the following options (case is significant):
+<P>The available media sizes depend on the printer, but most support at
+least the following sizes (case is significant):

 <UL>

@@ -332,22 +298,8 @@ most support the following options (case is significant):

 	<LI><CODE>DL</CODE> - ISO DL Envelope (8.66x4.33 inches, or 220x110mm)

-	<LI><CODE>Transparency</CODE> - Transparency media type or source
-
-	<LI><CODE>Upper</CODE> - Upper paper tray
-
-	<LI><CODE>Lower</CODE> - Lower paper tray
-
-	<LI><CODE>MultiPurpose</CODE> - Multi-purpose paper tray
-
-	<LI><CODE>LargeCapacity</CODE> - Large capacity paper tray
-
 </UL>

-<P>The actual options supported are defined in the printer's PPD file in the
-<CODE>PageSize</CODE>, <CODE>InputSlot</CODE>, and <CODE>MediaType</CODE>
-options.
-
 <H3>Setting the Orientation</H3>

 <P>The "-o landscape" option will rotate the page 90 degrees to print in
@@ -371,12 +323,12 @@ suitable for portrait pages:

 <H3>Selecting a Range of Pages</H3>

-<P>The "-o page-ranges=pages" option selects a range of pages for printing:
+<P>The "-o page-range=pages" option selects a range of pages for printing:

 <UL><PRE>
-% lp -o page-ranges=1 filename ENTER
-% lp -o page-ranges=1-4 filename ENTER
-% lp -o page-ranges=1-4,7,9-12 filename ENTER
+% lp -o page-range=1 filename ENTER
+% lp -o page-range=1-4 filename ENTER
+% lp -o page-range=1-4,7,9-12 filename ENTER
 </PRE></UL>

 <P>As shown above, the <I>pages</I> value can be a single page, a range of
@@ -14,7 +14,7 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44141 Airport View Drive, Suite 204
+#       44145 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -46,7 +46,7 @@ all:	$(TARGETS)
 #

 clean:
-	rm -f $(OBJS) $(TARGETS) $(LIBCUPSIMAGE)
+	rm -f $(OBJS) $(TARGETS) image.a

 #
 # Install all targets...
@@ -55,70 +55,46 @@ clean:
 install:
 	-$(MKDIR) $(SERVERROOT)/filter
 	$(CP) $(TARGETS) $(SERVERROOT)/filter
-	-$(MKDIR) $(LIBDIR)
-	$(CP) $(LIBCUPSIMAGE) $(LIBDIR)
-	-if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \
-		$(LN) $(LIBCUPSIMAGE) `basename $(LIBCUPSIMAGE) .1`; \
-	fi

 #
 # hpgltops
 #

-hpgltops:	$(HPGLOBJS) common.o ../Makedefs ../cups/$(LIBCUPS)
-	echo Linking $@...
+hpgltops:	$(HPGLOBJS) common.o ../Makedefs ../cups/libcups.a
 	$(CC) $(LDFLAGS) -o $@ $(HPGLOBJS) common.o $(LIBS) -lm
 $(HPGLOBJS):	hpgltops.h

 #
-# libcupsimage.so.1, libcupsimage.sl.1
+# image.a
 #

-libcupsimage.so.1 libcupsimage.sl.1:	$(IMAGEOBJS) ../Makedefs
-	echo Linking $@...
-	$(DSO) $@ $(IMAGEOBJS) $(DSOLIBS) -lm
-	-$(LN) $@ `basename $@ .1`
-
-#
-# libcupsimage.a
-#
-
-libcupsimage.a:	$(IMAGEOBJS) ../Makedefs
-	echo Archiving $@...
+image.a:	$(IMAGEOBJS) ../Makedefs ../cups/libcups.a
 	$(RM) $@
 	$(AR) $(ARFLAGS) $@ $(IMAGEOBJS)
 	$(RANLIB) $@
-
 $(IMAGEOBJS):	image.h

 #
 # imagetops
 #

-imagetops:	imagetops.o common.o $(LIBCUPSIMAGE) ../Makedefs \
-		../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ imagetops.o common.o -L. -lcupsimage \
-		$(IMGLIBS) $(LIBS)
+imagetops:	imagetops.o common.o image.a ../Makedefs ../cups/libcups.a
+	$(CC) $(LDFLAGS) -o $@ imagetops.o common.o image.a $(IMGLIBS)
 imagetops:	common.h image.h

 #
 # imagetoraster
 #

-imagetoraster:	imagetoraster.o common.o $(LIBCUPSIMAGE) ../Makedefs \
-		../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o $@ imagetoraster.o common.o -L. -lcupsimage \
-		$(IMGLIBS) $(LIBS)
+imagetoraster:	imagetoraster.o common.o image.a ../Makedefs ../cups/libcups.a
+	$(CC) $(LDFLAGS) -o $@ imagetoraster.o common.o image.a $(IMGLIBS)
 imagetoraster:	common.h image.h

 #
 # pstops
 #

-pstops:	pstops.o common.o ../Makedefs ../cups/$(LIBCUPS)
-	echo Linking $@...
+pstops:	pstops.o common.o ../Makedefs ../cups/libcups.a
 	$(CC) $(LDFLAGS) -o $@ pstops.o common.o $(LIBS)
 pstops.o:	common.h

@@ -126,8 +102,7 @@ pstops.o:	common.h
 # rastertohp
 #

-rastertohp:	rastertohp.o ../Makedefs ../cups/$(LIBCUPS)
-	echo Linking $@...
+rastertohp:	rastertohp.o ../Makedefs ../cups/libcups.a
 	$(CC) $(LDFLAGS) -o $@ rastertohp.o $(LIBS)
 rastertohp.o:	../cups/raster.h

@@ -135,9 +110,7 @@ rastertohp.o:	../cups/raster.h
 # texttops
 #

-texttops:	texttops.o textcommon.o common.o ../Makedefs \
-		../cups/$(LIBCUPS)
-	echo Linking $@...
+texttops:	texttops.o textcommon.o common.o ../Makedefs ../cups/libcups.a
 	$(CC) $(LDFLAGS) -o $@ texttops.o textcommon.o common.o $(LIBS)
 texttops.o:	common.h textcommon.h

@@ -0,0 +1,250 @@
+/*
+ * "$Id$"
+ *
+ *   Common filter routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   SetCommonOptions() - Set common filter options for media size, etc.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "common.h"
+
+
+/*
+ * Globals...
+ */
+
+int	Orientation = 0,	/* 0 = portrait, 1 = landscape, etc. */
+	Duplex = 0,		/* Duplexed? */
+	LanguageLevel = 1,	/* Language level of printer */
+	ColorDevice = 1;	/* Do color text? */
+float	PageLeft = 18.0f,	/* Left margin */
+	PageRight = 594.0f,	/* Right margin */
+	PageBottom = 36.0f,	/* Bottom margin */
+	PageTop = 756.0f,	/* Top margin */
+	PageWidth = 612.0f,	/* Total page width */
+	PageLength = 792.0f;	/* Total page length */
+
+
+/*
+ * 'SetCommonOptions()' - Set common filter options for media size, etc.
+ */
+
+ppd_file_t *					/* O - PPD file */
+SetCommonOptions(int           num_options,	/* I - Number of options */
+                 cups_option_t *options,	/* I - Options */
+		 int           change_size)	/* I - Change page size? */
+{
+  float		temp;		/* Swapping variable */
+  ppd_file_t	*ppd;		/* PPD file */
+  ppd_size_t	*pagesize;	/* Current page size */
+  char		*val;		/* Option value */
+
+
+  ppd = ppdOpenFile(getenv("PPD"));
+
+  ppdMarkDefaults(ppd);
+  cupsMarkOptions(ppd, num_options, options);
+
+  if ((pagesize = ppdPageSize(ppd, NULL)) != NULL)
+  {
+    PageWidth  = pagesize->width;
+    PageLength = pagesize->length;
+    PageTop    = pagesize->top;
+    PageBottom = pagesize->bottom;
+    PageLeft   = pagesize->left;
+    PageRight  = pagesize->right;
+  }
+
+  if (ppd != NULL)
+  {
+    ColorDevice   = ppd->color_device;
+    LanguageLevel = ppd->language_level;
+  }
+
+  if ((val = cupsGetOption("landscape", num_options, options)) != NULL)
+    Orientation = 1;
+
+  if ((val = cupsGetOption("orientation-requested", num_options, options)) != NULL)
+  {
+   /*
+    * Map IPP orientation values to 0 to 3:
+    *
+    *   3 = 0 degrees   = 0
+    *   4 = 90 degrees  = 1
+    *   5 = -90 degrees = 3
+    *   6 = 180 degrees = 2
+    */
+
+    Orientation = atoi(val) - 3;
+    if (Orientation >= 2)
+      Orientation ^= 1;
+  }
+
+  if ((val = cupsGetOption("page-left", num_options, options)) != NULL)
+  {
+    switch (Orientation)
+    {
+      case 0 :
+          PageLeft = (float)atof(val);
+	  break;
+      case 1 :
+          PageBottom = (float)atof(val);
+	  break;
+      case 2 :
+          PageRight = PageWidth - (float)atof(val);
+	  break;
+      case 3 :
+          PageTop = PageLength - (float)atof(val);
+	  break;
+    }
+  }
+
+  if ((val = cupsGetOption("page-right", num_options, options)) != NULL)
+  {
+    switch (Orientation)
+    {
+      case 0 :
+          PageRight = PageWidth - (float)atof(val);
+	  break;
+      case 1 :
+          PageTop = PageLength - (float)atof(val);
+	  break;
+      case 2 :
+          PageLeft = (float)atof(val);
+	  break;
+      case 3 :
+          PageBottom = (float)atof(val);
+	  break;
+    }
+  }
+
+  if ((val = cupsGetOption("page-bottom", num_options, options)) != NULL)
+  {
+    switch (Orientation)
+    {
+      case 0 :
+          PageBottom = (float)atof(val);
+	  break;
+      case 1 :
+          PageRight = PageWidth - (float)atof(val);
+	  break;
+      case 2 :
+          PageTop = PageLength - (float)atof(val);
+	  break;
+      case 3 :
+          PageLeft = (float)atof(val);
+	  break;
+    }
+  }
+
+  if ((val = cupsGetOption("page-top", num_options, options)) != NULL)
+  {
+    switch (Orientation)
+    {
+      case 0 :
+          PageTop = PageLength - (float)atof(val);
+	  break;
+      case 1 :
+          PageLeft = (float)atof(val);
+	  break;
+      case 2 :
+          PageBottom = (float)atof(val);
+	  break;
+      case 3 :
+          PageRight = PageWidth - (float)atof(val);
+	  break;
+    }
+  }
+
+  if (change_size)
+    switch (Orientation)
+    {
+      case 0 : /* Portait */
+          break;
+
+      case 1 : /* Landscape */
+	  temp       = PageLeft;
+	  PageLeft   = PageBottom;
+	  PageBottom = temp;
+
+	  temp       = PageRight;
+	  PageRight  = PageTop;
+	  PageTop    = temp;
+
+	  temp       = PageWidth;
+	  PageWidth  = PageLength;
+	  PageLength = temp;
+	  break;
+
+      case 2 : /* Reverse Portrait */
+	  temp       = PageWidth - PageLeft;
+	  PageLeft   = PageWidth - PageRight;
+	  PageRight  = temp;
+
+	  temp       = PageLength - PageBottom;
+	  PageBottom = PageLength - PageTop;
+	  PageTop    = temp;
+          break;
+
+      case 3 : /* Reverse Landscape */
+	  temp       = PageWidth - PageLeft;
+	  PageLeft   = PageWidth - PageRight;
+	  PageRight  = temp;
+
+	  temp       = PageLength - PageBottom;
+	  PageBottom = PageLength - PageTop;
+	  PageTop    = temp;
+
+	  temp       = PageLeft;
+	  PageLeft   = PageBottom;
+	  PageBottom = temp;
+
+	  temp       = PageRight;
+	  PageRight  = PageTop;
+	  PageTop    = temp;
+
+	  temp       = PageWidth;
+	  PageWidth  = PageLength;
+	  PageLength = temp;
+	  break;
+    }
+
+  if ((val = cupsGetOption("sides", num_options, options)) != NULL &&
+      strncmp(val, "two-", 4) == 0)
+    Duplex = 1;
+
+  if ((val = cupsGetOption("Duplex", num_options, options)) != NULL &&
+      strcmp(val, "DuplexNoTumble") == 0)
+    Duplex = 1;
+
+  return (ppd);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,67 @@
+/*
+ * "$Id$"
+ *
+ *   Common filter definitions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1997-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <ctype.h>
+#include <time.h>
+
+#include <cups/cups.h>
+#include <cups/language.h>
+#include <cups/string.h>
+
+
+/*
+ * Globals...
+ */
+
+extern int	Orientation,	/* 0 = portrait, 1 = landscape, etc. */
+		Duplex,		/* Duplexed? */
+		LanguageLevel,	/* Language level of printer */
+		ColorDevice;	/* Do color text? */
+extern float	PageLeft,	/* Left margin */
+		PageRight,	/* Right margin */
+		PageBottom,	/* Bottom margin */
+		PageTop,	/* Top margin */
+		PageWidth,	/* Total page width */
+		PageLength;	/* Total page length */
+
+
+/*
+ * Prototypes...
+ */
+
+extern ppd_file_t *SetCommonOptions(int num_options, cups_option_t *options,
+		                    int change_size);
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,405 @@
+/*
+ * "$Id$"
+ *
+ *   HP-GL/2 attribute processing for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   CR_color_range()     - Set the range for color values.
+ *   AC_anchor_corner()   - Set the anchor corner.
+ *   FT_fill_type()       - Set the fill type or pattern.
+ *   LA_line_attributes() - Set the line drawing attributes.
+ *   LT_line_type()       - Set the line type (style)...
+ *   NP_number_pens()     - Set the number of pens to be used.
+ *   PC_pen_color()       - Set the pen color...
+ *   PW_pen_width()       - Set the pen width.
+ *   RF_raster_fill()     - Set the raster fill pattern.
+ *   SM_symbol_mode()     - Set where symbols are drawn.
+ *   SP_select_pen()      - Select a pen for drawing.
+ *   UL_user_line_type()  - Set a user-defined line type.
+ *   WU_width_units()     - Set the units used for pen widths.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "hpgltops.h"
+
+
+/*
+ * 'CR_color_range()' - Set the range for color values.
+ */
+
+void
+CR_color_range(int     num_params,	/* I - Number of parameters */
+               param_t *params)		/* I - Parameters */
+{
+  if (num_params == 0)
+  {
+   /*
+    * Default to 0 to 255 for all color values.
+    */
+
+    ColorRange[0][0] = 0.0;
+    ColorRange[0][1] = 255.0;
+    ColorRange[1][0] = 0.0;
+    ColorRange[1][1] = 255.0;
+    ColorRange[2][0] = 0.0;
+    ColorRange[2][1] = 255.0;
+  }
+  else if (num_params == 6)
+  {
+   /*
+    * Set the range based on the parameters...
+    */
+    ColorRange[0][0] = params[0].value.number;
+    ColorRange[0][1] = params[1].value.number - params[0].value.number;
+    ColorRange[1][0] = params[2].value.number;
+    ColorRange[1][1] = params[3].value.number - params[2].value.number;
+    ColorRange[2][0] = params[4].value.number;
+    ColorRange[2][1] = params[5].value.number - params[4].value.number;
+  }
+  else
+    fprintf(stderr, "WARNING: HP-GL/2 \'CR\' command with invalid number of parameters (%d)!\n",
+            num_params);
+}
+
+
+/*
+ * 'AC_anchor_corner()' - Set the anchor corner.
+ */
+
+void
+AC_anchor_corner(int     num_params,	/* I - Number of parameters */
+                 param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * 'FT_fill_type()' - Set the fill type or pattern.
+ *
+ * Note:
+ *
+ *   This needs to be updated to support non-solid fill.
+ */
+
+void
+FT_fill_type(int     num_params,	/* I - Number of parameters */
+             param_t *params)		/* I - Parameters */
+{
+  if (num_params == 0 ||
+      params[0].value.number == 1 ||
+      params[0].value.number == 2)
+  {
+    /**** SOLID PATTERN ****/
+  }
+}
+
+
+/*
+ * 'LA_line_attributes()' - Set the line drawing attributes.
+ */
+
+void
+LA_line_attributes(int     num_params,	/* I - Number of parameters */
+                   param_t *params)	/* I - Parameters */
+{
+  int	i;				/* Looping var */
+
+
+  if (num_params == 0)
+  {
+    Outputf("3.0 setmiterlimit\n");
+    Outputf("0 setlinecap\n");
+    Outputf("0 setlinejoin\n");
+  }
+  else for (i = 0; i < (num_params - 1); i += 2)
+    switch ((int)params[i].value.number)
+    {
+      case 1 :
+          Outputf("%d setlinecap\n",
+                  params[i + 1].value.number == 1 ? 0 :
+                  params[i + 1].value.number == 4 ? 1 : 2);
+          break;
+      case 2 :
+          switch ((int)params[i + 1].value.number)
+          {
+            case 1 :
+            case 2 :
+            case 3 :
+                Outputf("0 setlinejoin\n");
+                break;
+            case 5 :
+                Outputf("2 setlinejoin\n");
+                break;
+            default :
+                Outputf("1 setlinejoin\n");
+                break;
+          }
+          break;
+      case 3 :
+          Outputf("%f setmiterlimit\n",
+                  1.0 + 0.5 * (params[i + 1].value.number - 1.0));
+          break;
+    }
+}
+
+
+/*
+ * 'LT_line_type()' - Set the line type (style)...
+ *
+ * Note:
+ *
+ *   This needs to be updated to support line types.
+ */
+
+void
+LT_line_type(int     num_params,	/* I - Number of parameters */
+             param_t *params)		/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * 'NP_number_pens()' - Set the number of pens to be used.
+ */
+
+void
+NP_number_pens(int     num_params,	/* I - Number of parameters */
+               param_t *params)		/* I - Parameters */
+{
+  int	i;				/* Looping var */
+
+
+  if (num_params == 0)
+    PenCount = 8;
+  else if (num_params == 1)
+    PenCount = (int)params[0].value.number;
+  else
+    fprintf(stderr, "WARNING: HP-GL/2 \'NP\' command with invalid number of parameters (%d)!\n",
+            num_params);
+
+  PC_pen_color(0, NULL);
+
+  for (i = 0; i <= PenCount; i ++)
+    Outputf("/W%d { DefaultPenWidth PenScaling mul setlinewidth } bind def\n", i);
+}
+
+
+/*
+ * 'PC_pen_color()' - Set the pen color...
+ */
+
+void
+PC_pen_color(int     num_params,	/* I - Number of parameters */
+             param_t *params)		/* I - Parameters */
+{
+  int		i;			/* Looping var */
+  static float	standard_colors[8][3] =	/* Standard colors for first 8 pens */
+		{
+		  { 1.0, 1.0, 1.0 },	/* White */
+		  { 0.0, 0.0, 0.0 },	/* Black */
+		  { 1.0, 0.0, 0.0 },	/* Red */
+		  { 0.0, 1.0, 0.0 },	/* Green */
+		  { 1.0, 1.0, 0.0 },	/* Yellow */
+		  { 0.0, 0.0, 1.0 },	/* Blue */
+		  { 1.0, 0.0, 1.0 },	/* Magenta */
+		  { 0.0, 1.0, 1.0 }	/* Cyan */
+		};
+
+  if (num_params == 0)
+  {
+    for (i = 0; i <= PenCount; i ++)
+      if (i < 8)
+	Outputf("/P%d { %.3f %.3f %.3f setrgbcolor } bind def\n",
+        	i, standard_colors[i][0],
+        	standard_colors[i][1], standard_colors[i][2]);
+      else
+	Outputf("/P%d { 0.0 0.0 0.0 setrgbcolor } bind def\n", i);
+  }
+  else if (num_params == 1)
+  {
+    i = (int)params[0].value.number;
+
+    Outputf("/P%d { %.3f %.3f %.3f setrgbcolor } bind def\n",
+            i, standard_colors[i & 7][0], standard_colors[i & 7][1],
+            standard_colors[i & 7][2]);
+  }
+  else if (num_params == 4)
+    Outputf("/P%d { %.3f %.3f %.3f setrgbcolor } bind def\n",
+            (int)params[0].value.number, 
+            (params[1].value.number - ColorRange[0][0]) / ColorRange[0][1],
+            (params[2].value.number - ColorRange[1][0]) / ColorRange[1][1],
+            (params[3].value.number - ColorRange[2][0]) / ColorRange[2][1]);
+  else
+    fprintf(stderr, "WARNING: HP-GL/2 \'PC\' command with invalid number of parameters (%d)!\n",
+            num_params);
+}
+
+
+/*
+ * 'PW_pen_width()' - Set the pen width.
+ */
+
+void
+PW_pen_width(int     num_params,	/* I - Number of parameters */
+             param_t *params)		/* I - Parameters */
+{
+  int	pen;				/* Pen number */
+  float	w;				/* Width value */
+
+
+  if (WidthUnits == 0)
+  {
+   /*
+    * Metric...
+    */
+
+    if (num_params == 0)
+      w = 0.35f / 25.4f * 72.0f;
+    else
+      w = params[0].value.number / 25.4f * 72.0f;
+  }
+  else
+  {
+   /*
+    * Relative...
+    */
+
+    w = (float)hypot(PlotSize[0], PlotSize[1]) / 1016.0f * 72.0f;
+
+    if (num_params == 0)
+      w *= 0.01f;
+    else
+      w *= params[0].value.number;
+  }
+
+  if (num_params == 2)
+    Outputf("/W%d { %.1f PenScaling mul setlinewidth } bind def W%d\n",
+            (int)params[1].value.number, w, (int)params[1].value.number);
+  else if (num_params < 2)
+  {
+   /*
+    * Set width for all pens...
+    */
+
+    for (pen = 0; pen <= PenCount; pen ++)
+      Outputf("/W%d { %.1f PenScaling mul setlinewidth } bind def\n",
+              pen, w);
+
+    Outputf("W%d\n", PenNumber);
+  }
+  else
+    fprintf(stderr, "WARNING: HP-GL/2 \'PW\' command with invalid number of parameters (%d)!\n",
+            num_params);
+}
+
+
+/*
+ * 'RF_raster_fill()' - Set the raster fill pattern.
+ *
+ * Note:
+ *
+ *   This needs to be implemented.
+ */
+
+void
+RF_raster_fill(int     num_params,	/* I - Number of parameters */
+               param_t *params)		/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * 'SM_symbol_mode()' - Set where symbols are drawn.
+ */
+
+void
+SM_symbol_mode(int     num_params,	/* I - Number of parameters */
+               param_t *params)		/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * 'SP_select_pen()' - Select a pen for drawing.
+ */
+
+void
+SP_select_pen(int     num_params,	/* I - Number of parameters */
+              param_t *params)		/* I - Parameters */
+{
+  if (num_params == 0)
+    PenNumber = 1;
+  else if (params[0].value.number <= PenCount)
+    PenNumber = (int)params[0].value.number;
+  else
+    fprintf(stderr, "WARNING: HP-GL/2 \'SP\' command with invalid number or value of parameters (%d, %d)!\n",
+            num_params, (int)params[0].value.number);
+
+  Outputf("P%d W%d\n", PenNumber, PenNumber);
+}
+
+
+/*
+ * 'UL_user_line_type()' - Set a user-defined line type.
+ */
+
+void
+UL_user_line_type(int     num_params,	/* I - Number of parameters */
+                  param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * 'WU_width_units()' - Set the units used for pen widths.
+ */
+
+void
+WU_width_units(int     num_params,	/* I - Number of parameters */
+               param_t *params)		/* I - Parameters */
+{
+  if (num_params == 0)
+    WidthUnits = 0;
+  else if (num_params == 1)
+    WidthUnits = (int)params[0].value.number;
+  else
+    fprintf(stderr, "WARNING: HP-GL/2 \'WU\' command with invalid number of parameters (%d)!\n",
+            num_params);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,433 @@
+/*
+ * "$Id$"
+ *
+ *   HP-GL/2 character processing for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   AD_define_alternate()     - Define the alternate font.
+ *   CF_character_fill()       - Set whether or not to fill or outline
+ *                               characters.
+ *   CP_character_plot()       - Move the current pen position for the given
+ *                               number of columns and rows.
+ *   DI_absolute_direction()   - Set the direction vector for text.
+ *   DR_relative_direction()   - Set the relative direction vector for text.
+ *   DT_define_label_term()    - Set the label string terminator.
+ *   DV_define_variable_path() - Define a path for text.
+ *   ES_extra_space()          - Set extra spacing (kerning) between characters.
+ *   LB_label()                - Display a label string.
+ *   LO_label_origin()         - Set the label origin.
+ *   SA_select_alternate()     - Select the alternate font.
+ *   SD_define_standard()      - Define the standard font...
+ *   SI_absolute_size()        - Set the absolute size of text.
+ *   SL_character_slant()      - Set the slant of text.
+ *   SR_relative_size()        - Set the relative size of text.
+ *   SS_select_standard()      - Select the standard font for text.
+ *   TD_transparent_data()     - Send transparent print data.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "hpgltops.h"
+
+
+/*
+ * 'AD_define_alternate()' - Define the alternate font.
+ */
+
+void
+AD_define_alternate(int     num_params,	/* I - Number of parameters */
+                    param_t *params)	/* I - Parameters */
+{
+  int	i;				/* Looping var */
+  int	typeface,			/* Typeface number */
+	posture,			/* Posture number */
+	weight;				/* Weight number */
+  float	height;				/* Height/size of font */
+
+
+ /*
+  * Set default font attributes...
+  */
+
+  typeface = 48;
+  posture  = 0;
+  weight   = 0;
+  height   = 11.5;
+
+ /*
+  * Loop through parameter value pairs...
+  */
+
+  for (i = 0; i < (num_params - 1); i += 2)
+    switch ((int)params[i].value.number)
+    {
+      case 4 :
+          height = params[i + 1].value.number;
+          break;
+      case 5 :
+          posture = (int)params[i + 1].value.number;
+          break;
+      case 6 :
+          weight = (int)params[i + 1].value.number;
+          break;
+      case 7 :
+          typeface = (int)params[i + 1].value.number;
+          break;
+    }
+
+ /*
+  * Define the font...
+  */
+
+  Outputf("/SA { /%s%s%s%s findfont %.1f scalefont setfont } def\n",
+          typeface == 48 ? "Courier" : "Helvetica",
+          (weight != 0 || posture != 0) ? "-" : "",
+          weight != 0 ? "Bold" : "",
+          posture != 0 ? "Oblique" : "",
+          height);
+
+  CharHeight[1] = height;
+}
+
+
+/*
+ * 'CF_character_fill()' - Set whether or not to fill or outline characters.
+ */
+
+void
+CF_character_fill(int     num_params,	/* I - Number of parameters */
+                  param_t *params)	/* I - Parameters */
+{
+  if (num_params == 0)
+    CharFillMode = 0;
+  else
+    CharFillMode = (int)params[0].value.number;
+
+  if (num_params == 2)
+    CharPen = (int)params[1].value.number;
+}
+
+
+/*
+ * 'CP_character_plot()' - Move the current pen position for the given number
+ *                         of columns and rows.
+ */
+
+void
+CP_character_plot(int     num_params,
+                  param_t *params)
+{
+  if (num_params < 2)
+    return;
+
+  switch (Rotation)
+  {
+    case 0:
+	PenPosition[0] += params[0].value.number * 1.2f / CharHeight[CharFont];
+	PenPosition[1] += params[1].value.number * CharHeight[CharFont];
+	break;
+    case 90:
+	PenPosition[0] -= params[1].value.number * 1.2f / CharHeight[CharFont];
+	PenPosition[1] += params[0].value.number * CharHeight[CharFont];
+	break;
+    case 180:
+	PenPosition[0] -= params[0].value.number * 1.2f / CharHeight[CharFont];
+	PenPosition[1] -= params[1].value.number * CharHeight[CharFont];
+	break;
+    case 270:
+	PenPosition[0] += params[1].value.number * 1.2f / CharHeight[CharFont];
+	PenPosition[1] -= params[0].value.number * CharHeight[CharFont];
+	break;
+  }
+}
+
+
+/*
+ * 'DI_absolute_direction()' - Set the direction vector for text.
+ */
+
+void
+DI_absolute_direction(int     num_params,	/* I - Number of parameters */
+                      param_t *params)		/* I - Parameters */
+{
+  Outputf(CharFont == 0 ? "SS\n" : "SA\n");
+
+  if (num_params == 2)
+    Outputf("currentfont [ %f %f %f %f 0.0 0.0 ] makefont setfont\n",
+            params[0].value.number, -params[1].value.number,
+            params[1].value.number, params[0].value.number);
+}
+
+
+/*
+ * 'DR_relative_direction()' - Set the relative direction vector for text.
+ */
+
+void
+DR_relative_direction(int     num_params,	/* I - Number of parameters */
+                      param_t *params)		/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * 'DT_define_label_term()' - Set the label string terminator.
+ */
+
+void
+DT_define_label_term(int     num_params,	/* I - Number of parameters */
+                     param_t *params)		/* I - Parameters */
+{
+  if (num_params == 0)
+    StringTerminator = '\003';
+  else
+    StringTerminator = params[0].value.string[0];
+}
+
+
+/*
+ * 'DV_define_variable_path()' - Define a path for text.
+ */
+
+void
+DV_define_variable_path(int     num_params,	/* I - Number of parameters */
+                        param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * 'ES_extra_space()' - Set extra spacing (kerning) between characters.
+ */
+
+void
+ES_extra_space(int     num_params,	/* I - Number of parameters */
+               param_t *params)		/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * 'LB_label()' - Display a label string.
+ */
+
+void
+LB_label(int     num_params,		/* I - Number of parameters */
+         param_t *params)		/* I - Parameters */
+{
+  char	*s;				/* Pointer into string */
+
+
+  if (num_params == 0)
+    return;
+
+  Outputf("gsave\n");
+  Outputf("currentmiterlimit 1.0 setmiterlimit\n");
+  Outputf("MP\n");
+  Outputf("%.3f %.3f MO\n", PenPosition[0], PenPosition[1]);
+
+  Outputf("(");
+  for (s = params[0].value.string; *s != '\0'; s ++)
+    if (strchr("()\\", *s) != NULL)
+      Outputf("\\%c", *s);
+    else
+      Outputf("%c", *s);
+  Outputf(") true charpath\n");
+
+  if (CharFillMode != 1)
+    Outputf("FI\n");
+  if (CharFillMode == 1 || CharFillMode == 3)
+    Outputf("P%d ST\n", CharPen);
+
+  Outputf("setmiterlimit\n");
+  Outputf("grestore\n");
+}
+
+
+/*
+ * 'LO_label_origin()' - Set the label origin.
+ */
+
+void
+LO_label_origin(int     num_params,	/* I - Number of parameters */
+                param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * 'SA_select_alternate()' - Select the alternate font.
+ */
+
+void
+SA_select_alternate(int     num_params,	/* I - Number of parameters */
+                    param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+
+  Outputf("SA\n");
+  CharFont = 1;
+}
+
+
+/*
+ * 'SD_define_standard()' - Define the standard font...
+ */
+ 
+void
+SD_define_standard(int     num_params,	/* I - Number of parameters */
+                   param_t *params)	/* I - Parameters */
+{
+  int	i;				/* Looping var */
+  int	typeface,			/* Typeface number */
+	posture,			/* Posture number */
+	weight;				/* Weight number */
+  float	height;				/* Height/size of font */
+
+
+ /*
+  * Set default font attributes...
+  */
+
+  typeface = 48;
+  posture  = 0;
+  weight   = 0;
+  height   = 11.5;
+
+ /*
+  * Loop through parameter value pairs...
+  */
+
+  for (i = 0; i < (num_params - 1); i += 2)
+    switch ((int)params[i].value.number)
+    {
+      case 4 :
+          height = params[i + 1].value.number;
+          break;
+      case 5 :
+          posture = (int)params[i + 1].value.number;
+          break;
+      case 6 :
+          weight = (int)params[i + 1].value.number;
+          break;
+      case 7 :
+          typeface = (int)params[i + 1].value.number;
+          break;
+    }
+
+ /*
+  * Define the font...
+  */
+
+  Outputf("/SS { /%s%s%s%s findfont %.1f scalefont setfont } def\n",
+          typeface == 48 ? "Courier" : "Helvetica",
+          (weight != 0 || posture != 0) ? "-" : "",
+          weight != 0 ? "Bold" : "",
+          posture != 0 ? "Oblique" : "",
+          height);
+
+  CharHeight[0] = height;
+}
+
+
+/*
+ * 'SI_absolute_size()' - Set the absolute size of text.
+ */
+
+void
+SI_absolute_size(int     num_params,	/* I - Number of parameters */
+                 param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * 'SL_character_slant()' - Set the slant of text.
+ */
+
+void
+SL_character_slant(int     num_params,	/* I - Number of parameters */
+                   param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * 'SR_relative_size()' - Set the relative size of text.
+ */
+
+void
+SR_relative_size(int     num_params,	/* I - Number of parameters */
+                 param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * 'SS_select_standard()' - Select the standard font for text.
+ */
+
+void
+SS_select_standard(int     num_params,	/* I - Number of parameters */
+                   param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+
+  Outputf("SS\n");
+  CharFont = 0;
+}
+
+
+/*
+ * 'TD_transparent_data()' - Send transparent print data.
+ */
+
+void
+TD_transparent_data(int     num_params,	/* I - Number of parameters */
+                    param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,473 @@
+/*
+ * "$Id$"
+ *
+ *   HP-GL/2 configuration routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   update_transform()  - Update the page transformation matrix as needed.
+ *   BP_begin_plot()     - Start a plot...
+ *   DF_default_values() - Set all state info to the default values.
+ *   IN_initialize()     - Initialize the plotter.
+ *   IP_input_absolute() - Set P1 and P2 values for the plot.
+ *   IR_input_relative() - Update P1 and P2.
+ *   IW_input_window()   - Setup an input window.
+ *   PG_advance_page()   - Eject the current page.
+ *   PS_plot_size()      - Set the plot size.
+ *   RO_rotate()         - Rotate the plot.
+ *   RP_replot()         - Replot the current page.
+ *   SC_scale()          - Set user-defined scaling.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "hpgltops.h"
+
+
+/*
+ * 'update_transform()' - Update the page transformation matrix as needed.
+ */
+
+void
+update_transform(void)
+{
+  float	width,		/* Plot width */
+	height;		/* Plot height */
+  float	page_width,	/* Actual page width in points */
+	page_length;	/* Actual page length in points */
+  float	scaling;	/* Scaling factor */
+
+
+ /*
+  * Get the page and input window sizes...
+  */
+
+  width  = IW2[0] - IW1[0];
+  height = IW2[1] - IW1[1];
+
+  if (width == 0 || height == 0)
+    return;
+
+ /*
+  * Scale the plot as needed...
+  */
+
+  if (FitPlot)
+  {
+    page_width  = PageRight - PageLeft;
+    page_length = PageTop - PageBottom;
+
+    if (Rotation == 0 || Rotation == 180)
+    {
+      scaling = page_width / width;
+      if (scaling > (page_length / width))
+        scaling = page_length / width;
+    }
+    else
+    {
+      scaling = page_width / height;
+      if (scaling > (page_length / height))
+        scaling = page_length / height;
+    }
+  }
+  else
+  {
+    page_width  = PlotSize[0];
+    page_length = PlotSize[1];
+
+    if (Rotation == 0 || Rotation == 180)
+      scaling = page_width / width;
+    else
+      scaling = page_width / height;
+  }
+
+ /*
+  * Generate a new transformation matrix...
+  */
+
+  switch (Rotation)
+  {
+    case 0 :
+	Transform[0][0] = scaling;
+	Transform[0][1] = 0.0;
+	Transform[0][2] = -IW1[0] * scaling;
+	Transform[1][0] = 0.0;
+	Transform[1][1] = scaling;
+	Transform[1][2] = -IW1[1] * scaling;
+	break;
+
+    case 90 :
+	Transform[0][0] = 0.0;
+	Transform[0][1] = -scaling;
+	Transform[0][2] = (height - IW1[0]) * scaling;
+	Transform[1][0] = scaling;
+	Transform[1][1] = 0.0;
+	Transform[1][2] = -IW1[1] * scaling;
+	break;
+
+    case 180 :
+	Transform[0][0] = -scaling;
+	Transform[0][1] = 0.0;
+	Transform[0][2] = (height - IW1[0]) * scaling;
+	Transform[1][0] = 0.0;
+	Transform[1][1] = -scaling;
+	Transform[1][2] = (width - IW1[1]) * scaling;
+	break;
+
+    case 270 :
+	Transform[0][0] = 0.0;
+	Transform[0][1] = scaling;
+	Transform[0][2] = -IW1[0] * scaling;
+	Transform[1][0] = -scaling;
+	Transform[1][1] = 0.0;
+	Transform[1][2] = (width - IW1[1]) * scaling;
+	break;
+  }
+
+  PenScaling = Transform[0][0] + Transform[0][1];
+
+  if (PenScaling < 0.0)
+    PenScaling = -PenScaling;
+
+  if (PageDirty)
+    printf("/PenScaling %.3f def W%d\n", PenScaling, PenNumber);
+}
+
+
+/*
+ * 'BP_begin_plot()' - Start a plot...
+ */
+
+void
+BP_begin_plot(int     num_params,	/* I - Number of parameters */
+              param_t *params)		/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * 'DF_default_values()' - Set all state info to the default values.
+ */
+
+void
+DF_default_values(int     num_params,	/* I - Number of parameters */
+                  param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+
+  AC_anchor_corner(0, NULL);
+  AD_define_alternate(0, NULL);
+  SD_define_standard(0, NULL);
+  CF_character_fill(0, NULL);
+  DI_absolute_direction(0, NULL);
+  DT_define_label_term(0, NULL);
+  DV_define_variable_path(0, NULL);
+  ES_extra_space(0, NULL);
+  FT_fill_type(0, NULL);
+  IW_input_window(0, NULL);
+  LA_line_attributes(0, NULL);
+  LO_label_origin(0, NULL);
+  LT_line_type(0, NULL);
+  PA_plot_absolute(0, NULL);
+  PolygonMode = 0;
+  RF_raster_fill(0, NULL);
+  SC_scale(0, NULL);
+  SM_symbol_mode(0, NULL);
+  SS_select_standard(0, NULL);
+  TD_transparent_data(0, NULL);
+  UL_user_line_type(0, NULL);
+}
+
+
+/*
+ * 'IN_initialize()' - Initialize the plotter.
+ */
+
+void
+IN_initialize(int     num_params,	/* I - Number of parameters */
+              param_t *params)		/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+
+  DF_default_values(0, NULL);
+  PU_pen_up(0, NULL);
+  RO_rotate(0, NULL);
+  PS_plot_size(0, NULL);
+  WU_width_units(0, NULL);
+  PW_pen_width(0, NULL);
+  SP_select_pen(0, NULL);
+
+  PenPosition[0] = PenPosition[1] = 0.0;
+}
+
+
+/*
+ * 'IP_input_absolute()' - Set P1 and P2 values for the plot.
+ */
+
+void
+IP_input_absolute(int     num_params,	/* I - Number of parameters */
+                  param_t *params)	/* I - Parameters */
+{
+  if (num_params == 0)
+  {
+    P1[0] = 0.0;
+    P1[1] = 0.0;
+    P2[0] = PlotSize[0] / 72.0f * 1016.0f;
+    P2[1] = PlotSize[1] / 72.0f * 1016.0f;
+  }
+  else if (num_params == 2)
+  {
+    P2[0] -= P1[0];
+    P2[1] -= P1[1];
+    P1[0] = params[0].value.number;
+    P1[1] = params[1].value.number;
+    P2[0] += P1[0];
+    P2[1] += P1[1];
+  }
+  else if (num_params == 4)
+  {
+    P1[0] = params[0].value.number;
+    P1[1] = params[1].value.number;
+    P2[0] = params[2].value.number;
+    P2[1] = params[3].value.number;
+  }
+
+  IW1[0] = P1[0];
+  IW1[1] = P1[1];
+  IW2[0] = P2[0];
+  IW2[1] = P2[1];
+
+  update_transform();
+}
+
+
+/*
+ * 'IR_input_relative()' - Update P1 and P2.
+ */
+
+void
+IR_input_relative(int     num_params,	/* I - Number of parameters */
+                  param_t *params)	/* I - Parameters */
+{
+  if (num_params == 0)
+  {
+    P1[0] = PageLeft / 72.0f * 1016.0f;
+    P1[1] = PageBottom / 72.0f * 1016.0f;
+    P2[0] = PageRight / 72.0f * 1016.0f;
+    P2[1] = PageTop / 72.0f * 1016.0f;
+  }
+  else if (num_params == 2)
+  {
+    P2[0] -= P1[0];
+    P2[1] -= P1[1];
+    P1[0] = params[0].value.number * PlotSize[0] / 72.0f * 1016.0f / 100.0f;
+    P1[1] = params[1].value.number * PlotSize[1] / 72.0f * 1016.0f / 100.0f;
+    P2[0] += P1[0];
+    P2[1] += P1[1];
+  }
+  else if (num_params == 4)
+  {
+    P1[0] = params[0].value.number * PlotSize[0] / 72.0f * 1016.0f / 100.0f;
+    P1[1] = params[1].value.number * PlotSize[1] / 72.0f * 1016.0f / 100.0f;
+    P2[0] = params[2].value.number * PlotSize[0] / 72.0f * 1016.0f / 100.0f;
+    P2[1] = params[3].value.number * PlotSize[1] / 72.0f * 1016.0f / 100.0f;
+  }
+
+  IW1[0] = P1[0];
+  IW1[1] = P1[1];
+  IW2[0] = P2[0];
+  IW2[1] = P2[1];
+
+  update_transform();
+}
+
+
+/*
+ * 'IW_input_window()' - Setup an input window.
+ */
+
+void
+IW_input_window(int     num_params,	/* I - Number of parameters */
+                param_t *params)	/* I - Parameters */
+{
+  if (num_params == 0)
+  {
+    IW1[0] = P1[0];
+    IW1[1] = P1[1];
+    IW2[0] = P2[0];
+    IW2[1] = P2[1];
+  }
+  else if (num_params == 4)
+  {
+    IW1[0] = params[0].value.number;
+    IW1[1] = params[1].value.number;
+    IW2[0] = params[2].value.number;
+    IW2[1] = params[3].value.number;
+  }
+
+  update_transform();
+}
+
+
+/*
+ * 'PG_advance_page()' - Eject the current page.
+ */
+
+void
+PG_advance_page(int     num_params,	/* I - Number of parameters */
+                param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+
+  if (PageDirty)
+  {
+    puts("grestore");
+    puts("showpage");
+
+    PageDirty = 0;
+  }
+}
+
+
+/*
+ * 'PS_plot_size()' - Set the plot size.
+ */
+
+void
+PS_plot_size(int     num_params,	/* I - Number of parameters */
+             param_t *params)		/* I - Parameters */
+{
+  switch (num_params)
+  {
+    case 0 :
+        if (Rotation == 0 || Rotation == 180)
+        {
+          PlotSize[0] = PageRight - PageLeft;
+          PlotSize[1] = PageTop - PageBottom;
+	}
+	else
+	{
+          PlotSize[0] = PageTop - PageBottom;
+          PlotSize[1] = PageRight - PageLeft;
+	}
+        break;
+    case 1 :
+        if (Rotation == 0 || Rotation == 180)
+        {
+          PlotSize[1] = 72.0f * params[0].value.number / 1016.0f;
+          PlotSize[0] = 0.75f * PlotSize[1];
+        }
+        else
+        {
+          PlotSize[0] = 72.0f * params[0].value.number / 1016.0f;
+          PlotSize[1] = 0.75f * PlotSize[0];
+        }
+        break;
+    case 2 :
+        if (Rotation == 0 || Rotation == 180)
+        {
+          PlotSize[0] = 72.0f * params[1].value.number / 1016.0f;
+          PlotSize[1] = 72.0f * params[0].value.number / 1016.0f;
+        }
+        else
+        {
+          PlotSize[0] = 72.0f * params[0].value.number / 1016.0f;
+          PlotSize[1] = 72.0f * params[1].value.number / 1016.0f;
+        }
+        break;
+  }
+
+ /*
+  * This is required for buggy files that don't set the input window.
+  */
+
+  IP_input_absolute(0, NULL);
+}
+
+
+/*
+ * 'RO_rotate()' - Rotate the plot.
+ */
+
+void
+RO_rotate(int     num_params,	/* I - Number of parameters */
+          param_t *params)	/* I - Parameters */
+{
+  if (num_params == 0)
+    Rotation = 0;
+  else
+    Rotation = (int)params[0].value.number;
+
+  update_transform();
+}
+
+
+/*
+ * 'RP_replot()' - Replot the current page.
+ */
+
+void
+RP_replot(int     num_params,	/* I - Number of parameters */
+          param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+}
+
+
+/*
+ * 'SC_scale()' - Set user-defined scaling.
+ */
+
+void
+SC_scale(int     num_params,	/* I - Number of parameters */
+         param_t *params)	/* I - Parameters */
+{
+  if (num_params == 0)
+    ScalingType = -1;
+  else if (num_params > 3)
+  {
+    Scaling1[0] = params[0].value.number;
+    Scaling2[0] = params[1].value.number;
+    Scaling1[1] = params[2].value.number;
+    Scaling2[1] = params[3].value.number;
+
+    if (num_params > 4)
+      ScalingType = (int)params[4].value.number;
+    else
+      ScalingType = 0;
+  }
+
+  update_transform();
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,232 @@
+/*
+ * "$Id$"
+ *
+ *   HP-GL/2 input processing for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   ParseCommand()   - Parse an HPGL/2 command.
+ *   FreeParameters() - Free all string parameter values.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "hpgltops.h"
+#include <ctype.h>
+
+#define MAX_PARAMS 16384
+
+
+/*
+ * 'ParseCommand()' - Parse an HPGL/2 command.
+ *
+ * Returns the number of parameters seen or -1 on EOF.
+ */
+
+int				/* O - -1 on EOF, # params otherwise */
+ParseCommand(FILE    *fp,	/* I - File to read from */
+             char    *name,	/* O - Name of command */
+             param_t **params)	/* O - Parameter list */
+{
+  int		num_params,	/* Number of parameters seen */
+		ch,		/* Current char */
+		done,		/* Non-zero when the current command is read */
+		i;		/* Looping var */
+  char		buf[262144];	/* String buffer */
+  static param_t p[MAX_PARAMS];	/* Parameter buffer */
+
+
+  num_params = 0;
+  done       = 0;
+
+  do
+  {
+    while ((ch = getc(fp)) != EOF)
+      if (strchr(" \t\r\n,;", ch) == NULL)
+        break;
+
+    if (ch == EOF)
+      return (-1);
+
+    if (ch == 0x1b)
+      switch (getc(fp))
+      {
+        case '.' : /* HP-GL/2 job control */
+            i = getc(fp);
+
+            if (strchr(")Z", i) != NULL)
+            {
+             /*
+              * 'Printer Off' command - look for next 'Printer On' command...
+              */
+
+              for (;;)
+              {
+                while ((i = getc(fp)) != EOF && i != 0x1b);
+
+                if (i == EOF)
+                  return (-1);
+
+                if (getc(fp) != '.')
+                  continue;
+
+                if ((i = getc(fp)) == '(' ||
+                    i == 'Y')
+                  break;
+              }
+            }
+            else if (strchr("@HIMNTI\003", i) != NULL)
+            {
+              while ((i = getc(fp)) != EOF && i != ':');
+            }
+            break;
+
+        default : /* HP RTL/PCL control */
+            while ((i = getc(fp)) != EOF && !isupper(i));
+            break;
+      }
+  } while (ch == 0x1b);
+
+  name[0] = ch;
+  name[1] = getc(fp);
+  name[2] = '\0';
+
+  if (strcasecmp(name, "LB") == 0)
+  {
+    for (i = 0; (ch = getc(fp)) != StringTerminator; i ++)
+      buf[i] = ch;
+    buf[i] = '\0';
+    p[num_params].type         = PARAM_STRING;
+    p[num_params].value.string = strdup(buf);
+    num_params ++;
+  }
+  else if (strcasecmp(name, "SM") == 0)
+  {
+    buf[0] = getc(fp);
+    buf[1] = '\0';
+    p[num_params].type         = PARAM_STRING;
+    p[num_params].value.string = strdup(buf);
+    num_params ++;
+  }
+  else if (strcasecmp(name, "DT") == 0)
+  {
+    if ((buf[0] = getc(fp)) != ';')
+    {
+      buf[1] = '\0';
+      p[num_params].type         = PARAM_STRING;
+      p[num_params].value.string = strdup(buf);
+      num_params ++;
+    }
+  }
+  else if (strcasecmp(name, "PE") == 0)
+  {
+    for (i = 0; i < (sizeof(buf) - 1); i ++)
+      if ((buf[i] = getc(fp)) == ';')
+        break;
+
+    buf[i] = '\0';
+    p[num_params].type         = PARAM_STRING;
+    p[num_params].value.string = strdup(buf);
+    num_params ++;
+  }
+
+  while (!done)
+    switch (ch = getc(fp))
+    {
+      case ',' :
+      case ' ' :
+      case '\n' :
+      case '\r' :
+      case '\t' :
+          break;
+
+      case '\"' :
+          fscanf(fp, "%[^\"]\"", buf);
+          if (num_params < MAX_PARAMS)
+          {
+            p[num_params].type         = PARAM_STRING;
+            p[num_params].value.string = strdup(buf);
+            num_params ++;
+          };
+          break;
+
+      case '-' :
+      case '+' :
+          ungetc(ch, fp);
+          fscanf(fp, "%f", &(p[num_params].value.number));
+          if (num_params < MAX_PARAMS)
+          {
+            p[num_params].type = PARAM_RELATIVE;
+            num_params ++;
+          }
+          break;
+      case '0' :
+      case '1' :
+      case '2' :
+      case '3' :
+      case '4' :
+      case '5' :
+      case '6' :
+      case '7' :
+      case '8' :
+      case '9' :
+      case '.' :
+          ungetc(ch, fp);
+          fscanf(fp, "%f", &(p[num_params].value.number));
+          if (num_params < MAX_PARAMS)
+          {
+            p[num_params].type = PARAM_ABSOLUTE;
+            num_params ++;
+          }
+          break;
+      default :
+          ungetc(ch, fp);
+          done = 1;
+          break;
+    }
+
+  *params = p;
+  return (num_params);
+}
+
+
+/*
+ * 'FreeParameters()' - Free all string parameter values.
+ */
+
+void
+FreeParameters(int     num_params,	/* I - Number of parameters */
+               param_t *params)		/* I - Parameter values */
+{
+  int	i;				/* Looping var */
+
+
+  for (i = 0; i < num_params; i ++)
+    if (params[i].type == PARAM_STRING)
+      free(params[i].value.string);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,255 @@
+/*
+ * "$Id$"
+ *
+ *   HP-GL/2 filter main entry for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   main()          - Main entry for HP-GL/2 filter.
+ *   compare_names() - Compare two command names.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+/*#define DEBUG*/
+#define _HPGL_MAIN_C_
+#include "hpgltops.h"
+
+
+/*
+ * HP-GL/2 command table...
+ */
+
+typedef struct
+{
+  char	name[4];			/* Name of command */
+  void	(*func)(int, param_t *);	/* Function to call */
+} name_t;
+
+static name_t commands[] =
+{
+  { "BP", BP_begin_plot },
+  { "DF", DF_default_values },
+  { "IN", IN_initialize },
+  { "IP", IP_input_absolute },
+  { "IR", IR_input_relative },
+  { "IW", IW_input_window },
+  { "PG", PG_advance_page },
+  { "RO", RO_rotate },
+  { "RP", RP_replot },
+  { "SC", SC_scale },
+  { "AA", AA_arc_absolute },
+  { "AR", AR_arc_relative },
+  { "AT", AT_arc_absolute3 },
+  { "CI", CI_circle },
+  { "PA", PA_plot_absolute },
+  { "PD", PD_pen_down },
+  { "PE", PE_polyline_encoded },
+  { "PR", PR_plot_relative },
+  { "PS", PS_plot_size },
+  { "PU", PU_pen_up },
+  { "RT", RT_arc_relative3 },
+  { "EA", EA_edge_rect_absolute },
+  { "EP", EP_edge_polygon },
+  { "ER", ER_edge_rect_relative },
+  { "EW", EW_edge_wedge },
+  { "FP", FP_fill_polygon },
+  { "PM", PM_polygon_mode },
+  { "RA", RA_fill_rect_absolute },
+  { "RR", RR_fill_rect_relative },
+  { "WG", WG_fill_wedge },
+  { "AD", AD_define_alternate },
+  { "CF", CF_character_fill },
+  { "CP", CP_character_plot },
+  { "DI", DI_absolute_direction },
+  { "DR", DR_relative_direction },
+  { "DT", DT_define_label_term },
+  { "DV", DV_define_variable_path },
+  { "ES", ES_extra_space },
+  { "LB", LB_label },
+  { "LO", LO_label_origin },
+  { "SA", SA_select_alternate },
+  { "SD", SD_define_standard },
+  { "SI", SI_absolute_size },
+  { "SL", SL_character_slant },
+  { "SR", SR_relative_size },
+  { "SS", SS_select_standard },
+  { "TD", TD_transparent_data },
+  { "AC", AC_anchor_corner },
+  { "FT", FT_fill_type },
+  { "LA", LA_line_attributes },
+  { "LT", LT_line_type },
+  { "NP", NP_number_pens },
+  { "PC", PC_pen_color },
+  { "CR", CR_color_range },
+  { "PW", PW_pen_width },
+  { "RF", RF_raster_fill },
+  { "SM", SM_symbol_mode },
+  { "SP", SP_select_pen },
+  { "UL", UL_user_line_type },
+  { "WU", WU_width_units }
+};
+#define NUM_COMMANDS (sizeof(commands) / sizeof(name_t))
+
+
+/*
+ * Local functions...
+ */
+
+static int	compare_names(const void *p1, const void *p2);
+
+
+/*
+ * 'main()' - Main entry for HP-GL/2 filter.
+ */
+
+int			/* O - Exit status */
+main(int  argc,		/* I - Number of command-line arguments */
+     char *argv[])	/* I - Command-line arguments */
+{
+  FILE		*fp;		/* Input file */
+  ppd_file_t	*ppd;		/* PPD file */
+  int		num_params;	/* Number of parameters */
+  param_t	*params;	/* Command parameters */
+  name_t	*command,	/* Command */
+		name;		/* Name of command */
+  int		num_options;	/* Number of print options */
+  cups_option_t	*options;	/* Print options */
+  char		*val;		/* Option value */
+  int		shading;	/* -1 = black, 0 = grey, 1 = color */
+  float		penwidth;	/* Default pen width */
+
+
+  if (argc < 6 || argc > 7)
+  {
+    fputs("ERROR: hpgltops job-id user title copies options [file]\n", stderr);
+    return (1);
+  }
+
+ /*
+  * If we have 7 arguments, print the file named on the command-line.
+  * Otherwise, send stdin instead...
+  */
+
+  if (argc == 6)
+    fp = stdin;
+  else
+  {
+   /*
+    * Try to open the print file...
+    */
+
+    if ((fp = fopen(argv[6], "rb")) == NULL)
+    {
+      perror("ERROR: unable to open print file - ");
+      return (1);
+    }
+  }
+
+ /*
+  * Process command-line options and write the prolog...
+  */
+
+  options     = NULL;
+  num_options = cupsParseOptions(argv[5], 0, &options);
+
+  if ((ppd = SetCommonOptions(num_options, options, 1)) != NULL)
+    ppdClose(ppd);
+
+  shading  = 1;
+  penwidth = 1.0;
+
+  if ((val = cupsGetOption("blackplot", num_options, options)) != NULL)
+    shading = 0;
+
+  if ((val = cupsGetOption("fitplot", num_options, options)) != NULL)
+    FitPlot = 1;
+
+  if ((val = cupsGetOption("penwidth", num_options, options)) != NULL)
+    penwidth = (float)atof(val);
+
+ /*
+  * Write the PostScript prolog and initialize the plotting "engine"...
+  */
+
+  OutputProlog(argv[3], argv[2], shading, penwidth);
+
+  IP_input_absolute(0, NULL);
+
+ /*
+  * Sort the command array...
+  */
+
+  qsort(commands, NUM_COMMANDS, sizeof(name_t),
+        (int (*)(const void *, const void *))compare_names);
+
+ /*
+  * Read commands until we reach the end of file.
+  */
+
+  while ((num_params = ParseCommand(fp, name.name, &params)) >= 0)
+  {
+#ifdef DEBUG
+    {
+      int i;
+      fprintf(stderr, "DEBUG: %s(%d)", name.name, num_params);
+      for (i = 0; i < num_params; i ++)
+	if (params[i].type == PARAM_STRING)
+          fprintf(stderr, " \'%s\'", params[i].value.string);
+	else
+          fprintf(stderr, " %f", params[i].value.number);
+      fputs("\n", stderr);
+    }
+#endif /* DEBUG */
+
+    if ((command = bsearch(&name, commands, NUM_COMMANDS, sizeof(name_t),
+                           (int (*)(const void *, const void *))compare_names)) != NULL)
+      (*command->func)(num_params, params);
+
+    FreeParameters(num_params, params);
+  }
+
+  OutputTrailer();
+
+  if (fp != stdin)
+    fclose(fp);
+
+  return (0);
+}
+
+
+/*
+ * 'compare_names()' - Compare two command names.
+ */
+
+static int			/* O - Result of strcasecmp() on names */
+compare_names(const void *p1,	/* I - First name */
+              const void *p2)	/* I - Second name */
+{
+  return (strcasecmp(((name_t *)p1)->name, ((name_t *)p2)->name));
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,380 @@
+/*
+ * "$Id$"
+ *
+ *   HP-GL/2 polygon routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   EA_edge_rect_absolute() - Draw a rectangle.
+ *   EP_edge_polygon()       - Stroke the edges of a polygon.
+ *   ER_edge_rect_relative() - Draw a rectangle relative to the current
+ *   EW_edge_wedge()         - Draw a pie wedge.
+ *   FP_fill_polygon()       - Fill a polygon.
+ *   PM_polygon_mode()       - Set the polygon drawing mode.
+ *   RA_fill_rect_absolute() - Fill a rectangle.
+ *   RR_fill_rect_relative() - Fill a rectangle relative to the current
+ *   WG_fill_wedge()         - Fill a pie wedge.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "hpgltops.h"
+
+
+/*
+ * 'EA_edge_rect_absolute()' - Draw a rectangle.
+ */
+
+void
+EA_edge_rect_absolute(int     num_params,	/* I - Number of parameters */
+                      param_t *params)		/* I - Parameters */
+{
+  float	x, y;		/* Transformed coordinates */
+
+
+  if (num_params < 2)
+    return;
+
+  x = Transform[0][0] * params[0].value.number +
+      Transform[0][1] * params[1].value.number +
+      Transform[0][2];
+  y = Transform[1][0] * params[0].value.number +
+      Transform[1][1] * params[1].value.number +
+      Transform[1][2];
+
+  if (!PolygonMode)
+    Outputf("MP\n");
+
+  Outputf("%.3f %.3f MO\n", PenPosition[0], PenPosition[1]);
+  Outputf("%.3f %.3f LI\n", PenPosition[0], y);
+  Outputf("%.3f %.3f LI\n", x, y);
+  Outputf("%.3f %.3f LI\n", x, PenPosition[1]);
+
+  Outputf("CP\n");
+  if (!PolygonMode)
+    Outputf("ST\n");
+}
+
+
+/*
+ * 'EP_edge_polygon()' - Stroke the edges of a polygon.
+ */
+
+void
+EP_edge_polygon(int     num_params,	/* I - Number of parameters */
+                param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+
+  Outputf("ST\n");
+}
+
+
+/*
+ * 'ER_edge_rect_relative()' - Draw a rectangle relative to the current
+ *                             pen position.
+ */
+
+void
+ER_edge_rect_relative(int     num_params,	/* I - Number of parameters */
+                      param_t *params)		/* I - Parameters */
+{
+  float x, y;		/* Transformed coordinates */
+
+
+  if (num_params < 2)
+    return;
+
+  x = Transform[0][0] * params[0].value.number +
+      Transform[0][1] * params[1].value.number +
+      PenPosition[0];
+  y = Transform[1][0] * params[0].value.number +
+      Transform[1][1] * params[1].value.number +
+      PenPosition[1];
+
+  if (!PolygonMode)
+    Outputf("MP\n");
+
+  Outputf("%.3f %.3f MO\n", PenPosition[0], PenPosition[1]);
+  Outputf("%.3f %.3f LI\n", PenPosition[0], y);
+  Outputf("%.3f %.3f LI\n", x, y);
+  Outputf("%.3f %.3f LI\n", x, PenPosition[1]);
+
+  Outputf("CP\n");
+  if (!PolygonMode)
+    Outputf("ST\n");
+}
+
+
+/*
+ * 'EW_edge_wedge()' - Draw a pie wedge.
+ */
+
+void
+EW_edge_wedge(int     num_params,	/* I - Number of parameters */
+              param_t *params)		/* I - Parameters */
+{
+  float x, y;				/* Transformed coordinates */
+  float start, end,			/* Start and end of arc */
+	theta,				/* Current angle */
+	dt,				/* Step between points */
+	radius;				/* Radius of arc */
+
+
+  if (num_params < 3)
+    return;
+
+  radius = params[0].value.number;
+  start  = params[1].value.number;
+  end    = start + params[2].value.number;
+
+  if (num_params > 3)
+    dt = (float)fabs(params[3].value.number);
+  else
+    dt = 5.0f;
+
+  if (!PolygonMode)
+    Outputf("MP\n");
+
+  Outputf("%.3f %.3f MO\n", PenPosition[0], PenPosition[1]);
+
+  if (start < end)
+    for (theta = start + dt; theta < end; theta += dt)
+    {
+      x = (float)(PenPosition[0] +
+                  radius * cos(M_PI * theta / 180.0) * Transform[0][0] +
+                  radius * sin(M_PI * theta / 180.0) * Transform[0][1]);
+      y = (float)(PenPosition[1] +
+                  radius * cos(M_PI * theta / 180.0) * Transform[1][0] +
+                  radius * sin(M_PI * theta / 180.0) * Transform[1][1]);
+
+      Outputf("%.3f %.3f LI\n", x, y);
+    }
+  else
+    for (theta = start - dt; theta > end; theta -= dt)
+    {
+      x = (float)(PenPosition[0] +
+                  radius * cos(M_PI * theta / 180.0) * Transform[0][0] +
+                  radius * sin(M_PI * theta / 180.0) * Transform[0][1]);
+      y = (float)(PenPosition[1] +
+                  radius * cos(M_PI * theta / 180.0) * Transform[1][0] +
+                  radius * sin(M_PI * theta / 180.0) * Transform[1][1]);
+
+      Outputf("%.3f %.3f LI\n", x, y);
+    }
+
+  x = (float)(PenPosition[0] +
+              radius * cos(M_PI * end / 180.0) * Transform[0][0] +
+              radius * sin(M_PI * end / 180.0) * Transform[0][1]);
+  y = (float)(PenPosition[1] +
+              radius * cos(M_PI * end / 180.0) * Transform[1][0] +
+              radius * sin(M_PI * end / 180.0) * Transform[1][1]);
+  Outputf("%.3f %.3f LI\n", x, y);
+
+  Outputf("CP\n");
+  if (!PolygonMode)
+    Outputf("ST\n");
+}
+
+
+/*
+ * 'FP_fill_polygon()' - Fill a polygon.
+ */
+
+void
+FP_fill_polygon(int     num_params,	/* I - Number of parameters */
+                param_t *params)	/* I - Parameters */
+{
+  (void)num_params;
+  (void)params;
+
+  Outputf("FI\n");
+}
+
+
+/*
+ * 'PM_polygon_mode()' - Set the polygon drawing mode.
+ */
+
+void
+PM_polygon_mode(int     num_params,	/* I - Number of parameters */
+                param_t *params)	/* I - Parameters */
+{
+  if (num_params == 0 ||
+      params[0].value.number == 0)
+  {
+    Outputf("MP\n");
+    Outputf("%.3f %.3f MO\n", PenPosition[0], PenPosition[1]);
+    PolygonMode = 1;
+  }
+  else if (params[0].value.number == 2)
+    PolygonMode = 0;
+}
+
+
+/*
+ * 'RA_fill_rect_absolute()' - Fill a rectangle.
+ */
+
+void
+RA_fill_rect_absolute(int     num_params,	/* I - Number of parameters */
+                      param_t *params)		/* I - Parameters */
+{
+  float x, y;			/* Transformed coordinates */
+
+
+  if (num_params < 2)
+    return;
+
+  x = Transform[0][0] * params[0].value.number +
+      Transform[0][1] * params[1].value.number +
+      Transform[0][2];
+  y = Transform[1][0] * params[0].value.number +
+      Transform[1][1] * params[1].value.number +
+      Transform[1][2];
+
+  if (!PolygonMode)
+    Outputf("MP\n");
+
+  Outputf("%.3f %.3f MO\n", PenPosition[0], PenPosition[1]);
+  Outputf("%.3f %.3f LI\n", PenPosition[0], y);
+  Outputf("%.3f %.3f LI\n", x, y);
+  Outputf("%.3f %.3f LI\n", x, PenPosition[1]);
+
+  Outputf("CP\n");
+  if (!PolygonMode)
+    Outputf("FI\n");
+}
+
+
+/*
+ * 'RR_fill_rect_relative()' - Fill a rectangle relative to the current
+ *                             pen position.
+ */
+
+void
+RR_fill_rect_relative(int     num_params,	/* I - Number of parameters */
+                      param_t *params)		/* I - Parameters */
+{
+  float x, y;			/* Transformed coordinates */
+
+
+  if (num_params < 2)
+    return;
+
+  x = Transform[0][0] * params[0].value.number +
+      Transform[0][1] * params[1].value.number +
+      PenPosition[0];
+  y = Transform[1][0] * params[0].value.number +
+      Transform[1][1] * params[1].value.number +
+      PenPosition[1];
+
+  if (!PolygonMode)
+    Outputf("MP\n");
+
+  Outputf("%.3f %.3f MO\n", PenPosition[0], PenPosition[1]);
+  Outputf("%.3f %.3f LI\n", PenPosition[0], y);
+  Outputf("%.3f %.3f LI\n", x, y);
+  Outputf("%.3f %.3f LI\n", x, PenPosition[1]);
+
+  Outputf("CP\n");
+  if (!PolygonMode)
+    Outputf("FI\n");
+}
+
+
+/*
+ * 'WG_fill_wedge()' - Fill a pie wedge.
+ */
+
+void
+WG_fill_wedge(int     num_params,	/* I - Number of parameters */
+              param_t *params)		/* I - Parameters */
+{
+  float x, y;				/* Transformed coordinates */
+  float start, end,			/* Start and end angles */
+	theta,				/* Current angle */
+	dt,				/* Step between points */
+	radius;				/* Radius of arc */
+
+
+  if (num_params < 3)
+    return;
+
+  radius = params[0].value.number;
+  start  = params[1].value.number;
+  end    = start + params[2].value.number;
+
+  if (num_params > 3)
+    dt = (float)fabs(params[3].value.number);
+  else
+    dt = 5.0;
+
+  if (!PolygonMode)
+    Outputf("MP\n");
+
+  Outputf("%.3f %.3f MO\n", PenPosition[0], PenPosition[1]);
+
+  if (start < end)
+    for (theta = start + dt; theta < end; theta += dt)
+    {
+      x = (float)(PenPosition[0] +
+                  radius * cos(M_PI * theta / 180.0) * Transform[0][0] +
+                  radius * sin(M_PI * theta / 180.0) * Transform[0][1]);
+      y = (float)(PenPosition[1] +
+                  radius * cos(M_PI * theta / 180.0) * Transform[1][0] +
+                  radius * sin(M_PI * theta / 180.0) * Transform[1][1]);
+
+      Outputf("%.3f %.3f LI\n", x, y);
+    }
+  else
+    for (theta = start - dt; theta > end; theta -= dt)
+    {
+      x = (float)(PenPosition[0] +
+                  radius * cos(M_PI * theta / 180.0) * Transform[0][0] +
+                  radius * sin(M_PI * theta / 180.0) * Transform[0][1]);
+      y = (float)(PenPosition[1] +
+                  radius * cos(M_PI * theta / 180.0) * Transform[1][0] +
+                  radius * sin(M_PI * theta / 180.0) * Transform[1][1]);
+
+      Outputf("%.3f %.3f LI\n", x, y);
+    }
+
+  x = (float)(PenPosition[0] +
+              radius * cos(M_PI * end / 180.0) * Transform[0][0] +
+              radius * sin(M_PI * end / 180.0) * Transform[0][1]);
+  y = (float)(PenPosition[1] +
+              radius * cos(M_PI * end / 180.0) * Transform[1][0] +
+              radius * sin(M_PI * end / 180.0) * Transform[1][1]);
+  Outputf("%.3f %.3f LI\n", x, y);
+
+  Outputf("CP\n");
+  if (!PolygonMode)
+    Outputf("FI\n");
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,192 @@
+/*
+ * "$Id$"
+ *
+ *   HP-GL/2 prolog routines for for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *  OutputProlog()  - Output the PostScript prolog...
+ *  OutputTrailer() - Output the PostScript trailer...
+ *  Outputf()       - Write a formatted string to the output file, creating the
+ *                    page header as needed...
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "hpgltops.h"
+#include <stdarg.h>
+
+
+/*
+ * 'OutputProlog()' - Output the PostScript prolog...
+ */
+
+void
+OutputProlog(char  *title,	/* I - Job title */
+             char  *user,	/* I - Username */
+             int   shading,	/* I - Type of shading */
+             float penwidth)	/* I - Default pen width */
+{
+  FILE		*prolog;	/* Prolog file */
+  char		line[255];	/* Line from prolog file */
+  time_t	curtime;	/* Current time */
+  struct tm	*curtm;		/* Current date */
+
+
+  curtime = time(NULL);
+  curtm   = localtime(&curtime);
+
+  puts("%!PS-Adobe-3.0");
+  printf("%%%%BoundingBox: %.0f %.0f %.0f %.0f\n",
+         PageLeft, PageBottom, PageRight, PageTop);
+  puts("%%Pages: (atend)");
+  printf("%%%%LanguageLevel: %d\n", LanguageLevel);
+  puts("%%DocumentData: Clean7Bit");
+  puts("%%DocumentSuppliedResources: procset hpgltops 1.0 0");
+  puts("%%DocumentNeededResources: font Courier Helvetica");
+  puts("%%Creator: hpgltops/" CUPS_SVERSION);
+  strftime(line, sizeof(line), "%%%%CreationDate: %c", curtm);
+  puts(line);
+  printf("%%%%Title: %s\n", title);
+  printf("%%%%For: %s\n", user);
+  if (Orientation & 1)
+    puts("%%Orientation: Landscape");
+  puts("%%EndComments");
+  puts("%%BeginProlog");
+  printf("/DefaultPenWidth %.2f def\n", penwidth * 72.0 / 25.4);
+  puts("3.0 setmiterlimit");
+  if (!shading)			/* Black only */
+    puts("/setrgbcolor { pop pop pop } bind def");
+  else if (!ColorDevice)	/* Greyscale */
+    puts("/setrgbcolor { 0.08 mul exch 0.61 mul add exch 0.31 mul add setgray } bind def\n");
+
+  if ((prolog = fopen(CUPS_DATADIR "/HPGLprolog", "r")) == NULL)
+  {
+    perror("ERROR: Unable to open HPGL prolog \"" CUPS_DATADIR "/HPGLprolog\" for reading");
+    exit(1);
+  }
+
+  while (fgets(line, sizeof(line), prolog) != NULL)
+    fputs(line, stdout);
+
+  fclose(prolog);
+
+  puts("%%EndProlog");
+
+  IN_initialize(0, NULL);
+}
+
+
+/*
+ * 'OutputTrailer()' - Output the PostScript trailer...
+ */
+
+void
+OutputTrailer(void)
+{
+  if (PageDirty)
+    PG_advance_page(0, NULL);
+
+  puts("%%BeginTrailer");
+  printf("%%%%Pages: %d\n", PageCount);
+  puts("%%EOF");
+}
+
+
+/*
+ * 'Outputf()' - Write a formatted string to the output file, creating the
+ *               page header as needed...
+ */
+
+int				/* O - Number of bytes written */
+Outputf(const char *format,	/* I - Printf-style string */
+        ...)			/* I - Additional args as needed */
+{
+  va_list	ap;		/* Argument pointer */
+  int		bytes;		/* Number of bytes written */
+
+
+ /*
+  * Write the page header as needed...
+  */
+
+  if (!PageDirty)
+  {
+    PageDirty = 1;
+    PageCount ++;
+
+    printf("%%%%Page: %d %d\n", PageCount, PageCount);
+    printf("/PenScaling %.3f def\n", PenScaling);
+    puts("gsave");
+
+    if (Duplex && (PageCount & 1) == 0)
+      switch ((PageRotation / 90) & 3)
+      {
+	case 0 :
+            printf("%.1f %.1f translate\n", PageWidth - PageRight, PageBottom);
+	    break;
+	case 1 :
+            printf("%.1f %.1f translate\n", PageLength - PageTop,
+	           PageWidth - PageRight);
+	    break;
+	case 2 :
+            printf("%.1f %.1f translate\n", PageLeft, PageLength - PageTop);
+	    break;
+	case 3 :
+            printf("%.1f %.1f translate\n", PageBottom, PageLeft);
+	    break;
+      }
+    else
+      switch ((PageRotation / 90) & 3)
+      {
+	case 0 :
+            printf("%.1f %.1f translate\n", PageLeft, PageBottom);
+	    break;
+	case 1 :
+            printf("%.1f %.1f translate\n", PageBottom, PageWidth - PageRight);
+	    break;
+	case 2 :
+            printf("%.1f %.1f translate\n", PageWidth - PageRight,
+	            PageLength - PageTop);
+	    break;
+	case 3 :
+            printf("%.1f %.1f translate\n", PageLength - PageTop, PageLeft);
+	    break;
+      }
+  }
+
+ /*
+  * Write the string to the output file...
+  */
+
+  va_start(ap, format);
+  bytes = vprintf(format, ap);
+  va_end(ap);
+
+  return (bytes);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,704 @@
+/*
+ * "$Id$"
+ *
+ *   HP-GL/2 vector routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   AA_arc_absolute()    - Draw an arc.
+ *   AR_arc_relative()    - Draw an arc relative to the current pen
+ *   AT_arc_absolute3()   - Draw an arc using 3 points.
+ *   CI_circle()          - Draw a circle.
+ *   PA_plot_absolute()   - Plot a line using absolute coordinates.
+ *   PD_pen_down()        - Start drawing.
+ *   PE_polygon_encoded() - Draw an encoded polyline.
+ *   PR_plot_relative()   - Plot a line using relative coordinates.
+ *   PU_pen_up()          - Stop drawing.
+ *   RT_arc_relative3()   - Draw an arc through 3 points relative to the
+ *   decode_number()      - Decode an encoded number.
+ *   plot_points()        - Plot the specified points.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "hpgltops.h"
+
+
+/*
+ * Local functions...
+ */
+
+static double	decode_number(unsigned char **, int, double);
+static void	plot_points(int, param_t *);
+
+
+/*
+ * 'AA_arc_absolute()' - Draw an arc.
+ */
+
+void
+AA_arc_absolute(int     num_params,	/* I - Number of parameters */
+                param_t *params)	/* I - Parameters */
+{
+  float x, y,				/* Transformed coordinates */
+	dx, dy;				/* Distance from current pen */
+  float start, end,			/* Start and end angles */
+	theta,				/* Current angle */
+	dt,				/* Step between points */
+	radius;				/* Radius of arc */
+
+
+  if (num_params < 3)
+    return;
+
+  x = Transform[0][0] * params[0].value.number +
+      Transform[0][1] * params[1].value.number +
+      Transform[0][2];
+  y = Transform[1][0] * params[0].value.number +
+      Transform[1][1] * params[1].value.number +
+      Transform[1][2];
+
+  dx = PenPosition[0] - x;
+  dy = PenPosition[1] - y;
+
+  start = (float)(180.0 * atan2(dy, dx) / M_PI);
+  if (start < 0.0)
+    start += 360.0f;
+
+  end    = start + params[2].value.number;
+  radius = (float)hypot(dx, dy);
+
+  if (PenDown)
+  {
+    if (num_params > 3 && params[3].value.number > 0.0)
+      dt = (float)fabs(params[3].value.number);
+    else
+      dt = 5.0;
+
+    if (!PolygonMode)
+      Outputf("MP\n");
+
+    Outputf("%.3f %.3f MO\n", PenPosition[0], PenPosition[1]);
+
+    if (start < end)
+      for (theta = start + dt; theta < end; theta += dt)
+      {
+	PenPosition[0] = (float)(x + radius * cos(M_PI * theta / 180.0));
+	PenPosition[1] = (float)(y + radius * sin(M_PI * theta / 180.0));
+
+	Outputf("%.3f %.3f LI\n", PenPosition[0], PenPosition[1]);
+      }
+    else
+      for (theta = start - dt; theta > end; theta -= dt)
+      {
+	PenPosition[0] = (float)(x + radius * cos(M_PI * theta / 180.0));
+	PenPosition[1] = (float)(y + radius * sin(M_PI * theta / 180.0));
+
+	Outputf("%.3f %.3f LI\n", PenPosition[0], PenPosition[1]);
+      }
+  }
+
+  PenPosition[0] = (float)(x + radius * cos(M_PI * end / 180.0));
+  PenPosition[1] = (float)(y + radius * sin(M_PI * end / 180.0));
+
+  if (PenDown)
+  {
+    Outputf("%.3f %.3f LI\n", PenPosition[0], PenPosition[1]);
+
+    if (!PolygonMode)
+      Outputf("ST\n");
+  }
+}
+
+
+/*
+ * 'AR_arc_relative()' - Draw an arc relative to the current pen
+ *                       position.
+ */
+
+void
+AR_arc_relative(int     num_params,	/* I - Number of parameters */
+                param_t *params)	/* I - Parameters */
+{
+  float x, y,				/* Transformed coordinates */
+	dx, dy;				/* Distance from current pen */
+  float start, end,			/* Start and end angles */
+	theta,				/* Current angle */
+	dt,				/* Step between points */
+	radius;				/* Radius of arc */
+
+
+  if (num_params < 3)
+    return;
+
+  x = Transform[0][0] * params[0].value.number +
+      Transform[0][1] * params[1].value.number +
+      PenPosition[0];
+  y = Transform[1][0] * params[0].value.number +
+      Transform[1][1] * params[1].value.number +
+      PenPosition[1];
+
+  dx = PenPosition[0] - x;
+  dy = PenPosition[1] - y;
+
+  start = (float)(180.0 * atan2(dy, dx) / M_PI);
+  if (start < 0.0)
+    start += 360.0f;
+
+  end    = start + params[2].value.number;
+  radius = (float)hypot(dx, dy);
+
+  if (PenDown)
+  {
+    if (num_params > 3 && params[3].value.number > 0.0)
+      dt = (float)fabs(params[3].value.number);
+    else
+      dt = 5.0;
+
+    if (!PolygonMode)
+      Outputf("MP\n");
+
+    Outputf("%.3f %.3f MO\n", PenPosition[0], PenPosition[1]);
+
+    if (start < end)
+      for (theta = start + dt; theta < end; theta += dt)
+      {
+	PenPosition[0] = (float)(x + radius * cos(M_PI * theta / 180.0));
+	PenPosition[1] = (float)(y + radius * sin(M_PI * theta / 180.0));
+
+	Outputf("%.3f %.3f LI\n", PenPosition[0], PenPosition[1]);
+      }
+    else
+      for (theta = start - dt; theta > end; theta -= dt)
+      {
+	PenPosition[0] = (float)(x + radius * cos(M_PI * theta / 180.0));
+	PenPosition[1] = (float)(y + radius * sin(M_PI * theta / 180.0));
+
+	Outputf("%.3f %.3f LI\n", PenPosition[0], PenPosition[1]);
+      }
+  }
+
+  PenPosition[0] = (float)(x + radius * cos(M_PI * end / 180.0));
+  PenPosition[1] = (float)(y + radius * sin(M_PI * end / 180.0));
+
+  if (PenDown)
+  {
+    Outputf("%.3f %.3f LI\n", PenPosition[0], PenPosition[1]);
+
+    if (!PolygonMode)
+      Outputf("ST\n");
+  }
+}
+
+
+/*
+ * 'AT_arc_absolute3()' - Draw an arc using 3 points.
+ *
+ * Note:
+ *
+ *   Currently this only draws two line segments through the
+ *   specified points.
+ */
+
+void
+AT_arc_absolute3(int     num_params,	/* I - Number of parameters */
+                 param_t *params)	/* I - Parameters */
+{
+  if (num_params < 4)
+    return;
+
+  if (PenDown)
+  {
+    if (!PolygonMode)
+      Outputf("MP\n");
+
+    Outputf("%.3f %.3f MO\n", PenPosition[0], PenPosition[1]);
+
+    PenPosition[0] = Transform[0][0] * params[0].value.number +
+                     Transform[0][1] * params[1].value.number +
+                     Transform[0][2];
+    PenPosition[1] = Transform[1][0] * params[0].value.number +
+                     Transform[1][1] * params[1].value.number +
+                     Transform[1][2];
+
+    Outputf("%.3f %.3f LI\n", PenPosition[0], PenPosition[1]);
+  }
+
+  PenPosition[0] = Transform[0][0] * params[2].value.number +
+                   Transform[0][1] * params[3].value.number +
+                   Transform[0][2];
+  PenPosition[1] = Transform[1][0] * params[2].value.number +
+                   Transform[1][1] * params[3].value.number +
+                   Transform[1][2];
+
+  if (PenDown)
+  {
+    Outputf("%.3f %.3f LI\n", PenPosition[0], PenPosition[1]);
+
+    if (!PolygonMode)
+      Outputf("ST\n");
+  }
+}
+
+
+/*
+ * 'CI_circle()' - Draw a circle.
+ */
+
+void
+CI_circle(int     num_params,	/* I - Number of parameters */
+          param_t *params)	/* I - Parameters */
+{
+  float x, y;			/* Transformed coordinates */
+  float theta,			/* Current angle */
+	dt,			/* Step between points */
+	radius;			/* Radius of circle */
+
+
+  if (num_params < 1)
+    return;
+
+  if (!PenDown)
+    return;
+
+  radius = params[0].value.number;
+
+  if (num_params > 1)
+    dt = (float)fabs(params[1].value.number);
+  else
+    dt = 5.0;
+
+  if (!PolygonMode)
+    Outputf("MP\n");
+
+  for (theta = 0.0; theta < 360.0; theta += dt)
+  {
+    x = (float)(PenPosition[0] +
+                radius * cos(M_PI * theta / 180.0) * Transform[0][0] +
+                radius * sin(M_PI * theta / 180.0) * Transform[0][1]);
+    y = (float)(PenPosition[1] +
+                radius * cos(M_PI * theta / 180.0) * Transform[1][0] +
+                radius * sin(M_PI * theta / 180.0) * Transform[1][1]);
+
+    Outputf("%.3f %.3f %s\n", x, y, theta == 0.0 ? "MO" : "LI");
+  }
+
+  Outputf("CP\n");
+  if (!PolygonMode)
+    Outputf("ST\n");
+}
+
+
+/*
+ * 'PA_plot_absolute()' - Plot a line using absolute coordinates.
+ */
+
+void
+PA_plot_absolute(int     num_params,	/* I - Number of parameters */
+                 param_t *params)	/* I - Parameters */
+{
+  PenMotion = 0;
+
+  if (num_params > 1)
+    plot_points(num_params, params);
+}
+
+
+/*
+ * 'PD_pen_down()' - Start drawing.
+ */
+
+void
+PD_pen_down(int     num_params,		/* I - Number of parameters */
+            param_t *params)		/* I - Parameters */
+{
+  PenDown = 1;
+
+  if (num_params > 1)
+    plot_points(num_params, params);
+}
+
+
+/*
+ * 'PE_polygon_encoded()' - Draw an encoded polyline.
+ */
+
+void
+PE_polyline_encoded(int     num_params,	/* I - Number of parameters */
+                    param_t *params)	/* I - Parameters */
+{
+  unsigned char	*s;			/* Pointer into string */
+  int		temp,			/* Temporary value */
+		base_bits,		/* Data bits per byte */
+		draw,			/* Draw or move */
+		abscoords;		/* Use absolute coordinates */
+  double	tx, ty,			/* Transformed coordinates */
+		x, y,			/* Raw coordinates */
+		frac_bits;		/* Multiplier for encoded number */
+
+
+  base_bits = 6;
+  frac_bits = 1.0;
+  draw      = 1;
+  abscoords = 0;
+
+  if (num_params == 0)
+    return;
+
+  if (!PolygonMode)
+  {
+    Outputf("MP\n");
+    Outputf("%.3f %.3f MO\n", PenPosition[0], PenPosition[1]);
+  }
+
+  for (s = (unsigned char *)params[0].value.string; *s != '\0';)
+    switch (*s)
+    {
+      case '7' :
+          s ++;
+          base_bits = 5;
+          break;
+      case ':' :	/* Select pen */
+          s ++;
+          temp = (int)decode_number(&s, base_bits, 1.0);
+          Outputf("P%d W%d\n", temp, temp);
+          break;
+      case '<' :	/* Next coords are a move-to */
+          draw = 0;
+          s ++;
+          break;
+      case '>' :	/* Set fractional bits */
+          s ++;
+          temp      = (int)decode_number(&s, base_bits, 1.0);
+          frac_bits = 1.0 / (1 << temp);
+          break;
+      case '=' :	/* Next coords are absolute */
+          s ++;
+          abscoords = 1;
+          break;
+      default :
+          if (*s >= 63)
+          {
+           /*
+            * Coordinate...
+            */
+
+            x = decode_number(&s, base_bits, frac_bits);
+            y = decode_number(&s, base_bits, frac_bits);
+
+            if (abscoords)
+            {
+	      tx = Transform[0][0] * x + Transform[0][1] * y +
+        	   Transform[0][2];
+	      ty = Transform[1][0] * x + Transform[1][1] * y +
+        	   Transform[1][2];
+	    }
+	    else if (x == 0.0 && y == 0.0)
+	    {
+	      draw = 1;
+	      continue;
+	    }
+	    else
+	    {
+	      tx = Transform[0][0] * x + Transform[0][1] * y +
+        	   PenPosition[0];
+	      ty = Transform[1][0] * x + Transform[1][1] * y +
+        	   PenPosition[1];
+	    }
+
+            if (draw)
+              Outputf("%.3f %.3f LI\n", tx, ty);
+            else
+              Outputf("%.3f %.3f MO\n", tx, ty);
+
+	    PenPosition[0] = (float)tx;
+	    PenPosition[1] = (float)ty;
+
+	    draw           = 1;
+	    abscoords      = 0;
+          }
+          else
+          {
+           /*
+            * Junk - ignore...
+            */
+
+            if (*s != '\n' && *s != '\r')
+              fprintf(stderr, "WARNING: ignoring illegal PE char \'%c\'...\n", *s);
+            s ++;
+          }
+          break;
+    }
+
+  if (!PolygonMode)
+    Outputf("ST\n");
+}
+
+
+/*
+ * 'PR_plot_relative()' - Plot a line using relative coordinates.
+ */
+
+void
+PR_plot_relative(int     num_params,	/* I - Number of parameters */
+                 param_t *params)	/* I - Parameters */
+{
+  PenMotion = 1;
+
+  if (num_params > 1)
+    plot_points(num_params, params);
+}
+
+
+/*
+ * 'PU_pen_up()' - Stop drawing.
+ */
+
+void
+PU_pen_up(int     num_params,	/* I - Number of parameters */
+          param_t *params)	/* I - Parameters */
+{
+  PenDown = 0;
+
+  if (num_params > 1)
+    plot_points(num_params, params);
+}
+
+
+/*
+ * 'RT_arc_relative3()' - Draw an arc through 3 points relative to the
+ *                        current pen position.
+ *
+ * Note:
+ *
+ *   This currently only draws two line segments through the specified
+ *   points.
+ */
+
+void
+RT_arc_relative3(int     num_params,	/* I - Number of parameters */
+                 param_t *params)	/* I - Parameters */
+{
+  if (num_params < 4)
+    return;
+
+  if (PenDown)
+  {
+    if (!PolygonMode)
+      Outputf("MP\n");
+
+    Outputf("%.3f %.3f MO\n", PenPosition[0], PenPosition[1]);
+
+    PenPosition[0] = Transform[0][0] * params[0].value.number +
+                     Transform[0][1] * params[1].value.number +
+                     PenPosition[0];
+    PenPosition[1] = Transform[1][0] * params[0].value.number +
+                     Transform[1][1] * params[1].value.number +
+                     PenPosition[1];
+
+    Outputf("%.3f %.3f LI\n", PenPosition[0], PenPosition[1]);
+  }
+
+  PenPosition[0] = Transform[0][0] * params[2].value.number +
+                   Transform[0][1] * params[3].value.number +
+                   PenPosition[0];
+  PenPosition[1] = Transform[1][0] * params[2].value.number +
+                   Transform[1][1] * params[3].value.number +
+                   PenPosition[1];
+
+  if (PenDown)
+  {
+    Outputf("%.3f %.3f LI\n", PenPosition[0], PenPosition[1]);
+
+    if (!PolygonMode)
+      Outputf("ST\n");
+  }
+}
+
+
+/*
+ * 'decode_number()' - Decode an encoded number.
+ */
+
+static double				/* O - Value */
+decode_number(unsigned char **s,	/* IO - String to decode */
+              int           base_bits,	/* I - Number of data bits per byte */
+	      double        frac_bits)	/* I - Multiplier for fractional data */
+{
+  double	temp,		/* Current value */
+		shift;		/* Multiplier */
+  int		sign;		/* Sign of result */
+
+
+  sign = 0;
+
+  if (base_bits == 5)
+  {
+    for (temp = 0.0, shift = frac_bits * 0.5; **s != '\0'; (*s) ++)
+      if (**s >= 95 && **s < 127)
+      {
+        if (sign == 0)
+        {
+          if ((**s - 95) & 1)
+            sign = -1;
+          else
+            sign = 1;
+
+          temp += ((**s - 95) & ~1) * shift;
+        }
+        else
+          temp += (**s - 95) * shift;
+        break;
+      }
+      else if (**s < 63)
+      {
+        if (**s != '\r' && **s != '\n')
+          fprintf(stderr, "hpgl2ps: Bad PE character \'%c\'!\n", **s);
+
+        continue;
+      }
+      else
+      {
+        if (sign == 0)
+        {
+          if ((**s - 63) & 1)
+            sign = -1;
+          else
+            sign = 1;
+
+          temp += ((**s - 63) & ~1) * shift;
+        }
+        else
+          temp += (**s - 63) * shift;
+
+	shift *= 32.0;
+      }
+  }
+  else
+  {
+    for (temp = 0.0, shift = frac_bits * 0.5; **s != '\0'; (*s) ++)
+      if (**s >= 191 && **s < 255)
+      {
+        if (sign == 0)
+        {
+          if ((**s - 191) & 1)
+            sign = -1;
+          else
+            sign = 1;
+
+          temp += ((**s - 191) & ~1) * shift;
+        }
+        else
+          temp += (**s - 191) * shift;
+        break;
+      }
+      else if (**s < 63)
+      {
+        if (**s != '\r' && **s != '\n')
+          fprintf(stderr, "hpgl2ps: Bad PE character \'%c\'!\n", **s);
+
+        continue;
+      }
+      else
+      {
+        if (sign == 0)
+        {
+          if ((**s - 63) & 1)
+            sign = -1;
+          else
+            sign = 1;
+
+          temp += ((**s - 63) & ~1) * shift;
+        }
+        else
+          temp += (**s - 63) * shift;
+
+        shift *= 64.0;
+      }
+  }
+
+  (*s) ++;
+
+  return (temp * sign);
+}
+
+
+/*
+ * 'plot_points()' - Plot the specified points.
+ */
+
+static void
+plot_points(int     num_params,	/* I - Number of parameters */
+            param_t *params)	/* I - Parameters */
+{
+  int	i;			/* Looping var */
+  float	x, y;			/* Transformed coordinates */
+
+
+  if (PenDown)
+  {
+    if (!PolygonMode)
+      Outputf("MP\n");
+
+    Outputf("%.3f %.3f MO\n", PenPosition[0], PenPosition[1]);
+  }
+
+  for (i = 0; i < num_params; i += 2)
+  {
+    if (PenMotion == 0)
+    {
+      x = Transform[0][0] * params[i + 0].value.number +
+          Transform[0][1] * params[i + 1].value.number +
+          Transform[0][2];
+      y = Transform[1][0] * params[i + 0].value.number +
+          Transform[1][1] * params[i + 1].value.number +
+          Transform[1][2];
+    }
+    else
+    {
+      x = Transform[0][0] * params[i + 0].value.number +
+          Transform[0][1] * params[i + 1].value.number +
+          PenPosition[0];
+      y = Transform[1][0] * params[i + 0].value.number +
+          Transform[1][1] * params[i + 1].value.number +
+          PenPosition[1];
+    }
+
+    if (PenDown)
+      Outputf("%.3f %.3f LI\n", x, y);
+
+    PenPosition[0] = x;
+    PenPosition[1] = y;
+  }
+
+  if (PenDown)
+  {
+    if (!PolygonMode)
+      Outputf("ST\n");
+  }
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,130 @@
+# Microsoft Developer Studio Project File - Name="hpgltops" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=hpgltops - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "hpgltops.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "hpgltops.mak" CFG="hpgltops - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "hpgltops - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "hpgltops - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "hpgltops - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ../cups/cups.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"hpgltops.exe"
+
+!ELSEIF  "$(CFG)" == "hpgltops - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "hpgltops___Win32_Debug"
+# PROP BASE Intermediate_Dir "hpgltops___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ../cups/cupsd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"hpgltopsd.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "hpgltops - Win32 Release"
+# Name "hpgltops - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=".\hpgl-attr.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hpgl-char.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hpgl-config.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hpgl-input.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hpgl-main.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hpgl-polygon.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hpgl-prolog.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hpgl-vector.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\hpgltops.h
+# End Source File
+# End Group
+# End Target
+# End Project
@@ -0,0 +1,196 @@
+/*
+ * "$Id$"
+ *
+ *   HP-GL/2 to PostScript filter for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "common.h"
+#include <math.h>
+
+#ifndef M_PI
+#  define M_PI	3.14159265358979323846
+#endif /* M_PI */
+
+/*
+ * Parameter value structure...
+ */
+
+typedef struct
+{
+  int	type;
+  union
+  {
+    float	number;
+    char	*string;
+  }	value;
+} param_t;
+
+#define PARAM_ABSOLUTE	0
+#define PARAM_RELATIVE	1
+#define PARAM_STRING	2
+
+
+/*
+ * Globals...
+ */
+
+#ifdef _HPGL_MAIN_C_
+#  define VAR
+#  define VALUE(x) =x
+#  define VALUE2(x,y) ={x,y}
+#else
+#  define VAR extern
+#  define VALUE(x)
+#  define VALUE2(x,y)
+#endif /* _HPGL_MAIN_C_ */
+
+VAR float	P1[2],				/* Lower-lefthand physical limit */
+		P2[2],				/* Upper-righthand physical limit */
+		IW1[2],				/* Window lower-lefthand limit */
+		IW2[2];				/* Window upper-righthand limit */
+VAR int		Rotation	VALUE(0);	/* Page rotation */
+VAR int		ScalingType	VALUE(-1);	/* Type of scaling (-1 for none) */
+VAR float	Scaling1[2],			/* Lower-lefthand user limit */
+		Scaling2[2];			/* Upper-righthand user limit */
+VAR float	Transform[2][3];		/* Transform matrix */
+VAR int		PageRotation	VALUE(0);	/* Page/plot rotation */
+
+VAR char	StringTerminator VALUE('\003');	/* Terminator for labels */
+VAR float	PenPosition[2]	VALUE2(0.0f, 0.0f),
+						/* Current pen position */
+		PenScaling	VALUE(1.0f);	/* Pen width scaling factor */
+VAR int		PenMotion	VALUE(0), 	/* 0 = absolute, 1 = relative */
+		PenNumber	VALUE(1),	/* Current pen number */
+		PenCount	VALUE(8),	/* Number of pens */
+		PenDown		VALUE(0),	/* 0 = pen up, 1 = pen down */
+		PolygonMode	VALUE(0),	/* Drawing polygons? */
+		PageCount	VALUE(1),	/* Number of pages in plot */
+		PageDirty	VALUE(0),	/* Current page written on? */
+		WidthUnits	VALUE(0);	/* 0 = mm, 1 = proportionate */
+VAR float	PlotSize[2]	VALUE2(2592.0f, 3456.0f);
+						/* Plot size */
+VAR int		CharFillMode	VALUE(0),	/* Where to draw labels */
+		CharPen		VALUE(0),	/* Pen to use for labels */
+		CharFont	VALUE(0);	/* Font to use for labels */
+VAR float	CharHeight[2]	VALUE2(11.5f,11.5f);
+						/* Size of font for labels */
+VAR int		FitPlot		VALUE(0);	/* 1 = fit to page */
+VAR float	ColorRange[3][2]		/* Range of color values */
+#ifdef _HPGL_MAIN_C_
+		= {
+		  { 0.0, 255.0 },
+		  { 0.0, 255.0 },
+		  { 0.0, 255.0 }
+		}
+#endif /* _HPGL_MAIN_C_ */
+;
+
+/*
+ * Prototypes...
+ */
+
+/* hpgl-input.c */
+extern int	ParseCommand(FILE *fp, char *name, param_t **params);
+extern void	FreeParameters(int num_params, param_t *params);
+
+/* hpgl-config.c */
+extern void	update_transform(void);
+extern void	BP_begin_plot(int num_params, param_t *params);
+extern void	DF_default_values(int num_params, param_t *params);
+extern void	IN_initialize(int num_params, param_t *params);
+extern void	IP_input_absolute(int num_params, param_t *params);
+extern void	IR_input_relative(int num_params, param_t *params);
+extern void	IW_input_window(int num_params, param_t *params);
+extern void	PG_advance_page(int num_params, param_t *params);
+extern void	PS_plot_size(int num_params, param_t *params);
+extern void	RO_rotate(int num_params, param_t *params);
+extern void	RP_replot(int num_params, param_t *params);
+extern void	SC_scale(int num_params, param_t *params);
+
+/* hpgl-vector.c */
+extern void	AA_arc_absolute(int num_params, param_t *params);
+extern void	AR_arc_relative(int num_params, param_t *params);
+extern void	AT_arc_absolute3(int num_params, param_t *params);
+extern void	CI_circle(int num_params, param_t *params);
+extern void	PA_plot_absolute(int num_params, param_t *params);
+extern void	PD_pen_down(int num_params, param_t *params);
+extern void	PE_polyline_encoded(int num_params, param_t *params);
+extern void	PR_plot_relative(int num_params, param_t *params);
+extern void	PU_pen_up(int num_params, param_t *params);
+extern void	RT_arc_relative3(int num_params, param_t *params);
+
+/* hpgl-polygon.c */
+extern void	EA_edge_rect_absolute(int num_params, param_t *params);
+extern void	EP_edge_polygon(int num_params, param_t *params);
+extern void	ER_edge_rect_relative(int num_params, param_t *params);
+extern void	EW_edge_wedge(int num_params, param_t *params);
+extern void	FP_fill_polygon(int num_params, param_t *params);
+extern void	PM_polygon_mode(int num_params, param_t *params);
+extern void	RA_fill_rect_absolute(int num_params, param_t *params);
+extern void	RR_fill_rect_relative(int num_params, param_t *params);
+extern void	WG_fill_wedge(int num_params, param_t *params);
+
+/* hpgl-char.c */
+extern void	AD_define_alternate(int num_params, param_t *params);
+extern void	CF_character_fill(int num_params, param_t *params);
+extern void	CP_character_plot(int num_params, param_t *params);
+extern void	DI_absolute_direction(int num_params, param_t *params);
+extern void	DR_relative_direction(int num_params, param_t *params);
+extern void	DT_define_label_term(int num_params, param_t *params);
+extern void	DV_define_variable_path(int num_params, param_t *params);
+extern void	ES_extra_space(int num_params, param_t *params);
+extern void	LB_label(int num_params, param_t *params);
+extern void	LO_label_origin(int num_params, param_t *params);
+extern void	SA_select_alternate(int num_params, param_t *params);
+extern void	SD_define_standard(int num_params, param_t *params);
+extern void	SI_absolute_size(int num_params, param_t *params);
+extern void	SL_character_slant(int num_params, param_t *params);
+extern void	SR_relative_size(int num_params, param_t *params);
+extern void	SS_select_standard(int num_params, param_t *params);
+extern void	TD_transparent_data(int num_params, param_t *params);
+
+/* hpgl-attr.c */
+extern void	AC_anchor_corner(int num_params, param_t *params);
+extern void	CR_color_range(int num_params, param_t *params);
+extern void	FT_fill_type(int num_params, param_t *params);
+extern void	LA_line_attributes(int num_params, param_t *params);
+extern void	LT_line_type(int num_params, param_t *params);
+extern void	NP_number_pens(int num_params, param_t *params);
+extern void	PC_pen_color(int num_params, param_t *params);
+extern void	PW_pen_width(int num_params, param_t *params);
+extern void	RF_raster_fill(int num_params, param_t *params);
+extern void	SM_symbol_mode(int num_params, param_t *params);
+extern void	SP_select_pen(int num_params, param_t *params);
+extern void	UL_user_line_type(int num_params, param_t *params);
+extern void	WU_width_units(int num_params, param_t *params);
+
+/* hpgl-prolog.c */
+extern void	OutputProlog(char *title, char *user, int shading, float penwidth);
+extern void	OutputTrailer(void);
+extern int	Outputf(const char *format, ...);
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,910 @@
+/*
+ * "$Id$"
+ *
+ *   Colorspace conversions for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   ImageWhiteToWhite() - Convert luminance colors to device-dependent
+ *   ImageWhiteToRGB()   - Convert luminance data to RGB.
+ *   ImageWhiteToBlack() - Convert luminance colors to black.
+ *   ImageWhiteToCMY()   - Convert luminance colors to CMY.
+ *   ImageWhiteToCMYK()  - Convert luminance colors to CMYK.
+ *   ImageRGBToBlack()   - Convert RGB data to black.
+ *   ImageRGBToCMY()     - Convert RGB colors to CMY.
+ *   ImageRGBToCMYK()    - Convert RGB colors to CMYK.
+ *   ImageRGBToWhite()   - Convert RGB colors to luminance.
+ *   ImageRGBToRGB()     - Convert RGB colors to device-dependent RGB.
+ *   ImageLut()          - Adjust all pixel values with the given LUT.
+ *   ImageRGBAdjust()    - Adjust the hue and saturation of the given RGB
+ *                         colors.
+ *   huerotate()         - Rotate the hue, maintaining luminance.
+ *   ident()             - Make an identity matrix.
+ *   mult()              - Multiply two matrices.
+ *   saturate()          - Make a saturation matrix.
+ *   xform()             - Transform a 3D point using a matrix...
+ *   xrotate()           - Rotate about the x (red) axis...
+ *   yrotate()           - Rotate about the y (green) axis...
+ *   zrotate()           - Rotate about the z (blue) axis...
+ *   zshear()            - Shear z using x and y...
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "image.h"
+#include <math.h>
+
+
+/*
+ * Globals...
+ */
+
+extern int	ImageHaveProfile;
+extern int	ImageDensity[256];
+extern int	ImageMatrix[3][3][256];
+
+/*
+ * Local functions...
+ */
+
+static void	huerotate(float [3][3], float);
+static void	ident(float [3][3]);
+static void	mult(float [3][3], float [3][3], float [3][3]);
+static void	saturate(float [3][3], float);
+static void	xform(float [3][3], float, float, float, float *, float *, float *);
+static void	xrotate(float [3][3], float, float);
+static void	yrotate(float [3][3], float, float);
+static void	zrotate(float [3][3], float, float);
+static void	zshear(float [3][3], float, float);
+
+
+/*
+ * 'ImageWhiteToWhite()' - Convert luminance colors to device-dependent
+ *                         luminance.
+ */
+
+void
+ImageWhiteToWhite(ib_t *in,	/* I - Input pixels */
+                  ib_t *out,	/* I - Output pixels */
+                  int  count)	/* I - Number of pixels */
+{
+  if (ImageHaveProfile)
+    while (count > 0)
+    {
+      *out++ = 255 - ImageDensity[255 - *in++];
+      count --;
+    }
+  else if (in != out)
+    memcpy(out, in, count);
+}
+
+
+/*
+ * 'ImageWhiteToRGB()' - Convert luminance data to RGB.
+ */
+
+void
+ImageWhiteToRGB(ib_t *in,	/* I - Input pixels */
+                ib_t *out,	/* I - Output pixels */
+                int  count)	/* I - Number of pixels */
+{
+  if (ImageHaveProfile)
+    while (count > 0)
+    {
+      out[0] = 255 - ImageDensity[255 - *in++];
+      out[1] = out[0];
+      out[2] = out[0];
+      out += 3;
+      count --;
+    }
+  else
+    while (count > 0)
+    {
+      *out++ = *in;
+      *out++ = *in;
+      *out++ = *in++;
+      count --;
+    }
+}
+
+
+/*
+ * 'ImageWhiteToBlack()' - Convert luminance colors to black.
+ */
+
+void
+ImageWhiteToBlack(ib_t *in,	/* I - Input pixels */
+                  ib_t *out,	/* I - Output pixels */
+                  int  count)	/* I - Number of pixels */
+{
+  if (ImageHaveProfile)
+    while (count > 0)
+    {
+      *out++ = ImageDensity[255 - *in++];
+      count --;
+    }
+  else
+    while (count > 0)
+    {
+      *out++ = 255 - *in++;
+      count --;
+    }
+}
+
+
+/*
+ * 'ImageWhiteToCMY()' - Convert luminance colors to CMY.
+ */
+
+void
+ImageWhiteToCMY(ib_t *in,	/* I - Input pixels */
+                ib_t *out,	/* I - Output pixels */
+                int  count)	/* I - Number of pixels */
+{
+  if (ImageHaveProfile)
+    while (count > 0)
+    {
+      out[0] = ImageDensity[255 - *in++];
+      out[1] = out[0];
+      out[2] = out[0];
+      out += 3;
+      count --;
+    }
+  else
+    while (count > 0)
+    {
+      *out++ = 255 - *in;
+      *out++ = 255 - *in;
+      *out++ = 255 - *in++;
+      count --;
+    }
+}
+
+
+/*
+ * 'ImageWhiteToCMYK()' - Convert luminance colors to CMYK.
+ */
+
+void
+ImageWhiteToCMYK(ib_t *in,	/* I - Input pixels */
+                 ib_t *out,	/* I - Output pixels */
+                 int  count)	/* I - Number of pixels */
+{
+  if (ImageHaveProfile)
+    while (count > 0)
+    {
+      *out++ = 0;
+      *out++ = 0;
+      *out++ = 0;
+      *out++ = ImageDensity[255 - *in++];
+      count --;
+    }
+  else
+    while (count > 0)
+    {
+      *out++ = 0;
+      *out++ = 0;
+      *out++ = 0;
+      *out++ = 255 - *in++;
+      count --;
+    }
+}
+
+
+/*
+ * 'ImageRGBToBlack()' - Convert RGB data to black.
+ */
+
+void
+ImageRGBToBlack(ib_t *in,	/* I - Input pixels */
+                ib_t *out,	/* I - Output pixels */
+                int count)	/* I - Number of pixels */
+{
+  if (ImageHaveProfile)
+    while (count > 0)
+    {
+      *out++ = ImageDensity[255 - (31 * in[0] + 61 * in[1] + 8 * in[2]) / 100];
+      in += 3;
+      count --;
+    }
+  else
+    while (count > 0)
+    {
+      *out++ = 255 - (31 * in[0] + 61 * in[1] + 8 * in[2]) / 100;
+      in += 3;
+      count --;
+    }
+}
+
+
+/*
+ * 'ImageRGBToCMY()' - Convert RGB colors to CMY.
+ */
+
+void
+ImageRGBToCMY(ib_t *in,		/* I - Input pixels */
+              ib_t *out,	/* I - Output pixels */
+              int  count)	/* I - Number of pixels */
+{
+  int	c, m, y, k;		/* CMYK values */
+  int	cc, cm, cy;		/* Calibrated CMY values */
+
+
+  if (ImageHaveProfile)
+    while (count > 0)
+    {
+      c = 255 - *in++;
+      m = 255 - *in++;
+      y = 255 - *in++;
+      k = min(c, min(m, y));
+      c -= k;
+      m -= k;
+      y -= k;
+
+      cc = ImageMatrix[0][0][c] +
+           ImageMatrix[0][1][m] +
+	   ImageMatrix[0][2][y] + k;
+      cm = ImageMatrix[1][0][c] +
+           ImageMatrix[1][1][m] +
+	   ImageMatrix[1][2][y] + k;
+      cy = ImageMatrix[2][0][c] +
+           ImageMatrix[2][1][m] +
+	   ImageMatrix[2][2][y] + k;
+
+      if (cc < 0)
+        *out++ = 0;
+      else if (cc > 255)
+        *out++ = ImageDensity[255];
+      else
+        *out++ = ImageDensity[cc];
+
+      if (cm < 0)
+        *out++ = 0;
+      else if (cm > 255)
+        *out++ = ImageDensity[255];
+      else
+        *out++ = ImageDensity[cm];
+
+      if (cy < 0)
+        *out++ = 0;
+      else if (cy > 255)
+        *out++ = ImageDensity[255];
+      else
+        *out++ = ImageDensity[cy];
+
+      count --;
+    }
+  else
+    while (count > 0)
+    {
+      c    = 255 - in[0];
+      m    = 255 - in[1];
+      y    = 255 - in[2];
+      k    = min(c, min(m, y));
+
+      *out++ = (255 - in[1] / 4) * (c - k) / 255 + k;
+      *out++ = (255 - in[2] / 4) * (m - k) / 255 + k;
+      *out++ = (255 - in[0] / 4) * (y - k) / 255 + k;
+      in += 3;
+      count --;
+    }
+}
+
+
+/*
+ * 'ImageRGBToCMYK()' - Convert RGB colors to CMYK.
+ */
+
+void
+ImageRGBToCMYK(ib_t *in,	/* I - Input pixels */
+               ib_t *out,	/* I - Output pixels */
+               int  count)	/* I - Number of pixels */
+{
+  int	c, m, y, k,		/* CMYK values */
+	diff,			/* Color differences */
+	divk;			/* Color divisor */
+  int	cc, cm, cy;		/* Calibrated CMY values */
+
+
+  if (ImageHaveProfile)
+    while (count > 0)
+    {
+      c = 255 - *in++;
+      m = 255 - *in++;
+      y = 255 - *in++;
+      k = min(c, min(m, y));
+
+      diff = 255 - (max(c, max(m, y)) - k);
+      k = k * diff / 255;
+
+      if (k == 255)
+        c = m = y = 0;
+      else if (k > 0)
+      {
+        divk = 255 - k;
+	c    = 255 * (c - k) / divk;
+	m    = 255 * (m - k) / divk;
+	y    = 255 * (y - k) / divk;
+
+	if (c > 255)
+	  c = 255;
+
+	if (m > 255)
+	  m = 255;
+
+	if (y > 255)
+	  y = 255;
+      }
+
+      cc = (ImageMatrix[0][0][c] +
+            ImageMatrix[0][1][m] +
+	    ImageMatrix[0][2][y]);
+      cm = (ImageMatrix[1][0][c] +
+            ImageMatrix[1][1][m] +
+	    ImageMatrix[1][2][y]);
+      cy = (ImageMatrix[2][0][c] +
+            ImageMatrix[2][1][m] +
+	    ImageMatrix[2][2][y]);
+
+      if (cc < 0)
+        *out++ = 0;
+      else if (cc > 255)
+        *out++ = ImageDensity[255];
+      else
+        *out++ = ImageDensity[cc];
+
+      if (cm < 0)
+        *out++ = 0;
+      else if (cm > 255)
+        *out++ = ImageDensity[255];
+      else
+        *out++ = ImageDensity[cm];
+
+      if (cy < 0)
+        *out++ = 0;
+      else if (cy > 255)
+        *out++ = ImageDensity[255];
+      else
+        *out++ = cy;
+
+      *out++ = ImageDensity[k];
+
+      count --;
+    }
+  else
+    while (count > 0)
+    {
+      c = 255 - *in++;
+      m = 255 - *in++;
+      y = 255 - *in++;
+      k = min(c, min(m, y));
+
+      if (k == 255)
+        c = m = y = 0;
+      else if (k > 0)
+      {
+        divk = 255 - k;
+	c    = 255 * (c - k) / divk;
+	m    = 255 * (m - k) / divk;
+	y    = 255 * (y - k) / divk;
+
+	if (c > 255)
+	  c = 255;
+
+	if (m > 255)
+	  m = 255;
+
+	if (y > 255)
+	  y = 255;
+      }
+
+      *out++ = c;
+      *out++ = m;
+      *out++ = y;
+      *out++ = k;
+
+      count --;
+    }
+}
+
+
+/*
+ * 'ImageRGBToWhite()' - Convert RGB colors to luminance.
+ */
+
+void
+ImageRGBToWhite(ib_t *in,	/* I - Input pixels */
+                ib_t *out,	/* I - Output pixels */
+                int  count)	/* I - Number of pixels */
+{
+  if (ImageHaveProfile)
+    while (count > 0)
+    {
+      *out++ = 255 - ImageDensity[255 - (31 * in[0] + 61 * in[1] + 8 * in[2]) / 100];
+      in += 3;
+      count --;
+    }
+  else
+    while (count > 0)
+    {
+      *out++ = (31 * in[0] + 61 * in[1] + 8 * in[2]) / 100;
+      in += 3;
+      count --;
+    }
+}
+
+
+/*
+ * 'ImageRGBToRGB()' - Convert RGB colors to device-dependent RGB.
+ */
+
+void
+ImageRGBToRGB(ib_t *in,		/* I - Input pixels */
+              ib_t *out,	/* I - Output pixels */
+              int  count)	/* I - Number of pixels */
+{
+  int	c, m, y, k;		/* CMYK values */
+  int	cr, cg, cb;		/* Calibrated RGB values */
+
+
+  if (ImageHaveProfile)
+    while (count > 0)
+    {
+      c = 255 - *in++;
+      m = 255 - *in++;
+      y = 255 - *in++;
+      k = min(c, min(m, y));
+      c -= k;
+      m -= k;
+      y -= k;
+
+      cr = ImageMatrix[0][0][c] +
+           ImageMatrix[0][1][m] +
+           ImageMatrix[0][2][y] + k;
+      cg = ImageMatrix[1][0][c] +
+           ImageMatrix[1][1][m] +
+	   ImageMatrix[1][2][y] + k;
+      cb = ImageMatrix[2][0][c] +
+           ImageMatrix[2][1][m] +
+	   ImageMatrix[2][2][y] + k;
+
+      if (cr < 0)
+        *out++ = 255;
+      else if (cr > 255)
+        *out++ = 255 - ImageDensity[255];
+      else
+        *out++ = 255 - ImageDensity[cr];
+
+      if (cg < 0)
+        *out++ = 255;
+      else if (cg > 255)
+        *out++ = 255 - ImageDensity[255];
+      else
+        *out++ = 255 - ImageDensity[cg];
+
+      if (cb < 0)
+        *out++ = 255;
+      else if (cb > 255)
+        *out++ = 255 - ImageDensity[255];
+      else
+        *out++ = 255 - ImageDensity[cb];
+
+      count --;
+    }
+  else if (in != out)
+    memcpy(out, in, count * 3);
+}
+
+
+/*
+ * 'ImageLut()' - Adjust all pixel values with the given LUT.
+ */
+
+void
+ImageLut(ib_t *pixels,	/* I - Input/output pixels */
+         int  count,	/* I - Number of pixels/bytes to adjust */
+         ib_t *lut)	/* I - Lookup table */
+{
+  while (count > 0)
+  {
+    *pixels = lut[*pixels];
+    pixels ++;
+    count --;
+  }
+}
+
+
+/*
+ * 'ImageRGBAdjust()' - Adjust the hue and saturation of the given RGB colors.
+ */
+
+void
+ImageRGBAdjust(ib_t *pixels,	/* I - Input/output pixels */
+               int  count,	/* I - Number of pixels to adjust */
+               int  saturation,	/* I - Color saturation (%) */
+               int  hue)	/* I - Color hue (degrees) */
+{
+  int		i, j, k;	/* Looping vars */
+  float		mat[3][3];	/* Color adjustment matrix */
+  static int	last_sat = 100,	/* Last saturation used */
+		last_hue = 0;	/* Last hue used */
+  static int	lut[3][3][256];	/* Lookup table for matrix */
+
+
+  if (saturation != last_sat ||
+      hue != last_hue)
+  {
+   /*
+    * Build the color adjustment matrix...
+    */
+
+    ident(mat);
+    saturate(mat, saturation * 0.01);
+    huerotate(mat, (float)hue);
+
+   /*
+    * Convert the matrix into a 3x3 array of lookup tables...
+    */
+
+    for (i = 0; i < 3; i ++)
+      for (j = 0; j < 3; j ++)
+        for (k = 0; k < 256; k ++)
+          lut[i][j][k] = mat[i][j] * k + 0.5;
+
+   /*
+    * Save the saturation and hue to compare later...
+    */
+
+    last_sat = saturation;
+    last_hue = hue;
+  }
+
+ /*
+  * Adjust each pixel in the given buffer.
+  */
+
+  while (count > 0)
+  {
+    i = lut[0][0][pixels[0]] +
+        lut[1][0][pixels[1]] +
+        lut[2][0][pixels[2]];
+    if (i < 0)
+      pixels[0] = 0;
+    else if (i > 255)
+      pixels[0] = 255;
+    else
+      pixels[0] = i;
+
+    i = lut[0][1][pixels[0]] +
+        lut[1][1][pixels[1]] +
+        lut[2][1][pixels[2]];
+    if (i < 0)
+      pixels[1] = 0;
+    else if (i > 255)
+      pixels[1] = 255;
+    else
+      pixels[1] = i;
+
+    i = lut[0][2][pixels[0]] +
+        lut[1][2][pixels[1]] +
+        lut[2][2][pixels[2]];
+    if (i < 0)
+      pixels[2] = 0;
+    else if (i > 255)
+      pixels[2] = 255;
+    else
+      pixels[2] = i;
+
+    count --;
+    pixels += 3;
+  }
+}
+
+
+/*
+ * The color saturation/hue matrix stuff is provided thanks to Mr. Paul
+ * Haeberli at "http://www.sgi.com/grafica/matrix/index.html".
+ */
+
+/* 
+ * 'huerotate()' - Rotate the hue, maintaining luminance.
+ */
+
+static void
+huerotate(float mat[3][3],	/* I - Matrix to append to */
+          float rot)		/* I - Hue rotation in degrees */
+{
+  float hmat[3][3];		/* Hue matrix */
+  float lx, ly, lz;		/* Luminance vector */
+  float xrs, xrc;		/* X rotation sine/cosine */
+  float yrs, yrc;		/* Y rotation sine/cosine */
+  float zrs, zrc;		/* Z rotation sine/cosine */
+  float zsx, zsy;		/* Z shear x/y */
+
+
+ /*
+  * Load the identity matrix...
+  */
+
+  ident(hmat);
+
+ /*
+  * Rotate the grey vector into positive Z...
+  */
+
+  xrs = M_SQRT1_2;
+  xrc = M_SQRT1_2;
+  xrotate(hmat,xrs,xrc);
+
+  yrs = -1.0 / sqrt(3.0);
+  yrc = -M_SQRT2 * yrs;
+  yrotate(hmat,yrs,yrc);
+
+ /*
+  * Shear the space to make the luminance plane horizontal...
+  */
+
+  xform(hmat, 0.3086, 0.6094, 0.0820, &lx, &ly, &lz);
+  zsx = lx / lz;
+  zsy = ly / lz;
+  zshear(hmat, zsx, zsy);
+
+ /*
+  * Rotate the hue...
+  */
+
+  zrs = sin(rot * M_PI / 180.0);
+  zrc = cos(rot * M_PI / 180.0);
+
+  zrotate(hmat, zrs, zrc);
+
+ /*
+  * Unshear the space to put the luminance plane back...
+  */
+
+  zshear(hmat, -zsx, -zsy);
+
+ /*
+  * Rotate the grey vector back into place...
+  */
+
+  yrotate(hmat, -yrs, yrc);
+  xrotate(hmat, -xrs, xrc);
+
+ /*
+  * Append it to the current matrix...
+  */
+
+  mult(hmat, mat, mat);
+}
+
+
+/* 
+ * 'ident()' - Make an identity matrix.
+ */
+
+static void
+ident(float mat[3][3])	/* I - Matrix to identify */
+{
+  mat[0][0] = 1.0;
+  mat[0][1] = 0.0;
+  mat[0][2] = 0.0;
+  mat[1][0] = 0.0;
+  mat[1][1] = 1.0;
+  mat[1][2] = 0.0;
+  mat[2][0] = 0.0;
+  mat[2][1] = 0.0;
+  mat[2][2] = 1.0;
+}
+
+
+/* 
+ * 'mult()' - Multiply two matrices.
+ */
+
+static void
+mult(float a[3][3],	/* I - First matrix */
+     float b[3][3],	/* I - Second matrix */
+     float c[3][3])	/* I - Destination matrix */
+{
+  int	x, y;		/* Looping vars */
+  float	temp[3][3];	/* Temporary matrix */
+
+
+ /*
+  * Multiply a and b, putting the result in temp...
+  */
+
+  for (y = 0; y < 3; y ++)
+    for (x = 0; x < 3; x ++)
+      temp[y][x] = b[y][0] * a[0][x] +
+                   b[y][1] * a[1][x] +
+                   b[y][2] * a[2][x];
+
+ /*
+  * Copy temp to c (that way c can be a pointer to a or b).
+  */
+
+  memcpy(c, temp, sizeof(temp));
+}
+
+
+/* 
+ * 'saturate()' - Make a saturation matrix.
+ */
+
+static void
+saturate(float mat[3][3],	/* I - Matrix to append to */
+         float sat)		/* I - Desired color saturation */
+{
+  float	smat[3][3];		/* Saturation matrix */
+
+
+  smat[0][0] = (1.0 - sat) * 0.3086 + sat;
+  smat[0][1] = (1.0 - sat) * 0.3086;
+  smat[0][2] = (1.0 - sat) * 0.3086;
+  smat[1][0] = (1.0 - sat) * 0.6094;
+  smat[1][1] = (1.0 - sat) * 0.6094 + sat;
+  smat[1][2] = (1.0 - sat) * 0.6094;
+  smat[2][0] = (1.0 - sat) * 0.0820;
+  smat[2][1] = (1.0 - sat) * 0.0820;
+  smat[2][2] = (1.0 - sat) * 0.0820 + sat;
+
+  mult(smat, mat, mat);
+}
+
+
+/* 
+ * 'xform()' - Transform a 3D point using a matrix...
+ */
+
+static void
+xform(float mat[3][3],	/* I - Matrix */
+      float x,		/* I - Input X coordinate */
+      float y,		/* I - Input Y coordinate */
+      float z,		/* I - Input Z coordinate */
+      float *tx,	/* O - Output X coordinate */
+      float *ty,	/* O - Output Y coordinate */
+      float *tz)	/* O - Output Z coordinate */
+{
+  *tx = x * mat[0][0] + y * mat[1][0] + z * mat[2][0];
+  *ty = x * mat[0][1] + y * mat[1][1] + z * mat[2][1];
+  *tz = x * mat[0][2] + y * mat[1][2] + z * mat[2][2];
+}
+
+
+/* 
+ * 'xrotate()' - Rotate about the x (red) axis...
+ */
+
+static void
+xrotate(float mat[3][3],	/* I - Matrix */
+        float rs,		/* I - Rotation angle sine */
+        float rc)		/* I - Rotation angle cosine */
+{
+  float rmat[3][3];		/* I - Rotation matrix */
+
+
+  rmat[0][0] = 1.0;
+  rmat[0][1] = 0.0;
+  rmat[0][2] = 0.0;
+
+  rmat[1][0] = 0.0;
+  rmat[1][1] = rc;
+  rmat[1][2] = rs;
+
+  rmat[2][0] = 0.0;
+  rmat[2][1] = -rs;
+  rmat[2][2] = rc;
+
+  mult(rmat, mat, mat);
+}
+
+
+/* 
+ * 'yrotate()' - Rotate about the y (green) axis...
+ */
+
+static void
+yrotate(float mat[3][3],	/* I - Matrix */
+        float rs,		/* I - Rotation angle sine */
+        float rc)		/* I - Rotation angle cosine */
+{
+  float rmat[3][3];		/* I - Rotation matrix */
+
+
+  rmat[0][0] = rc;
+  rmat[0][1] = 0.0;
+  rmat[0][2] = -rs;
+
+  rmat[1][0] = 0.0;
+  rmat[1][1] = 1.0;
+  rmat[1][2] = 0.0;
+
+  rmat[2][0] = rs;
+  rmat[2][1] = 0.0;
+  rmat[2][2] = rc;
+
+  mult(rmat,mat,mat);
+}
+
+
+/* 
+ * 'zrotate()' - Rotate about the z (blue) axis...
+ */
+
+static void
+zrotate(float mat[3][3],	/* I - Matrix */
+        float rs,		/* I - Rotation angle sine */
+        float rc)		/* I - Rotation angle cosine */
+{
+  float rmat[3][3];		/* I - Rotation matrix */
+
+
+  rmat[0][0] = rc;
+  rmat[0][1] = rs;
+  rmat[0][2] = 0.0;
+
+  rmat[1][0] = -rs;
+  rmat[1][1] = rc;
+  rmat[1][2] = 0.0;
+
+  rmat[2][0] = 0.0;
+  rmat[2][1] = 0.0;
+  rmat[2][2] = 1.0;
+
+  mult(rmat,mat,mat);
+}
+
+
+/* 
+ * 'zshear()' - Shear z using x and y...
+ */
+
+static void
+zshear(float mat[3][3],	/* I - Matrix */
+       float dx,	/* I - X shear */
+       float dy)	/* I - Y shear */
+{
+  float smat[3][3];	/* Shear matrix */
+
+
+  smat[0][0] = 1.0;
+  smat[0][1] = 0.0;
+  smat[0][2] = dx;
+
+  smat[1][0] = 0.0;
+  smat[1][1] = 1.0;
+  smat[1][2] = dy;
+
+  smat[2][0] = 0.0;
+  smat[2][1] = 0.0;
+  smat[2][2] = 1.0;
+
+  mult(smat, mat, mat);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,644 @@
+/*
+ * "$Id$"
+ *
+ *   GIF image routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   ImageReadGIF()   - Read a GIF image file.
+ *   gif_read_cmap()  - Read the colormap from a GIF file...
+ *   gif_get_block()  - Read a GIF data block...
+ *   gif_get_code()   - Get a LZW code from the file...
+ *   gif_read_lzw()   - Read a byte from the LZW stream...
+ *   gif_read_image() - Read a GIF image stream...
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "image.h"
+
+
+/*
+ * GIF definitions...
+ */
+
+#define GIF_INTERLACE	0x40
+#define GIF_COLORMAP	0x80
+
+typedef ib_t	gif_cmap_t[256][4];
+
+
+/*
+ * Local globals...
+ */
+
+static int	gif_eof = 0;		/* Did we hit EOF? */
+
+
+/*
+ * Local functions...
+ */
+
+static int	gif_read_cmap(FILE *fp, int ncolors, gif_cmap_t cmap,
+		              int *gray);
+static int	gif_get_block(FILE *fp, unsigned char *buffer);
+static int	gif_get_code (FILE *fp, int code_size, int first_time);
+static int	gif_read_lzw(FILE *fp, int first_time, int input_code_size);
+static int	gif_read_image(FILE *fp, image_t *img, gif_cmap_t cmap,
+		               int interlace);
+
+
+/*
+ * 'ImageReadGIF()' - Read a GIF image file.
+ */
+
+int				/* O - Read status */
+ImageReadGIF(image_t *img,	/* IO - Image */
+             FILE    *fp,	/* I - Image file */
+             int     primary,	/* I - Primary choice for colorspace */
+             int     secondary,	/* I - Secondary choice for colorspace */
+             int     saturation,/* I - Color saturation (%) */
+             int     hue,	/* I - Color hue (degrees) */
+	     ib_t    *lut)	/* I - Lookup table for gamma/brightness */
+{
+  unsigned char	buf[1024];	/* Input buffer */
+  gif_cmap_t	cmap;		/* Colormap */
+  int		i,		/* Looping var */
+		bpp,		/* Bytes per pixel */
+		gray,		/* Grayscale image? */
+		ncolors,	/* Bits per pixel */
+		transparent;	/* Transparent color index */
+
+
+ /*
+  * Read the header; we already know it is a GIF file...
+  */
+
+  fread(buf, 13, 1, fp);
+
+  img->xsize = (buf[7] << 8) | buf[6];
+  img->ysize = (buf[9] << 8) | buf[8];
+  ncolors    = 2 << (buf[10] & 0x07);
+  gray       = primary == IMAGE_BLACK || primary == IMAGE_WHITE;
+
+  if (buf[10] & GIF_COLORMAP)
+    if (gif_read_cmap(fp, ncolors, cmap, &gray))
+    {
+      fclose(fp);
+      return (-1);
+    }
+
+  transparent = -1;
+
+  for (;;)
+  {
+    switch (getc(fp))
+    {
+      case ';' :	/* End of image */
+          fclose(fp);
+          return (-1);		/* Early end of file */
+
+      case '!' :	/* Extension record */
+          buf[0] = getc(fp);
+          if (buf[0] == 0xf9)	/* Graphic Control Extension */
+          {
+            gif_get_block(fp, buf);
+            if (buf[0] & 1)	/* Get transparent color index */
+              transparent = buf[3];
+          }
+
+          while (gif_get_block(fp, buf) != 0);
+          break;
+
+      case ',' :	/* Image data */
+          fread(buf, 9, 1, fp);
+
+          if (buf[8] & GIF_COLORMAP)
+          {
+            ncolors = 2 << (buf[8] & 0x07);
+            gray = primary == IMAGE_BLACK || primary == IMAGE_WHITE;
+
+	    if (gif_read_cmap(fp, ncolors, cmap, &gray))
+	    {
+              fclose(fp);
+	      return (-1);
+	    }
+	  }
+
+          if (transparent >= 0)
+          {
+           /*
+            * Make transparent color white...
+            */
+
+            cmap[transparent][0] = 255;
+            cmap[transparent][1] = 255;
+            cmap[transparent][2] = 255;
+          }
+
+	  if (gray)
+	  {
+	    switch (secondary)
+	    {
+              case IMAGE_CMYK :
+        	  for (i = ncolors - 1; i >= 0; i --)
+        	    ImageWhiteToCMYK(cmap[i], cmap[i], 1);
+        	  break;
+              case IMAGE_CMY :
+        	  for (i = ncolors - 1; i >= 0; i --)
+        	    ImageWhiteToCMY(cmap[i], cmap[i], 1);
+        	  break;
+              case IMAGE_BLACK :
+        	  for (i = ncolors - 1; i >= 0; i --)
+        	    ImageWhiteToBlack(cmap[i], cmap[i], 1);
+        	  break;
+              case IMAGE_WHITE :
+        	  break;
+              case IMAGE_RGB :
+        	  for (i = ncolors - 1; i >= 0; i --)
+        	    ImageWhiteToRGB(cmap[i], cmap[i], 1);
+        	  break;
+	    }
+
+            img->colorspace = secondary;
+	  }
+	  else
+	  {
+	    if (hue != 0 || saturation != 100)
+              for (i = ncolors - 1; i >= 0; i --)
+        	ImageRGBAdjust(cmap[i], 1, saturation, hue);
+
+	    switch (primary)
+	    {
+              case IMAGE_CMYK :
+        	  for (i = ncolors - 1; i >= 0; i --)
+        	    ImageRGBToCMYK(cmap[i], cmap[i], 1);
+        	  break;
+              case IMAGE_CMY :
+        	  for (i = ncolors - 1; i >= 0; i --)
+        	    ImageRGBToCMY(cmap[i], cmap[i], 1);
+        	  break;
+              case IMAGE_BLACK :
+        	  for (i = ncolors - 1; i >= 0; i --)
+        	    ImageRGBToBlack(cmap[i], cmap[i], 1);
+        	  break;
+              case IMAGE_WHITE :
+        	  for (i = ncolors - 1; i >= 0; i --)
+        	    ImageRGBToWhite(cmap[i], cmap[i], 1);
+        	  break;
+              case IMAGE_RGB :
+        	  break;
+	    }
+
+            img->colorspace = primary;
+	  }
+
+          if (lut)
+	  {
+	    bpp = ImageGetDepth(img);
+
+            for (i = ncolors - 1; i >= 0; i --)
+              ImageLut(cmap[i], bpp, lut);
+	  }
+
+          img->xsize = (buf[5] << 8) | buf[4];
+          img->ysize = (buf[7] << 8) | buf[6];
+
+	  i = gif_read_image(fp, img, cmap, buf[8] & GIF_INTERLACE);
+          fclose(fp);
+          return (i);
+    }
+  }
+}
+
+
+/*
+ * 'gif_read_cmap()' - Read the colormap from a GIF file...
+ */
+
+static int
+gif_read_cmap(FILE       *fp,
+  	      int        ncolors,
+	      gif_cmap_t cmap,
+	      int        *gray)
+{
+  int	i;
+
+
+ /*
+  * Read the colormap...
+  */
+
+  for (i = 0; i < ncolors; i ++)
+    if (fread(cmap[i], 3, 1, fp) < 1)
+      return (-1);
+
+ /*
+  * Check to see if the colormap is a grayscale ramp...
+  */
+
+  for (i = 0; i < ncolors; i ++)
+    if (cmap[i][0] != cmap[i][1] || cmap[i][1] != cmap[i][2])
+      break;
+
+  if (i == ncolors)
+  {
+    *gray = 1;
+    return (0);
+  }
+
+ /*
+  * If this needs to be a grayscale image, convert the RGB values to
+  * luminance values...
+  */
+
+  if (*gray)
+    for (i = 0; i < ncolors; i ++)
+      cmap[i][0] = (cmap[i][0] * 31 + cmap[i][1] * 61 + cmap[i][2] * 8) / 100;
+
+  return (0);
+}
+
+
+/*
+ * 'gif_get_block()' - Read a GIF data block...
+ */
+
+static int				/* O - Number characters read */
+gif_get_block(FILE          *fp,	/* I - File to read from */
+	      unsigned char *buf)	/* I - Input buffer */
+{
+  int	count;				/* Number of character to read */
+
+
+ /*
+  * Read the count byte followed by the data from the file...
+  */
+
+  if ((count = getc(fp)) == EOF)
+  {
+    gif_eof = 1;
+    return (-1);
+  }
+  else if (count == 0)
+    gif_eof = 1;
+  else if (fread(buf, 1, count, fp) < count)
+  {
+    gif_eof = 1;
+    return (-1);
+  }
+  else
+    gif_eof = 0;
+
+  return (count);
+}
+
+
+/*
+ * 'gif_get_code()' - Get a LZW code from the file...
+ */
+
+static int			/* O - LZW code */
+gif_get_code(FILE *fp,		/* I - File to read from */
+	     int  code_size,	/* I - Size of code in bits */
+	     int  first_time)	/* I - 1 = first time, 0 = not first time */
+{
+  unsigned		i, j,		/* Looping vars */
+			ret;		/* Return value */
+  int			count;		/* Number of bytes read */
+  static unsigned char	buf[280];	/* Input buffer */
+  static unsigned	curbit,		/* Current bit */
+			lastbit,	/* Last bit in buffer */
+			done,		/* Done with this buffer? */
+			last_byte;	/* Last byte in buffer */
+  static unsigned char	bits[8] =	/* Bit masks for codes */
+			{
+			  0x01, 0x02, 0x04, 0x08,
+			  0x10, 0x20, 0x40, 0x80
+			};
+
+
+  if (first_time)
+  {
+   /*
+    * Just initialize the input buffer...
+    */
+
+    curbit  = 0;
+    lastbit = 0;
+    done    = 0;
+
+    return (0);
+  }
+
+
+  if ((curbit + code_size) >= lastbit)
+  {
+   /*
+    * Don't have enough bits to hold the code...
+    */
+
+    if (done)
+      return (-1);	/* Sorry, no more... */
+
+   /*
+    * Move last two bytes to front of buffer...
+    */
+
+    buf[0] = buf[last_byte - 2];
+    buf[1] = buf[last_byte - 1];
+
+   /*
+    * Read in another buffer...
+    */
+
+    if ((count = gif_get_block (fp, buf + 2)) <= 0)
+    {
+     /*
+      * Whoops, no more data!
+      */
+
+      done = 1;
+      return (-1);
+    }
+
+   /*
+    * Update buffer state...
+    */
+
+    last_byte = 2 + count;
+    curbit    = (curbit - lastbit) + 16;
+    lastbit   = last_byte * 8;
+  }
+
+  ret = 0;
+  for (ret = 0, i = curbit + code_size - 1, j = code_size;
+       j > 0;
+       i --, j --)
+    ret = (ret << 1) | ((buf[i / 8] & bits[i & 7]) != 0);
+
+  curbit += code_size;
+
+  return ret;
+}
+
+
+/*
+ * 'gif_read_lzw()' - Read a byte from the LZW stream...
+ */
+
+static int				/* I - Byte from stream */
+gif_read_lzw(FILE *fp,			/* I - File to read from */
+	     int  first_time,		/* I - 1 = first time, 0 = not first time */
+ 	     int  input_code_size)	/* I - Code size in bits */
+{
+  int		i,			/* Looping var */
+		code,			/* Current code */
+		incode;			/* Input code */
+  static short	fresh = 0,		/* 1 = empty buffers */
+		code_size,		/* Current code size */
+		set_code_size,		/* Initial code size set */
+		max_code,		/* Maximum code used */
+		max_code_size,		/* Maximum code size */
+		firstcode,		/* First code read */
+		oldcode,		/* Last code read */
+		clear_code,		/* Clear code for LZW input */
+		end_code,		/* End code for LZW input */
+		table[2][4096],		/* String table */
+		stack[8192],		/* Output stack */
+		*sp;			/* Current stack pointer */
+
+
+  if (first_time)
+  {
+   /*
+    * Setup LZW state...
+    */
+
+    set_code_size = input_code_size;
+    code_size     = set_code_size + 1;
+    clear_code    = 1 << set_code_size;
+    end_code      = clear_code + 1;
+    max_code_size = 2 * clear_code;
+    max_code      = clear_code + 2;
+
+   /*
+    * Initialize input buffers...
+    */
+
+    gif_get_code(fp, 0, 1);
+
+   /*
+    * Wipe the decompressor table...
+    */
+
+    fresh = 1;
+
+    for (i = 0; i < clear_code; i ++)
+    {
+      table[0][i] = 0;
+      table[1][i] = i;
+    }
+
+    for (; i < 4096; i ++)
+      table[0][i] = table[1][0] = 0;
+
+    sp = stack;
+
+    return (0);
+  }
+  else if (fresh)
+  {
+    fresh = 0;
+
+    do
+      firstcode = oldcode = gif_get_code(fp, code_size, 0);
+    while (firstcode == clear_code);
+
+    return (firstcode);
+  }
+
+  if (sp > stack)
+    return (*--sp);
+
+  while ((code = gif_get_code (fp, code_size, 0)) >= 0)
+  {
+    if (code == clear_code)
+    {
+      for (i = 0; i < clear_code; i ++)
+      {
+	table[0][i] = 0;
+	table[1][i] = i;
+      }
+
+      for (; i < 4096; i ++)
+	table[0][i] = table[1][i] = 0;
+
+      code_size     = set_code_size + 1;
+      max_code_size = 2 * clear_code;
+      max_code      = clear_code + 2;
+
+      sp = stack;
+
+      firstcode = oldcode = gif_get_code(fp, code_size, 0);
+
+      return (firstcode);
+    }
+    else if (code == end_code)
+    {
+      unsigned char	buf[260];
+
+
+      if (!gif_eof)
+        while (gif_get_block(fp, buf) > 0);
+
+      return (-2);
+    }
+
+    incode = code;
+
+    if (code >= max_code)
+    {
+      *sp++ = firstcode;
+      code  = oldcode;
+    }
+
+    while (code >= clear_code)
+    {
+      *sp++ = table[1][code];
+      if (code == table[0][code])
+	return (255);
+
+      code = table[0][code];
+    }
+
+    *sp++ = firstcode = table[1][code];
+    code  = max_code;
+
+    if (code < 4096)
+    {
+      table[0][code] = oldcode;
+      table[1][code] = firstcode;
+      max_code ++;
+
+      if (max_code >= max_code_size && max_code_size < 4096)
+      {
+	max_code_size *= 2;
+	code_size ++;
+      }
+    }
+
+    oldcode = incode;
+
+    if (sp > stack)
+      return (*--sp);
+  }
+
+  return (code);
+}
+
+
+/*
+ * 'gif_read_image()' - Read a GIF image stream...
+ */
+
+static int				/* I - 0 = success, -1 = failure */
+gif_read_image(FILE       *fp,		/* I - Input file */
+	       image_t    *img,		/* I - Image pointer */
+	       gif_cmap_t cmap,		/* I - Colormap */
+	       int        interlace)	/* I - Non-zero = interlaced image */
+{
+  unsigned char	code_size;		/* Code size */
+  ib_t		*pixels,		/* Pixel buffer */
+		*temp;			/* Current pixel */
+  int		xpos,			/* Current X position */
+		ypos,			/* Current Y position */
+		pass;			/* Current pass */
+  int		pixel;			/* Current pixel */
+  int		bpp;			/* Bytes per pixel */
+  static int	xpasses[4] = { 8, 8, 4, 2 },
+		ypasses[5] = { 0, 4, 2, 1, 999999 };
+
+
+  bpp       = ImageGetDepth(img);
+  pixels    = calloc(bpp, img->xsize);
+  xpos      = 0;
+  ypos      = 0;
+  pass      = 0;
+  code_size = getc(fp);
+
+  if (gif_read_lzw(fp, 1, code_size) < 0)
+    return (-1);
+
+  temp = pixels;
+  while ((pixel = gif_read_lzw(fp, 0, code_size)) >= 0)
+  {
+    switch (bpp)
+    {
+      case 4 :
+          temp[3] = cmap[pixel][3];
+      case 3 :
+          temp[2] = cmap[pixel][2];
+      case 2 :
+          temp[1] = cmap[pixel][1];
+      default :
+          temp[0] = cmap[pixel][0];
+    }
+
+    xpos ++;
+    temp += bpp;
+    if (xpos == img->xsize)
+    {
+      ImagePutRow(img, 0, ypos, img->xsize, pixels);
+
+      xpos = 0;
+      temp = pixels;
+
+      if (interlace)
+      {
+        ypos += xpasses[pass];
+
+        if (ypos >= img->ysize)
+	{
+	  pass ++;
+
+          ypos = ypasses[pass];
+	}
+      }
+      else
+	ypos ++;
+    }
+
+    if (ypos >= img->ysize)
+      break;
+  }
+
+  free(pixels);
+
+  return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,190 @@
+/*
+ * "$Id$"
+ *
+ *   JPEG image routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   ImageReadJPEG() - Read a JPEG image file.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "image.h"
+
+#ifdef HAVE_LIBJPEG
+#  include <jpeglib.h>	/* JPEG/JFIF image definitions */
+
+
+/*
+ * 'ImageReadJPEG()' - Read a JPEG image file.
+ */
+
+int					/* O - Read status */
+ImageReadJPEG(image_t *img,		/* IO - Image */
+              FILE    *fp,		/* I - Image file */
+              int     primary,		/* I - Primary choice for colorspace */
+              int     secondary,	/* I - Secondary choice for colorspace */
+              int     saturation,	/* I - Color saturation (%) */
+              int     hue,		/* I - Color hue (degrees) */
+	      ib_t    *lut)		/* I - Lookup table for gamma/brightness */
+{
+  struct jpeg_decompress_struct	cinfo;	/* Decompressor info */
+  struct jpeg_error_mgr		jerr;	/* Error handler info */
+  ib_t				*in,	/* Input pixels */
+				*out;	/* Output pixels */
+
+
+  (void)secondary;
+
+  cinfo.err = jpeg_std_error(&jerr);
+  jpeg_create_decompress(&cinfo);
+  jpeg_stdio_src(&cinfo, fp);
+  jpeg_read_header(&cinfo, 1);
+
+  cinfo.quantize_colors = 0;
+
+  if (cinfo.num_components == 1)
+  {
+    cinfo.out_color_space      = JCS_GRAYSCALE;
+    cinfo.out_color_components = 1;
+    cinfo.output_components    = 1;
+  }
+  else
+  {
+    cinfo.out_color_space      = JCS_RGB;
+    cinfo.out_color_components = 3;
+    cinfo.output_components    = 3;
+  }
+
+  jpeg_calc_output_dimensions(&cinfo);
+
+  img->xsize      = cinfo.output_width;
+  img->ysize      = cinfo.output_height;
+  img->colorspace = primary;
+
+  if (cinfo.X_density > 0 && cinfo.Y_density > 0 && cinfo.density_unit > 0)
+  {
+    if (cinfo.density_unit == 1)
+    {
+      img->xppi = cinfo.X_density;
+      img->yppi = cinfo.Y_density;
+    }
+    else
+    {
+      img->xppi = (int)((float)cinfo.X_density * 2.54);
+      img->yppi = (int)((float)cinfo.Y_density * 2.54);
+    }
+  }
+
+  ImageSetMaxTiles(img, 0);
+
+  in = malloc(img->xsize * cinfo.output_components);
+  if (primary < 0)
+    out = malloc(-img->xsize * primary);
+  else
+    out = malloc(img->xsize * primary);
+
+  jpeg_start_decompress(&cinfo);
+
+  while (cinfo.output_scanline < cinfo.output_height)
+  {
+    jpeg_read_scanlines(&cinfo, (JSAMPROW *)&in, (JDIMENSION)1);
+
+    if ((saturation != 100 || hue != 0) && cinfo.output_components > 1)
+      ImageRGBAdjust(in, img->xsize, saturation, hue);
+
+    if ((primary == IMAGE_WHITE && cinfo.out_color_space == JCS_GRAYSCALE) ||
+        (primary == IMAGE_RGB && cinfo.out_color_space == JCS_RGB))
+    {
+      if (lut)
+        ImageLut(in, img->xsize * ImageGetDepth(img), lut);
+
+      ImagePutRow(img, 0, cinfo.output_scanline - 1, img->xsize, in);
+    }
+    else if (cinfo.out_color_space == JCS_GRAYSCALE)
+    {
+      switch (primary)
+      {
+        case IMAGE_BLACK :
+            ImageWhiteToBlack(in, out, img->xsize);
+            break;
+        case IMAGE_RGB :
+            ImageWhiteToRGB(in, out, img->xsize);
+            break;
+        case IMAGE_CMY :
+            ImageWhiteToCMY(in, out, img->xsize);
+            break;
+        case IMAGE_CMYK :
+            ImageWhiteToCMYK(in, out, img->xsize);
+            break;
+      }
+
+      if (lut)
+        ImageLut(out, img->xsize * ImageGetDepth(img), lut);
+
+      ImagePutRow(img, 0, cinfo.output_scanline - 1, img->xsize, out);
+    }
+    else
+    {
+      switch (primary)
+      {
+        case IMAGE_WHITE :
+            ImageRGBToWhite(in, out, img->xsize);
+            break;
+        case IMAGE_BLACK :
+            ImageRGBToBlack(in, out, img->xsize);
+            break;
+        case IMAGE_CMY :
+            ImageRGBToCMY(in, out, img->xsize);
+            break;
+        case IMAGE_CMYK :
+            ImageRGBToCMYK(in, out, img->xsize);
+            break;
+      }
+
+      if (lut)
+        ImageLut(out, img->xsize * ImageGetDepth(img), lut);
+
+      ImagePutRow(img, 0, cinfo.output_scanline - 1, img->xsize, out);
+    }
+  }
+
+  free(in);
+  free(out);
+
+  jpeg_finish_decompress(&cinfo);
+  jpeg_destroy_decompress(&cinfo);
+
+  fclose(fp);
+
+  return (0);
+}
+
+
+#endif /* HAVE_LIBJPEG */
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,319 @@
+/*
+ * "$Id$"
+ *
+ *   PhotoCD routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   ImageReadPhotoCD() - Read a PhotoCD image file.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "image.h"
+
+
+/*
+ * PhotoCD support is currently limited to the 768x512 base image, which
+ * is only YCC encoded.  Support for the higher resolution images will
+ * require a lot of extra code...
+ */
+
+/*
+ * 'ImageReadPhotoCD()' - Read a PhotoCD image file.
+ */
+
+int					/* O - Read status */
+ImageReadPhotoCD(image_t *img,		/* IO - Image */
+        	 FILE    *fp,		/* I - Image file */
+        	 int     primary,	/* I - Primary choice for colorspace */
+        	 int     secondary,	/* I - Secondary choice for colorspace */
+        	 int     saturation,	/* I - Color saturation (%) */
+        	 int     hue,		/* I - Color hue (degrees) */
+		 ib_t    *lut)		/* I - Lookup table for gamma/brightness */
+{
+  int		x, y;		/* Looping vars */
+  int		xdir,		/* X direction */
+		xstart;		/* X starting point */
+  int		bpp;		/* Bytes per pixel */
+  int		pass;		/* Pass number */
+  int		rotation;	/* 0 for 768x512, 1 for 512x768 */
+  int		temp,		/* Adjusted luminance */
+		temp2,		/* Red, green, and blue values */
+		cb, cr;		/* Adjusted chroma values */
+  ib_t		*in,		/* Input (YCC) pixels */
+		*iy,		/* Luminance */
+		*icb,		/* Blue chroma */
+		*icr,		/* Red chroma */
+		*rgb,		/* RGB */
+		*rgbptr,	/* Pointer into RGB data */
+		*out;		/* Output pixels */
+
+
+  (void)secondary;
+
+ /*
+  * Get the image orientation...
+  */
+
+  fseek(fp, 72, SEEK_SET);
+  rotation = (getc(fp) & 63) != 8;
+
+ /*
+  * Seek to the start of the base image...
+  */
+
+  fseek(fp, 0x30000, SEEK_SET);
+
+ /*
+  * Allocate and initialize...
+  */
+
+  img->colorspace = primary;
+  img->xppi       = 128;
+  img->yppi       = 128;
+
+  if (rotation)
+  {
+    img->xsize = 512;
+    img->ysize = 768;
+  }
+  else
+  {
+    img->xsize = 768;
+    img->ysize = 512;
+  }
+
+  ImageSetMaxTiles(img, 0);
+
+  bpp = ImageGetDepth(img);
+  in  = malloc(768 * 3);
+  out = malloc(768 * bpp);
+
+  if (bpp > 1)
+    rgb = malloc(768 * 3);
+
+  if (rotation)
+  {
+    xstart = 767 * bpp;
+    xdir   = -2 * bpp;
+  }
+  else
+  {
+    xstart = 0;
+    xdir   = 0;
+  }
+
+ /*
+  * Read the image file...
+  */
+
+  for (y = 0; y < 512; y += 2)
+  {
+   /*
+    * Grab the next two scanlines:
+    *
+    *     YYYYYYYYYYYYYYY...
+    *     YYYYYYYYYYYYYYY...
+    *     CbCbCb...CrCrCr...
+    */
+
+    if (fread(in, 1, 768 * 3, fp) < (768 * 3))
+    {
+     /*
+      * Couldn't read a row of data - return an error!
+      */
+
+      free(in);
+      free(out);
+
+      return (-1);
+    }
+
+   /*
+    * Process the two scanlines...
+    */
+
+    for (pass = 0, iy = in; pass < 2; pass ++)
+    {
+      if (bpp == 1)
+      {
+       /*
+	* Just extract the luminance channel from the line and put it
+	* in the image...
+	*/
+
+        if (primary == IMAGE_BLACK)
+	{
+	  if (rotation)
+	  {
+	    for (rgbptr = out + xstart, x = 0; x < 768; x ++)
+	      *rgbptr-- = 255 - *iy++;
+
+	    if (lut)
+	      ImageLut(out, 768, lut);
+
+            ImagePutCol(img, 511 - y - pass, 0, 768, out);
+	  }
+	  else
+	  {
+            ImageWhiteToBlack(iy, out, 768);
+
+	    if (lut)
+	      ImageLut(out, 768, lut);
+
+            ImagePutRow(img, 0, y + pass, 768, out);
+            iy += 768;
+	  }
+	}
+	else if (rotation)
+	{
+	  for (rgbptr = out + xstart, x = 0; x < 768; x ++)
+	    *rgbptr-- = 255 - *iy++;
+
+	  if (lut)
+	    ImageLut(out, 768, lut);
+
+          ImagePutCol(img, 511 - y - pass, 0, 768, out);
+	}
+	else
+	{
+	  if (lut)
+	    ImageLut(iy, 768, lut);
+
+          ImagePutRow(img, 0, y + pass, 768, iy);
+          iy += 768;
+	}
+      }
+      else
+      {
+       /*
+        * Convert YCbCr to RGB...  While every pixel gets a luminance
+	* value, adjacent pixels share chroma information.
+	*/
+
+        for (x = 0, rgbptr = rgb + xstart, icb = in + 1536, icr = in + 1920;
+	     x < 768;
+	     x ++, iy ++, rgbptr += xdir)
+	{
+	  if (!(x & 1))
+	  {
+	    cb = (float)(*icb - 156);
+	    cr = (float)(*icr - 137);
+	  }
+
+          temp = 92241 * (*iy);
+
+	  temp2 = (temp + 86706 * cr) / 65536;
+	  if (temp2 < 0)
+	    *rgbptr++ = 0;
+	  else if (temp2 > 255)
+	    *rgbptr++ = 255;
+	  else
+	    *rgbptr++ = temp2;
+
+          temp2 = (temp - 25914 * cb - 44166 * cr) / 65536;
+	  if (temp2 < 0)
+	    *rgbptr++ = 0;
+	  else if (temp2 > 255)
+	    *rgbptr++ = 255;
+	  else
+	    *rgbptr++ = temp2;
+
+          temp2 = (temp + 133434 * cb) / 65536;
+	  if (temp2 < 0)
+	    *rgbptr++ = 0;
+	  else if (temp2 > 255)
+	    *rgbptr++ = 255;
+	  else
+	    *rgbptr++ = temp2;
+
+	  if (x & 1)
+	  {
+	    icb ++;
+	    icr ++;
+	  }
+	}
+
+       /*
+        * Adjust the hue and saturation if needed...
+	*/
+
+	if (saturation != 100 || hue != 0)
+	  ImageRGBAdjust(rgb, 768, saturation, hue);
+
+       /*
+        * Then convert the RGB data to the appropriate colorspace and
+	* put it in the image...
+	*/
+
+        if (img->colorspace == IMAGE_RGB)
+	{
+	  if (lut)
+	    ImageLut(rgb, 768 * 3, lut);
+
+	  if (rotation)
+            ImagePutCol(img, 511 - y - pass, 0, 768, rgb);
+	  else
+            ImagePutRow(img, 0, y + pass, 768, rgb);
+	}
+	else
+	{
+	  switch (img->colorspace)
+	  {
+	    case IMAGE_CMY :
+		ImageRGBToCMY(rgb, out, 768);
+		break;
+	    case IMAGE_CMYK :
+		ImageRGBToCMYK(rgb, out, 768);
+		break;
+	  }
+
+	  if (lut)
+	    ImageLut(out, 768 * bpp, lut);
+
+	  if (rotation)
+            ImagePutCol(img, 511 - y - pass, 0, 768, out);
+	  else
+            ImagePutRow(img, 0, y + pass, 768, out);
+	}
+      }
+    }
+  }
+
+ /*
+  * Free memory and return...
+  */
+
+  free(in);
+  free(out);
+  if (bpp > 1)
+    free(rgb);
+
+  return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,205 @@
+/*
+ * "$Id$"
+ *
+ *   PNG image routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   ImageReadPNG() - Read a PNG image file.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "image.h"
+
+#if defined(HAVE_LIBPNG) && defined(HAVE_LIBZ)
+#include <png.h>	/* Portable Network Graphics (PNG) definitions */
+
+
+/*
+ * 'ImageReadPNG()' - Read a PNG image file.
+ */
+
+int				/* O - Read status */
+ImageReadPNG(image_t *img,	/* IO - Image */
+             FILE    *fp,	/* I - Image file */
+             int     primary,	/* I - Primary choice for colorspace */
+             int     secondary,	/* I - Secondary choice for colorspace */
+             int     saturation,/* I - Color saturation (%) */
+             int     hue,	/* I - Color hue (degrees) */
+	     ib_t    *lut)	/* I - Lookup table for gamma/brightness */
+{
+  int		y;		/* Looping var */
+  png_structp	pp;		/* PNG read pointer */
+  png_infop	info;		/* PNG info pointers */
+  int		bpp;		/* Bytes per pixel */
+  ib_t		*in,		/* Input pixels */
+		*out;		/* Output pixels */
+
+
+ /*
+  * Setup the PNG data structures...
+  */
+
+  pp   = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+  info = png_create_info_struct(pp);
+
+ /*
+  * Initialize the PNG read "engine"...
+  */
+
+  png_init_io(pp, fp);
+
+ /*
+  * Get the image dimensions and load the output image...
+  */
+
+  png_read_info(pp, info);
+
+  if (info->color_type == PNG_COLOR_TYPE_PALETTE)
+    png_set_expand(pp);
+
+  if (info->color_type == PNG_COLOR_TYPE_GRAY ||
+      info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+    img->colorspace = secondary;
+  else
+    img->colorspace = primary;
+
+  img->xsize = info->width;
+  img->ysize = info->height;
+
+  if (info->valid & PNG_INFO_pHYs &&
+      info->phys_unit_type == PNG_RESOLUTION_METER)
+  {
+    img->xppi = (int)((float)info->x_pixels_per_unit * 0.0254);
+    img->yppi = (int)((float)info->y_pixels_per_unit * 0.0254);
+  }
+
+  ImageSetMaxTiles(img, 0);
+
+  if (info->bit_depth < 8)
+  {
+    png_set_packing(pp);
+
+    if (info->valid & PNG_INFO_sBIT)
+      png_set_shift(pp, &(info->sig_bit));
+  }
+  else if (info->bit_depth == 16)
+    png_set_strip_16(pp);
+
+  if (info->color_type == PNG_COLOR_TYPE_GRAY ||
+      info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+    in = malloc(img->xsize);
+  else
+    in = malloc(img->xsize * 3);
+
+  bpp = ImageGetDepth(img);
+  out = malloc(img->xsize * bpp);
+
+ /*
+  * This doesn't work for interlaced PNG files... :(
+  */
+
+  for (y = 0; y < img->ysize; y ++)
+  {
+    if (info->color_type == PNG_COLOR_TYPE_GRAY ||
+	 info->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+    {
+      if (img->colorspace == IMAGE_WHITE)
+        png_read_row(pp, (png_bytep)out, NULL);
+      else
+      {
+	png_read_row(pp, (png_bytep)in, NULL);
+
+	switch (img->colorspace)
+	{
+	  case IMAGE_RGB :
+	      ImageWhiteToRGB(in, out, img->xsize);
+	      break;
+	  case IMAGE_BLACK :
+	      ImageWhiteToBlack(in, out, img->xsize);
+	      break;
+	  case IMAGE_CMY :
+	      ImageWhiteToCMY(in, out, img->xsize);
+	      break;
+	  case IMAGE_CMYK :
+	      ImageWhiteToCMYK(in, out, img->xsize);
+	      break;
+	}
+      }
+    }
+    else
+    {
+      if (img->colorspace == IMAGE_RGB)
+      {
+        png_read_row(pp, (png_bytep)out, NULL);
+
+	if (saturation != 100 || hue != 0)
+	  ImageRGBAdjust(out, img->xsize, saturation, hue);
+      }
+      else
+      {
+	png_read_row(pp, (png_bytep)in, NULL);
+
+	if ((saturation != 100 || hue != 0) && bpp > 1)
+	  ImageRGBAdjust(in, img->xsize, saturation, hue);
+
+	switch (img->colorspace)
+	{
+	  case IMAGE_WHITE :
+	      ImageRGBToWhite(in, out, img->xsize);
+	      break;
+	  case IMAGE_BLACK :
+	      ImageRGBToBlack(in, out, img->xsize);
+	      break;
+	  case IMAGE_CMY :
+	      ImageRGBToCMY(in, out, img->xsize);
+	      break;
+	  case IMAGE_CMYK :
+	      ImageRGBToCMYK(in, out, img->xsize);
+	      break;
+	}
+      }
+    }
+
+    if (lut)
+      ImageLut(out, img->xsize * bpp, lut);
+
+    ImagePutRow(img, 0, y, img->xsize, out);
+  }
+
+  png_read_end(pp, info);
+  png_read_destroy(pp, info, NULL);
+
+  fclose(fp);
+
+  return (0);
+}
+
+
+#endif /* HAVE_LIBPNG && HAVE_LIBZ */
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,288 @@
+/*
+ * "$Id$"
+ *
+ *   Portable Any Map file routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   ImageReadPNM() - Read a PNM image file.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "image.h"
+#include <ctype.h>
+
+
+/*
+ * 'ImageReadPNM()' - Read a PNM image file.
+ */
+
+int				/* O - Read status */
+ImageReadPNM(image_t *img,	/* IO - Image */
+             FILE    *fp,	/* I - Image file */
+             int     primary,	/* I - Primary choice for colorspace */
+             int     secondary,	/* I - Secondary choice for colorspace */
+             int     saturation,/* I - Color saturation (%) */
+             int     hue,	/* I - Color hue (degrees) */
+	     ib_t    *lut)	/* I - Lookup table for gamma/brightness */
+{
+  int		x, y;		/* Looping vars */
+  int		bpp;		/* Bytes per pixel */
+  ib_t		*in,		/* Input pixels */
+		*inptr,		/* Current input pixel */
+		*out,		/* Output pixels */
+		*outptr,	/* Current output pixel */
+		bit;		/* Bit in input line */
+  char		line[255],	/* Input line */
+		*lineptr;	/* Pointer in line */
+  int		format,		/* Format of PNM file */
+		val,		/* Pixel value */
+		maxval;		/* Maximum pixel value */
+
+
+ /*
+  * Read the file header in the format:
+  *
+  *   Pformat
+  *   # comment1
+  *   # comment2
+  *   ...
+  *   # commentN
+  *   width
+  *   height
+  *   max sample
+  */
+
+  lineptr = fgets(line, sizeof(line), fp);
+  lineptr ++;
+
+  format = atoi(lineptr);
+  while (isdigit(*lineptr))
+    lineptr ++;
+
+  while (lineptr != NULL && img->xsize == 0)
+  {
+    if (*lineptr == '\0' || *lineptr == '#')
+      lineptr = fgets(line, sizeof(line), fp);
+    else if (isdigit(*lineptr))
+    {
+      img->xsize = atoi(lineptr);
+      while (isdigit(*lineptr))
+	lineptr ++;
+    }
+    else
+      lineptr ++;
+  }
+
+  while (lineptr != NULL && img->ysize == 0)
+  {
+    if (*lineptr == '\0' || *lineptr == '#')
+      lineptr = fgets(line, sizeof(line), fp);
+    else if (isdigit(*lineptr))
+    {
+      img->ysize = atoi(lineptr);
+      while (isdigit(*lineptr))
+	lineptr ++;
+    }
+    else
+      lineptr ++;
+  }
+
+  if (format != 1 && format != 4)
+  {
+    maxval = 0;
+
+    while (lineptr != NULL && maxval == 0)
+    {
+      if (*lineptr == '\0' || *lineptr == '#')
+	lineptr = fgets(line, sizeof(line), fp);
+      else if (isdigit(*lineptr))
+      {
+	maxval = atoi(lineptr);
+	while (isdigit(*lineptr))
+	  lineptr ++;
+      }
+      else
+	lineptr ++;
+    }
+  }
+  else
+    maxval = 1;
+
+  if (format == 1 || format == 2 || format == 4 || format == 5)
+    img->colorspace = secondary;
+  else
+    img->colorspace = primary;
+
+  ImageSetMaxTiles(img, 0);
+
+  bpp = ImageGetDepth(img);
+  in  = malloc(img->xsize * 3);
+  out = malloc(img->xsize * bpp);
+
+ /*
+  * Read the image file...
+  */
+
+  for (y = 0; y < img->ysize; y ++)
+  {
+    switch (format)
+    {
+      case 1 :
+      case 2 :
+          for (x = img->xsize, inptr = in; x > 0; x --, inptr ++)
+            if (fscanf(fp, "%d", &val) == 1)
+              *inptr = 255 * val / maxval;
+          break;
+
+      case 3 :
+          for (x = img->xsize, inptr = in; x > 0; x --, inptr += 3)
+          {
+            if (fscanf(fp, "%d", &val) == 1)
+              inptr[0] = 255 * val / maxval;
+            if (fscanf(fp, "%d", &val) == 1)
+              inptr[1] = 255 * val / maxval;
+            if (fscanf(fp, "%d", &val) == 1)
+              inptr[2] = 255 * val / maxval;
+          }
+          break;
+
+      case 4 :
+          fread(out, (img->xsize + 7) / 8, 1, fp);
+          for (x = img->xsize, inptr = in, outptr = out, bit = 128;
+               x > 0;
+               x --, inptr ++)
+          {
+            if (*outptr & bit)
+              *inptr = 255;
+            else
+              *inptr = 0;
+
+            if (bit > 1)
+              bit >>= 1;
+            else
+            {
+              bit = 128;
+              inptr ++;
+            }
+          }
+          break;
+
+      case 5 :
+          fread(in, img->xsize, 1, fp);
+          break;
+
+      case 6 :
+          fread(in, img->xsize, 3, fp);
+          break;
+    }
+
+    switch (format)
+    {
+      case 1 :
+      case 2 :
+      case 4 :
+      case 5 :
+          if (img->colorspace == IMAGE_WHITE)
+	  {
+	    if (lut)
+	      ImageLut(in, img->xsize, lut);
+
+            ImagePutRow(img, 0, y, img->xsize, in);
+	  }
+	  else
+	  {
+	    switch (img->colorspace)
+	    {
+	      case IMAGE_RGB :
+		  ImageWhiteToRGB(in, out, img->xsize);
+		  break;
+	      case IMAGE_BLACK :
+		  ImageWhiteToBlack(in, out, img->xsize);
+		  break;
+	      case IMAGE_CMY :
+		  ImageWhiteToCMY(in, out, img->xsize);
+		  break;
+	      case IMAGE_CMYK :
+		  ImageWhiteToCMYK(in, out, img->xsize);
+		  break;
+	    }
+
+	    if (lut)
+	      ImageLut(out, img->xsize * bpp, lut);
+
+            ImagePutRow(img, 0, y, img->xsize, out);
+	  }
+	  break;
+
+      default :
+	  if ((saturation != 100 || hue != 0) && bpp > 1)
+	    ImageRGBAdjust(in, img->xsize, saturation, hue);
+
+	  if (img->colorspace == IMAGE_RGB)
+	  {
+	    if (lut)
+	      ImageLut(in, img->xsize * 3, lut);
+
+            ImagePutRow(img, 0, y, img->xsize, in);
+	  }
+	  else
+	  {
+	    switch (img->colorspace)
+	    {
+	      case IMAGE_WHITE :
+		  ImageRGBToWhite(in, out, img->xsize);
+		  break;
+	      case IMAGE_BLACK :
+		  ImageRGBToBlack(in, out, img->xsize);
+		  break;
+	      case IMAGE_CMY :
+		  ImageRGBToCMY(in, out, img->xsize);
+		  break;
+	      case IMAGE_CMYK :
+		  ImageRGBToCMYK(in, out, img->xsize);
+		  break;
+	    }
+
+	    if (lut)
+	      ImageLut(out, img->xsize * bpp, lut);
+
+            ImagePutRow(img, 0, y, img->xsize, out);
+	  }
+  	  break;
+    }
+  }
+
+  free(in);
+  free(out);
+
+  fclose(fp);
+
+  return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -0,0 +1,267 @@
+/*
+ * "$Id$"
+ *
+ *   SGI image file routines for the Common UNIX Printing System (CUPS).
+ *
+ *   Copyright 1993-1999 by Easy Software Products.
+ *
+ *   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-3111 USA
+ *
+ *       Voice: (301) 373-9603
+ *       EMail: cups-info@cups.org
+ *         WWW: http://www.cups.org
+ *
+ * Contents:
+ *
+ *   ImageReadSGI() - Read a SGI image file.
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "image.h"
+#include "image-sgi.h"
+
+
+/*
+ * 'ImageReadSGI()' - Read a SGI image file.
+ */
+
+int				/* O - Read status */
+ImageReadSGI(image_t *img,	/* IO - Image */
+             FILE    *fp,	/* I - Image file */
+             int     primary,	/* I - Primary choice for colorspace */
+             int     secondary,	/* I - Secondary choice for colorspace */
+             int     saturation,/* I - Color saturation (%) */
+             int     hue,	/* I - Color hue (degrees) */
+	     ib_t    *lut)	/* I - Lookup table for gamma/brightness */
+{
+  int		i, y;		/* Looping vars */
+  int		bpp;		/* Bytes per pixel */
+  sgi_t		*sgip;		/* SGI image file */
+  ib_t		*in,		/* Input pixels */
+		*inptr,		/* Current input pixel */
+		*out;		/* Output pixels */
+  unsigned short *rows[4],	/* Row pointers for image data */
+		*red,
+		*green,
+		*blue,
+		*gray,
+		*alpha;
+
+
+ /*
+  * Setup the SGI file...
+  */
+
+  sgip = sgiOpenFile(fp, SGI_READ, 0, 0, 0, 0, 0);
+
+ /*
+  * Get the image dimensions and load the output image...
+  */
+
+  if (sgip->zsize < 3)
+    img->colorspace = secondary;
+  else
+    img->colorspace = primary;
+
+  img->xsize = sgip->xsize;
+  img->ysize = sgip->ysize;
+
+  ImageSetMaxTiles(img, 0);
+
+  bpp = ImageGetDepth(img);
+  in  = malloc(img->xsize * sgip->zsize);
+  out = malloc(img->xsize * bpp);
+
+  rows[0] = calloc(img->xsize * sgip->zsize, sizeof(unsigned short));
+  for (i = 1; i < sgip->zsize; i ++)
+    rows[i] = rows[0] + i * img->xsize;
+
+ /*
+  * Read the SGI image file...
+  */
+
+  for (y = 0; y < img->ysize; y ++)
+  {
+    for (i = 0; i < sgip->zsize; i ++)
+      sgiGetRow(sgip, rows[i], img->ysize - 1 - y, i);
+
+    switch (sgip->zsize)
+    {
+      case 1 :
+          if (sgip->bpp == 1)
+	    for (i = img->xsize - 1, gray = rows[0], inptr = in;
+		 i >= 0;
+		 i --)
+            {
+              *inptr++ = *gray++;
+            }
+          else
+	    for (i = img->xsize - 1, gray = rows[0], inptr = in;
+		 i >= 0;
+		 i --)
+            {
+              *inptr++ = (*gray++) / 256 + 128;
+            }
+          break;
+      case 2 :
+          if (sgip->bpp == 1)
+	    for (i = img->xsize - 1, gray = rows[0], alpha = rows[1], inptr = in;
+		 i >= 0;
+		 i --)
+            {
+              *inptr++ = (*gray++) * (*alpha++) / 255;
+            }
+          else
+	    for (i = img->xsize - 1, gray = rows[0], alpha = rows[1], inptr = in;
+		 i >= 0;
+		 i --)
+            {
+              *inptr++ = ((*gray++) / 256 + 128) * (*alpha++) / 32767;
+            }
+          break;
+      case 3 :
+          if (sgip->bpp == 1)
+	    for (i = img->xsize - 1, red = rows[0], green = rows[1],
+	             blue = rows[2], inptr = in;
+		 i >= 0;
+		 i --)
+            {
+              *inptr++ = *red++;
+              *inptr++ = *green++;
+              *inptr++ = *blue++;
+            }
+          else
+	    for (i = img->xsize - 1, red = rows[0], green = rows[1],
+	             blue = rows[2], inptr = in;
+		 i >= 0;
+		 i --)
+            {
+              *inptr++ = (*red++) / 256 + 128;
+              *inptr++ = (*green++) / 256 + 128;
+              *inptr++ = (*blue++) / 256 + 128;
+            }
+          break;
+      case 4 :
+          if (sgip->bpp == 1)
+	    for (i = img->xsize - 1, red = rows[0], green = rows[1],
+	             blue = rows[2], alpha = rows[3], inptr = in;
+		 i >= 0;
+		 i --)
+            {
+              *inptr++ = (*red++) * (*alpha) / 255;
+              *inptr++ = (*green++) * (*alpha) / 255;
+              *inptr++ = (*blue++) * (*alpha++) / 255;
+            }
+          else
+	    for (i = img->xsize - 1, red = rows[0], green = rows[1],
+	             blue = rows[2], inptr = in;
+		 i >= 0;
+		 i --)
+            {
+              *inptr++ = ((*red++) / 256 + 128) * (*alpha) / 32767;
+              *inptr++ = ((*green++) / 256 + 128) * (*alpha) / 32767;
+              *inptr++ = ((*blue++) / 256 + 128) * (*alpha++) / 32767;
+            }
+          break;
+    }
+
+    if (sgip->zsize < 3)
+    {
+      if (img->colorspace == IMAGE_WHITE)
+      {
+        if (lut)
+	  ImageLut(in, img->xsize, lut);
+
+        ImagePutRow(img, 0, y, img->xsize, in);
+      }
+      else
+      {
+	switch (img->colorspace)
+	{
+	  case IMAGE_RGB :
+	      ImageWhiteToRGB(in, out, img->xsize);
+	      break;
+	  case IMAGE_BLACK :
+	      ImageWhiteToBlack(in, out, img->xsize);
+	      break;
+	  case IMAGE_CMY :
+	      ImageWhiteToCMY(in, out, img->xsize);
+	      break;
+	  case IMAGE_CMYK :
+	      ImageWhiteToCMYK(in, out, img->xsize);
+	      break;
+	}
+
+        if (lut)
+	  ImageLut(out, img->xsize * bpp, lut);
+
+        ImagePutRow(img, 0, y, img->xsize, out);
+      }
+    }
+    else
+    {
+      if (img->colorspace == IMAGE_RGB)
+      {
+	if (saturation != 100 || hue != 0)
+	  ImageRGBAdjust(in, img->xsize, saturation, hue);
+
+        if (lut)
+	  ImageLut(in, img->xsize * 3, lut);
+
+        ImagePutRow(img, 0, y, img->xsize, in);
+      }
+      else
+      {
+	if ((saturation != 100 || hue != 0) && bpp > 1)
+	  ImageRGBAdjust(in, img->xsize, saturation, hue);
+
+	switch (img->colorspace)
+	{
+	  case IMAGE_WHITE :
+	      ImageRGBToWhite(in, out, img->xsize);
+	      break;
+	  case IMAGE_BLACK :
+	      ImageRGBToBlack(in, out, img->xsize);
+	      break;
+	  case IMAGE_CMY :
+	      ImageRGBToCMY(in, out, img->xsize);
+	      break;
+	  case IMAGE_CMYK :
+	      ImageRGBToCMYK(in, out, img->xsize);
+	      break;
+	}
+
+        if (lut)
+	  ImageLut(out, img->xsize * bpp, lut);
+
+        ImagePutRow(img, 0, y, img->xsize, out);
+      }
+    }
+  }
+
+  free(in);
+  free(out);
+  free(rows[0]);
+
+  sgiClose(sgip);
+
+  return (0);
+}
+
+
+/*
+ * End of "$Id$".
+ */
--- a/Mostrar Mais
+++ b/Mostrar Mais