Import cups.org releases

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

 <BODY BGCOLOR=#ffffff>

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

-<P ALIGN=CENTER>(Version 6, June 17, 1997)</P>
+<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>Copyright &copy; 1994, 1995, 1997 Aladdin Enterprises,<BR><BR>
-Menlo Park, California, U.S.A.  All rights reserved.</P>
+<H3>Introduction</H3>

-<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.
+<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>

-<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>
+<H3>Support</H3>

-<H2><FONT FACE="Arial,HELVETICA">0. Subject Matter</FONT></H2>
+<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.

-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.
+<H3>Trademarks</H3>

-<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.
+<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>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.
+<H2 ALIGN="CENTER">GNU General Public License</H2>

-<H2><FONT FACE="Arial,HELVETICA">1. Licenses</FONT></H2>
+<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

-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:
+<P ALIGN="CENTER">Everyone is permitted to copy and distribute verbatim
+copies of this license document, but changing it is not allowed.

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

-	<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>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 modify the PROGRAM, create works based on the
-	PROGRAM and distribute copies of such 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.)

 </OL>

-<H2><FONT FACE="Arial,HELVETICA">2. Restrictions</FONT></H2>
+<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.

-This license is subject to the following restrictions:
+<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.

-<OL TYPE=a>
+<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.

-	<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>
+<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:

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

-		<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 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>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 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,

-	</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>
+<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>

-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>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.

-<H2><FONT FACE="Arial,HELVETICA">3. Reservation of Rights</FONT></H2>
+<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.

-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 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.

-<H2><FONT FACE="Arial,HELVETICA">4. Other Restrictions</FONT></H2>
+<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.

-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>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.

-<H2><FONT FACE="Arial,HELVETICA">5. Limitations</FONT></H2>
+<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.

-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>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.

-<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>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.

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

-This License is governed by the laws of the State of Maryland, U.S.A.,
-excluding choice of law rules.
+<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.

-<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.
+<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>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:
+<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.

-<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>
+<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>

 </BODY>
 </HTML>
@@ -1,223 +0,0 @@
-                         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
-#       44145 Airport View Drive, Suite 204
+#       44141 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -31,14 +31,30 @@
 AR	=	@AR@
 AWK	=	@AWK@
 CC	=	@CC@
+CHMOD	=	@CHMOD@
 CP	=	@CP@
+DSO	=	@DSO@
 HTMLDOC	=	@HTMLDOC@
 LN	=	/bin/ln -sf
 MKDIR	=	@MKDIR@ -p
-NROFF	=	@GROFF@ -T ascii
+NROFF	=	@NROFF@
+PACK	=	@PACK@
 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...
@@ -50,12 +66,20 @@ SHELL	=	/bin/sh

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

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

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

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

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

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

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

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

@@ -55,12 +57,18 @@ 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)

 #
@@ -1,243 +0,0 @@
-<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,192 +1,195 @@
-README - CUPS v1.0b1
+README - CUPS v1.0b6 - 07/30/1999
+---------------------------------

-CONTENTS
+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

-   * 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.

-REQUIREMENTS
+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.

-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®.

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

-If you make changes to the man pages you'll need GNU groff or another
-nroff-like package.
+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.

-The documentation is formatted using the HTMLDOC software (again, not needed
-unless you make changes.)
+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".

-COMPILING CUPS

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

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

-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:
+    - 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)

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

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

-     % make ENTER
+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.

-to build the software.
+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.

-INSTALLING 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:

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

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

-CONFIGURING THE SOFTWARE

-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.
+SETTING UP PRINTER QUEUES

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

-     The printers.conf file configures each printer queue. You'll need to
-     add a listing for each printer on your system.
+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 classes.conf file configures each printer class. You'll need to add
-     a listing for each printer class you want.
+    Digital UNIX:

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

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

-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.
+        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/c2t0d0_lp -E

-RUNNING THE SOFTWARE
+    IRIX:

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

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

-USING THE SOFTWARE
+        /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

-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.
+    Solaris:

-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!
+        /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

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

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

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

-   * 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.
+PRINTING FILES

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

-   * 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)
+    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.

-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 Aladdin Free Public License which is
-located in the files "LICENSE.html" and "LICENSE.txt". For commercial
+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
 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 software at http://www.easysw.com/print.html.
+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
@@ -14,7 +14,7 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44145 Airport View Drive, Suite 204
+#       44141 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -24,8 +24,8 @@

 include ../Makedefs

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

 #
 # Make all targets...
@@ -47,12 +47,26 @@ 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.a
+lpd:	lpd.o ../cups/$(LIBCUPS)
+	echo Linking $@...
 	$(CC) $(LDFLAGS) -o lpd lpd.o $(LIBS)

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

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

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

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

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

-smb:	smb.o ../cups/libcups.a
-	$(CC) $(LDFLAGS) -o smb smb.o $(LIBS)
-
-smb.o:	../cups/cups.h ../Makedefs
+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

 #
 # socket
 #

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

 socket.o:	../cups/cups.h ../Makedefs
@@ -0,0 +1,399 @@
+/*
+ * "$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))
+    {
+      fputs("INFO: Unable to POST print request; retrying...\n", stderr);
+      sleep(10);
+      httpReconnect(http);
+      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;
+      }
+    }
+
+    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
- *       44145 Airport View Drive, Suite 204
+ *       44141 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -107,16 +107,16 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    int  bytes;		/* Number of bytes read */


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

    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
      if (fwrite(buffer, 1, bytes, fp) < bytes)
      {
-        perror("lpd: unable to write to temporary file");
+        perror("ERROR: 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, "lpd: lpd_command %02.2x %s", buf[0], buf + 1);
+  fprintf(stderr, "DEBUG: 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, "lpd: lpd_command returning %d\n", status);
+  fprintf(stderr, "DEBUG: 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("lpd: unable to stat print file");
+    perror("ERROR: unable to stat print file");
    return (1);
  }

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

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

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

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

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

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

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

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

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

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

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

    tbytes = 0;
@@ -375,7 +374,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("lpd: Data file sent successfully\n", stderr);
+      fputs("INFO: Data file sent successfully\n", stderr);
  }

 /*
@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44145 Airport View Drive, Suite 204
+ *       44141 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
- *       44145 Airport View Drive, Suite 204
+ *       44141 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -1,66 +0,0 @@
-/*
- * "$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$".
- */
@@ -0,0 +1,88 @@
+#!/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
-#       44145 Airport View Drive, Suite 204
+#       44141 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -24,8 +24,8 @@

 include ../Makedefs

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

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

 #
 # lpc
 #

-lpc:	lpc.o ../cups/libcups.a
+lpc:	lpc.o ../cups/$(LIBCUPS)
+	echo Linking $@...
 	$(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.a
+lpr:	lpr.o ../cups/$(LIBCUPS)
+	echo Linking $@...
 	$(CC) $(LDFLAGS) -o lpr lpr.o $(LIBS)

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

-lprm:	lprm.o ../cups/libcups.a
+lprm:	lprm.o ../cups/$(LIBCUPS)
+	echo Linking $@...
 	$(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("localhost", ippPort());
+  http = httpConnect(cupsServer(), ippPort());

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

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


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

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

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

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

 	  language = cupsLangDefault();

-	  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                	      "attributes-charset", NULL,
-			      cupsLangEncoding(language));
+	  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);
+	  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+                       "attributes-natural-language", NULL,
+		       language->language);

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

@@ -0,0 +1,369 @@
+/*
+ * "$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,20 +45,22 @@ main(int  argc,		/* I - Number of command-line arguments */
 {
  int		i;		/* Looping var */
  int		job_id;		/* Job ID */
-  char		*dest;		/* Destination printer */
-  char		*title;		/* Job title */
+  const char	*dest;		/* Destination printer */
+  const 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? */
+  int		silent,		/* Silent or verbose output? */
+		deletefile;	/* Delete file after print? */
  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;
@@ -84,6 +86,16 @@ 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;
@@ -96,10 +108,14 @@ 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;
@@ -177,6 +193,8 @@ 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]);
    }

 /*
@@ -191,7 +209,7 @@ main(int  argc,		/* I - Number of command-line arguments */
      return (1);
    }

-    temp = fopen(tmpnam(tempfile), "w");
+    temp = fopen(cupsTempFile(tempfile, sizeof(tempfile)), "w");

    if (temp == NULL)
    {
@@ -207,7 +225,7 @@ main(int  argc,		/* I - Number of command-line arguments */

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

@@ -216,9 +234,11 @@ main(int  argc,		/* I - Number of command-line arguments */
    else
      job_id = cupsPrintFile(dest, tempfile, "(stdin)", num_options, options);

+    unlink(tempfile);
+
    if (job_id < 1)
    {
-      fprintf(stderr, "lpr: unable to print file \'%s\'.\n", argv[i]);
+      fputs("lpr: unable to print standard input.\n", stderr);
      return (1);
    }
  }
@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44145 Airport View Drive, Suite 204
+ *       44141 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 */
-  char		*dest;		/* Destination printer */
+  const 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("localhost", ippPort())) == NULL)
+  if ((http = httpConnect(cupsServer(), 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, "http://localhost/printers/%s", dest);
+        sprintf(uri, "ipp://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, "http://localhost/jobs/%d", job_id);
+        sprintf(uri, "ipp://localhost/jobs/%d", job_id);
 	ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "job-uri", NULL,
 	             uri);
      }
@@ -169,7 +169,14 @@ 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
-#       44145 Airport View Drive, Suite 204
+#       44141 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -24,8 +24,7 @@

 include ../Makedefs

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

 #
@@ -49,11 +48,32 @@ 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.a
+printers.cgi:	printers.o ../Makedefs ../cups/$(LIBCUPS)
+	echo Linking $@...
 	$(CC) $(LDFLAGS) -o $@ printers.o $(LIBS)

 $(OBJS):	../Makedefs ../cups/cups.h ../cups/ipp.h ../cups/language.h
@@ -0,0 +1,484 @@
+/*
+ * "$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\">");
+#ifdef ESPPRINTPRO
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.easysw.com/printpro/software.html\" ALT=\"Download the Current ESP Print Pro Software\">");
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"505,10,585,30\" HREF=\"http://www.easysw.com/printpro/support.html\" ALT=\"Get Tech Support for Current ESP Print Pro\">");
+#else
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.cups.org\" ALT=\"Download the Current CUPS Software\">");
+#endif /* ESPPRINTPRO */
+  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>");
+#ifdef ESPPRINTPRO
+  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"600\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");
+#else
+  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"540\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");
+#endif /* ESPPRINTPRO */
+
+  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$".
+ */
@@ -0,0 +1,584 @@
+/*
+ * "$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 */
+
+
+ /*
+  * 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\">");
+#ifdef ESPPRINTPRO
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.easysw.com/printpro/software.html\" ALT=\"Download the Current ESP Print Pro Software\">");
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"505,10,585,30\" HREF=\"http://www.easysw.com/printpro/support.html\" ALT=\"Get Tech Support for Current ESP Print Pro\">");
+#else
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.cups.org\" ALT=\"Download the Current CUPS Software\">");
+#endif /* ESPPRINTPRO */
+  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>");
+#ifdef ESPPRINTPRO
+  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"600\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");
+#else
+  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"540\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");
+#endif /* ESPPRINTPRO */
+
+  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,7 +62,6 @@ main(int  argc,			/* I - Number of command-line arguments */
  http_t	*http;		/* Connection to the server */


-  setbuf(stdout, NULL);
 /*
  * Get the request language...
  */
@@ -104,18 +103,27 @@ 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,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("<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\">");
+#ifdef ESPPRINTPRO
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.easysw.com/printpro/software.html\" ALT=\"Download the Current ESP Print Pro Software\">");
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"505,10,585,30\" HREF=\"http://www.easysw.com/printpro/support.html\" ALT=\"Get Tech Support for Current ESP Print Pro\">");
+#else
+  puts("<AREA SHAPE=\"RECT\" COORDS=\"405,10,490,30\" HREF=\"http://www.cups.org\" ALT=\"Download the Current CUPS Software\">");
+#endif /* ESPPRINTPRO */
  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>");
+#ifdef ESPPRINTPRO
+  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"600\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");
+#else
  puts("<IMG SRC=\"/images/navbar.gif\" WIDTH=\"540\" HEIGHT=\"40\" USEMAP=\"#navbar\" BORDER=0>");
+#endif /* ESPPRINTPRO */

  printf("<H1>%s on %s</H1>\n", printer == NULL ? "Printers" : printer,
         getenv("SERVER_NAME"));
@@ -197,11 +205,11 @@ show_printer_list(http_t      *http,	/* I - HTTP connection */
  request->request.op.request_id   = 1;


-  attr = ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
-                      "attributes-charset", NULL, cupsLangEncoding(language));
+  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);
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE,
+               "attributes-natural-language", NULL, language->language);

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


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

-  if ((response = cupsDoRequest(http, request, uri + 15)) != NULL)
+  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)
  {
   /*
-    * Grab the needed printer attributes...
+    * Build an IPP_GET_JOBS request, which requires the following
+    * attributes:
+    *
+    *    attributes-charset
+    *    attributes-natural-language
+    *    printer-uri
    */

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

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

-    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_CHARSET,
+                 "attributes-charset", NULL,
+		 cupsLangEncoding(language));

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

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

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

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

-    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 */
+  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)
+    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)
      {
-       /*
-	* Skip leading attributes until we hit a job...
-	*/
+        if (strcmp(attr->name, "job-id") == 0 &&
+	    attr->value_tag == IPP_TAG_INTEGER)
+	  jobid = attr->values[0].integer;

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

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

-       /*
-	* 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;
+        attr = attr->next;
      }

-      ippDelete(jobs);
-    }
-      
-    if (jobcount == 0)
-      puts("None");
-    puts("</TD>");
-    puts("</TR>");
+     /*
+      * Display the job if it matches the current printer...
+      */

-    ippDelete(response);
+      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);
 }


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

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

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

 install:
 	-$(MKDIR) $(SERVERROOT)/conf
-	for file in $(FILES); do \
+	for file in $(KEEP); 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 349 1999-05-21 20:53:02Z mike $"
+# "$Id: cupsd.conf 628 1999-08-23 15:24:48Z mike $"
 #
 #   Sample configuration file for the Common UNIX Printing System (CUPS)
 #   scheduler.
@@ -53,6 +53,13 @@
 #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
@@ -63,20 +70,25 @@ Port 631
 # program is run...
 #

-User lp
-Group sys
+#User lp
+#Group sys

 #
 # SystemGroup: the group name for "System" (printer administration)
-# access.
+# access.  The default varies depending on the operating system, but
+# will be "sys", "system", or "root" (checked for in that order.)
 #

-SystemGroup sys
+#SystemGroup sys

 #
 # ServerName: the hostname of your server, as advertised to the world.
 # By default CUPS will use the hostname of the system.
 #
+# This is also the name used by clients when connecting to the local
+# server, so you can use this to configure a client machine without
+# a local server running.
+#

 #ServerName myhost.domain.com

@@ -264,10 +276,18 @@ 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 "32m" (32 megabytes).
+# (1 tile = 256x256 pixels.)  Defaults to "8m" (8 megabytes).
 #

-#RIPCache: 32m
+#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

 #
 # Access permissions for each directory served by the scheduler.
@@ -290,6 +310,23 @@ LogLevel info
 # Deny: denies access from the specified hostname, domain, IP address, or
 # network.
 #
+# Both "Allow" and "Deny" accept the following notations for addresses:
+#
+#     All
+#     None
+#     *.domain.com
+#     .domain.com
+#     host.domain.com
+#     nnn.*
+#     nnn.nnn.*
+#     nnn.nnn.nnn.*
+#     nnn.nnn.nnn.nnn
+#     nnn.nnn.nnn.nnn/mm
+#     nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
+#
+# The host and domain address require that you enable hostname lookups
+# with "HostNameLookups On" above.
+#

 <Location />
 </Location>
@@ -314,8 +351,8 @@ LogLevel info
 #
 # 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.
+# is a member of the system group to do any admin tasks.  You can change
+# the group name using the SystemGroup directive.
 #

 AuthType Basic
@@ -328,5 +365,5 @@ Allow From 127.0.0.1
 </Location>

 #
-# End of "$Id: cupsd.conf 349 1999-05-21 20:53:02Z mike $".
+# End of "$Id: cupsd.conf 628 1999-08-23 15:24:48Z mike $".
 #
@@ -0,0 +1,250 @@
+#
+# "$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 $".
+#
@@ -0,0 +1,313 @@
+#
+# "$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 237 1999-04-21 19:29:35Z mike $"
+# "$Id: mime.convs 575 1999-07-30 13:57:16Z 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 237 1999-04-21 19:29:35Z mike $".
+# End of "$Id: mime.convs 575 1999-07-30 13:57:16Z mike $".
 #
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.types 185 1999-03-24 18:38:50Z mike $"
+# "$Id: mime.types 575 1999-07-30 13:57:16Z mike $"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
@@ -92,10 +92,9 @@ 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
-
-# TODO: Add Sun Raster, Alias, SoftImage, GIMP??? files
-
 image/x-sun-raster		ras
+
+# TODO: Add Alias, SoftImage, GIMP??? files
 #image/x-alias			pix
 #image/x-softimage
 #image/x-gimp-xcf		xcf xcf.gz
@@ -114,10 +113,10 @@ text/plain			txt printable(0,1024)
 # CUPS-specific types...
 #

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

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

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

-CFLAGS="${CFLAGS:=}"
-CXXFLAGS="${CXXFLAGS:=}"
-OPTIM="-O"
+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:=}"

-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(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 test "$disable_shared" != "yes"; then
+	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* | FreeBSD*)
+			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
+else
+	PICFLAG=0
+	LIBCUPS="libcups.a"
+	LIBCUPSIMAGE="libcupsimage.a"
+	DSO=":"
+fi

 dnl Checks for programs...
 AC_PROG_AWK
@@ -45,50 +89,88 @@ 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(MKDIR,mkdir)
-AC_PATH_PROG(RM,rm)
-AC_PATH_PROG(GROFF,groff)
+AC_PATH_PROG(NROFF,nroff)
+if test "$NROFF" = ""; then
+    AC_PATH_PROG(GROFF,groff)
+    if test "$GROFF" = ""; then
+        NROFF="echo"
+    else
+        NROFF="$GROFF -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

 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
-	LIBS="$LIBS -lsocket"
+	NETLIBS="-lsocket"
 else
 	echo "Not using -lsocket since you are running IRIX."
 fi)
 AC_CHECK_LIB(nsl,gethostbyaddr,
 if test "$uname" != "IRIX"; then
-	LIBS="$LIBS -lnsl"
+	NETLIBS="$NETLIBS -lnsl"
 else
 	echo "Not using -lnsl since you are running IRIX."
 fi)

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

 dnl Checks for header files.
 AC_HEADER_STDC
@@ -108,11 +190,92 @@ 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
+			OPTIM="-Ae $OPTIM"
+			;;
+		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"
@@ -123,7 +286,21 @@ AC_DEFINE_UNQUOTED(CUPS_SERVERROOT, "$CUPS_SERVERROOT")
 AC_SUBST(CUPS_SERVERROOT)

 dnl Set the CUPS_LOCALE directory...
-CUPS_LOCALEDIR="$prefix/lib/locale"
+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
+
 AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
 AC_SUBST(CUPS_LOCALEDIR)

@@ -0,0 +1,112 @@
+#!/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$".
+#
@@ -14,7 +14,7 @@
 #
 #       Attn: CUPS Licensing Information
 #       Easy Software Products
-#       44145 Airport View Drive, Suite 204
+#       44141 Airport View Drive, Suite 204
 #       Hollywood, Maryland 20636-3111 USA
 #
 #       Voice: (301) 373-9603
@@ -28,8 +28,10 @@ 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
+LIBOBJS	=	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 usersys.o \
+		util.o
+OBJS	=	$(LIBOBJS) testhttp.o testmime.o testppd.o

 #
 # Header files to install...
@@ -41,7 +43,7 @@ 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
+TARGETS	=	$(LIBCUPS) testhttp testmime testppd

 #
 # Make all targets...
@@ -61,18 +63,31 @@ clean:
 #

 install:	all
-	-$(MKDIR) $(LIBDIR)
-	$(CP) libcups.a $(LIBDIR)
 	-$(MKDIR) $(INCLUDEDIR)/cups
 	$(CP) $(HEADERS) $(INCLUDEDIR)/cups
+	-$(MKDIR) $(LIBDIR)
+	$(CP) $(LIBCUPS) $(LIBDIR)
+	if test $(LIBCUPS) != "libcups.a"; then \
+		$(LN) $(LIBCUPS) `basename $(LIBCUPS) .1`; \
+	fi
+
+#
+# libcups.so.1, libcups.sl.1
+#
+
+libcups.so.1 libcups.sl.1:	$(LIBOBJS) ../Makedefs
+	echo Linking $@...
+	$(DSO) $@ $(LIBOBJS)
+	-$(LN) $@ `basename $@ .1`

 #
 # libcups.a
 #

-libcups.a:	$(OBJS)
+libcups.a:	$(LIBOBJS)
+	echo Archiving $@...
 	$(RM) $@
-	$(AR) $(ARFLAGS) $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
 	$(RANLIB) $@

 #
@@ -80,6 +95,7 @@ libcups.a:	$(OBJS)
 #

 cups_C.h:	../locale/C/cups_C
+	echo Generating $@...
 	$(RM) cups_C.h
 	$(AWK) '{print "\"" $$0 "\","}' < ../locale/C/cups_C > cups_C.h

@@ -92,36 +108,40 @@ 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
+ppd.o:		language.h 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
+usersys.o:	cups.h ../config.h ../Makedefs
 util.o:		cups.h http.h ipp.h ../config.h ../Makedefs

 #
-# testhttp
+# testhttp (dependency on static CUPS library is intentional)
 #

 testhttp:	testhttp.o libcups.a
-	$(CC) $(LDFLAGS) -o $@ testhttp.o $(LIBS)
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o $@ testhttp.o libcups.a $(NETLIBS)

 testhttp.o:	http.h ../Makedefs

 #
-# testmime
+# testmime (dependency on static CUPS library is intentional)
 #

 testmime:	testmime.o libcups.a
-	$(CC) $(LDFLAGS) -o $@ testmime.o $(LIBS)
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o $@ testmime.o libcups.a

 testmime.o:	mime.h ../Makedefs

 #
-# testppd
+# testppd (dependency on static CUPS library is intentional)
 #

 testppd:	testppd.o libcups.a
-	$(CC) $(LDFLAGS) -o $@ testppd.o $(LIBS)
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o $@ testppd.o libcups.a $(NETLIBS)

 testppd.o:	ppd.h ../Makedefs

@@ -0,0 +1,176 @@
+# Microsoft Developer Studio Project File - Name="cups" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
+
+CFG=cups - 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 "cups.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 "cups.mak" CFG="cups - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "cups - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "cups - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "cups - 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 Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\visualc" /I ".." /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /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
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"cups.lib"
+
+!ELSEIF  "$(CFG)" == "cups - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "..\visualc" /I ".." /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /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
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo /out:"cupsd.lib"
+
+!ENDIF 
+
+# Begin Target
+
+# Name "cups - Win32 Release"
+# Name "cups - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=.\emit.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\filter.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\http.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ipp.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\language.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mark.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\mime.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\options.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\page.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\ppd.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\raster.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\string.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\type.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\util.c
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\cups.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\http.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ipp.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\language.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\mime.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ppd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\raster.h
+# End Source File
+# End Group
+# End Target
+# End Project
@@ -74,7 +74,9 @@ enum					/* Not a typedef'd enum so we can OR */
  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 */
+  CUPS_PRINTER_VARIABLE = 0x8000,	/* Can do variable sizes */
+  CUPS_PRINTER_IMPLICIT = 0x10000,	/* Implicit class */
+  CUPS_PRINTER_OPTIONS = 0xfffc		/* ~(CLASS | REMOTE | IMPLICIT) */
 };


@@ -104,27 +106,32 @@ typedef struct				/**** Printer Options ****/
 * Functions...
 */

-extern int		cupsCancelJob(char *printer, int job);
+extern int		cupsCancelJob(const 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);
+			                   const char *resource, const char *filename);
 extern int		cupsGetClasses(char ***classes);
-extern char		*cupsGetPPD(char *printer);
-extern char		*cupsGetDefault(void);
+extern const char	*cupsGetDefault(void);
+extern const char	*cupsGetPPD(const char *printer);
 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 int		cupsPrintFile(const char *printer, const char *filename,
+			              const char *title, int num_options,
+				      cups_option_t *options);
+extern char		*cupsTempFile(char *filename, int len);
+extern int		cupsAddOption(const char *name, const 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,
+extern const char	*cupsGetOption(const char *name, int num_options,
 			               cups_option_t *options);
-extern int		cupsParseOptions(char *arg, int num_options,
+extern int		cupsParseOptions(const char *arg, int num_options,
 			                 cups_option_t **options);
 extern int		cupsMarkOptions(ppd_file_t *ppd, int num_options,
 			                cups_option_t *options);

+extern const char	*cupsGetPassword(const char *prompt);
+extern const char	*cupsServer(void);
+extern const char	*cupsUser(void);
+
 #  ifdef __cplusplus
 }
 #  endif /* __cplusplus */
@@ -0,0 +1,123 @@
+"us-ascii",
+"OK",
+"Cancel",
+"Help",
+"Quit",
+"Close",
+"Yes",
+"No",
+"On",
+"Off",
+"Save",
+"Discard",
+"Default",
+"Options",
+"More Info",
+"Black",
+"Color",
+"Cyan",
+"Magenta",
+"Yellow",
+"Copyright 1993-1999 by Easy Software Products, All Rights Reserved.",
+"General",
+"Printer",
+"Image Options",
+"HP-GL/2 Options",
+"Extra",
+"Document",
+"Other",
+"Print Pages: ",
+"Entire Document",
+"Page Range:",
+"Reverse Order: ",
+"Page Format: ",
+" 1-Up",
+" 2-Up",
+" 4-Up",
+"Image Scaling: ",
+"Use Natural Image Size",
+"Zoom by Percent",
+"Zoom by PPI",
+"Mirror Image: ",
+"Color Saturation: ",
+"Color Hue: ",
+"Fit to Page: ",
+"Shading: ",
+"Pen Width: ",
+"Gamma Correction: ",
+"Brightness: ",
+"Add",
+"Delete",
+"Modify",
+"Printer URI",
+"Printer Name",
+"Printer Location",
+"Printer Info",
+"Printer Make and Model",
+"Device URI",
+"Formatting Page",
+"Printing Page",
+"Initializing Printer",
+"Printer State",
+"Accepting Jobs",
+"Not Accepting Jobs",
+"Print Jobs",
+"Class",
+"Local",
+"Remote",
+"Duplexing",
+"Stapling",
+"Fast Copies",
+"Collated Copies",
+"Hole Punching",
+"Covering",
+"Binding",
+"Sorting",
+"Small (up to 9.5x14in)",
+"Medium (9.5x14in to 13x19in)",
+"Large (13x19in and larger)",
+"Custom Size",
+"Idle",
+"Processing",
+"Stopped",
+"All",
+"Odd",
+"Even Pages",
+"Darker                     Lighter",
+"Media Size",
+"Media Type",
+"Media Source",
+"Orientation: ",
+"Portrait",
+"Landscape",
+"Job State",
+"Job Name",
+"User Name",
+"Priority",
+"Copies",
+"File Size",
+"Pending",
+"Output Mode",
+"Resolution",
+"400 Your browser sent a request that this server could not understand.",
+"This server could not verify that you are authorized to access the resource.",
+"You must pay to access this server.",
+"You don't have permission to access the resource on this server.",
+"The requested resource was not found on this server.",
+"The requested method is not allowed with the resource.",
+"An appropriate representation for the resource was not found on this server.",
+"You don't have permission to use this server as a proxy host.",
+"The request has taken too long to complete and has been aborted.",
+"The requested resource has more than one value.",
+"The requested resource is gone and has not been replaced.",
+"The requested method requires a valid Content-Length.",
+"The precondition on the request evaluated to false.",
+"The request is too large for this server to process.",
+"The request URI is too large for this server to process.",
+"The request format is not understood by this server.",
+"500 The server has detected an unrecoverable error and cannot process your request.",
+"The requested method is not implemented by this server.",
+"The proxy server received an invalid response from an upstream server.",
+"The requested resource is currently unavailable on this server.",
+"The proxy server has taken too long to respond to this server.",
+"This server does not support the HTTP version required by your browser.",
@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44145 Airport View Drive, Suite 204
+ *       44141 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
- *       44145 Airport View Drive, Suite 204
+ *       44141 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -58,7 +58,7 @@ 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 */
+	      const char  *filter)	/* I - Filter program to run */
 {
  mime_filter_t	*temp;			/* New filter */

@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44145 Airport View Drive, Suite 204
+ *       44141 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -25,6 +25,8 @@
 *
 *   httpInitialize()    - Initialize the HTTP interface library and set the
 *                         default HTTP proxy (if any).
+ *   httpCheck()         - Check to see if there is a pending response from
+ *                         the server.
 *   httpClose()         - Close an HTTP connection...
 *   httpConnect()       - Connect to a HTTP server.
 *   httpReconnect()     - Reconnect to a HTTP server...
@@ -66,6 +68,7 @@
 #include <ctype.h>
 #include "string.h"
 #include <fcntl.h>
+#include <errno.h>

 #include "http.h"
 #include "ipp.h"
@@ -89,28 +92,21 @@
 * Local functions...
 */

-static http_field_t	http_field(char *name);
-static int		http_send(http_t *http, http_state_t request, char *uri);
+static http_field_t	http_field(const char *name);
+static int		http_send(http_t *http, http_state_t request,
+			          const char *uri);


 /*
 * Local globals...
 */

-static char		*http_fields[] =
+static const char	*http_fields[] =
 			{
-			  "Accept",
-			  "Accept-Charset",
-			  "Accept-Encoding",
 			  "Accept-Language",
 			  "Accept-Ranges",
-			  "Age",
-			  "Allow",
-			  "Alternates",
 			  "Authorization",
-			  "Cache-Control",
 			  "Connection",
-			  "Content-Base",
 			  "Content-Encoding",
 			  "Content-Language",
 			  "Content-Length",
@@ -120,41 +116,22 @@ static char		*http_fields[] =
 			  "Content-Type",
 			  "Content-Version",
 			  "Date",
-			  "Derived-From",
-			  "Etag",
-			  "Expires",
-			  "From",
 			  "Host",
-			  "If-Match",
 			  "If-Modified-Since",
-			  "If-None-Match",
-			  "If-Range",
 			  "If-Unmodified-since",
 			  "Keep-Alive",
 			  "Last-Modified",
 			  "Link",
 			  "Location",
-			  "Max-Forwards",
-			  "Message-Id",
-			  "MIME-Version",
-			  "Pragma",
-			  "Proxy-Authenticate",
-			  "Proxy-Authorization",
-			  "Public",
 			  "Range",
 			  "Referer",
 			  "Retry-After",
-			  "Server",
 			  "Transfer-Encoding",
 			  "Upgrade",
-			  "URI",
 			  "User-Agent",
-			  "Vary",
-			  "Via",
-			  "Warning",
 			  "WWW-Authenticate"
 			};
-static char		*days[7] =
+static const char	*days[7] =
 			{
 			  "Sun",
 			  "Mon",
@@ -164,7 +141,7 @@ static char		*days[7] =
 			  "Fri",
 			  "Sat"
 			};
-static char		*months[12] =
+static const char	*months[12] =
 			{
 			  "Jan",
 			  "Feb",
@@ -215,6 +192,41 @@ httpInitialize(void)
 }


+/*
+ * 'httpCheck()' - Check to see if there is a pending response from the server.
+ */
+
+int				/* O - 0 = no data, 1 = data available */
+httpCheck(http_t *http)		/* I - HTTP connection */
+{
+  fd_set	input;		/* Input set for select() */
+  struct timeval timeout;	/* Timeout */
+
+
+ /*
+  * First see if there is data in the buffer...
+  */
+
+  if (http == NULL)
+    return (0);
+
+  if (http->used)
+    return (1);
+
+ /*
+  * Then try doing a select() to poll the socket...
+  */
+
+  FD_ZERO(&input);
+  FD_SET(http->fd, &input);
+
+  timeout.tv_sec  = 0;
+  timeout.tv_usec = 0;
+
+  return (select(http->fd + 1, &input, NULL, NULL, &timeout) > 0);
+}
+
+
 /*
 * 'httpClose()' - Close an HTTP connection...
 */
@@ -240,8 +252,8 @@ httpClose(http_t *http)		/* I - Connection to close */
 */

 http_t *			/* O - New HTTP connection */
-httpConnect(char *host,		/* I - Host to connect to */
-            int  port)		/* I - Port number */
+httpConnect(const char *host,	/* I - Host to connect to */
+            int        port)	/* I - Port number */
 {
  http_t		*http;		/* New HTTP connection */
  struct hostent	*hostaddr;	/* Host address data */
@@ -358,12 +370,12 @@ httpReconnect(http_t *http)	/* I - HTTP data */
 */

 void
-httpSeparate(char *uri,		/* I - Universal Resource Identifier */
-             char *method,	/* O - Method (http, https, etc.) */
-	     char *username,	/* O - Username */
-	     char *host,	/* O - Hostname */
-	     int  *port,	/* O - Port number to use */
-             char *resource)	/* O - Resource/filename */
+httpSeparate(const char *uri,		/* I - Universal Resource Identifier */
+             char       *method,	/* O - Method (http, https, etc.) */
+	     char       *username,	/* O - Username */
+	     char       *host,		/* O - Hostname */
+	     int        *port,		/* O - Port number to use */
+             char       *resource)	/* O - Resource/filename */
 {
  char	*ptr;			/* Pointer into string... */

@@ -405,7 +417,7 @@ httpSeparate(char *uri,		/* I - Universal Resource Identifier */
      * OK, we have "hostname:port[/resource]"...
      */

-      *port = strtol(uri, &uri, 10);
+      *port = strtol(uri, (char **)&uri, 10);

      if (*uri == '/')
        strcpy(resource, uri);
@@ -500,6 +512,8 @@ httpSeparate(char *uri,		/* I - Universal Resource Identifier */
      *port = 443;
    else if (strcasecmp(method, "ipp") == 0)	/* Not registered yet... */
      *port = ippPort();
+    else if (strcasecmp(method, "socket") == 0)	/* Not registered yet... */
+      *port = 9100;
    else
      *port = 0;
  }
@@ -519,7 +533,7 @@ httpSeparate(char *uri,		/* I - Universal Resource Identifier */
 void
 httpSetField(http_t       *http,	/* I - HTTP data */
             http_field_t field,	/* I - Field index */
-	     char         *value)	/* I - Value */
+	     const char   *value)	/* I - Value */
 {
  strncpy(http->fields[field], value, HTTP_MAX_VALUE - 1);
  http->fields[field][HTTP_MAX_VALUE - 1] = '\0';
@@ -531,8 +545,8 @@ httpSetField(http_t       *http,	/* I - HTTP data */
 */

 int					/* O - Status of call (0 = success) */
-httpDelete(http_t *http,		/* I - HTTP data */
-           char   *uri)			/* I - URI to delete */
+httpDelete(http_t     *http,		/* I - HTTP data */
+           const char *uri)		/* I - URI to delete */
 {
  return (http_send(http, HTTP_DELETE, uri));
 }
@@ -543,8 +557,8 @@ httpDelete(http_t *http,		/* I - HTTP data */
 */

 int					/* O - Status of call (0 = success) */
-httpGet(http_t *http,			/* I - HTTP data */
-        char   *uri)			/* I - URI to get */
+httpGet(http_t     *http,		/* I - HTTP data */
+        const char *uri)		/* I - URI to get */
 {
  return (http_send(http, HTTP_GET, uri));
 }
@@ -555,8 +569,8 @@ httpGet(http_t *http,			/* I - HTTP data */
 */

 int					/* O - Status of call (0 = success) */
-httpHead(http_t *http,			/* I - HTTP data */
-         char   *uri)			/* I - URI for head */
+httpHead(http_t     *http,		/* I - HTTP data */
+         const char *uri)		/* I - URI for head */
 {
  return (http_send(http, HTTP_HEAD, uri));
 }
@@ -567,8 +581,8 @@ httpHead(http_t *http,			/* I - HTTP data */
 */

 int					/* O - Status of call (0 = success) */
-httpOptions(http_t *http,		/* I - HTTP data */
-            char   *uri)		/* I - URI for options */
+httpOptions(http_t     *http,		/* I - HTTP data */
+            const char *uri)		/* I - URI for options */
 {
  return (http_send(http, HTTP_OPTIONS, uri));
 }
@@ -579,8 +593,8 @@ httpOptions(http_t *http,		/* I - HTTP data */
 */

 int					/* O - Status of call (0 = success) */
-httpPost(http_t *http,			/* I - HTTP data */
-         char   *uri)			/* I - URI for post */
+httpPost(http_t     *http,		/* I - HTTP data */
+         const char *uri)		/* I - URI for post */
 {
  httpGetLength(http);

@@ -593,8 +607,8 @@ httpPost(http_t *http,			/* I - HTTP data */
 */

 int					/* O - Status of call (0 = success) */
-httpPut(http_t *http,			/* I - HTTP data */
-        char   *uri)			/* I - URI to put */
+httpPut(http_t     *http,		/* I - HTTP data */
+        const char *uri)		/* I - URI to put */
 {
  httpGetLength(http);

@@ -607,8 +621,8 @@ httpPut(http_t *http,			/* I - HTTP data */
 */

 int					/* O - Status of call (0 = success) */
-httpTrace(http_t *http,			/* I - HTTP data */
-          char   *uri)			/* I - URI for trace */
+httpTrace(http_t     *http,		/* I - HTTP data */
+          const char *uri)		/* I - URI for trace */
 {
  return (http_send(http, HTTP_TRACE, uri));
 }
@@ -723,9 +737,9 @@ httpRead(http_t *http,			/* I - HTTP data */
 */
 
 int					/* O - Number of bytes written */
-httpWrite(http_t *http,			/* I - HTTP data */
-          char   *buffer,		/* I - Buffer for data */
-	  int    length)		/* I - Number of bytes to write */
+httpWrite(http_t     *http,		/* I - HTTP data */
+          const char *buffer,		/* I - Buffer for data */
+	  int        length)		/* I - Number of bytes to write */
 {
  int		tbytes,			/* Total bytes sent */
 		bytes;			/* Bytes sent */
@@ -769,6 +783,7 @@ httpWrite(http_t *http,			/* I - HTTP data */
    if (bytes < 0)
    {
      DEBUG_puts("httpWrite: error writing data...\n");
+
      return (-1);
    }

@@ -810,6 +825,7 @@ httpGets(char   *line,			/* I - Line to read into */
 	*bufptr,			/* Pointer into input buffer */
 	*bufend;			/* Pointer to end of buffer */
  int	bytes;				/* Number of bytes read */
+  int	lasterror;			/* Last error received */


  DEBUG_printf(("httpGets(%08x, %d, %08x)\n", line, length, http));
@@ -821,6 +837,9 @@ httpGets(char   *line,			/* I - Line to read into */
  * Pre-scan the buffer and see if there is a newline in there...
  */

+  lasterror = 0;
+  errno     = 0;
+
  do
  {
    bufptr  = http->buffer;
@@ -838,23 +857,32 @@ httpGets(char   *line,			/* I - Line to read into */
      * No newline; see if there is more data to be read...
      */

-      if ((bytes = recv(http->fd, bufend, HTTP_MAX_BUFFER - http->used, 0)) < 1)
+      if ((bytes = recv(http->fd, bufend, HTTP_MAX_BUFFER - http->used, 0)) < 0)
      {
       /*
 	* Nope, can't get a line this time...
 	*/

+        if (errno != lasterror && errno != ECONNRESET &&
+	    errno != ECONNABORTED && errno != ENETRESET)
+	{
+	  lasterror = errno;
+	  continue;
+	}
+
+        DEBUG_printf(("httpGets(): recv() error %d!\n", errno));
+
        return (NULL);
      }
-      else
-      {
-       /*
-	* Yup, update the amount used and the end pointer...
-	*/
+      else if (bytes == 0)
+        return (NULL);

-	http->used += bytes;
-	bufend     += bytes;
-      }
+     /*
+      * Yup, update the amount used and the end pointer...
+      */
+
+      http->used += bytes;
+      bufend     += bytes;
    }
  }
  while (bufptr >= bufend);
@@ -882,6 +910,7 @@ httpGets(char   *line,			/* I - Line to read into */
      if (http->used > 0)
 	memcpy(http->buffer, bufptr, http->used);

+      DEBUG_printf(("httpGets(): Returning \"%s\"\n", line));
      return (line);
    }
    else if (*bufptr == 0x0d)
@@ -890,6 +919,8 @@ httpGets(char   *line,			/* I - Line to read into */
      *lineptr++ = *bufptr++;
  }

+  DEBUG_puts("httpGets(): No new line available!");
+
  return (NULL);
 }

@@ -903,8 +934,11 @@ httpPrintf(http_t     *http,		/* I - HTTP data */
           const char *format,		/* I - printf-style format string */
 	   ...)				/* I - Additional args as needed */
 {
-  int		bytes;			/* Number of bytes to write */
-  char		buf[HTTP_MAX_BUFFER];	/* Buffer for formatted string */
+  int		bytes,			/* Number of bytes to write */
+		nbytes,			/* Number of bytes written */
+		tbytes;			/* Number of bytes all together */
+  char		buf[HTTP_MAX_BUFFER],	/* Buffer for formatted string */
+		*bufptr;		/* Pointer into buffer */
  va_list	ap;			/* Variable argument pointer */


@@ -914,7 +948,11 @@ httpPrintf(http_t     *http,		/* I - HTTP data */

  DEBUG_printf(("httpPrintf: %s", buf));

-  return (send(http->fd, buf, bytes, 0));
+  for (tbytes = 0, bufptr = buf; tbytes < bytes; tbytes += nbytes, bufptr += nbytes)
+    if ((nbytes = send(http->fd, bufptr, bytes - tbytes, 0)) < 0)
+      return (-1);
+
+  return (bytes);
 }


@@ -922,7 +960,7 @@ httpPrintf(http_t     *http,		/* I - HTTP data */
 * 'httpStatus()' - Return a short string describing a HTTP status code.
 */

-char *					/* O - String or NULL */
+const char *				/* O - String or NULL */
 httpStatus(http_status_t status)	/* I - HTTP status code */
 {
  switch (status)
@@ -963,7 +1001,7 @@ httpStatus(http_status_t status)	/* I - HTTP status code */
 * 'httpGetDateString()' - Get a formatted date/time string from a time value.
 */

-char *					/* O - Date/time string */
+const char *				/* O - Date/time string */
 httpGetDateString(time_t t)		/* I - UNIX time */
 {
  struct tm	*tdate;
@@ -984,7 +1022,7 @@ httpGetDateString(time_t t)		/* I - UNIX time */
 */

 time_t					/* O - UNIX time */
-httpGetDateTime(char *s)		/* I - Date/time string */
+httpGetDateTime(const char *s)		/* I - Date/time string */
 {
  int		i;			/* Looping var */
  struct tm	tdate;			/* Time/date structure */
@@ -1051,8 +1089,15 @@ httpUpdate(http_t *http)		/* I - HTTP data */
     /*
      * Blank line means the start of the data section (if any).  Return
      * the result code, too...
+      *
+      * If we get status 100 (HTTP_CONTINUE), then we *don't* change states.
+      * Instead, we just return HTTP_CONTINUE to the caller and keep on
+      * tryin'...
      */

+      if (http->status == HTTP_CONTINUE)
+        return (http->status);
+
      httpGetLength(http);

      switch (http->state)
@@ -1109,6 +1154,13 @@ httpUpdate(http_t *http)		/* I - HTTP data */
      return (HTTP_ERROR);
  }

+ /*
+  * See if there was an error...
+  */
+
+  if (errno)
+    return (HTTP_ERROR);
+
 /*
  * If we haven't already returned, then there is nothing new...
  */
@@ -1122,8 +1174,8 @@ httpUpdate(http_t *http)		/* I - HTTP data */
 */

 char *				/* O - Decoded string */
-httpDecode64(char *out,		/* I - String to write to */
-             char *in)		/* I - String to read from */
+httpDecode64(char       *out,	/* I - String to write to */
+             const char *in)	/* I - String to read from */
 {
  int	pos,			/* Bit position */
 	base64;			/* Value of this character */
@@ -1193,8 +1245,8 @@ httpDecode64(char *out,		/* I - String to write to */
 */

 char *				/* O - Encoded string */
-httpEncode64(char *out,		/* I - String to write to */
-             char *in)		/* I - String to read from */
+httpEncode64(char       *out,	/* I - String to write to */
+             const char *in)	/* I - String to read from */
 {
  char		*outptr;	/* Output pointer */
  static char	base64[] =	/* Base64 characters... */
@@ -1244,7 +1296,7 @@ httpEncode64(char *out,		/* I - String to write to */
 *                     content-length or transfer-encoding fields.
 */

-int
+int				/* O - Content length */
 httpGetLength(http_t *http)	/* I - HTTP data */
 {
  if (strcasecmp(http->fields[HTTP_FIELD_TRANSFER_ENCODING], "chunked") == 0)
@@ -1279,7 +1331,7 @@ httpGetLength(http_t *http)	/* I - HTTP data */
 */

 static http_field_t		/* O - Field index */
-http_field(char *name)		/* I - String name */
+http_field(const char *name)	/* I - String name */
 {
  int	i;			/* Looping var */

@@ -1299,12 +1351,12 @@ http_field(char *name)		/* I - String name */
 static int			/* O - 0 on success, non-zero on error */
 http_send(http_t       *http,	/* I - HTTP data */
          http_state_t request,	/* I - Request code */
-	  char         *uri)	/* I - URI */
+	  const char   *uri)	/* I - URI */
 {
  int		i;		/* Looping var */
  char		*ptr,		/* Pointer in buffer */
 		buf[1024];	/* Encoded URI buffer */
-  static char	*codes[] =	/* Request code strings */
+  static const char *codes[] =	/* Request code strings */
 		{
 		  NULL,
 		  "OPTIONS",
@@ -1320,7 +1372,7 @@ http_send(http_t       *http,	/* I - HTTP data */
 		  "TRACE",
 		  "CLOSE"
 		};
-  static char	*hex = "0123456789ABCDEF";
+  static const char *hex = "0123456789ABCDEF";
 				/* Hex digits */


@@ -1351,7 +1403,9 @@ http_send(http_t       *http,	/* I - HTTP data */
  if (request == HTTP_POST || request == HTTP_PUT)
    http->state ++;

-  if (httpPrintf(http, "%s %s HTTP/1.1\n", codes[request], buf) < 1)
+  http->status = HTTP_CONTINUE;
+
+  if (httpPrintf(http, "%s %s HTTP/1.1\r\n", codes[request], buf) < 1)
  {
   /*
    * Might have lost connection; try to reconnect...
@@ -1364,7 +1418,7 @@ http_send(http_t       *http,	/* I - HTTP data */
    * OK, we've reconnected, send the request again...
    */

-    if (httpPrintf(http, "%s %s HTTP/%d.%d\n", codes[request], buf,
+    if (httpPrintf(http, "%s %s HTTP/%d.%d\r\n", codes[request], buf,
                   http->version / 100, http->version % 100) < 1)
      return (-1);
  }
@@ -1374,11 +1428,11 @@ http_send(http_t       *http,	/* I - HTTP data */
    {
      DEBUG_printf(("%s: %s\n", http_fields[i], http->fields[i]));

-      if (httpPrintf(http, "%s: %s\n", http_fields[i], http->fields[i]) < 1)
+      if (httpPrintf(http, "%s: %s\r\n", http_fields[i], http->fields[i]) < 1)
        return (-1);
    }

-  if (httpPrintf(http, "\n") < 1)
+  if (httpPrintf(http, "\r\n") < 1)
    return (-1);

  httpClearFields(http);
@@ -15,7 +15,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44145 Airport View Drive, Suite 204
+ *       44141 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -63,7 +63,7 @@ extern "C" {

 #  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_BUFFER	2048	/* Max length of data buffer */
 #  define HTTP_MAX_VALUE	256	/* Max header field value length */


@@ -131,7 +131,8 @@ typedef enum
 typedef enum
 {
  HTTP_ERROR = -1,		/* An error response from httpXxxx() */
-  HTTP_CONTINUE,		/* Everything OK, keep going... */
+
+  HTTP_CONTINUE = 100,		/* Everything OK, keep going... */

  HTTP_OK = 200,		/* OPTIONS/GET/HEAD/POST/TRACE command was successful */
  HTTP_CREATED,			/* PUT command was successful */
@@ -181,18 +182,10 @@ typedef enum
 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,
@@ -202,38 +195,19 @@ typedef enum
  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;
@@ -271,34 +245,35 @@ typedef struct
 */

 #  define		httpBlocking(http,b)	(http)->blocking = (b)
+extern int		httpCheck(http_t *http);
 #  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 http_t		*httpConnect(const char *host, int port);
+extern int		httpDelete(http_t *http, const char *uri);
 extern void		httpFlush(http_t *http);
-extern int		httpGet(http_t *http, char *uri);
+extern int		httpGet(http_t *http, const char *uri);
 extern char		*httpGets(char *line, int length, http_t *http);
-extern char		*httpGetDateString(time_t t);
-extern time_t		httpGetDateTime(char *s);
+extern const char	*httpGetDateString(time_t t);
+extern time_t		httpGetDateTime(const char *s);
 #  define		httpGetField(http,field)	(http)->fields[field]
-extern int		httpHead(http_t *http, char *uri);
+extern int		httpHead(http_t *http, const char *uri);
 extern void		httpInitialize(void);
-extern int		httpOptions(http_t *http, char *uri);
-extern int		httpPost(http_t *http, char *uri);
+extern int		httpOptions(http_t *http, const char *uri);
+extern int		httpPost(http_t *http, const char *uri);
 extern int		httpPrintf(http_t *http, const char *format, ...);
-extern int		httpPut(http_t *http, char *uri);
+extern int		httpPut(http_t *http, const 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,
+extern void		httpSeparate(const 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 void		httpSetField(http_t *http, http_field_t field, const char *value);
+extern const char	*httpStatus(http_status_t status);
+extern int		httpTrace(http_t *http, const 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		httpWrite(http_t *http, const char *buffer, int length);
+extern char		*httpEncode64(char *out, const char *in);
+extern char		*httpDecode64(char *out, const char *in);
 extern int		httpGetLength(http_t *http);


@@ -65,7 +65,7 @@
 */

 static ipp_attribute_t	*add_attr(ipp_t *ipp, int num_values);
-static int		ipp_read(http_t *http, char *buffer, int length);
+static int		ipp_read(http_t *http, unsigned char *buffer, int length);


 /*
@@ -73,10 +73,10 @@ static int		ipp_read(http_t *http, char *buffer, int length);
 */

 ipp_attribute_t *			/* O - New attribute */
-ippAddBoolean(ipp_t     *ipp,		/* I - IPP request */
-              ipp_tag_t group,		/* I - IPP group */
-              char      *name,		/* I - Name of attribute */
-              char      value)		/* I - Value of attribute */
+ippAddBoolean(ipp_t      *ipp,		/* I - IPP request */
+              ipp_tag_t  group,		/* I - IPP group */
+              const char *name,		/* I - Name of attribute */
+              char       value)		/* I - Value of attribute */
 {
  ipp_attribute_t	*attr;		/* New attribute */

@@ -103,11 +103,11 @@ ippAddBoolean(ipp_t     *ipp,		/* I - IPP request */
 */

 ipp_attribute_t *			/* O - New attribute */
-ippAddBooleans(ipp_t     *ipp,		/* I - IPP request */
-               ipp_tag_t group,		/* I - IPP group */
-	       char      *name,		/* I - Name of attribute */
-	       int       num_values,	/* I - Number of values */
-	       char      *values)	/* I - Values */
+ippAddBooleans(ipp_t      *ipp,		/* I - IPP request */
+               ipp_tag_t  group,	/* I - IPP group */
+	       const char *name,	/* I - Name of attribute */
+	       int        num_values,	/* I - Number of values */
+	       const char *values)	/* I - Values */
 {
  int			i;		/* Looping var */
  ipp_attribute_t	*attr;		/* New attribute */
@@ -139,10 +139,10 @@ ippAddBooleans(ipp_t     *ipp,		/* I - IPP request */
 */

 ipp_attribute_t *			/* O - New attribute */
-ippAddDate(ipp_t       *ipp,		/* I - IPP request */
-           ipp_tag_t   group,		/* I - IPP group */
-	   char        *name,		/* I - Name of attribute */
-	   ipp_uchar_t *value)		/* I - Value */
+ippAddDate(ipp_t             *ipp,	/* I - IPP request */
+           ipp_tag_t         group,	/* I - IPP group */
+	   const char        *name,	/* I - Name of attribute */
+	   const ipp_uchar_t *value)	/* I - Value */
 {
  ipp_attribute_t	*attr;		/* New attribute */

@@ -170,11 +170,11 @@ ippAddDate(ipp_t       *ipp,		/* I - IPP request */
 */

 ipp_attribute_t *			/* O - New attribute */
-ippAddInteger(ipp_t     *ipp,		/* I - IPP request */
-              ipp_tag_t group,		/* I - IPP group */
-	      ipp_tag_t type,		/* I - Type of attribute */
-              char      *name,		/* I - Name of attribute */
-              int       value)		/* I - Value of attribute */
+ippAddInteger(ipp_t      *ipp,		/* I - IPP request */
+              ipp_tag_t  group,		/* I - IPP group */
+	      ipp_tag_t  type,		/* I - Type of attribute */
+              const char *name,		/* I - Name of attribute */
+              int        value)		/* I - Value of attribute */
 {
  ipp_attribute_t	*attr;		/* New attribute */

@@ -202,12 +202,12 @@ ippAddInteger(ipp_t     *ipp,		/* I - IPP request */
 */

 ipp_attribute_t *			/* O - New attribute */
-ippAddIntegers(ipp_t     *ipp,		/* I - IPP request */
-               ipp_tag_t group,		/* I - IPP group */
-	       ipp_tag_t type,		/* I - Type of attribute */
-	       char      *name,		/* I - Name of attribute */
-	       int       num_values,	/* I - Number of values */
-	       int       *values)	/* I - Values */
+ippAddIntegers(ipp_t      *ipp,		/* I - IPP request */
+               ipp_tag_t  group,	/* I - IPP group */
+	       ipp_tag_t  type,		/* I - Type of attribute */
+	       const char *name,	/* I - Name of attribute */
+	       int        num_values,	/* I - Number of values */
+	       const int  *values)	/* I - Values */
 {
  int			i;		/* Looping var */
  ipp_attribute_t	*attr;		/* New attribute */
@@ -236,12 +236,12 @@ ippAddIntegers(ipp_t     *ipp,		/* I - IPP request */
 */

 ipp_attribute_t *			/* O - New attribute */
-ippAddString(ipp_t     *ipp,		/* I - IPP request */
-             ipp_tag_t group,		/* I - IPP group */
-	     ipp_tag_t type,		/* I - Type of attribute */
-             char      *name,		/* I - Name of attribute */
-             char      *charset,	/* I - Character set */
-             char      *value)		/* I - Value */
+ippAddString(ipp_t      *ipp,		/* I - IPP request */
+             ipp_tag_t  group,		/* I - IPP group */
+	     ipp_tag_t  type,		/* I - Type of attribute */
+             const char *name,		/* I - Name of attribute */
+             const char *charset,	/* I - Character set */
+             const char *value)		/* I - Value */
 {
  ipp_attribute_t	*attr;		/* New attribute */

@@ -267,13 +267,13 @@ ippAddString(ipp_t     *ipp,		/* I - IPP request */
 */

 ipp_attribute_t *			/* O - New attribute */
-ippAddStrings(ipp_t     *ipp,		/* I - IPP request */
-              ipp_tag_t group,		/* I - IPP group */
-	      ipp_tag_t type,		/* I - Type of attribute */
-	      char      *name,		/* I - Name of attribute */
-	      int       num_values,	/* I - Number of values */
-	      char      *charset,	/* I - Character set */
-	      char      **values)	/* I - Values */
+ippAddStrings(ipp_t      *ipp,		/* I - IPP request */
+              ipp_tag_t  group,		/* I - IPP group */
+	      ipp_tag_t  type,		/* I - Type of attribute */
+	      const char *name,		/* I - Name of attribute */
+	      int        num_values,	/* I - Number of values */
+	      const char *charset,	/* I - Character set */
+	      const char **values)	/* I - Values */
 {
  int			i;		/* Looping var */
  ipp_attribute_t	*attr;		/* New attribute */
@@ -309,11 +309,11 @@ ippAddStrings(ipp_t     *ipp,		/* I - IPP request */
 */

 ipp_attribute_t *			/* O - New attribute */
-ippAddRange(ipp_t     *ipp,		/* I - IPP request */
-            ipp_tag_t group,		/* I - IPP group */
-	    char      *name,		/* I - Name of attribute */
-	    int       lower,		/* I - Lower value */
-	    int       upper)		/* I - Upper value */
+ippAddRange(ipp_t      *ipp,		/* I - IPP request */
+            ipp_tag_t  group,		/* I - IPP group */
+	    const char *name,		/* I - Name of attribute */
+	    int        lower,		/* I - Lower value */
+	    int        upper)		/* I - Upper value */
 {
  ipp_attribute_t	*attr;		/* New attribute */

@@ -339,12 +339,12 @@ ippAddRange(ipp_t     *ipp,		/* I - IPP request */
 */

 ipp_attribute_t *			/* O - New attribute */
-ippAddRanges(ipp_t     *ipp,		/* I - IPP request */
-             ipp_tag_t group,		/* I - IPP group */
-	     char      *name,		/* I - Name of attribute */
-	     int       num_values,	/* I - Number of values */
-	     int       *lower,		/* I - Lower values */
-	     int       *upper)		/* I - Upper values */
+ippAddRanges(ipp_t      *ipp,		/* I - IPP request */
+             ipp_tag_t  group,		/* I - IPP group */
+	     const char *name,		/* I - Name of attribute */
+	     int        num_values,	/* I - Number of values */
+	     const int  *lower,		/* I - Lower values */
+	     const int  *upper)		/* I - Upper values */
 {
  int			i;		/* Looping var */
  ipp_attribute_t	*attr;		/* New attribute */
@@ -376,12 +376,12 @@ ippAddRanges(ipp_t     *ipp,		/* I - IPP request */
 */

 ipp_attribute_t *			/* O - New attribute */
-ippAddResolution(ipp_t     *ipp,	/* I - IPP request */
-        	 ipp_tag_t group,	/* I - IPP group */
-		 char      *name,	/* I - Name of attribute */
-		 ipp_res_t units,	/* I - Units for resolution */
-		 int       xres,	/* I - X resolution */
-		 int       yres)	/* I - Y resolution */
+ippAddResolution(ipp_t      *ipp,	/* I - IPP request */
+        	 ipp_tag_t  group,	/* I - IPP group */
+		 const char *name,	/* I - Name of attribute */
+		 ipp_res_t  units,	/* I - Units for resolution */
+		 int        xres,	/* I - X resolution */
+		 int        yres)	/* I - Y resolution */
 {
  ipp_attribute_t	*attr;		/* New attribute */

@@ -408,13 +408,13 @@ ippAddResolution(ipp_t     *ipp,	/* I - IPP request */
 */

 ipp_attribute_t *			/* O - New attribute */
-ippAddResolutions(ipp_t     *ipp,	/* I - IPP request */
-        	  ipp_tag_t group,	/* I - IPP group */
-		  char      *name,	/* I - Name of attribute */
-		  int       num_values,	/* I - Number of values */
-		  ipp_res_t units,	/* I - Units for resolution */
-		  int       *xres,	/* I - X resolutions */
-		  int       *yres)	/* I - Y resolutions */
+ippAddResolutions(ipp_t      *ipp,	/* I - IPP request */
+        	  ipp_tag_t  group,	/* I - IPP group */
+		  const char *name,	/* I - Name of attribute */
+		  int        num_values,/* I - Number of values */
+		  ipp_res_t  units,	/* I - Units for resolution */
+		  const int  *xres,	/* I - X resolutions */
+		  const int  *yres)	/* I - Y resolutions */
 {
  int			i;		/* Looping var */
  ipp_attribute_t	*attr;		/* New attribute */
@@ -472,8 +472,8 @@ ippAddSeparator(ipp_t *ipp)		/* I - IPP request */
 *                      in seconds.
 */

-time_t				/* O - UNIX time value */
-ippDateToTime(ipp_uchar_t *date)/* I - RFC 1903 date info */
+time_t					/* O - UNIX time value */
+ippDateToTime(const ipp_uchar_t *date)	/* I - RFC 1903 date info */
 {
  struct tm	unixdate;	/* UNIX date/time info */
  time_t	t;		/* Computed time */
@@ -512,6 +512,8 @@ ippDateToTime(ipp_uchar_t *date)/* I - RFC 1903 date info */
  else
    t -= date[9] * 3600 + date[10] * 60;

+  t -= timezone;
+
  return (t);
 }

@@ -576,9 +578,9 @@ ippDelete(ipp_t *ipp)		/* I - IPP request */
 */

 ipp_attribute_t	*			/* O - Matching attribute */
-ippFindAttribute(ipp_t     *ipp,	/* I - IPP request */
-                 char      *name,	/* I - Name of attribute */
-		 ipp_tag_t type)	/* I - Type of attribute */
+ippFindAttribute(ipp_t      *ipp,	/* I - IPP request */
+                 const char *name,	/* I - Name of attribute */
+		 ipp_tag_t  type)	/* I - Type of attribute */
 {
  ipp_attribute_t	*attr;	/* Current atttribute */

@@ -723,7 +725,7 @@ ippRead(http_t *http,		/* I - HTTP data */
        ipp_t  *ipp)		/* I - IPP data */
 {
  int			n;		/* Length of data */
-  char			buffer[8192];	/* Data buffer */
+  unsigned char		buffer[8192];	/* Data buffer */
  ipp_attribute_t	*attr;		/* Current attribute */
  ipp_tag_t		tag;		/* Current tag */

@@ -865,7 +867,7 @@ ippRead(http_t *http,		/* I - HTTP data */

 	    attr->group_tag  = ipp->curtag;
 	    attr->value_tag  = tag;
-	    attr->name       = strdup(buffer);
+	    attr->name       = strdup((char *)buffer);
 	    attr->num_values = 0;
 	  }

@@ -911,7 +913,7 @@ ippRead(http_t *http,		/* I - HTTP data */
                buffer[n] = '\0';
 		DEBUG_printf(("ippRead: value = \'%s\'\n", buffer));

-                attr->values[attr->num_values].string.text = strdup(buffer);
+                attr->values[attr->num_values].string.text = strdup((char *)buffer);
 	        break;
 	    case IPP_TAG_DATE :
 	        if (ipp_read(http, buffer, 11) < 11)
@@ -950,7 +952,7 @@ ippRead(http_t *http,		/* I - HTTP data */

                buffer[n] = '\0';

-                attr->values[attr->num_values].string.charset = strdup(buffer);
+                attr->values[attr->num_values].string.charset = strdup((char *)buffer);

 	        if (ipp_read(http, buffer, 2) < 2)
 		  return (IPP_ERROR);
@@ -962,7 +964,7 @@ ippRead(http_t *http,		/* I - HTTP data */

                buffer[n] = '\0';

-                attr->values[attr->num_values].string.text = strdup(buffer);
+                attr->values[attr->num_values].string.text = strdup((char *)buffer);
 	        break;
 	  }

@@ -989,7 +991,7 @@ ippRead(http_t *http,		/* I - HTTP data */
 * 'ippTimeToDate()' - Convert from UNIX time to RFC 1903 format.
 */

-ipp_uchar_t *				/* O - RFC-1903 date/time data */
+const ipp_uchar_t *			/* O - RFC-1903 date/time data */
 ippTimeToDate(time_t t)			/* I - UNIX time value */
 {
  struct tm		*unixdate;	/* UNIX unixdate/time info */
@@ -1042,7 +1044,7 @@ ippWrite(http_t *http,		/* I - HTTP data */
 {
  int			i;		/* Looping var */
  int			n;		/* Length of data */
-  char			buffer[8192],	/* Data buffer */
+  unsigned char		buffer[8192],	/* Data buffer */
 			*bufptr;	/* Pointer into buffer */
  ipp_attribute_t	*attr;		/* Current attribute */

@@ -1071,7 +1073,7 @@ ippWrite(http_t *http,		/* I - HTTP data */
 	*bufptr++ = ipp->request.any.request_id >> 8;
 	*bufptr++ = ipp->request.any.request_id;

-        if (httpWrite(http, buffer, bufptr - buffer) < 0)
+        if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
 	{
 	  DEBUG_puts("ippWrite: Could not write IPP header...");
 	  return (IPP_ERROR);
@@ -1327,7 +1329,7 @@ ippWrite(http_t *http,		/* I - HTTP data */
 	  * Write the data out...
 	  */

-          if (httpWrite(http, buffer, bufptr - buffer) < 0)
+          if (httpWrite(http, (char *)buffer, bufptr - buffer) < 0)
 	  {
 	    DEBUG_puts("ippWrite: Could not write IPP attribute...");
 	    return (IPP_ERROR);
@@ -1350,7 +1352,7 @@ ippWrite(http_t *http,		/* I - HTTP data */
 	  */

          buffer[0] = IPP_TAG_END;
-	  if (httpWrite(http, buffer, 1) < 0)
+	  if (httpWrite(http, (char *)buffer, 1) < 0)
 	  {
 	    DEBUG_puts("ippWrite: Could not write IPP end-tag...");
 	    return (IPP_ERROR);
@@ -1375,11 +1377,11 @@ ippWrite(http_t *http,		/* I - HTTP data */
 int				/* O - Port number */
 ippPort(void)
 {
-  char		*server_port;	/* SERVER_PORT environment variable */
+  const char	*server_port;	/* SERVER_PORT environment variable */
  struct servent *port;		/* Port number info */  


-  if ((server_port = getenv("SERVER_PORT")) != NULL)
+  if ((server_port = getenv("IPP_PORT")) != NULL)
    return (atoi(server_port));
  else if ((port = getservbyname("ipp", NULL)) == NULL)
    return (IPP_PORT);
@@ -1427,13 +1429,13 @@ add_attr(ipp_t *ipp,			/* I - IPP request */
 * 'ipp_read()' - Semi-blocking read on a HTTP connection...
 */

-static int		/* O - Number of bytes read */
-ipp_read(http_t *http,	/* I - Client connection */
-         char   *buffer,/* O - Buffer for data */
-	 int    length)	/* I - Total length */
+static int			/* O - Number of bytes read */
+ipp_read(http_t        *http,	/* I - Client connection */
+         unsigned char *buffer,	/* O - Buffer for data */
+	 int           length)	/* I - Total length */
 {
-  int	tbytes,		/* Total bytes read */
-	bytes;		/* Bytes read this pass */
+  int	tbytes,			/* Total bytes read */
+	bytes;			/* Bytes read this pass */


 /*
@@ -1441,7 +1443,7 @@ ipp_read(http_t *http,	/* I - Client connection */
  */

  for (tbytes = 0; tbytes < length; tbytes += bytes, buffer += bytes)
-    if ((bytes = httpRead(http, buffer, length - tbytes)) <= 0)
+    if ((bytes = httpRead(http, (char *)buffer, length - tbytes)) <= 0)
      break;

 /*
@@ -1452,7 +1454,6 @@ ipp_read(http_t *http,	/* I - Client connection */
 }


-
 /*
 * End of "$Id$".
 */
@@ -87,11 +87,12 @@ typedef enum			/**** Format tags for attribute formats... ****/
  IPP_TAG_DATE,
  IPP_TAG_RESOLUTION,
  IPP_TAG_RANGE,
+  IPP_TAG_COLLECTION,
  IPP_TAG_TEXTLANG,
  IPP_TAG_NAMELANG,
  IPP_TAG_TEXT = 0x41,
  IPP_TAG_NAME,
-  IPP_TAG_KEYWORD,
+  IPP_TAG_KEYWORD = 0x44,
  IPP_TAG_URI,
  IPP_TAG_URISCHEME,
  IPP_TAG_CHARSET,
@@ -306,25 +307,25 @@ typedef struct			/**** Request State ****/
 * 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 time_t		ippDateToTime(const ipp_uchar_t *date);
+extern ipp_attribute_t	*ippAddBoolean(ipp_t *ipp, ipp_tag_t group, const char *name, char value);
+extern ipp_attribute_t	*ippAddBooleans(ipp_t *ipp, ipp_tag_t group, const char *name, int num_values, const char *values);
+extern ipp_attribute_t	*ippAddDate(ipp_t *ipp, ipp_tag_t group, const char *name, const ipp_uchar_t *value);
+extern ipp_attribute_t	*ippAddInteger(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, const char *name, int value);
+extern ipp_attribute_t	*ippAddIntegers(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, const char *name, int num_values, const int *values);
+extern ipp_attribute_t	*ippAddRange(ipp_t *ipp, ipp_tag_t group, const char *name, int lower, int upper);
+extern ipp_attribute_t	*ippAddRanges(ipp_t *ipp, ipp_tag_t group, const char *name, int num_values, const int *lower, const int *upper);
+extern ipp_attribute_t	*ippAddResolution(ipp_t *ipp, ipp_tag_t group, const char *name, ipp_res_t units, int xres, int yres);
+extern ipp_attribute_t	*ippAddResolutions(ipp_t *ipp, ipp_tag_t group, const char *name, int num_values, ipp_res_t units, const int *xres, const 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 ipp_attribute_t	*ippAddString(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, const char *name, const char *charset, const char *value);
+extern ipp_attribute_t	*ippAddStrings(ipp_t *ipp, ipp_tag_t group, ipp_tag_t type, const char *name, int num_values, const char *charset, const char **values);
 extern void		ippDelete(ipp_t *ipp);
-extern ipp_attribute_t	*ippFindAttribute(ipp_t *ipp, char *name, ipp_tag_t type);
+extern ipp_attribute_t	*ippFindAttribute(ipp_t *ipp, const 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 const ipp_uchar_t *ippTimeToDate(time_t t);
 extern ipp_state_t	ippWrite(http_t *http, ipp_t *ipp);
 extern int		ippPort(void);

@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44145 Airport View Drive, Suite 204
+ *       44141 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -127,10 +127,11 @@ cupsLangFree(cups_lang_t *lang)	/* I - Language to free */
 */

 cups_lang_t *			/* O - Language data */
-cupsLangGet(char *language)	/* I - Language or locale */
+cupsLangGet(const char *language) /* I - Language or locale */
 {
  int		i, count;	/* Looping vars */
-  char		real[16],	/* Real language name */
+  char		langname[16],	/* Requested language name */
+		real[16],	/* Real language name */
 		filename[1024],	/* Filename for language locale file */
 		*localedir;	/* Directory for locale files */
  FILE		*fp;		/* Language locale file pointer */
@@ -149,26 +150,28 @@ cupsLangGet(char *language)	/* I - Language or locale */
  */

  if (language == NULL || language[0] == '\0')
-    language = "C";
+    strcpy(langname, "C");
+  else
+    strcpy(langname, language);

-  if (strlen(language) < 2)
+  if (strlen(langname) < 2)
    strcpy(real, "C");
  else
  {
-    real[0] = tolower(language[0]);
-    real[1] = tolower(language[1]);
+    real[0] = tolower(langname[0]);
+    real[1] = tolower(langname[1]);

-    if (language[2] == '_' || language[2] == '-')
+    if (langname[2] == '_' || langname[2] == '-')
    {
      real[2]     = '_';
-      real[3]     = toupper(language[3]);
-      real[4]     = toupper(language[4]);
+      real[3]     = toupper(langname[3]);
+      real[4]     = toupper(langname[4]);
      real[5]     = '\0';
-      language[5] = '\0';
+      langname[5] = '\0';
    }
    else
    {
-      language[2] = '\0';
+      langname[2] = '\0';
      real[2]     = '\0';
    }
  }
@@ -201,7 +204,7 @@ cupsLangGet(char *language)	/* I - Language or locale */
  */

  for (lang = lang_cache; lang != NULL; lang = lang->next)
-    if (strcmp(lang->language, language) == 0)
+    if (strcmp(lang->language, langname) == 0)
    {
      lang->used ++;

@@ -288,7 +291,7 @@ cupsLangGet(char *language)	/* I - Language or locale */
  */

  lang->used ++;
-  strcpy(lang->language, language);
+  strcpy(lang->language, langname);

  for (i = 0; i < (sizeof(lang_encodings) / sizeof(lang_encodings[0])); i ++)
    if (strcmp(lang_encodings[i], line) == 0)
@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44145 Airport View Drive, Suite 204
+ *       44141 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -48,13 +48,11 @@ typedef enum			/**** Message Indices ****/
  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,
@@ -63,18 +61,14 @@ typedef enum			/**** Message Indices ****/
  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_HPGL2,
+  CUPS_MSG_EXTRA,
  CUPS_MSG_DOCUMENT,
+  CUPS_MSG_OTHER,
+  CUPS_MSG_PRINT_PAGES,
  CUPS_MSG_ENTIRE_DOCUMENT,
  CUPS_MSG_PAGE_RANGE,
  CUPS_MSG_REVERSE_ORDER,
@@ -87,22 +81,16 @@ typedef enum			/**** Message Indices ****/
  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_ADD,
+  CUPS_MSG_DELETE,
+  CUPS_MSG_MODIFY,
  CUPS_MSG_PRINTER_URI,
  CUPS_MSG_PRINTER_NAME,
  CUPS_MSG_PRINTER_LOCATION,
@@ -134,6 +122,25 @@ typedef enum			/**** Message Indices ****/
  CUPS_MSG_IDLE,
  CUPS_MSG_PROCESSING,
  CUPS_MSG_STOPPED,
+  CUPS_MSG_ALL,
+  CUPS_MSG_ODD,
+  CUPS_MSG_EVEN_PAGES,
+  CUPS_MSG_DARKER_LIGHTER,
+  CUPS_MSG_MEDIA_SIZE,
+  CUPS_MSG_MEDIA_TYPE,
+  CUPS_MSG_MEDIA_SOURCE,
+  CUPS_MSG_ORIENTATION,
+  CUPS_MSG_PORTRAIT,
+  CUPS_MSG_LANDSCAPE,
+  CUPS_MSG_JOB_STATE,
+  CUPS_MSG_JOB_NAME,
+  CUPS_MSG_USER_NAME,
+  CUPS_MSG_PRIORITY,
+  CUPS_MSG_COPIES,
+  CUPS_MSG_FILE_SIZE,
+  CUPS_MSG_PENDING,
+  CUPS_MSG_OUTPUT_MODE,
+  CUPS_MSG_RESOLUTION,
  CUPS_MSG_HTTP_BASE = 200,
  CUPS_MSG_HTTP_END = 505,
  CUPS_MSG_MAX
@@ -170,11 +177,11 @@ typedef struct cups_lang_str	/**** Language Cache Structure ****/
 * Prototypes...
 */

-#  define		cupsLangDefault() cupsLangGet(setlocale(LC_ALL, 0))
+#  define		cupsLangDefault() cupsLangGet(setlocale(LC_ALL, ""))
 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);
+extern cups_lang_t	*cupsLangGet(const char *language);
 #  define		cupsLangString(lang,msg) (lang)->messages[(msg)]

 #  ifdef __cplusplus
@@ -33,7 +33,6 @@
 *   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.
 */

 /*
@@ -48,8 +47,7 @@
 * Local functions...
 */

-static void	ppd_defaults(ppd_group_t *g);
-static void	ppd_default(ppd_option_t *o);
+static void	ppd_defaults(ppd_file_t *ppd, ppd_group_t *g);


 /*
@@ -59,9 +57,10 @@ static void	ppd_default(ppd_option_t *o);
 int				/* O - Number of conflicts found */
 ppdConflicts(ppd_file_t *ppd)	/* I - PPD to check */
 {
-  int		i, j,		/* Looping variables */
+  int		i, j, k,	/* Looping variables */
 		conflicts;	/* Number of conflicts */
  ppd_const_t	*c;		/* Current constraint */
+  ppd_group_t	*g, *sg;	/* Groups */
  ppd_option_t	*o1, *o2;	/* Options */
  ppd_choice_t	*c1, *c2;	/* Choices */

@@ -69,8 +68,22 @@ ppdConflicts(ppd_file_t *ppd)	/* I - PPD to check */
  if (ppd == NULL)
    return (0);

+ /*
+  * Clear all conflicts...
+  */
+
  conflicts = 0;

+  for (i = ppd->num_groups, g = ppd->groups; i > 0; i --, g ++)
+  {
+    for (j = g->num_options, o1 = g->options; j > 0; j --, o1 ++)
+      o1->conflicted = 0;
+
+    for (j = g->num_subgroups, sg = g->subgroups; j > 0; j --, sg ++)
+      for (k = sg->num_options, o1 = sg->options; k > 0; k --, o1 ++)
+        o1->conflicted = 0;
+  }
+
 /*
  * Loop through all of the UI constraints and flag any options
  * that conflict...
@@ -149,11 +162,6 @@ ppdConflicts(ppd_file_t *ppd)	/* I - PPD to check */
      o1->conflicted = 1;
      o2->conflicted = 1;
    }
-    else
-    {
-      o1->conflicted = 0;
-      o2->conflicted = 0;
-    }
  }

 /*
@@ -170,7 +178,7 @@ ppdConflicts(ppd_file_t *ppd)	/* I - PPD to check */

 ppd_choice_t *				/* O - Choice pointer or NULL */
 ppdFindChoice(ppd_option_t *o,		/* I - Pointer to option */
-              char         *choice)	/* I - Name of choice */
+              const char   *choice)	/* I - Name of choice */
 {
  int		i;		/* Looping var */
  ppd_choice_t	*c;		/* Current choice */
@@ -193,7 +201,7 @@ ppdFindChoice(ppd_option_t *o,		/* I - Pointer to option */

 ppd_choice_t *				/* O - Pointer to choice or NULL */
 ppdFindMarkedChoice(ppd_file_t *ppd,	/* I - PPD file */
-                    char       *option)	/* I - Keyword/option name */
+                    const char *option)	/* I - Keyword/option name */
 {
  int		i;		/* Looping var */
  ppd_option_t	*o;		/* Pointer to option */
@@ -217,7 +225,7 @@ ppdFindMarkedChoice(ppd_file_t *ppd,	/* I - PPD file */

 ppd_option_t *				/* O - Pointer to option or NULL */
 ppdFindOption(ppd_file_t *ppd,		/* I - PPD file data */
-              char       *option)	/* I - Option/Keyword name */
+              const char *option)	/* I - Option/Keyword name */
 {
  int		i, j, k;	/* Looping vars */
  ppd_option_t	*o;		/* Pointer to option */
@@ -250,8 +258,8 @@ ppdFindOption(ppd_file_t *ppd,		/* I - PPD file data */

 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 */
+            const char *option,	/* I - Option/Keyword name */
+            const char *choice)	/* I - Choice name */
 {
  ppd_option_t	*o;		/* Option pointer */
  ppd_choice_t	*c;		/* Choice pointer */
@@ -286,12 +294,7 @@ ppdMarkDefaults(ppd_file_t *ppd)/* I - PPD file record */
    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;
+    ppd_defaults(ppd, g);
 }


@@ -306,8 +309,8 @@ ppdMarkDefaults(ppd_file_t *ppd)/* I - PPD file record */

 int					/* O - Number of conflicts */
 ppdMarkOption(ppd_file_t *ppd,		/* I - PPD file record */
-              char       *option,	/* I - Keyword */
-              char       *choice)	/* I - Option name */
+              const char *option,	/* I - Keyword */
+              const char *choice)	/* I - Option name */
 {
  int		i;		/* Looping var */
  ppd_option_t	*o;		/* Option pointer */
@@ -332,34 +335,46 @@ ppdMarkOption(ppd_file_t *ppd,		/* I - PPD file record */

  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;
+      break;

-  if (strcmp(option, "PageSize") == 0 || strcmp(option, "PageRegion") == 0)
+  if (i)
  {
   /*
-    * Mark current page size...
+    * Option found; mark it and then handle unmarking any other options.
    */

-    for (i = 0; i < ppd->num_sizes; i ++)
-      ppd->sizes[i].marked = strcmp(ppd->sizes[i].name, choice) == 0;
+    c->marked = 1;

-   /*
-    * Unmark the current PageSize or PageRegion setting, as appropriate...
-    */
+    if (o->ui != PPD_UI_PICKMANY)
+      for (i = o->num_choices, c = o->choices; i > 0; i --, c ++)
+	if (strcmp(c->choice, choice) != 0)
+          c->marked = 0;

-    if (strcmp(option, "PageSize") == 0)
+    if (strcmp(option, "PageSize") == 0 || strcmp(option, "PageRegion") == 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;
+     /*
+      * 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;
+      }
    }
  }

@@ -372,7 +387,8 @@ ppdMarkOption(ppd_file_t *ppd,		/* I - PPD file record */
 */

 static void
-ppd_defaults(ppd_group_t *g)	/* I - Group to default */
+ppd_defaults(ppd_file_t  *ppd,	/* I - PPD file */
+             ppd_group_t *g)	/* I - Group to default */
 {
  int		i;		/* Looping var */
  ppd_option_t	*o;		/* Current option */
@@ -384,32 +400,10 @@ ppd_defaults(ppd_group_t *g)	/* I - Group to default */

  for (i = g->num_options, o = g->options; i > 0; i --, o ++)
    if (strcmp(o->keyword, "PageRegion") != 0)
-      ppd_default(o);
+      ppdMarkOption(ppd, o->keyword, o->defchoice);

  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;
+    ppd_defaults(ppd, sg);
 }


@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44145 Airport View Drive, Suite 204
+ *       44141 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -33,6 +33,12 @@
 * Revision History:
 *
 *   $Log: mime.c,v $
+ *   Revision 1.14  1999/07/12 16:09:38  mike
+ *   Fixed all constant arrays to use "const" modifier.
+ *
+ *   Revision 1.13  1999/06/18 18:36:10  mike
+ *   Fixed address to 44141 Airport View Drive...
+ *
 *   Revision 1.12  1999/04/21 21:19:33  mike
 *   Changes for HP-UX.
 *
@@ -174,8 +180,8 @@ mimeDelete(mime_t *mime)	/* I - MIME database */
 */

 mime_t *			/* O - Updated MIME database */
-mimeMerge(mime_t *mime,		/* I - MIME database to add to */
-          char   *pathname)	/* I - Directory to load */
+mimeMerge(mime_t     *mime,	/* I - MIME database to add to */
+          const char *pathname)	/* I - Directory to load */
 {
 #if defined(WIN32) || defined(__EMX__)
  HANDLE	dir;		/* Directory handle */
@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44145 Airport View Drive, Suite 204
+ *       44141 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -114,16 +114,16 @@ typedef struct				/**** MIME Database ****/

 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		*mimeMerge(mime_t *mime, const 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_type_t	*mimeAddType(mime_t *mime, const char *super, const char *type);
+extern int		mimeAddTypeRule(mime_type_t *mt, const char *rule);
+extern mime_type_t	*mimeFileType(mime_t *mime, const char *pathname);
+extern mime_type_t	*mimeType(mime_t *mime, const char *super, const char *type);

 extern mime_filter_t	*mimeAddFilter(mime_t *mime, mime_type_t *src, mime_type_t *dst,
-			               int cost, char *filter);
+			               int cost, const char *filter);
 extern mime_filter_t	*mimeFilter(mime_t *mime, mime_type_t *src, mime_type_t *dst,
 			            int *num_filters);

@@ -45,8 +45,8 @@
 */

 int						/* O - Number of options */
-cupsAddOption(char          *name,		/* I - Name of option */
-              char          *value,		/* I - Value of option */
+cupsAddOption(const char    *name,		/* I - Name of option */
+              const char    *value,		/* I - Value of option */
 	      int           num_options,	/* I - Number of options */
              cups_option_t **options)		/* IO - Pointer to options */
 {
@@ -128,8 +128,8 @@ cupsFreeOptions(int           num_options,	/* I - Number of options */
 * 'cupsGetOption()' - Get an option value.
 */

-char *					/* O - Option value or NULL */
-cupsGetOption(char          *name,	/* I - Name of option */
+const char *				/* O - Option value or NULL */
+cupsGetOption(const char    *name,	/* I - Name of option */
              int           num_options,/* I - Number of options */
              cups_option_t *options)	/* I - Options */
 {
@@ -152,7 +152,7 @@ cupsGetOption(char          *name,	/* I - Name of option */
 */

 int						/* O - Number of options found */
-cupsParseOptions(char          *arg,		/* I - Argument to parse */
+cupsParseOptions(const char    *arg,		/* I - Argument to parse */
                 int           num_options,	/* I - Number of options */
                 cups_option_t **options)	/* O - Options found */
 {
@@ -279,6 +279,9 @@ cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
 {
  int	i;					/* Looping var */
  int	conflict;				/* Option conflicts */
+  char	*val,					/* Pointer into value */
+	*ptr,					/* Pointer into string */
+	s[255];					/* Temporary string */


  conflict = 0;
@@ -286,12 +289,40 @@ cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
  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;
+     /*
+      * Loop through the option string, separating it at commas and
+      * marking each individual option.
+      */
+
+      for (val = options->value; *val;)
+      {
+       /*
+        * Extract the sub-option from the string...
+	*/
+
+        for (ptr = s; *val && *val != ',' && (ptr - s) < (sizeof(s) - 1);)
+	  *ptr++ = *val++;
+	*ptr++ = '\0';
+
+	if (*val == ',')
+	  val ++;
+
+       /*
+        * Mark it...
+	*/
+
+	if (ppdMarkOption(ppd, "PageSize", s))
+          conflict = 1;
+	if (ppdMarkOption(ppd, "InputSlot", s))
+          conflict = 1;
+	if (ppdMarkOption(ppd, "MediaType", s))
+          conflict = 1;
+	if (ppdMarkOption(ppd, "EFMediaQualityMode", s))	/* EFI */
+          conflict = 1;
+	if (strcasecmp(s, "manual") == 0)
+          if (ppdMarkOption(ppd, "ManualFeed", "True"))
+	    conflict = 1;
+      }
    }
    else if (strcmp(options->name, "sides") == 0)
    {
@@ -299,18 +330,42 @@ cupsMarkOptions(ppd_file_t    *ppd,		/* I - PPD file */
      {
        if (ppdMarkOption(ppd, "Duplex", "None"))
 	  conflict = 1;
+        if (ppdMarkOption(ppd, "EFDuplex", "None"))	/* EFI */
+	  conflict = 1;
+        if (ppdMarkOption(ppd, "KD03Duplex", "None"))	/* Kodak */
+	  conflict = 1;
      }
      else if (strcmp(options->value, "two-sided-long-edge") == 0)
      {
-        if (ppdMarkOption(ppd, "Duplex", "NoTumble"))
+        if (ppdMarkOption(ppd, "Duplex", "DuplexNoTumble"))
+	  conflict = 1;
+        if (ppdMarkOption(ppd, "EFDuplex", "DuplexNoTumble"))	/* EFI */
+	  conflict = 1;
+        if (ppdMarkOption(ppd, "KD03Duplex", "DuplexNoTumble"))	/* Kodak */
 	  conflict = 1;
      }
      else if (strcmp(options->value, "two-sided-short-edge") == 0)
      {
-        if (ppdMarkOption(ppd, "Duplex", "Tumble"))
+        if (ppdMarkOption(ppd, "Duplex", "DuplexTumble"))
+	  conflict = 1;
+        if (ppdMarkOption(ppd, "EFDuplex", "DuplexTumble"))	/* EFI */
+	  conflict = 1;
+        if (ppdMarkOption(ppd, "KD03Duplex", "DuplexTumble"))	/* Kodak */
 	  conflict = 1;
      }
    }
+    else if (strcmp(options->name, "resolution") == 0)
+    {
+      if (ppdMarkOption(ppd, "Resolution", options->value))
+        conflict = 1;
+      if (ppdMarkOption(ppd, "SetResolution", options->value))
+      	/* Calcomp, Linotype, QMS, Summagraphics, Tektronix, Varityper */
+        conflict = 1;
+      if (ppdMarkOption(ppd, "JCLResolution", options->value))	/* HP */
+        conflict = 1;
+      if (ppdMarkOption(ppd, "CNRes_PGP", options->value))	/* Canon */
+        conflict = 1;
+    }
    else if (ppdMarkOption(ppd, options->name, options->value))
      conflict = 1;

@@ -45,7 +45,7 @@

 ppd_size_t *			/* O - Size record for page or NULL */
 ppdPageSize(ppd_file_t *ppd,	/* I - PPD file record */
-            char       *name)	/* I - Size name */
+            const char *name)	/* I - Size name */
 {
  int	i;			/* Looping var */
  float	w, l;			/* Width and length of page */
@@ -57,9 +57,19 @@ ppdPageSize(ppd_file_t *ppd,	/* I - PPD file record */

  if (name != NULL)
  {
-    if (strncmp(name, "Custom.", 7) == 0 &&
-        strcmp(ppd->sizes[0].name, "Custom") == 0)
+    if (strncmp(name, "Custom.", 7) == 0 && ppd->variable_sizes)
    {
+     /*
+      * Find the custom page size...
+      */
+
+      for (i = 0; i < ppd->num_sizes; i ++)
+	if (strcmp("Custom", ppd->sizes[i].name) == 0)
+          break;
+
+      if (i == ppd->num_sizes)
+        return (NULL);
+
     /*
      * Variable size; size name can be one of the following:
      *
@@ -75,42 +85,42 @@ ppdPageSize(ppd_file_t *ppd,	/* I - PPD file record */

      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];
+        ppd->sizes[i].width  = w * 72.0;
+	ppd->sizes[i].length = l * 72.0;
+	ppd->sizes[i].left   = ppd->custom_margins[0];
+	ppd->sizes[i].bottom = ppd->custom_margins[1];
+	ppd->sizes[i].right  = w * 72.0 - ppd->custom_margins[2];
+	ppd->sizes[i].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];
+        ppd->sizes[i].width  = w * 2.54 * 72.0;
+	ppd->sizes[i].length = l * 2.54 * 72.0;
+	ppd->sizes[i].left   = ppd->custom_margins[0];
+	ppd->sizes[i].bottom = ppd->custom_margins[1];
+	ppd->sizes[i].right  = w * 2.54 * 72.0 - ppd->custom_margins[2];
+	ppd->sizes[i].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];
+        ppd->sizes[i].width  = w * 25.4 * 72.0;
+	ppd->sizes[i].length = l * 25.4 * 72.0;
+	ppd->sizes[i].left   = ppd->custom_margins[0];
+	ppd->sizes[i].bottom = ppd->custom_margins[1];
+	ppd->sizes[i].right  = w * 25.4 * 72.0 - ppd->custom_margins[2];
+	ppd->sizes[i].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];
+        ppd->sizes[i].width  = w;
+	ppd->sizes[i].length = l;
+	ppd->sizes[i].left   = ppd->custom_margins[0];
+	ppd->sizes[i].bottom = ppd->custom_margins[1];
+	ppd->sizes[i].right  = w - ppd->custom_margins[2];
+	ppd->sizes[i].top    = l - ppd->custom_margins[3];
      }

-      return (ppd->sizes);
+      return (ppd->sizes + i);
    }
    else
    {
@@ -144,7 +154,7 @@ ppdPageSize(ppd_file_t *ppd,	/* I - PPD file record */

 float				/* O - Width of page in points or 0.0 */
 ppdPageWidth(ppd_file_t *ppd,	/* I - PPD file record */
-             char       *name)	/* I - Size name */
+             const char *name)	/* I - Size name */
 {
  ppd_size_t	*size;		/* Page size */

@@ -162,7 +172,7 @@ ppdPageWidth(ppd_file_t *ppd,	/* I - PPD file record */

 float				/* O - Length of page in points or 0.0 */
 ppdPageLength(ppd_file_t *ppd,	/* I - PPD file */
-              char       *name)	/* I - Size name */
+              const char *name)	/* I - Size name */
 {
  ppd_size_t	*size;		/* Page size */

@@ -40,17 +40,22 @@
 *   ppdOpenFile()     - Read a PPD file into memory.
 *   ppd_read()        - Read a line from a PPD file, skipping comment lines
 *                       as necessary.
+ *   compare_strings() - Compare two strings.
+ *   compare_groups()  - Compare two groups.
+ *   compare_options() - Compare two options.
+ *   compare_choices() - Compare two choices.
 */

 /*
 * Include necessary headers.
 */

-/*#define DEBUG*/
 #include "ppd.h"
 #include <stdlib.h>
 #include <ctype.h>
 #include "string.h"
+#include "language.h"
+#include "debug.h"


 /*
@@ -65,6 +70,8 @@
 #  define WRITE_BINARY	"w"		/* Open a binary file for writing */
 #endif /* WIN32 || __EMX__ */

+#define safe_free(p)	if (p) free(p)	/* Safe free macro */
+
 #define PPD_KEYWORD	1		/* Line contained a keyword */
 #define PPD_OPTION	2		/* Line contained an option name */
 #define PPD_TEXT	4		/* Line contained human-readable text */
@@ -75,9 +82,14 @@
 * Local functions...
 */

+static int		compare_strings(char *s, char *t);
+static int		compare_groups(ppd_group_t *g0, ppd_group_t *g1);
+static int		compare_options(ppd_option_t *o0, ppd_option_t *o1);
+static int		compare_choices(ppd_choice_t *c0, ppd_choice_t *c1);
 static int		ppd_read(FILE *fp, char *keyword, char *option,
 			         char *text, char **string);
 static void		ppd_decode(char *string);
+static void		ppd_fix(char *string);
 static void		ppd_free_group(ppd_group_t *group);
 static void		ppd_free_option(ppd_option_t *option);
 static ppd_group_t	*ppd_get_group(ppd_file_t *ppd, char *name);
@@ -109,14 +121,14 @@ ppdClose(ppd_file_t *ppd)	/* I - PPD file record */
  * Free all strings at the top level...
  */

-  free(ppd->lang_encoding);
-  free(ppd->lang_version);
-  free(ppd->modelname);
-  free(ppd->ttrasterizer);
-  free(ppd->manufacturer);
-  free(ppd->product);
-  free(ppd->nickname);
-  free(ppd->shortnickname);
+  safe_free(ppd->lang_encoding);
+  safe_free(ppd->lang_version);
+  safe_free(ppd->modelname);
+  safe_free(ppd->ttrasterizer);
+  safe_free(ppd->manufacturer);
+  safe_free(ppd->product);
+  safe_free(ppd->nickname);
+  safe_free(ppd->shortnickname);

 /*
  * Free any emulations...
@@ -126,11 +138,11 @@ ppdClose(ppd_file_t *ppd)	/* I - PPD file record */
  {
    for (i = ppd->num_emulations, emul = ppd->emulations; i > 0; i --, emul ++)
    {
-      free(emul->start);
-      free(emul->stop);
+      safe_free(emul->start);
+      safe_free(emul->stop);
    }

-    free(ppd->emulations);
+    safe_free(ppd->emulations);
  }

 /*
@@ -142,7 +154,7 @@ ppdClose(ppd_file_t *ppd)	/* I - PPD file record */
    for (i = ppd->num_groups, group = ppd->groups; i > 0; i --, group ++)
      ppd_free_group(group);

-    free(ppd->groups);
+    safe_free(ppd->groups);
  }

 /*
@@ -150,14 +162,14 @@ ppdClose(ppd_file_t *ppd)	/* I - PPD file record */
  */

  if (ppd->num_sizes > 0)
-    free(ppd->sizes);
+    safe_free(ppd->sizes);

 /*
  * Free any constraints...
  */

  if (ppd->num_consts > 0)
-    free(ppd->consts);
+    safe_free(ppd->consts);

 /*
  * Free any fonts...
@@ -166,9 +178,9 @@ ppdClose(ppd_file_t *ppd)	/* I - PPD file record */
  if (ppd->num_fonts > 0)
  {
    for (i = ppd->num_fonts, font = ppd->fonts; i > 0; i --, font ++)
-      free(*font);
+      safe_free(*font);

-    free(ppd->fonts);
+    safe_free(ppd->fonts);
  }

 /*
@@ -176,13 +188,13 @@ ppdClose(ppd_file_t *ppd)	/* I - PPD file record */
  */

  if (ppd->num_profiles > 0)
-    free(ppd->profiles);
+    safe_free(ppd->profiles);

 /*
  * Free the whole record...
  */

-  free(ppd);
+  safe_free(ppd);
 }


@@ -205,7 +217,7 @@ ppd_free_group(ppd_group_t *group)	/* I - Group to free */
 	 i --, option ++)
      ppd_free_option(option);

-    free(group->options);
+    safe_free(group->options);
  }

  if (group->num_subgroups > 0)
@@ -215,7 +227,7 @@ ppd_free_group(ppd_group_t *group)	/* I - Group to free */
 	 i --, subgroup ++)
      ppd_free_group(subgroup);

-    free(group->subgroups);
+    safe_free(group->subgroups);
  }
 }

@@ -236,9 +248,9 @@ ppd_free_option(ppd_option_t *option)	/* I - Option to free */
    for (i = option->num_choices, choice = option->choices;
         i > 0;
         i --, choice ++)
-      free(choice->code);
+      safe_free(choice->code);

-    free(option->choices);
+    safe_free(option->choices);
  }
 }

@@ -275,7 +287,7 @@ ppd_get_group(ppd_file_t *ppd,	/* I - PPD file */
    ppd->num_groups ++;

    memset(group, 0, sizeof(ppd_group_t));
-    strcpy(group->text, name);
+    strncpy(group->text, name, sizeof(group->text) - 1);
  }

  return (group);
@@ -314,7 +326,7 @@ ppd_get_option(ppd_group_t *group,	/* I - Group */
    group->num_options ++;

    memset(option, 0, sizeof(ppd_option_t));
-    strcpy(option->keyword, name);
+    strncpy(option->keyword, name, sizeof(option->keyword) - 1);
  }

  return (option);
@@ -346,7 +358,7 @@ ppd_add_choice(ppd_option_t *option,	/* I - Option */
  option->num_choices ++;

  memset(choice, 0, sizeof(ppd_choice_t));
-  strcpy(choice->choice, name);
+  strncpy(choice->choice, name, sizeof(choice->choice) - 1);

  return (choice);
 }
@@ -376,7 +388,7 @@ ppd_add_size(ppd_file_t *ppd,	/* I - PPD file */
  ppd->num_sizes ++;

  memset(size, 0, sizeof(ppd_size_t));
-  strcpy(size->name, name);
+  strncpy(size->name, name, sizeof(size->name) - 1);

  return (size);
 }
@@ -409,8 +421,15 @@ ppdOpen(FILE *fp)		/* I - File to read from */
  ppd_section_t	section;	/* Order dependency section */
  ppd_profile_t	*profile;	/* Pointer to color profile */
  char		**filter;	/* Pointer to filter */
+  cups_lang_t	*language;	/* Default language */


+ /*
+  * Get the default language for the user...
+  */
+
+  language = cupsLangDefault();
+
 /*
  * Range check input...
  */
@@ -432,14 +451,12 @@ ppdOpen(FILE *fp)		/* I - File to read from */
    * Either this is not a PPD file, or it is not a 4.x PPD file.
    */

-    if (string != NULL)
-      free(string);
+    safe_free(string);

    return (NULL);
  }

-  if (string != NULL)
-    free(string);
+  safe_free(string);

 /*
  * Allocate memory for the PPD file record...
@@ -582,9 +599,10 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      ppd->num_profiles ++;

      memset(profile, 0, sizeof(ppd_profile_t));
-      strcpy(profile->resolution, name);
-      strcpy(profile->media_type, text);
-      sscanf(string, "%f%f%f%f%f%f%f%f%f%f", &(profile->density),
+      strncpy(profile->resolution, name, sizeof(profile->resolution) - 1);
+      strncpy(profile->media_type, text, sizeof(profile->media_type) - 1);
+      sscanf(string, "%f%f%f%f%f%f%f%f%f%f%f", &(profile->density),
+	     &(profile->gamma),
 	     profile->matrix[0] + 0, profile->matrix[0] + 1,
 	     profile->matrix[0] + 2, profile->matrix[1] + 0,
 	     profile->matrix[1] + 1, profile->matrix[1] + 2,
@@ -624,28 +642,31 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      * Add a "Custom" page size option...
      */

-      if ((group = ppd_get_group(ppd, "General")) == NULL)
+      if ((group = ppd_get_group(ppd,
+                                 cupsLangString(language,
+                                                CUPS_MSG_GENERAL))) == NULL)
      {
        ppdClose(ppd);
-	free(string);
+	safe_free(string);
 	return (NULL);
      }

      if ((option = ppd_get_option(group, "PageSize")) == NULL)
      {
        ppdClose(ppd);
-	free(string);
+	safe_free(string);
 	return (NULL);
      }

      if ((choice = ppd_add_choice(option, "Custom")) == NULL)
      {
        ppdClose(ppd);
-	free(string);
+	safe_free(string);
 	return (NULL);
      }

-      strcpy(choice->text, "Custom Size");
+      strncpy(choice->text, cupsLangString(language, CUPS_MSG_VARIABLE),
+              sizeof(choice->text) - 1);
      group  = NULL;
      option = NULL;
    }
@@ -672,15 +693,15 @@ ppdOpen(FILE *fp)		/* I - File to read from */
    {
      if ((option = ppdFindOption(ppd, "PageSize")) == NULL)
      {
-        ppdClose(ppd);
-	free(string);
+	ppdClose(ppd);
+	safe_free(string);
 	return (NULL);
      }

      if ((choice = ppdFindChoice(option, "Custom")) == NULL)
      {
        ppdClose(ppd);
-	free(string);
+	safe_free(string);
 	return (NULL);
      }

@@ -773,45 +794,41 @@ ppdOpen(FILE *fp)		/* I - File to read from */

      if (subgroup != NULL)
        option = ppd_get_option(subgroup, name);
-      else
+      else if (group == NULL)
      {
+        if (strcmp(name, "Collate") != 0 &&
+            strcmp(name, "Duplex") != 0 &&
+            strcmp(name, "InputSlot") != 0 &&
+            strcmp(name, "ManualFeed") != 0 &&
+            strcmp(name, "MediaType") != 0 &&
+            strcmp(name, "MediaColor") != 0 &&
+            strcmp(name, "MediaWeight") != 0 &&
+            strcmp(name, "OutputBin") != 0 &&
+            strcmp(name, "OutputMode") != 0 &&
+            strcmp(name, "OutputOrder") != 0 &&
+	    strcmp(name, "PageSize") != 0 &&
+            strcmp(name, "PageRegion") != 0)
+	  group = ppd_get_group(ppd, cupsLangString(language, CUPS_MSG_EXTRA));
+	else
+	  group = ppd_get_group(ppd, cupsLangString(language, CUPS_MSG_GENERAL));
+
        if (group == NULL)
 	{
-          if (strcmp(name, "Collate") != 0 &&
-              strcmp(name, "Duplex") != 0 &&
-              strcmp(name, "InputSlot") != 0 &&
-              strcmp(name, "ManualFeed") != 0 &&
-              strcmp(name, "MediaType") != 0 &&
-              strcmp(name, "MediaColor") != 0 &&
-              strcmp(name, "MediaWeight") != 0 &&
-              strcmp(name, "OutputBin") != 0 &&
-              strcmp(name, "OutputMode") != 0 &&
-              strcmp(name, "OutputOrder") != 0 &&
-	      strcmp(name, "PageSize") != 0 &&
-              strcmp(name, "PageRegion") != 0)
-	    group = ppd_get_group(ppd, "Printer");
-	  else
-	    group = ppd_get_group(ppd, "General");
-
-          if (group == NULL)
-	  {
-	    ppdClose(ppd);
-	    free(string);
-	    return (NULL);
-	  }
-
-          option = ppd_get_option(group, name);
-	  group  = NULL;
+	  ppdClose(ppd);
+	  safe_free(string);
+	  return (NULL);
 	}
-	else
-          option = ppd_get_option(group, name);
+
+        option = ppd_get_option(group, name);
 	group  = NULL;
      }
+      else
+        option = ppd_get_option(group, name);

      if (option == NULL)
      {
 	ppdClose(ppd);
-	free(string);
+	safe_free(string);
 	return (NULL);
      }

@@ -826,7 +843,31 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      else
        option->ui = PPD_UI_PICKONE;

-      strcpy(option->text, text);
+      if (text[0])
+      {
+        strncpy(option->text, text, sizeof(option->text) - 1);
+	ppd_fix(option->text);
+      }
+      else
+      {
+        if (strcmp(name, "PageSize") == 0)
+	  strncpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_SIZE),
+                  sizeof(option->text) - 1);
+	else if (strcmp(name, "MediaType") == 0)
+	  strncpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_TYPE),
+                  sizeof(option->text) - 1);
+	else if (strcmp(name, "InputSlot") == 0)
+	  strncpy(option->text, cupsLangString(language, CUPS_MSG_MEDIA_SOURCE),
+                  sizeof(option->text) - 1);
+	else if (strcmp(name, "ColorModel") == 0)
+	  strncpy(option->text, cupsLangString(language, CUPS_MSG_OUTPUT_MODE),
+                  sizeof(option->text) - 1);
+	else if (strcmp(name, "Resolution") == 0)
+	  strncpy(option->text, cupsLangString(language, CUPS_MSG_RESOLUTION),
+                  sizeof(option->text) - 1);
+        else
+	  strncpy(option->text, name, sizeof(option->text) - 1);
+      }

      option->section = PPD_ORDER_ANY;
    }
@@ -836,19 +877,12 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      * Find the JCL group, and add if needed...
      */

-      if (group != NULL)
-      {
-        ppdClose(ppd);
-	free(string);
-	return (NULL);
-      }
-
      group = ppd_get_group(ppd, "JCL");

      if (group == NULL)
      {
        ppdClose(ppd);
-	free(string);
+	safe_free(string);
 	return (NULL);
      }

@@ -864,7 +898,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      if (option == NULL)
      {
        ppdClose(ppd);
-	free(string);
+	safe_free(string);
 	return (NULL);
      }

@@ -879,7 +913,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      else
        option->ui = PPD_UI_PICKONE;

-      strcpy(option->text, text);
+      strncpy(option->text, text, sizeof(option->text) - 1);

      option->section = PPD_ORDER_JCL;
      group = NULL;
@@ -896,13 +930,15 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      if (group != NULL)
      {
        ppdClose(ppd);
-	free(string);
+	safe_free(string);
 	return (NULL);
      }

      if (strchr(string, '/') != NULL)	/* Just show human readable text */
        strcpy(string, strchr(string, '/') + 1);

+      ppd_decode(string);
+      ppd_fix(string);
      group = ppd_get_group(ppd, string);
    }
    else if (strcmp(keyword, "CloseGroup") == 0)
@@ -916,7 +952,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      if (group == NULL || subgroup != NULL)
      {
        ppdClose(ppd);
-	free(string);
+	safe_free(string);
 	return (NULL);
      }

@@ -929,7 +965,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      if (subgroup == NULL)
      {
 	ppdClose(ppd);
-	free(string);
+	safe_free(string);
 	return (NULL);
      }

@@ -938,7 +974,9 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      group->num_subgroups ++;

      memset(subgroup, 0, sizeof(ppd_group_t));
-      strcpy(subgroup->text, string);
+      ppd_decode(string);
+      ppd_fix(string);
+      strncpy(subgroup->text, string, sizeof(subgroup->text) - 1);
    }
    else if (strcmp(keyword, "CloseSubGroup") == 0)
      subgroup = NULL;
@@ -948,7 +986,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      if (sscanf(string, "%f%s%s", &order, name, keyword) != 3)
      {
        ppdClose(ppd);
-	free(string);
+	safe_free(string);
 	return (NULL);
      }

@@ -997,6 +1035,9 @@ ppdOpen(FILE *fp)		/* I - File to read from */
    }
    else if (strncmp(keyword, "Default", 7) == 0)
    {
+      if (string == NULL)
+        continue;
+
      if (strchr(string, '/') != NULL)
        *strchr(string, '/') = '\0';

@@ -1014,14 +1055,15 @@ ppdOpen(FILE *fp)		/* I - File to read from */
          for (i = 0; i < group->num_options; i ++)
 	    if (strcmp(keyword, group->options[i].keyword) == 0)
 	    {
-	      strcpy(group->options[i].defchoice, string);
+	      strncpy(group->options[i].defchoice, string,
+                      sizeof(group->options[i].defchoice) - 1);
 	      break;
 	    }

        group = NULL;
      }
      else
-        strcpy(option->defchoice, string);
+        strncpy(option->defchoice, string, sizeof(option->defchoice) - 1);
    }
    else if (strcmp(keyword, "UIConstraints") == 0 ||
             strcmp(keyword, "NonUIConstraints") == 0)
@@ -1035,7 +1077,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      if (constraint == NULL)
      {
 	ppdClose(ppd);
-	free(string);
+	safe_free(string);
 	return (NULL);
      }

@@ -1043,14 +1085,14 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      constraint += ppd->num_consts;
      ppd->num_consts ++;

-      switch (sscanf(string, "%s%s%s%s", constraint->option1,
+      switch (sscanf(string, "%40s%40s%40s%40s", constraint->option1,
                     constraint->choice1, constraint->option2,
 		     constraint->choice2))
      {
        case 0 : /* Error */
 	case 1 : /* Error */
 	    ppdClose(ppd);
-  	    free(string);
+  	    safe_free(string);
 	    break;

 	case 2 : /* Two options... */
@@ -1072,13 +1114,17 @@ ppdOpen(FILE *fp)		/* I - File to read from */

 	    if (constraint->choice1[0] == '*')
 	    {
+	      strcpy(constraint->choice2, constraint->option2);
 	      strcpy(constraint->option2, constraint->choice1 + 1);
              constraint->choice1[0] = '\0';
 	    }
-	    else if (constraint->option2[0] == '*')
-  	      strcpy(constraint->option2, constraint->option2 + 1);
+	    else
+	    {
+	      if (constraint->option2[0] == '*')
+  	        strcpy(constraint->option2, constraint->option2 + 1);

-            constraint->choice2[0] = '\0';
+              constraint->choice2[0] = '\0';
+	    }
 	    break;
 	    
 	case 4 : /* Two options, two choices... */
@@ -1121,13 +1167,16 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      choice = ppd_add_choice(option, name);

      if (mask & PPD_TEXT)
-        strcpy(choice->text, text);
+      {
+        strncpy(choice->text, text, sizeof(choice->text) - 1);
+        ppd_fix(choice->text);
+      }
      else if (strcmp(name, "True") == 0)
        strcpy(choice->text, "Yes");
      else if (strcmp(name, "False") == 0)
        strcpy(choice->text, "No");
      else
-        strcpy(choice->text, name);
+        strncpy(choice->text, name, sizeof(choice->text) - 1);

      if (strncmp(keyword, "JCL", 3) == 0)
        ppd_decode(string);		/* Decode quoted string */
@@ -1136,8 +1185,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      string = NULL;			/* Don't free this string below */
    }

-    if (string != NULL)
-      free(string);
+    safe_free(string);
  }

 #ifdef DEBUG
@@ -1149,24 +1197,48 @@ ppdOpen(FILE *fp)		/* I - File to read from */
  * Set the option back-pointer for each choice...
  */

+  qsort(ppd->groups, ppd->num_groups, sizeof(ppd_group_t),
+        (int (*)(const void *, const void *))compare_groups);
+
  for (i = ppd->num_groups, group = ppd->groups;
       i > 0;
       i --, group ++)
  {
+    qsort(group->options, group->num_options, sizeof(ppd_option_t),
+          (int (*)(const void *, const void *))compare_options);
+
    for (j = group->num_options, option = group->options;
         j > 0;
 	 j --, option ++)
+    {
+      qsort(option->choices, option->num_choices, sizeof(ppd_choice_t),
+            (int (*)(const void *, const void *))compare_choices);
+
      for (k = 0; k < option->num_choices; k ++)
        option->choices[k].option = (void *)option;
+    }
+
+    qsort(group->subgroups, group->num_subgroups, sizeof(ppd_group_t),
+          (int (*)(const void *, const void *))compare_groups);

    for (j = group->num_subgroups, subgroup = group->subgroups;
         j > 0;
 	 j --, subgroup ++)
+    {
+      qsort(subgroup->options, subgroup->num_options, sizeof(ppd_option_t),
+            (int (*)(const void *, const void *))compare_options);
+
      for (k = group->num_options, option = group->options;
           k > 0;
 	   k --, option ++)
+      {
+	qsort(option->choices, option->num_choices, sizeof(ppd_choice_t),
+              (int (*)(const void *, const void *))compare_choices);
+
        for (m = 0; m < option->num_choices; m ++)
          option->choices[m].option = (void *)option;
+      }
+    }
  }

  return (ppd);
@@ -1201,7 +1273,7 @@ ppdOpenFd(int fd)		/* I - File to read from */

    ppd = ppdOpen(fp);

-    free(fp);
+    safe_free(fp);
  }
  else
    ppd = NULL;
@@ -1215,7 +1287,7 @@ ppdOpenFd(int fd)		/* I - File to read from */
 */

 ppd_file_t *			/* O - PPD file record */
-ppdOpenFile(char *filename)	/* I - File to read from */
+ppdOpenFile(const char *filename) /* I - File to read from */
 {
  FILE		*fp;		/* File pointer */
  ppd_file_t	*ppd;		/* PPD file record */
@@ -1245,6 +1317,151 @@ ppdOpenFile(char *filename)	/* I - File to read from */
 }


+/*
+ * 'compare_strings()' - Compare two strings.
+ */
+
+int				/* O - Result of comparison */
+compare_strings(char *s,	/* I - First string */
+                char *t)	/* I - Second string */
+{
+  int	diff,			/* Difference between digits */
+	digits;			/* Number of digits */
+
+
+ /*
+  * Loop through both strings, returning only when a difference is
+  * seen.  Also, compare whole numbers rather than just characters, too!
+  */
+
+  while (*s && *t)
+  {
+    if (isdigit(*s) && isdigit(*t))
+    {
+     /*
+      * Got a number; start by skipping leading 0's...
+      */
+
+      while (*s == '0')
+        s ++;
+      while (*t == '0')
+        t ++;
+
+     /*
+      * Skip equal digits...
+      */
+
+      while (isdigit(*s) && *s == *t)
+      {
+        s ++;
+	t ++;
+      }
+
+     /*
+      * Bounce out if *s and *t aren't both digits...
+      */
+
+      if (isdigit(*s) && !isdigit(*t))
+        return (1);
+      else if (!isdigit(*s) && isdigit(*t))
+        return (-1);
+      else if (!isdigit(*s) || !isdigit(*t))
+        continue;     
+
+      if (*s < *t)
+        diff = -1;
+      else
+        diff = 1;
+
+     /*
+      * Figure out how many more digits there are...
+      */
+
+      digits = 0;
+
+      while (isdigit(*s))
+      {
+        digits ++;
+	s ++;
+      }
+
+      while (isdigit(*t))
+      {
+        digits --;
+	t ++;
+      }
+
+     /*
+      * Return if the number or value of the digits is different...
+      */
+
+      if (digits < 0)
+        return (-1);
+      else if (digits > 0)
+        return (1);
+      else
+        return (diff);
+    }
+    else if (tolower(*s) < tolower(*t))
+      return (-1);
+    else if (tolower(*s) > tolower(*t))
+      return (1);
+    else
+    {
+      s ++;
+      t ++;
+    }
+  }
+
+ /*
+  * Return the results of the final comparison...
+  */
+
+  if (*s)
+    return (1);
+  else if (*t)
+    return (-1);
+  else
+    return (0);
+}
+
+
+/*
+ * 'compare_groups()' - Compare two groups.
+ */
+
+static int			/* O - Result of comparison */
+compare_groups(ppd_group_t *g0,	/* I - First group */
+               ppd_group_t *g1)	/* I - Second group */
+{
+  return (compare_strings(g0->text, g1->text));
+}
+
+
+/*
+ * 'compare_options()' - Compare two options.
+ */
+
+static int			/* O - Result of comparison */
+compare_options(ppd_option_t *o0,/* I - First option */
+                ppd_option_t *o1)/* I - Second option */
+{
+  return (compare_strings(o0->text, o1->text));
+}
+
+
+/*
+ * 'compare_choices()' - Compare two choices.
+ */
+
+static int			/* O - Result of comparison */
+compare_choices(ppd_choice_t *c0,/* I - First choice */
+                ppd_choice_t *c1)/* I - Second choice */
+{
+  return (compare_strings(c0->text, c1->text));
+}
+
+
 /*
 * 'ppd_read()' - Read a line from a PPD file, skipping comment lines as
 *                necessary.
@@ -1495,6 +1712,56 @@ ppd_decode(char *string)	/* I - String to decode */
 }


+/*
+ * 'ppd_fix()' - Fix WinANSI characters in the range 0x80 to 0x9f to be
+ *               valid ISO-8859-1 characters...
+ */
+
+static void
+ppd_fix(char *string)		/* IO - String to fix */
+{
+  unsigned char		*p;	/* Pointer into string */
+  static unsigned char	lut[32] =/* Lookup table for characters */
+			{
+			  0x20,
+			  0x20,
+			  0x20,
+			  0x20,
+			  0x20,
+			  0x20,
+			  0x20,
+			  0x20,
+			  0x20,
+			  0x20,
+			  0x20,
+			  0x20,
+			  0x20,
+			  0x20,
+			  0x20,
+			  0x20,
+			  'l',
+			  '`',
+			  '\'',
+			  '^',
+			  '~',
+			  0x20, /* bar */
+			  0x20, /* circumflex */
+			  0x20, /* dot */
+			  0x20, /* double dot */
+			  0x20,
+			  0x20, /* circle */
+			  0x20, /* ??? */
+			  0x20,
+			  '\"', /* should be right quotes */
+			  0x20, /* ??? */
+			  0x20  /* accent */
+			};
+
+
+  for (p = (unsigned char *)string; *p; p ++)
+    if (*p >= 0x80 && *p < 0xa0)
+      *p = lut[*p - 0x80];
+}


 /*
@@ -153,6 +153,7 @@ typedef struct			/**** sRGB Color Profiles ****/
  char		resolution[41],	/* Resolution or "-" */
 		media_type[41];	/* Media type of "-" */
  float		density,	/* Ink density to use */
+		gamma,		/* Gamma correction to use */
 		matrix[3][3];	/* Transform matrix */
 } ppd_profile_t;

@@ -209,20 +210,20 @@ 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 int		ppdIsMarked(ppd_file_t *ppd, const char *keyword,
+			            const 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 int		ppdMarkOption(ppd_file_t *ppd, const char *keyword,
+			              const char *option);
+extern ppd_choice_t	*ppdFindChoice(ppd_option_t *o, const char *option);
+extern ppd_choice_t	*ppdFindMarkedChoice(ppd_file_t *ppd, const char *keyword);
+extern ppd_option_t	*ppdFindOption(ppd_file_t *ppd, const 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);
+extern ppd_file_t	*ppdOpenFile(const char *filename);
+extern float		ppdPageLength(ppd_file_t *ppd, const char *name);
+extern ppd_size_t	*ppdPageSize(ppd_file_t *ppd, const char *name);
+extern float		ppdPageWidth(ppd_file_t *ppd, const char *name);

 /*
 * C++ magic...
@@ -129,8 +129,13 @@ typedef enum
  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, *
+  CUPS_CSPACE_KCMYcm,			/* Black, cyan, magenta, yellow, *
 					 * light-cyan, light-magenta     */
+  CUPS_CSPACE_GMCK,			/* Gold, magenta, yellow, black */
+  CUPS_CSPACE_GMCS,			/* Gold, magenta, yellow, silver */
+  CUPS_CSPACE_WHITE,			/* White ink (as black) */
+  CUPS_CSPACE_GOLD,			/* Gold foil */
+  CUPS_CSPACE_SILVER			/* Silver foil */
 } cups_cspace_t;


@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44145 Airport View Drive, Suite 204
+ *       44141 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
- *       44145 Airport View Drive, Suite 204
+ *       44141 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
- *       44145 Airport View Drive, Suite 204
+ *       44141 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
- *       44145 Airport View Drive, Suite 204
+ *       44141 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
- *       44145 Airport View Drive, Suite 204
+ *       44141 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -45,7 +45,7 @@ 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 */
+  const char	*filename;	/* File to load */
  ppd_file_t	*ppd;		/* PPD file record */
  ppd_size_t	*size;		/* Size record */
  ppd_group_t	*group;		/* UI group */
@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44145 Airport View Drive, Suite 204
+ *       44141 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -50,8 +50,8 @@
 */

 static int	compare(mime_type_t **, mime_type_t **);
-static int	checkrules(char *, FILE *, mime_magic_t *);
-static int	patmatch(char *, char *);
+static int	checkrules(const char *, FILE *, mime_magic_t *);
+static int	patmatch(const char *, const char *);


 /*
@@ -59,9 +59,9 @@ static int	patmatch(char *, char *);
 */

 mime_type_t *			/* O - New (or existing) MIME type */
-mimeAddType(mime_t *mime,	/* I - MIME database */
-            char   *super,	/* I - Super-type name */
-	    char   *type)	/* I - Type name */
+mimeAddType(mime_t     *mime,	/* I - MIME database */
+            const char *super,	/* I - Super-type name */
+	    const char *type)	/* I - Type name */
 {
  mime_type_t	*temp,		/* New MIME type */
 		**types;	/* New MIME types array */
@@ -125,7 +125,7 @@ mimeAddType(mime_t *mime,	/* I - MIME database */

 int					/* O - 0 on success, -1 on failure */
 mimeAddTypeRule(mime_type_t *mt,	/* I - Type to add to */
-                char        *rule)	/* I - Rule to add */
+                const char  *rule)	/* I - Rule to add */
 {
  int		num_values,		/* Number of values seen */
 		op,			/* Operation code */
@@ -497,14 +497,14 @@ mimeAddTypeRule(mime_type_t *mt,	/* I - Type to add to */
 * 'mimeFileType()' - Determine the type of a file.
 */

-mime_type_t *			/* O - Type of file */
-mimeFileType(mime_t *mime,	/* I - MIME database */
-             char   *pathname)	/* I - Name of file to check */
+mime_type_t *				/* O - Type of file */
+mimeFileType(mime_t     *mime,		/* I - MIME database */
+             const char *pathname)	/* I - Name of file to check */
 {
  int		i;		/* Looping var */
  FILE		*fp;		/* File pointer */
  mime_type_t	**types;	/* File types */
-  char		*filename;	/* Base filename of file */
+  const char	*filename;	/* Base filename of file */


 /*
@@ -556,9 +556,9 @@ mimeFileType(mime_t *mime,	/* I - MIME database */
 */

 mime_type_t *			/* O - Matching file type definition */
-mimeType(mime_t *mime,		/* I - MIME database */
-         char   *super,		/* I - Super-type name */
-	 char   *type)		/* I - Type name */
+mimeType(mime_t     *mime,	/* I - MIME database */
+         const char *super,	/* I - Super-type name */
+	 const char *type)	/* I - Type name */
 {
  mime_type_t	key,		/* MIME type search key*/
 		*keyptr,	/* Key pointer... */
@@ -620,7 +620,7 @@ compare(mime_type_t **t0,	/* I - First type */
 */

 static int				/* O - 1 if match, 0 if no match */
-checkrules(char         *filename,	/* I - Filename */
+checkrules(const char   *filename,	/* I - Filename */
           FILE         *fp,		/* I - File to check */
           mime_magic_t *rules)		/* I - Rules to check */
 {
@@ -686,8 +686,8 @@ checkrules(char         *filename,	/* I - Filename */
          bufptr = buffer + rules->offset - bufoffset;
 	  while (n > 0)
 	    if ((*bufptr >= 32 && *bufptr <= 126) ||
-	        (*bufptr >= 8 && *bufptr <= 10) ||
-		*bufptr == 13 || *bufptr == 26)
+	        (*bufptr >= 8 && *bufptr <= 13) ||
+		*bufptr == 26 || *bufptr == 27)
 	    {
 	      n --;
 	      bufptr ++;
@@ -729,8 +729,8 @@ checkrules(char         *filename,	/* I - Filename */
 	  while (n > 0)
 	    if ((*bufptr >= 160 && *bufptr <= 254) ||
 	        (*bufptr >= 32 && *bufptr <= 126) ||
-	        (*bufptr >= 8 && *bufptr <= 10) ||
-		*bufptr == 13 || *bufptr == 26)
+	        (*bufptr >= 8 && *bufptr <= 13) ||
+		*bufptr == 26 || *bufptr == 27)
 	    {
 	      n --;
 	      bufptr ++;
@@ -906,9 +906,9 @@ checkrules(char         *filename,	/* I - Filename */
 * 'patmatch()' - Pattern matching...
 */

-static int		/* O - 1 if match, 0 if no match */
-patmatch(char *s,	/* I - String to match against */
-         char *pat)	/* I - Pattern to match against */
+static int			/* O - 1 if match, 0 if no match */
+patmatch(const char *s,		/* I - String to match against */
+         const char *pat)	/* I - Pattern to match against */
 {
 /*
  * Range check the input...
@@ -0,0 +1,175 @@
+/*
+ * "$Id$"
+ *
+ *   User, system, and password 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:
+ *
+ */
+
+/*
+ * Include necessary headers...
+ */
+
+#include "cups.h"
+#include <config.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+
+#if defined(WIN32) || defined(__EMX__)
+/*
+ * WIN32 and OS/2 username and password stuff...
+ */
+
+/*
+ * 'cupsUser()' - Return the current user's name.
+ */
+
+const char *				/* O - User name */
+cupsUser(void)
+{
+  return ("WindowsUser");
+}
+
+
+/*
+ * 'cupsGetPassword()' - Get a password from the user...
+ */
+
+const char *				/* O - Password */
+cupsGetPassword(const char *prompt)	/* I - Prompt string */
+{
+  return (NULL);
+}
+#else
+/*
+ * UNIX username and password stuff...
+ */
+
+#  include <pwd.h>
+
+/*
+ * 'cupsUser()' - Return the current user's name.
+ */
+
+const char *				/* O - User name */
+cupsUser(void)
+{
+  struct passwd	*pwd;			/* User/password entry */
+
+
+ /*
+  * Rewind the password file...
+  */
+
+  setpwent();
+
+ /*
+  * Lookup the password entry for the current user.
+  */
+
+  if ((pwd = getpwuid(getuid())) == NULL)
+    return ("unknown");			/* Unknown user! */
+
+ /*
+  * Rewind the password file again and return the username...
+  */
+
+  setpwent();
+
+  return (pwd->pw_name);
+}
+
+
+/*
+ * 'cupsGetPassword()' - Get a password from the user...
+ */
+
+const char *				/* O - Password */
+cupsGetPassword(const char *prompt)	/* I - Prompt string */
+{
+  return (getpass(prompt));
+}
+#endif /* WIN32 || __EMX__ */
+
+
+/*
+ * 'cupsServer()' - Return the hostname of the default server...
+ */
+
+const char *				/* O - Server name */
+cupsServer(void)
+{
+  FILE		*fp;			/* cupsd.conf file */
+  char		*server;		/* Pointer to server name */
+  static char	line[1024];		/* Line from file */
+
+
+ /*
+  * First see if the CUPS_SERVER environment variable is set...
+  */
+
+  if ((server = getenv("CUPS_SERVER")) != NULL)
+    return (server);
+
+ /*
+  * Next check to see if we have a cupsd.conf file...
+  */
+
+  if ((fp = fopen(CUPS_SERVERROOT "/conf/cupsd.conf", "r")) == NULL)
+    return ("localhost");
+
+ /*
+  * Read the cupsd.conf file and look for a ServerName line...
+  */
+
+  while (fgets(line, sizeof(line), fp) != NULL)
+    if (strncmp(line, "ServerName ", 11) == 0)
+    {
+     /*
+      * Got it!  Drop any trailing newline and find the name...
+      */
+
+      server = line + strlen(line) - 1;
+      if (*server == '\n')
+        *server = '\0';
+
+      for (server = line + 11; isspace(*server); server ++);
+
+      if (*server)
+        return (server);
+    }
+
+ /*
+  * Didn't see a ServerName line, so return "localhost"...
+  */
+
+  fclose(fp);
+
+  return ("localhost");
+}
+
+
+/*
+ * End of "$Id$".
+ */
@@ -14,7 +14,7 @@
 *
 *       Attn: CUPS Licensing Information
 *       Easy Software Products
- *       44145 Airport View Drive, Suite 204
+ *       44141 Airport View Drive, Suite 204
 *       Hollywood, Maryland 20636-3111 USA
 *
 *       Voice: (301) 373-9603
@@ -64,7 +64,7 @@ static http_t	*cups_server = NULL;
 * Local functions...
 */

-static char	*cups_connect(char *name, char *printer, char *hostname);
+static char	*cups_connect(const char *name, char *printer, char *hostname);


 /*
@@ -72,8 +72,8 @@ static char	*cups_connect(char *name, char *printer, char *hostname);
 */

 int				/* O - 1 on success, 0 on failure */
-cupsCancelJob(char *name,	/* I - Name of printer or class */
-              int  job)		/* I - Job ID */
+cupsCancelJob(const 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 */
@@ -118,7 +118,7 @@ cupsCancelJob(char *name,	/* I - Name of printer or class */
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
               NULL, uri);

-  ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "job-id", job);
+  ippAddInteger(request, IPP_TAG_OPERATION, IPP_TAG_INTEGER, "job-id", job);

 /*
  * Do the request...
@@ -137,10 +137,10 @@ cupsCancelJob(char *name,	/* I - Name of printer or class */
 */

 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 */
+cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
+                  ipp_t      *request,	/* I - IPP request */
+                  const char *resource,	/* I - HTTP resource for POST */
+		  const char *filename)	/* I - File to send or NULL */
 {
  ipp_t		*response;	/* IPP response data */
  char		length[255];	/* Content-Length field */
@@ -149,12 +149,9 @@ cupsDoFileRequest(http_t *http,		/* I - HTTP connection to server */
  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 */
+  const char	*password;	/* Password string */
+  char		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 */

@@ -204,7 +201,7 @@ cupsDoFileRequest(http_t *http,		/* I - HTTP connection to server */
    */

    if (filename != NULL)
-      sprintf(length, "%u", ippLength(request) + fileinfo.st_size);
+      sprintf(length, "%u", ippLength(request) + (size_t)fileinfo.st_size);
    else
      sprintf(length, "%u", ippLength(request));

@@ -220,8 +217,10 @@ cupsDoFileRequest(http_t *http,		/* I - HTTP connection to server */
    DEBUG_puts("cupsDoFileRequest: post...");

    if (httpPost(http, resource))
-      if (httpPost(http, resource))
-        break;
+    {
+      httpReconnect(http);
+      continue;
+    }

   /*
    * Send the IPP data and wait for the response...
@@ -254,7 +253,6 @@ cupsDoFileRequest(http_t *http,		/* I - HTTP connection to server */

    while ((status = httpUpdate(http)) == HTTP_CONTINUE);

-#if !defined(WIN32) && !defined(__EMX__)
    if (status == HTTP_UNAUTHORIZED)
    {
      DEBUG_puts("cupsDoFileRequest: unauthorized...");
@@ -265,7 +263,7 @@ cupsDoFileRequest(http_t *http,		/* I - HTTP connection to server */

      httpFlush(http);

-      if ((password = getpass("Password:")) != NULL)
+      if ((password = cupsGetPassword("Password:")) != NULL)
      {
       /*
 	* Got a password; send it to the server...
@@ -273,7 +271,7 @@ cupsDoFileRequest(http_t *http,		/* I - HTTP connection to server */

        if (!password[0])
          break;
-	sprintf(plain, "%s:%s", cuserid(NULL), password);
+	sprintf(plain, "%s:%s", cupsUser(), password);
 	httpEncode64(encode, plain);
 	sprintf(authstring, "Basic %s", encode);

@@ -282,7 +280,6 @@ cupsDoFileRequest(http_t *http,		/* I - HTTP connection to server */
      else
        break;
    }
-#endif /* !WIN32 && !__EMX__ */

    if (status != HTTP_OK)
    {
@@ -422,7 +419,7 @@ cupsGetClasses(char ***classes)	/* O - Classes */
 * 'cupsGetDefault()' - Get the default printer or class.
 */

-char *				/* O - Default printer or NULL */
+const char *			/* O - Default printer or NULL */
 cupsGetDefault(void)
 {
  ipp_t		*request,	/* IPP Request */
@@ -494,8 +491,8 @@ cupsGetDefault(void)
 * 'cupsGetPPD()' - Get the PPD file for a printer.
 */

-char *				/* O - Filename for PPD file */
-cupsGetPPD(char *name)		/* I - Printer name */
+const char *			/* O - Filename for PPD file */
+cupsGetPPD(const char *name)	/* I - Printer name */
 {
  FILE		*fp;			/* PPD file */
  int		bytes;			/* Number of bytes read */
@@ -505,7 +502,6 @@ cupsGetPPD(char *name)		/* I - Printer name */
 		resource[HTTP_MAX_URI];	/* Resource name */
  static char	filename[HTTP_MAX_URI];	/* Local filename */
  char		*tempdir;		/* Temporary file directory */
-  struct stat	fileinfo;		/* File information */


 /*
@@ -521,33 +517,29 @@ cupsGetPPD(char *name)		/* I - Printer name */

 #if defined(WIN32) || defined(__EMX__)
  tempdir = "C:/WINDOWS/TEMP";
+
+  sprintf(filename, "%s/%s.ppd", tempdir, printer);
 #else
  if ((tempdir = getenv("TMPDIR")) == NULL)
    tempdir = "/tmp";
+
+  sprintf(filename, "%s/%d.%s.ppd", tempdir, getuid(), printer);
 #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"...
+  * And send a request to the HTTP server...
  */

  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);
  }
@@ -659,9 +651,9 @@ cupsGetPrinters(char ***printers)	/* O - Printers */
 */

 int					/* O - Job ID */
-cupsPrintFile(char          *name,	/* I - Printer or class name */
-              char          *filename,	/* I - File to print */
-	      char          *title,	/* I - Title of job */
+cupsPrintFile(const char    *name,	/* I - Printer or class name */
+              const char    *filename,	/* I - File to print */
+	      const char    *title,	/* I - Title of job */
              int           num_options,/* I - Number of options */
 	      cups_option_t *options)	/* I - Options */
 {
@@ -728,22 +720,17 @@ cupsPrintFile(char          *name,	/* I - Printer or class name */
  */

  if (cupsGetOption("raw", num_options, options))
-    ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
        	 NULL, "application/vnd.cups-raw");
  else
-    ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
+    ippAddString(request, IPP_TAG_OPERATION, 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__ */
+  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+               NULL, cupsUser());

  if (title)
-    ippAddString(request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, title);
+    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL, title);

 /*
  * Then add all options on the command-line...
@@ -816,7 +803,7 @@ cupsPrintFile(char          *name,	/* I - Printer or class name */
      * String value(s)...
      */

-      DEBUG_printf(("cupsPrintJob: Adding string option \'%s\' with value \'%s\'...\n",
+      DEBUG_printf(("cupsPrintFile: Adding string option \'%s\' with value \'%s\'...\n",
                    option, val));

      ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, option, NULL, val);
@@ -832,7 +819,7 @@ cupsPrintFile(char          *name,	/* I - Printer or class name */
        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",
+	DEBUG_printf(("cupsPrintFile: Adding range option \'%s\' with value %d-%d...\n",
                      option, n, n2));
      }
      else if (*s == 'x')
@@ -846,14 +833,14 @@ cupsPrintFile(char          *name,	/* I - Printer or class name */
        else
          ippAddString(request, IPP_TAG_JOB, IPP_TAG_KEYWORD, option, NULL, val);

-	DEBUG_printf(("cupsPrintJob: Adding resolution option \'%s\' with value %s...\n",
+	DEBUG_printf(("cupsPrintFile: 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",
+	DEBUG_printf(("cupsPrintFile: Adding integer option \'%s\' with value %d...\n",
                      option, n));
      }
    }
@@ -863,7 +850,7 @@ cupsPrintFile(char          *name,	/* I - Printer or class name */
      * Boolean value...
      */

-      DEBUG_printf(("cupsPrintJob: Adding boolean option \'%s\' with value %d...\n",
+      DEBUG_printf(("cupsPrintFile: Adding boolean option \'%s\' with value %d...\n",
                    option, n));
      ippAddBoolean(request, IPP_TAG_JOB, option, (char)n);
    }
@@ -898,14 +885,64 @@ cupsPrintFile(char          *name,	/* I - Printer or class name */
 }


+/*
+ * 'cupsTempFile()' - Generate a temporary filename.
+ */
+
+char *					/* O - Filename */
+cupsTempFile(char *filename,		/* I - Pointer to buffer */
+             int  len)			/* I - Size of buffer */
+{
+  char		*tmpdir;		/* TMPDIR environment var */
+  static char	buf[1024] = "";		/* Buffer if you pass in NULL and 0 */
+
+
+ /*
+  * See if a filename was specified...
+  */
+
+  if (filename == NULL)
+  {
+    filename = buf;
+    len      = sizeof(buf);
+  }
+
+ /*
+  * See if TMPDIR is defined...
+  */
+
+  if ((tmpdir = getenv("TMPDIR")) == NULL)
+    tmpdir = "/var/tmp";
+
+  if ((strlen(tmpdir) + 8) > len)
+  {
+   /*
+    * The specified directory exceeds the size of the buffer; default it...
+    */
+
+    strcpy(buf, "/var/tmp/XXXXXX");
+    return (mktemp(buf));
+  }
+  else
+  {
+   /*
+    * Make the temporary name using the specified directory...
+    */
+
+    sprintf(filename, "%s/XXXXXX", tmpdir);
+    return (mktemp(filename));
+  }
+}
+
+
 /*
 * '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 */
+static char *				/* I - Printer name or NULL */
+cups_connect(const char *name,		/* I - Destination (printer[@host]) */
+	     char       *printer,	/* O - Printer name */
+             char       *hostname)	/* O - Hostname */
 {
  char		hostbuf[HTTP_MAX_URI];
 				/* Name of host */
@@ -917,7 +954,7 @@ cups_connect(char *name,	/* I - Destination (printer[@host]) */
    return (NULL);

  if (sscanf(name, "%[^@]@%s", printerbuf, hostbuf) == 1)
-    strcpy(hostbuf, "localhost");
+    strcpy(hostbuf, cupsServer());

  if (hostname != NULL)
    strcpy(hostname, hostbuf);
@@ -1,62 +0,0 @@
-%%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)
-	$(CP) $(FILES) $(DATADIR)
+	-$(MKDIR) $(DATADIR)/data
+	$(CP) $(FILES) $(DATADIR)/data

 #
 # End of "$Id$".
@@ -30,8 +30,10 @@ 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 $@ $<

@@ -44,7 +46,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/logo.gif images/navbar.gif \
+WEBIMAGES	=	images/classes.gif images/logo.gif images/navbar.gif \
 			images/printer-idle.gif	images/printer-processing.gif \
 			images/printer-stopped.gif

@@ -83,17 +85,22 @@ 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="sum.html">HTML</A> |
-	<A HREF="sum.pdf">PDF</A> )
+	<A HREF="sam.html">HTML</A> |
+	<A HREF="sam.pdf">PDF</A> )

 	<LI>Configuration Management Plan (
 	<A HREF="cmp.html">HTML</A> |
@@ -202,6 +202,9 @@ 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 
@@ -227,7 +230,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 
-used. </P>
+specified. </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 
@@ -240,17 +243,17 @@ specific model of printer. </P>
 <P>This string attribute specifies a color profile of the form: </P>
 <UL>
 <PRE>
-resolution/type density m00 m01 m02 m10 m11 m12 m20 m21 m22
+resolution/type density gamma 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> value defines a gamma and density adjustment 
-function such that: </P>
+<P>The <I>density</I> and <I>gamma</I> values define gamma and density 
+adjustment function such that: </P>
 <UL>
 <PRE>
-f(x) = d * x<SUP>1/d</SUP>
+f(x) = density * x<SUP>gamma</SUP>
 </PRE>
 </UL>
 <P>The <I>m00</I> through <I>m22</I> values define a 3x3 transformation 
@@ -300,42 +303,44 @@ directive followed by its value. The following directives are
 understood: 
 <CENTER>
 <TABLE BORDER=1 WIDTH=90%>
-<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><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><TD>&lt;Location path&gt;
-<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>
+<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>
 </TABLE>
 </CENTER>
 </P>
@@ -385,7 +390,8 @@ 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</TD></TR>
+<BR> 1 = remote
+<BR> (always 1)</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>
@@ -579,8 +585,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. Note that the printer will be disabled until a valid interface 
-script or PPD file is sent. </P>
+body. If a valid interface script or PPD file is not provided then the 
+printer is treated as a generic PostScript device. </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>
@@ -656,6 +662,8 @@ 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:19990521210311Z)/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:19990730151722Z)/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 205.2 368.7 216.2]/Border[0 0 0]/A 10 0 R>>endobj
+11 0 obj<</Subtype/Link/Rect[336.6 152.4 368.7 163.4]/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 205.2 414.8 216.2]/Border[0 0 0]/A 12 0 R>>endobj
+13 0 obj<</Subtype/Link/Rect[368.7 152.4 414.8 163.4]/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 205.2 448.1 216.2]/Border[0 0 0]/A 14 0 R>>endobj
+15 0 obj<</Subtype/Link/Rect[414.8 152.4 448.1 163.4]/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 205.2 493.4 216.2]/Border[0 0 0]/A 16 0 R>>endobj
+17 0 obj<</Subtype/Link/Rect[448.1 152.4 493.4 163.4]/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 192.0 68.7 203.0]/Border[0 0 0]/A 18 0 R>>endobj
+19 0 obj<</Subtype/Link/Rect[36.0 139.2 68.7 150.2]/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 192.0 122.8 203.0]/Border[0 0 0]/A 20 0 R>>endobj
+21 0 obj<</Subtype/Link/Rect[68.7 139.2 122.8 150.2]/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 192.0 142.6 203.0]/Border[0 0 0]/A 22 0 R>>endobj
+23 0 obj<</Subtype/Link/Rect[122.8 139.2 142.6 150.2]/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 192.0 177.2 203.0]/Border[0 0 0]/A 24 0 R>>endobj
+25 0 obj<</Subtype/Link/Rect[142.6 139.2 177.2 150.2]/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 192.0 238.0 203.0]/Border[0 0 0]/A 26 0 R>>endobj
+27 0 obj<</Subtype/Link/Rect[177.2 139.2 238.0 150.2]/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 192.0 275.5 203.0]/Border[0 0 0]/A 28 0 R>>endobj
+29 0 obj<</Subtype/Link/Rect[238.0 139.2 275.5 150.2]/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 192.0 289.3 203.0]/Border[0 0 0]/A 30 0 R>>endobj
+31 0 obj<</Subtype/Link/Rect[275.5 139.2 289.3 150.2]/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 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
+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
 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 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
+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
 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 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
+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
 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 702 null]>>endobj
+382 0 obj<</D[442 0 R/XYZ null 641 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,25 +778,30 @@ endobj
 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
ˆÌž¨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
-µª@/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
+xÚWËrÛ6Ýû+n™�Ò†4)Éòc¦5¶;^Äqcµ‹Æ]@$(¡&	…€ì8qÿ½ç”E1²2îTö�"qîëà> O{	ÅøKh0âÿ´Üûe²·~LÉ êÓ$ÇÚè(á¯Yo
¢„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-
šFoô²N%ÇØq<“ á»#,¢óí#�ŽŒmêë¦óœKâ˜§bdÏ'-j=«EÉë¤]ä[r¡ƒÅª´%³�)G–AråF¾Ä<[ÏhEÊR¹„ˆDpZ2èíïW×+û™ÂF£xÖIuseè“jHWˆç:ÕÂÒwJÈžJã^0)çÈ—lg“½8ŠqnâKÂ—¿Ò Ž‘u	T©¤’õ°y*èÚŸªÖ)š$ÍNsŠ~ÇìMïêê¬úÕ5
+’éÉd
+jòó^µü€W‡G|íÕ|QÒ0éãÄ·ßFp
7£îˆÔ³'¢Æ™Æ	k"Óù¥Fõ¿:ˆãÁI‹“gCÃòÏ€|”îá™¸Ö€’ŽFãtPâ>bwÀÛà‡|^Þ‰o!JêãïÄ·À#evã[àÐ0[xÞ<6u÷\¢£ö]¦]û
+L}_ø=†ïÃhàê÷ÉtÜlnowã"Y\ižK†Û|]][[¹Y†Ž*ï0‹Ÿ{É1¯§Këú9œå¶´®‹©Dójü9jT&ƒ~ÐGnÜž~ŸO(ô]0
¹@k˜ImFXGÈ¢áa?fÉ¿:ãç~!iÛû¥ÿ·ùendstream
 endobj
 432 0 obj
-1153
+1236
 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ëÍº
-ì…–(›‰Ôò#¶ÿ}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
-Í[Â‹–‚Õ=àå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
ÅéJŒn @Æº‚Àú€¾§EeŠŠaå7g{ÊÙÖY’1ú�öB‰w(Îe>ó™/µÂ�ùì±ã¤U+�›âü¯ÓÜ¨ÚQ�C›•\aÐ$	þSügÐ¤¸Fó&Åu†ë×Yv¦Ãëy÷úh£S¿)0YŽ�	ÊØÌkËôÝD�E•),¶62±uY &cø9Ð;a8‘�‰Påf‹-(ÙsÔ³3PÞsóôC”Èó©×ô‘—‚Þ@:ÔÊPc‰2Ò—f¹\�ØBg©â
¾ºB¼ÉB–òÞ°¦ažÂ¾rA¬
—¨R'ß¾Æaú4þµ.ª¯Óý×�ð”ðì{¯k*os:/2K/ËQÄt†)%}¼#}¤éZ¼'ÔÜ8]»ÕÊm¶¯,Çêä˜Abò}V3i¨ÂÃ‹{ß»TŒ»Ç¿»
-¾ý(x?ë=“t”´m-ø+Í²êÕy9ö9Ern<\ùñðW8>ßšwx*•G|�K$c·X÷þîÆÃÝŸË/ð°XÀÇÏÀž�^�À÷–XPÒÄ#îœÖ¨,<…
µæá4cê"�“‹.½›ršç0Ï¯Â'Æâé×ûD
-š•ÃãuÁ�ØHº ô¶ï¿ˆ\£ë,¨	~Ÿ|46~„³rv“Ä·A×tÿi5ù<ùH8±¹endstream
+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€[ü¥§
+7Ñ
Ôì›Ö¾¼ˆüÿQ:‹§'þSÏÿ“ŽU÷ªÜ¼ž…�Rgò,
RYº)ðü¸‚€Šž™õ/Ï)êÂ.z k?RÞaË%×ÁPÈA°;¦‹=ÓÈ_ ½d®²ðÂ*ç9/Yeøµh³*xõ›«7×$GP·ölÇ«9e0jßåPÓ¹ ýÁ„O�#c˜gP›#ú^fn)Ê†_œ	ì)ggIËè7¸uÞ¢¸ùÔG¾Ò
+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
-915
+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
 437 0 obj<</Length 438 0 R/Filter/FlateDecode>>stream
@@ -809,34 +814,45 @@ endobj
 endobj
 439 0 obj<</Type/Page/Parent 408 0 R/Contents 440 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F5 5 0 R/F8 7 0 R>>>>>>endobj
 440 0 obj<</Length 441 0 R/Filter/FlateDecode>>stream
-xÚ•—]oÚ0†ïùÖ®º‹'‘¦IŒ~¬Û°»ISd˜%¡]÷ëçø¤6Å8‚äMžãð`ÿ„Í‹ ˜"&Q¾½[�Æ7‚V$q$‘LX” Õúâª¨TÞ÷êõêÇˆÅæÒö¸ªóª86…>´g®W#asÛç·Å-¢<ÂHÆ±¹!Ò|¦8¢¨RhÙ&?§eÿ¤m}¼«�ÆHJfj4ULò\ÕõLoÛj[U^l
-U£f§P©ó¬-é�ýžÙkÌá-Ú¥Bß.Öj“�Ê½2Çê1œÿn>¿úö:òNÄ¦�Áƒ³éžÁµCâ,âvHe©<TG|8Õ¦Ts”Zê©ÙMË¬®=d›ü`²M;È˜=qW�Gu+ÒØ¼ÅBº+
-^¿«ô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
•½¤»Ê¸%ÌŸ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
+xÚ•˜]oÛ6†ïý+ˆ^µQÄQ"PpÝ¦–m©íÝ™¶µÉ–+Ééº_?Jç$)
+Æ<D€À‘)�øJ<ü:ã,u?œå‚IÍªÃìýzv}“1ÎÙzËtšh¦™l½yý¡îl5ÔöÍúïW"ÉÜ©ãq»-ÏÍ0Íx"�öUWŸ†º=Žß|\ÏÒ$uÿìé×ò*I™Îsw}Îµû,RwzgÙÊs•>Óšh™òéiŒ
+Ç(r¦µtãtÎóª²}×îFc‘ç0’ÕÉVõ¶¶=ö–5mUŽƒbívü{$SvÅ¥»¸cËé
+Ú±mÝXöåõæ¹:?p¯Ñ_ý—ûüêË›$P&9–Ê¤´ó½\& §�_¢±L^Ú•i,Ï§Ò4Mû-`ÈÇóÉ7hê�ôÒ`˜
t~ö‹¦ìûËž™I#&ÒDO?�ž¹Æiæ<×ßO6 ™�é#kMÕôÒ¨™éD�šï»ö[oç›Mgƒ%ÍÒDÑ]�¦ºzit•ò®·ÇÁve�•éS’²@Se½4Êrý¬zßvC@“§qBšªé¥AS™â¢ëú`ÛsÀU&"RH]ý4ºæYò\Ôú¸hj)¤©š^5³"…¯ÊÅ¾ìzª©2™Bš*ë¥QVf�)”½+�»s¹<”0¡Bšjë¥Ñ–gàzüLMDœ�¦
+zi”Fáò©Î{–m¸ó²("Ò„4QÕO£j® M»®íptASiBšªé¥Q3S�¦O]{>U"¤©Ž^¥‚ýÒöÃïåÁÞµí?çSà5*E"¤©¶^mùTÏÛÃ©©«z˜ÖP6äšyBšêê¥ÁUlG~µö4o°yÙS1íÒDO?�ž96Ož¤7©ÐyD¨�¦êziÔÍ$„êíÝcƒs*‡ý»Ÿú–·×�_¿Œc
+ŒCŽ—¾< '³K4ŽÃKã8ÄÔ³¹‡×�}°�• à*b#M-¶—InÌáßÊMí^
+�°ñiÒSE‘&ŠúiÍ
Lb'êJºªÿ¤�O³ž,
+4UÔK£hf`ú:Ñ¥ýz¶ý@��æ<Yhª¬—FYi MtÛ¥Œx% MuôÒèÈÍhxï~Á…wOzŒ�¦:zip4¤(ÜK€‰~^ôò²³¼½_”Õ>0s€‰Š^[ÒR³rm³íæ›CØ¬ËDLŸ/bÚ|ñòbª€¸€å¸š
+-£¢VQQ‹(`®o
+ÜNt™r‡ÐåüfÍ®ØâÏû›¶&¶eeÙÛ×»#ûiôj<ñ
+Ï”ÉØ‚Un½¸Iªö¸U¤‰�
IƒÃÿ<û›iš7endstream
 endobj
 441 0 obj
-891
+1023
 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
-xÚT]oÚ0}çW\u/ô�Ô‰�&T©kË„´I„·¾¸‰Þ‚ÍC×¿ë8¥+Jù�&PdÙçúœ{}îýÝó�àÏÙ¶ê}I{Wc¾iAQB½Ò¼ŸÊ•Ðs™þìÝ§=âÜ}¦_!`�(Žíû®âP	˜u€}FvhÐwhT`y#êE–w^‹êi#ôdÒÝAz5‚OqGñ?õB�Âº’Êˆªö2
-+çHtè°éR¼GB!K¸ªemjÐ–ZW°ÒHZJ%š›ÙídFü1ÜêÕJ(ÓÖ†Wž¥Y‚±Wë�Êá±ñéâñÒŠ@j§8ïgK^ñ‰½ö ˆ<fîy¶¥Õà©äêWs±»·~»Xñ•°J¸•ZÈÅ¦âFj¹¬DfäV@¡ËR?‹ž^@bè–—á�MØIµØS´®�cº(«b´Î?»ú…mý"‚ÅPâäÞ½FYP€wÅX`»/ê¬’k+ë°XœaA‡îtÃ?MÀÂÄ=ðèN|Sš÷ÈMá®÷ò]µ§×G„¢kX+”R\Ú �Ð7´ë„ŽúNle&æÓÉfˆø“KÔ »»”‘ÐòNT¡SÒá¿§R:t7%M˜HßtÆ�Û�ÆÉvpèˆ#æLð»÷„ŒÏœLÜ ? fÌõÆèØŽ6f9ÕvÝm;jû#ïÏ7â'	ÏyýÝÙ“IÛ“>¥n0LoÆ)àvþ0ƒ‰-@Á38/äBÁÞØØÀAé»ÅH„ó�¼Žú²ÍºÎws“úÑû‚`¶2endstream
+xÚ•ßOÛ0ÇßûWœØ<4øG~uBHŒª´I¬
o¼˜Ô¡Þ’¸KÜ2þ{Îqh7H*M¢ÈþÞÝÇç»Ë¯‚?
+<´ÿ´}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
-612
+695
 endobj
 445 0 obj<</Type/Page/Parent 408 0 R/Contents 446 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 4 0 R/F5 5 0 R/F6 6 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
 446 0 obj<</Length 447 0 R/Filter/FlateDecode>>stream
-xÚ�–M“Ú8†ïüŠ>Nx$âÚC˜ÌnQ•J±rËE–EpÖX^Yžaþý¶$›±±‹*ÊF¯ºŸþ’øoA�à‡BâC?.Ö»Åã_)Ðv{\‰“vùCÏ'-TÅJØTø°g\4v?�6òVN½ŒVžÓ{>Öõ‹äÿ
-
[%µä²tB ´“©ùî .äu'‡¢VÁj™x)ðy÷´}Ül¡qB.«Jp]ÈÊc"{Ö–ŒB¨×‚¨¥ÒÆNJ	ñ€‘ öáéÛöÖJ¾5Eõcôðß>ÖeÆ‘C¦$Ë9ktOæÁúý¬¸£G–µPL‹d…‘÷è”ˆN¯âŠêuë~ìâxfüpá¬f6Q¹h¸*2´©ºÑhä
v‰ÖTaª
-RažYcÒžwÙÿøò´Ù€'$×ÊD‰Û´Fä/{7à¢Ê�ðÐôQ‰·²¨| 'Â¾pµêŒ¡“½TG¦5&‰™—²Älþá²N 5v÷¦7Ï>z—Ô¼è÷ZÀË¶‹	ZUÀ—Ï×E[ší—esËq·ü`7_oy°)¸Ñ¡í[Õ++[Œ˜K¥DSKÜƒ‰1IÞl·ÐÑ‰»,/ÇÜ]Ë/²ÚoDÿË¦MíEþ›�ÍZÌÿmODlÒ6ŠkÝƒ8±\ðâˆó^µÇ[£«—5**m^8«YV”…~´uÀ9í+ufid&†8�u¡Íj’x†‡?|²}Y›	6Ï»ñHç¯¯c—Å�€„hÃ÷ñÑ'˜…ÅÇ«³˜&Á•Úžl}¸4LÁO‰Ë¯íbßwLþìçá¦¹)®Øñ˜`õj¾
k È]V'v¬¿ÔÈj	£ØœTèú–°”œ•|J¥k®{€A‚³0ÐŠÇýÀ•Ö¿´‰Â³Ã¦ÖS44™_Z'(¥!]&‚q<ž¥š ¢i‚vf9ñ]övâÉÛº§)2ÅŠÇPbßõR4ƒgÒLÁØvœcÅc0¡ïNãx03öæöâ².ÄÔ´Ñ î›y”�A¡ÛÌÉ}¨²dæø›â¢ñü¶vâ1.â»¶^
¶u[á•�åd¦Òx~W[íÏÊÂ¤C0\¾Š©éJâù�Äã
Óîl$C$Yá.Ô; Q4¿›v$¤®—)œ,¼§.·h~[íàÕ¶:ÿq wÿ²‡Iˆ±�_ÄHöÏâ�2÷šendstream
+xÚ�–Ár£8†ï~Š>:I`[µ‡q&³åª-ïÄsËE€¼f#VˆÄ~ûmIàØTª\ýêþôwKâ¿‚VüÒãl½›=~‹�Æ°ÛãH¸
+`—Íx>i¡J^À¦Ä‡=OEý°û×i—^äÔ‹eä9½GáKU½Èô§Ð°URËTnB”¶r?öB#ßÄ•¼jå�×ÀKˆI®!->ïž¶�›-ÔN˜Ê²©Îeé�	‘‰=o
+
F!Ô[ž
+¨¤Ò&NL	ñz€‘ fðôcûk%ßë¼ügtÿ?¾ÖEÂk‘A¢$ÏR^ëŽÌƒõù¬8£C–•P\‹d‰+1é1)õ“Þ¬+ô©×Ž³Ðã™§‡«d·Fe¢NUž`L�ÐµÆð ÷Èh°Œ¦rSU�
+}æµ±=kÝÿòò´Ù€'$×Ê¬'6h	4X’;¼älÀE™á{®˜£ïE^
+x�“á¯®Vm0L²—êÈµF“¸y)
+tó7ç:�ØÄÝ›Þ¼äèRRó¢Ï•€—m»&|hTýy[´…™~]67¶Ãs;ùvÊÜZp§ÃØ÷ª7^4¸âT*%êJâ4Æ˜¼Ùn¡[D+n]^¥»•_¹ÚMÄü‹º©LíEöK�Ž&
úß=+6¶õ.ÅµîAœx&Òüˆû½lŽ	¶F[/%*\¨(µyIyÅ“¼ÈõùÑÖ÷iW¹e–.ÍŽ!d�k3ºZy>.ÿñÕöeev°xÞÍˆGð@ºü|ÿ»,ôø$ÀŒá##èŠÂb÷‰Ãè"¦+ÿFmO¶n¹4ˆ�ÅÄùk»˜1ÇDà÷n?Ü57Å»=FXÙŠš_Ãêûò)«;Ö5²ZÂehN*L}OXÈ”=|J¥k®«�×9/Þù¹úú0ÆÎ.>ã{8ÂÎ>|þPwì´u—]³[ñX±ÃzŒ†˜sybÕ�¸§ê††Æ6½?Ì‚ç¶T#<4
+ºÊŽó8ñO»Ê}DYSâ4úb*ŒÁíÙ¸ìƒÁã
+iÆ`CL…±â!Ö^Éa¯3öæbKe•‹±�H™?ýÐpâ!(»f^}UÜœŒc\ÄŸÞÖN<ÀÅ†#êíê¦ÄO�ƒ,FmŠüéMmµ0(°-÷á¤òMŒm¯�Moh«	"×Î”ô‘$¹»j?	Øôf¶ÚÖ~SÚ»±ð=Ž§7°Õö^zÑå“‚|ú1¬4•|#Ùß³ÿåþcendstream
 endobj
 447 0 obj
-917
+935
 endobj
 448 0 obj<</Type/Page/Parent 408 0 R/Contents 449 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 4 0 R/F5 5 0 R/F8 7 0 R/F9 8 0 R>>>>/Annots 47 0 R>>endobj
 449 0 obj<</Length 450 0 R/Filter/FlateDecode>>stream
@@ -871,14 +887,16 @@ endobj
 endobj
 457 0 obj<</Type/Page/Parent 408 0 R/Contents 458 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 4 0 R/F8 7 0 R/F9 8 0 R/Fc 9 0 R>>>>/Annots 156 0 R>>endobj
 458 0 obj<</Length 459 0 R/Filter/FlateDecode>>stream
-xÚÍ˜ÛnÛF†ïýsé!Ã3E½p#Û0�ªôÊ@@‘+›
ÅUH*Žúô�YžF2µt€´(X ôíìîüÿì�ßÎl°ðÏ†Ð7€dsöûòìÝu¶oÎ`¹Æß‚04X¦ç~\g¹€eÕZ”°(e-™¿Yþuvµ<³LƒÑ?›þÝÝ€c‡¦�šlÀñlÓnŸr¸oºòÀ¶ÛŽÜu³|'º�‡óëåâá
d¤¢JÊl%RXíátÿ¬Gì?pM�õ?Â3ù™k:zžp�)žÈVŸ�6GMÊÇ>…*7w×ï!ò£�C«�pnÒ÷\T£	j¸ÎV)ÂmQ‹²5ËŠ:+¢r�¨YÐ)uºÙ•jÄ×2Ïå3a8•ê¢	�´¡�&Çp‚fPNžVÖ
0i¾kãH6àG8›æa<ïØÀ,4]-Í€
ØŽ7�sùÀ™'ÐdŽƒóÕñœ O
Ÿdâ!S§LÌsé¢
-!ãGM9Ø
ßu?�;?ð/4®x‡!.àªHdJ_ÇEÚØx+ËzÜ¾ƒ?ŒíkØTB¯ô‡=ÃÌuþP:´t#¿†f@ï
Î‰Þ:ž½?4<'�÷]3ÒóŒ@>œ'Ð¸t„Œ…?ìv™iýLûã£LE®Ìq/61IõëÍaùÈvæP:s´t£½†f™ÃžÀ9�¼Qru<#ÈLô©å�|H²iyF 9pÇÐ�Ÿ�ùôÉäò‘…ª
ü+Ìd�Â™Â˜‹*{,àFÆy…L‰¾™ØÍ~©�¼ÈQ»¹²Ió ñQG+›èh n¸ÄêqN��hZžä#¯ŸÉ)yl®Žâ¹JÇs‚|MÄçò.9BË3‚6Å«BË3‚6E"Ÿœ MqŠçòž;1×³pîy*Ÿœ@>ò¦xFlÀ›ô�wà/ #ÞÀO×¥¹¬*gp×™,â\¨’¤³ß}]î’zW
-�kõÅ°Ê÷gÆŽý/ëW¼Y_¿êAW¿-Ý”§†fíU›çÕcDîÖñŒ@•šˆÏªGWyÏ	ªG«ÏÔ©z´X.��Ž�ÿ
-ÿ„4ÿÁAxÇùo·¤üJÔÏBða1Wf¹],z7œ8±¿¦¼ÿ¼¸Ç›È:+Dut	?jQTèS�[Q*Ç""©‹áÒ¤¬Ô\|œî&LÅxƒöœ‹u¼Ëé³B—ªxK¥¿Ü\-¿Ì¯®/?XÂo`ýð,Ë~x£½L=bÄ´�˜²ˆýà X@E3�-•ÞþâºÆ;Ö®U_>Õ¾ªÅ¦�Õ‘øk’ÇUeö¦27TŠ,ò=†ÿ¶ËJ¼®±˜1l3j«õùð«‘<Åe%êÃi�+�N7ÂiíÊ87ò¸xÜÅ�â¨µÙ»	ÞœHËs–çÐŽ›ÒrÜc¶ÝòëXp�®ŽÒuÑd¬âb.în?-¯îî;5�W¨¹íâü”„1Î«oùµ�Ï™rVéŠ©ù¿Ó¯ŸÎ¿"š—iÚ‰Öiv9Ÿwšu’¹’Å¥/–^1ü¶¢Ú)Å6�“v©¶"ÉÖ™è4¢ül¦ß6•p*ßcjµƒ2veö‚>ôFç cÕFfÓÍe¢2s<—S|V¬åkÙ�,Åxƒ‘Y¦â{–ˆéIUG¿Ì=?á¾’Y�aÉíIhõRb¨KìRn›ƒLodš÷Ôqâ.a�;ÕšÞÐ¡iî›¥øOPìýôNl[Ã&Þ·[QsäÁm�†¬dº7á“¬þ×k…* Õñ”Ò¬ŠW9Ni‡Ç%<TÁ÷8ÏÒ—�âˆúÑeT¢¨_ŒŸ�êì'
-õíUÈÚˆwõ“,³¿›•jªÅ*N�6/pœÁH‹Aïñ¥cÖ>Û®ž�}šéüîòz	¨ÂmŸªöB9MÎZ£ÔÔkú]¸zx˜Q í·§Ï?ÎþÄÒ²endstream
+xÚÍ˜ÛnÛF†ïýsé!Ã3E½p#Û0�ª¥ôÊ@@“+›
ÅUH*Žòô�YžF2µt€´(X ôíìîüÿì�_Ïl°ðÏ†Ð7€dsöûêìÝu¶oÎ`µÆß‚04X¥ç~\g¹€UÕZ”°(e-™¿Yý}vµ:³LƒÑ?›þÝÝ€c‡¦�šlÀñlÓnŸrX6]y`ÛmGîŒºY=‰ÝÀýùõjqÿ²
+RQ%eö RxØÃéþY�Øàšë„gò3×tô<#6à:S<'�¬>;m>Žš”�}
+Unî®ßCäG†VáÜ¤ï¹¨FÔp#œR6„Û¢e!j–uV<Då:Q³ Sêt³*Õˆ¯ežËgÂp*ÕE:iC;3LŽáÍ î� <¬`Ò|×Æ‘lÀ�p6ÍÃxÞ°�YhºZš°oçò�31N Éç«ã9A&ž>'ÈÄC¦N™˜çÒEBÆ�šr°.¾ë4~ w:~à_h\ñC\ÀU‘È”¾Ž‹´±ñV–õ¸}!Ú×°©„^é{†™ëü¡tþhéF~
Í€Þœ½?t<#zhxN ï»f¤ç�|85N ?péÿ
+Øí2Óú#˜öÇG™Š\™c)61IõëÍaùÈvæP:s´t£½†f™ÃžÀ9�¼Qru<#ÈLô©å�|H²iyF 9pÇÐ�Ÿ�ùôÉäò‘…ª
ü+Ìd�Â™Â˜‹*{,àFÆy…L‰¾™ØÍ~©�¼ÈQ»¹²Ió ñQG+›èh n¸ÄêqN��hZžä#¯ŸÉ)yl®Žâ¹JÇs‚|MÄçò.9BË3‚6Å«BË3‚6E"Ÿœ MqŠçòž;1×³pîy*Ÿœ@>ò¦xFlÀ›ô�wà/ #ÞÀO×¥¹¬*gp×™,â\¨’¤³ß².wI½+ÈµúbXåû3cÇþ—õ‹+Þ¬¯_õ «ß–nÊSC3€ö�ˆªMƒs‚ê1"wëxF �JMÄgÕ£�«¼ŽçÕ£ÕgêT=Z,—NHÇÇ�…Bšÿà ¼ã|Œ·[RþAÔÏBða1Wf¹],z7œ8±¿¦¼ÿ´XâMd�¢:º„ˆïµ(*ô)È(•c‘ÔÅpiRVj.>Nw¦b¼A{ÎÅ:ÞåôY¡KU¼¥R�Ÿo®VŸçW×—Ÿ>¬à7°¾{–eß¿Ñ^¦1bÚFLYÄ~pP
+, ¢™Æ–Joq]ãkW‹ª/Ÿj_ÕbÓÇêHü5Éãª2{S™*EùÃÝe%^×XÌ¶µÕŽú|øÕHžâ²õá´Î•N§á´veœy\<îâGqÔÚl‡ÖÝoN¤å9ËshÇMi9î1Ûn
ùe,¸FWGéºh2Vq1w·¬®î–�šÎ+ÔÜvq~JÂçÕ·üRÈç‚L9«ôƒÅŽÔüßé×Oç_Í…Ë4íDë4»œÏ;Í:ÉÜ	ÉbŒÒK¯~[Qí”b›ÇI»ˆT[‘dëLô
Q~6ÓoŒJ8•ï1µÚA»2{Az£sÐ±j#³é‚æ2Q™9žË)>+ÖòµìF–b¼ÁÈ,Sñ-KÄô$�ª£_æžŸp_ÉŠ¬Î°äö$´z)1Ô%v)·ÍA¦�72ÍÖûê8q—°À�jMoèÐ4Ëf)þ»Fÿ½ÛÖ°‰÷íVÔyp[£�á2Ý›p»ÆN¾Åy–¾lŒ‘±—£y©>³
+
+I'¿e)Î±¦aóÅ�ºqMË<f×©B”YYÕË&z“×cÕ¡Êø'*øí…ã4â]ý$ËìG³„MµxˆS£MÒS2Òb0Âøš2kŸm×…Í>Ít~wy½ÔÑá¶Ï}{Óœ‹F„¶jj„Ž5ý’Ü=<å(ÐöÛcéŸgÿýnÛ¼endstream
 endobj
 459 0 obj
-1456
+1470
 endobj
 460 0 obj<</Type/Page/Parent 408 0 R/Contents 461 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 4 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
 461 0 obj<</Length 462 0 R/Filter/FlateDecode>>stream
@@ -909,19 +927,21 @@ endobj
 endobj
 469 0 obj<</Type/Page/Parent 408 0 R/Contents 470 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
 470 0 obj<</Length 471 0 R/Filter/FlateDecode>>stream
-xÚ•Énƒ0†ï<ÅS©„Ð’íÚtQ•R•>€c‰S/Ô6•Ú§¯ÉR)d’
-À|ö?ó{Œ?ƒzþŠax· 2¸KƒèqñÒÌGÃRÖéCB¸ç©Ó†£½J—ž@—œÞº+4*¬‰f\‰ä‘.ÖÑÞ&Ú¡DQ»C:×UJäõÄg=b r�!ŠísÖW!�j)=lÁ åa�»»~…{†	>ke¡sWWã–ÌÖa¨šP"'LV×õ°1—¾QþÅÛ¶•DN«Â2¤EnÙÉš&¸ £r¾ÓiRÏêÐ€E·J)ã¢|eÄ‘ò[ó§eZ9ÛÊ$ß¸Úëå«”s]–�Ô¬º•«ÙX"s�0�Þ_&u¬Œ³«?c-¾ˆ©]}nÁßÎgb´vÀ6ÿÑoÐÙêëä}ú–.�M#¹hFè*vºð
´iµöEEtÎÃÚ8yz†Üè¹!ò	²švÙ:%Ëç…!ŽkµÚD/Ï/g®XÄ4m*ìÑB¢rkácz£ž?NÃ¤×=~v&Ã¤;òç«�ÇãòÃC¼¿âê˜endstream
+xÚ•ÍnÂ0Çï}
+™´RÊÊ×uÀ&HLë $.„¥MIÂ¤íé—ÓD�–jmýKlÿm7k/„–½Bèµá©4õžc/x@8€8±–n/‚˜5:ÐF\!5RqÔñÊr]CÇÙ¥~»ÛÜ¢ÁF«`Î³� â%ÂÎÚÚ[”dÅá’Æc‘y5±®FÔHzÄ�ŒsÚS �Ê4µ°…š3„%*lêå	&ø¼–`„RÌMU"Œk2X…av	%rÂÒb]O£peå.Âèº$rZt|"BºÉ5+
ðçÒ—Daàö+“k°·±á*)
°ý$}ƒL¶_‡³wpÝÄ)0bH
·�ãË%¢&Ô �f+GÂ…{uKÝ3Ö,Ê¿óDfF×*�©ˆ¶î‹ú»½n‹&•¬ø)F£Iš„Ùlt›«si\�ýµø"êN�G—È6ÕEî‚9¡Ÿ˜±òÄ÷Ð¾Õê'Ð÷+§ø:�\É…"é5.d–T´ËŸ2àX¾Ø(;£2ÛÑt2ŸXÿÏ³=Zý¨Õ<ŽF½¨Ù·gµ‡÷a{oÞ/�½endstream
 endobj
 471 0 obj
-434
+433
 endobj
 472 0 obj<</Type/Page/Parent 408 0 R/Contents 473 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 4 0 R/F6 6 0 R/F8 7 0 R>>>>>>endobj
 473 0 obj<</Length 474 0 R/Filter/FlateDecode>>stream
-xÚ�’ßOÂ0Çß÷WÜ#&î'£ðªNßPª¯¦v·Qmi‡	ÿ½í6	%]ºäúùÞ÷îr› …Ä�†Ä|ÜÓ žHS •‘IM€–ƒø“™˜oµ�+±jÐÜÐ¥#óf$Ê=IŽi/Z0hE‰°@ƒQ'û6�u!�®bíï.ó�mp
o°‡Ár#ts…ßJÕör?ÝkÒ¿wµÙw§û)Üž’hŒ2gA&ËSX³Ï°í4¯hKëòRWÂB)òF™p%&¤…Ù¬èý*e_€6íŒÿfjp³EÛØÿ;k”¥�ugKõÑÕÑÛNúL$…lœu;Y¼ÜM)„ðð:›ÃÓ~
-7¨Zú_»BIŸ"L‡CÇYâ•YâCyB"m`#—¨è«Ýæ=Òà9øN›ãcendstream
+xÚ�“ßOÂ0Çß÷WÜ#&î'£òªNßP¦¯f¶·ÚÒv&ü÷¶l‚$JÖdÉõ{ßÏ]{Ý)$îKaLü¢ëà®â�4…²ö!2Í£)”lT:¦�21“ôª\:Y~�…‰r/+[C[dÝ
+58i·Fa+Ë¥€š¯Ð€FÃB‹£Þç~7:ð\šE}é¡^@àÂåÕEó;e±5×ð
+{±ëSse/àdcÎ÷Óï&Ãî¨¢®6óæò~¦�®�•¨µÔ'…•`ÇbU5xB{éE)ÅÎuÅ
0®‘Z©·@¥›
+.ÌçÅÀ«¥¬hJïÎøoP�›�5ÿ'+Œ‹¦ÇÁR¾÷uØéàDÜãÈ&ñNÅóí¬„î_æxÜÏAáªþ·7êÞ"LÇco²Ägf‰å	qF»À&Î¨ªâýä=”ÁSð	o|ìendstream
 endobj
 474 0 obj
-315
+338
 endobj
 475 0 obj<</Type/Page/Parent 408 0 R/Contents 476 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F6 6 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
 476 0 obj<</Length 477 0 R/Filter/FlateDecode>>stream
@@ -981,13 +1001,13 @@ endobj
 498 0 obj<</Parent 496 0 R/Title(3.2 Language Files)/Dest[427 0 R/XYZ null 574 null]/Prev 497 0 R/Next 499 0 R>>endobj
 499 0 obj<</Parent 496 0 R/Count -2/First 500 0 R/Last 501 0 R/Title(3.3 MIME Files)/Dest[427 0 R/XYZ null 204 null]/Prev 498 0 R/Next 502 0 R>>endobj
 500 0 obj<</Parent 499 0 R/Title(3.3.1 mime.types)/Dest[430 0 R/XYZ null 729 null]/Next 501 0 R>>endobj
-501 0 obj<</Parent 499 0 R/Title(3.3.2 mime.convs)/Dest[430 0 R/XYZ null 418 null]/Prev 500 0 R>>endobj
-502 0 obj<</Parent 496 0 R/Count -1/First 503 0 R/Last 503 0 R/Title(3.4 PostScript Printer Description Files)/Dest[430 0 R/XYZ null 286 null]/Prev 499 0 R/Next 504 0 R>>endobj
-503 0 obj<</Parent 502 0 R/Title(3.4.1 CUPS Extensions to PPD Files)/Dest[430 0 R/XYZ null 187 null]>>endobj
+501 0 obj<</Parent 499 0 R/Title(3.3.2 mime.convs)/Dest[430 0 R/XYZ null 365 null]/Prev 500 0 R>>endobj
+502 0 obj<</Parent 496 0 R/Count -1/First 503 0 R/Last 503 0 R/Title(3.4 PostScript Printer Description Files)/Dest[430 0 R/XYZ null 233 null]/Prev 499 0 R/Next 504 0 R>>endobj
+503 0 obj<</Parent 502 0 R/Title(3.4.1 CUPS Extensions to PPD Files)/Dest[430 0 R/XYZ null 134 null]>>endobj
 504 0 obj<</Parent 496 0 R/Count -3/First 505 0 R/Last 507 0 R/Title(3.5 Scheduler Configuration Files)/Dest[436 0 R/XYZ null 736 null]/Prev 502 0 R>>endobj
 505 0 obj<</Parent 504 0 R/Title(3.5.1 classes.conf)/Dest[436 0 R/XYZ null 511 null]/Next 506 0 R>>endobj
 506 0 obj<</Parent 504 0 R/Title(3.5.2 cupsd.conf)/Dest[436 0 R/XYZ null 178 null]/Prev 505 0 R/Next 507 0 R>>endobj
-507 0 obj<</Parent 504 0 R/Title(3.5.3 printers.conf)/Dest[442 0 R/XYZ null 665 null]/Prev 506 0 R>>endobj
+507 0 obj<</Parent 504 0 R/Title(3.5.3 printers.conf)/Dest[442 0 R/XYZ null 605 null]/Prev 506 0 R>>endobj
 508 0 obj<</Parent 487 0 R/Count -10/First 509 0 R/Last 528 0 R/Title(4 External Interfaces)/Dest[445 0 R/XYZ null 743 null]/Prev 496 0 R/Next 529 0 R>>endobj
 509 0 obj<</Parent 508 0 R/Title(4.1 AppSocket Protocol)/Dest[445 0 R/XYZ null 693 null]/Next 510 0 R>>endobj
 510 0 obj<</Parent 508 0 R/Title(4.2 CUPS Browsing Protocol)/Dest[445 0 R/XYZ null 613 null]/Prev 509 0 R/Next 511 0 R>>endobj
@@ -1448,110 +1468,110 @@ xref
 0000048434 00000 n 
 0000048455 00000 n 
 0000048609 00000 n 
-0000049833 00000 n 
-0000049855 00000 n 
-0000050004 00000 n 
-0000050990 00000 n 
-0000051011 00000 n 
-0000051160 00000 n 
-0000051972 00000 n 
-0000051993 00000 n 
-0000052124 00000 n 
-0000053086 00000 n 
-0000053107 00000 n 
-0000053247 00000 n 
-0000053930 00000 n 
-0000053951 00000 n 
-0000054109 00000 n 
-0000055097 00000 n 
-0000055118 00000 n 
-0000055281 00000 n 
-0000056759 00000 n 
-0000056781 00000 n 
-0000056903 00000 n 
-0000058322 00000 n 
-0000058344 00000 n 
-0000058484 00000 n 
-0000059692 00000 n 
-0000059714 00000 n 
-0000059878 00000 n 
-0000061405 00000 n 
-0000061427 00000 n 
-0000061567 00000 n 
-0000062409 00000 n 
-0000062430 00000 n 
-0000062585 00000 n 
-0000063520 00000 n 
-0000063541 00000 n 
-0000063654 00000 n 
-0000063879 00000 n 
-0000063900 00000 n 
-0000064049 00000 n 
-0000064554 00000 n 
-0000064575 00000 n 
-0000064715 00000 n 
-0000065101 00000 n 
-0000065122 00000 n 
-0000065262 00000 n 
-0000065758 00000 n 
-0000065779 00000 n 
-0000065910 00000 n 
-0000066357 00000 n 
-0000066378 00000 n 
-0000066533 00000 n 
-0000069714 00000 n 
-0000069736 00000 n 
-0000069882 00000 n 
-0000070226 00000 n 
-0000070247 00000 n 
-0000070302 00000 n 
-0000070407 00000 n 
-0000070551 00000 n 
-0000070657 00000 n 
-0000070777 00000 n 
-0000070886 00000 n 
-0000071035 00000 n 
-0000071145 00000 n 
-0000071252 00000 n 
-0000071410 00000 n 
-0000071521 00000 n 
-0000071640 00000 n 
-0000071791 00000 n 
-0000071895 00000 n 
-0000071999 00000 n 
-0000072176 00000 n 
-0000072285 00000 n 
-0000072442 00000 n 
-0000072548 00000 n 
-0000072665 00000 n 
-0000072772 00000 n 
-0000072931 00000 n 
-0000073041 00000 n 
-0000073168 00000 n 
-0000073293 00000 n 
-0000073414 00000 n 
-0000073533 00000 n 
-0000073660 00000 n 
-0000073828 00000 n 
-0000073975 00000 n 
-0000074125 00000 n 
-0000074273 00000 n 
-0000074427 00000 n 
-0000074575 00000 n 
-0000074719 00000 n 
-0000074869 00000 n 
-0000075017 00000 n 
-0000075165 00000 n 
-0000075313 00000 n 
-0000075446 00000 n 
-0000075580 00000 n 
-0000075703 00000 n 
-0000075821 00000 n 
-0000075955 00000 n 
-0000076052 00000 n 
-0000076152 00000 n 
+0000049916 00000 n 
+0000049938 00000 n 
+0000050087 00000 n 
+0000051074 00000 n 
+0000051095 00000 n 
+0000051244 00000 n 
+0000052056 00000 n 
+0000052077 00000 n 
+0000052208 00000 n 
+0000053302 00000 n 
+0000053324 00000 n 
+0000053464 00000 n 
+0000054230 00000 n 
+0000054251 00000 n 
+0000054409 00000 n 
+0000055415 00000 n 
+0000055436 00000 n 
+0000055599 00000 n 
+0000057077 00000 n 
+0000057099 00000 n 
+0000057221 00000 n 
+0000058640 00000 n 
+0000058662 00000 n 
+0000058802 00000 n 
+0000060010 00000 n 
+0000060032 00000 n 
+0000060196 00000 n 
+0000061737 00000 n 
+0000061759 00000 n 
+0000061899 00000 n 
+0000062741 00000 n 
+0000062762 00000 n 
+0000062917 00000 n 
+0000063852 00000 n 
+0000063873 00000 n 
+0000063986 00000 n 
+0000064211 00000 n 
+0000064232 00000 n 
+0000064381 00000 n 
+0000064885 00000 n 
+0000064906 00000 n 
+0000065046 00000 n 
+0000065455 00000 n 
+0000065476 00000 n 
+0000065616 00000 n 
+0000066112 00000 n 
+0000066133 00000 n 
+0000066264 00000 n 
+0000066711 00000 n 
+0000066732 00000 n 
+0000066887 00000 n 
+0000070068 00000 n 
+0000070090 00000 n 
+0000070236 00000 n 
+0000070580 00000 n 
+0000070601 00000 n 
+0000070656 00000 n 
+0000070761 00000 n 
+0000070905 00000 n 
+0000071011 00000 n 
+0000071131 00000 n 
+0000071240 00000 n 
+0000071389 00000 n 
+0000071499 00000 n 
+0000071606 00000 n 
+0000071764 00000 n 
+0000071875 00000 n 
+0000071994 00000 n 
+0000072145 00000 n 
+0000072249 00000 n 
+0000072353 00000 n 
+0000072530 00000 n 
+0000072639 00000 n 
+0000072796 00000 n 
+0000072902 00000 n 
+0000073019 00000 n 
+0000073126 00000 n 
+0000073285 00000 n 
+0000073395 00000 n 
+0000073522 00000 n 
+0000073647 00000 n 
+0000073768 00000 n 
+0000073887 00000 n 
+0000074014 00000 n 
+0000074182 00000 n 
+0000074329 00000 n 
+0000074479 00000 n 
+0000074627 00000 n 
+0000074781 00000 n 
+0000074929 00000 n 
+0000075073 00000 n 
+0000075223 00000 n 
+0000075371 00000 n 
+0000075519 00000 n 
+0000075667 00000 n 
+0000075800 00000 n 
+0000075934 00000 n 
+0000076057 00000 n 
+0000076175 00000 n 
+0000076309 00000 n 
+0000076406 00000 n 
+0000076506 00000 n 
 trailer
 <</Size 534/Root 533 0 R/Info 1 0 R>>
 startxref
-76338
+76692
 %%EOF
@@ -156,6 +156,9 @@ 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
@@ -188,7 +191,8 @@ 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 used.
+supports the source type directly the special filter program "-" may be
+specified.

 <H4>cupsManualCopies</H4>

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

 <UL><PRE>
-resolution/type density m00 m01 m02 m10 m11 m12 m20 m21 m22
+resolution/type density gamma 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> value defines a gamma and density adjustment function
-such that:
+<P>The <I>density</I> and <I>gamma</I> values define gamma and density
+adjustment function such that:

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

 <P>The <I>m00</I> through <I>m22</I> values define a 3x3 transformation
@@ -301,141 +305,185 @@ 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>

@@ -523,7 +571,8 @@ capability/type bits:
 <TR>
 	<TD>1</TD>
 	<TD>0 = local<BR>
-	1 = remote</TD>
+	1 = remote<BR>
+	(always 1)</TD>
 </TR>
 <TR>
 	<TD>2</TD>
@@ -926,8 +975,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. Note that the printer will be disabled until a valid interface script or
-PPD file is sent.
+body. If a valid interface script or PPD file is not provided then the
+printer is treated as a generic PostScript device.

 <P>Add printer will return <CODE>ipp-ok</CODE>, <CODE>ipp-not-authorized</CODE>,
 <CODE>ipp-bad-request</CODE>, or <CODE>ipp-attributes</CODE>.
@@ -1042,6 +1091,9 @@ 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,8 +24,11 @@ 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>Filters</A></LI>
-<LI><A HREF=#2_4>Printer Drivers</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>
 </UL>
 <B><A HREF=#3>2 - Building and Installing CUPS</A></B>
 <UL>
@@ -48,31 +51,35 @@ 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>Network Configuration</A></LI>
+<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>
 <UL>
-<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>
+<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>
 </UL>
-<LI><A HREF=#5_2>Printer Security</A></LI>
+<LI><A HREF=#5_4>Printer Security</A></LI>
 <UL>
-<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>
+<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>
 </UL>
-<LI><A HREF=#5_3>File Formats</A></LI>
+<LI><A HREF=#5_5>File Formats</A></LI>
 <UL>
-<LI><A HREF=#5_3_1>mime.types</A></LI>
-<LI><A HREF=#5_3_2>mime.convs</A></LI>
+<LI><A HREF=#5_5_1>mime.types</A></LI>
+<LI><A HREF=#5_5_2>mime.convs</A></LI>
 </UL>
 </UL>
 <B><A HREF=#6>5 - Printer Accounting</A></B>
@@ -157,7 +164,17 @@ 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>Filters</A></H2>
+<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>
 <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 
@@ -173,12 +190,28 @@ 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_4>Printer Drivers</A></H2>
+<H2><A NAME=2_6>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 
@@ -297,7 +330,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> -v<I>device</I> -P<I>ppd</I> ENTER
+% /usr/lib/lpadmin -p<I>printer</I> -E -v<I>device</I> -P<I>ppd</I> ENTER
 </PRE>
 </UL>
 <P>Spaces between the option letter and value are optional. </P>
@@ -312,7 +345,8 @@ installation of CUPS: </P>
 <DT>file:/dev/filename </DT>
 <DT>/dev/filename </DT>
 <DD>Sends all output to the specified file. </DD>
-<DT>ipp://hostname[:port]/resource </DT>
+<DT>http://[username:password@]hostname[:port]/resource </DT>
+<DT>ipp://[username:password@]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>
@@ -331,6 +365,9 @@ 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>
@@ -345,7 +382,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> -v<I>device</I> -m<I>model</I> ENTER
+% /usr/lib/lpadmin -p<I>printer</I> -E -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 
@@ -354,7 +391,7 @@ DeskJet series driver connected to parallel port 1 under Linux you
 would use: </P>
 <UL>
 <PRE>
-% /usr/lib/lpadmin -pDeskJet -vparallel:/dev/par1 -mdeskjet.ppd ENTER
+% /usr/lib/lpadmin -pDeskJet -E -vparallel:/dev/par1 -mdeskjet.ppd ENTER
 </PRE>
 </UL>
 <H2><A NAME=4_3>Removing Printers</A></H2>
@@ -392,21 +429,82 @@ 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>Network Configuration</A></H2>
+<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>
 <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_1_1>Port</A></H3>
+<H3><A NAME=5_3_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_1_2>Listen</A></H3>
+<H3><A NAME=5_3_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 
@@ -418,9 +516,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 specific only the network address and not your system's network 
+you specify only the network address and not your system's network 
 address! </P>
-<H3><A NAME=5_1_3>BrowsePort</A></H3>
+<H3><A NAME=5_3_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>
@@ -428,7 +526,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_1_4>BrowseAddress</A></H3>
+<H3><A NAME=5_3_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 
@@ -438,10 +536,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_2>Printer Security</A></H2>
+<H2><A NAME=5_4>Printer Security</A></H2>
 <P>CUPS provides IP and domain-name based access control and Basic 
 authentication for authentication. </P>
-<H3><A NAME=5_2_1>Location</A></H3>
+<H3><A NAME=5_4_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>
@@ -472,7 +570,7 @@ Allow From 127.0.0.1
 &lt;/Location&gt;
 </PRE>
 </UL>
-<H3><A NAME=5_2_2>Order</A></H3>
+<H3><A NAME=5_4_2>Order</A></H3>
 <P>The <CODE>Order</CODE> directive defines the default access control. 
 The following values are supported: </P>
 <UL>
@@ -483,7 +581,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_2_3>Allow</A></H3>
+<H3><A NAME=5_4_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>
@@ -503,10 +601,24 @@ 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. </P>
+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>
 <P>The <CODE>Allow</CODE> directive must appear inside a <CODE>Location</CODE>
 directive. </P>
-<H3><A NAME=5_2_4>Deny</A></H3>
+<H3><A NAME=5_4_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>
@@ -525,10 +637,25 @@ 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. </P>
+ 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>
 <P>The <CODE>Deny</CODE> directive must appear inside a <CODE>Location</CODE>
 directive. </P>
-<H3><A NAME=5_2_5>AuthType</A></H3>
+<H3><A NAME=5_4_5>AuthType</A></H3>
 <P>The <CODE>AuthType</CODE> directive defines the type of 
 authentication to perform: </P>
 <UL>
@@ -539,7 +666,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_2_6>AuthClass</A></H3>
+<H3><A NAME=5_4_6>AuthClass</A></H3>
 <P>The <CODE>AuthClass</CODE> directive defines what level of <CODE>
 Basic</CODE> access is required: </P>
 <UL>
@@ -555,21 +682,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_2_7>AuthGroupName</A></H3>
+<H3><A NAME=5_4_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_2_8>SystemGroup</A></H3>
+<H3><A NAME=5_4_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_3>File Formats</A></H2>
+<H2><A NAME=5_5>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_3_1>mime.types</A></H3>
+<H3><A NAME=5_5_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>
@@ -605,13 +732,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 </LI>
+identical (network or &quot;big-endian&quot; byte order) </LI>
 <LI><CODE>int(offset,value)</CODE> - True if 32-bit integer is 
- identical </LI>
+ identical (network or &quot;big-endian&quot; byte order) </LI>
 <LI><CODE>locale(&quot;string&quot;)</CODE> - True if current locale  matches 
 string </LI>
 </UL>
-<H3><A NAME=5_3_2>mime.convs</A></H3>
+<H3><A NAME=5_5_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,6 +98,19 @@ 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
@@ -126,6 +139,24 @@ 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.
@@ -264,7 +295,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> -v<I>device</I> -P<I>ppd</I> ENTER
+% /usr/lib/lpadmin -p<I>printer</I> -E -v<I>device</I> -P<I>ppd</I> ENTER
 </PRE></UL>

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

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

@@ -311,6 +343,10 @@ 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.
@@ -328,7 +364,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> -v<I>device</I> -m<I>model</I> ENTER
+% /usr/lib/lpadmin -p<I>printer</I> -E -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
@@ -336,7 +372,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 -vparallel:/dev/par1 -mdeskjet.ppd ENTER
+% /usr/lib/lpadmin -pDeskJet -E -vparallel:/dev/par1 -mdeskjet.ppd ENTER
 </PRE></UL>

 <H2>Removing Printers</H2>
@@ -379,10 +415,80 @@ 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
@@ -413,7 +519,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
-specific only the network address and not your system's network address!
+specify only the network address and not your system's network address!

 <H3>BrowsePort</H3>

@@ -531,7 +637,47 @@ 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.
+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>

 <P>The <CODE>Allow</CODE> directive must appear inside a
 <CODE>Location</CODE> directive.
@@ -556,7 +702,47 @@ 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.
+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>

 <P>The <CODE>Deny</CODE> directive must appear inside a
 <CODE>Location</CODE> directive.
@@ -677,10 +863,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
+	is identical (network or "big-endian" byte order)

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

 	<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:19990521210321Z)/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:19990621185446Z)/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,15 +26,14 @@ 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 Risk Identification</A></B>
+<B><A HREF=#3>3 Local Access Risks</A></B>
 <UL>
-<LI><A HREF=#3_1>3.1 Local Access Risks</A></LI>
-<LI><A HREF=#3_2>3.2 Remote Access Risks</A></LI>
+<LI><A HREF=#3_1>3.1 Security Breaches</A></LI>
 </UL>
-<B><A HREF=#4>4 Risk Assessment</A></B>
+<B><A HREF=#4>4 Remote Access Risks</A></B>
 <UL>
-<LI><A HREF=#4_1>4.1 Local Access Risks</A></LI>
-<LI><A HREF=#4_2>4.2 Remote Access Risks</A></LI>
+<LI><A HREF=#4_1>4.1 Denial of Service Attacks</A></LI>
+<LI><A HREF=#4_2>4.2 Security Breaches</A></LI>
 </UL>
 <B><A HREF=#5>A Glossary</A></B>
 <UL>
@@ -69,8 +68,8 @@ sections:</P>
 <UL>
 <LI>1 - Scope</LI>
 <LI>2 - References</LI>
-<LI>3 - Risk Identification</LI>
-<LI>4 - Risk Assessment</LI>
+<LI>3 - Local Access Risks</LI>
+<LI>4 - Remote Access Risks</LI>
 <LI>A - Glossary</LI>
 </UL>
 <H1><A NAME=2>2 References</A></H1>
@@ -97,12 +96,78 @@ sections:</P>
 <LI>IPP/1.0: Model and Semantics </LI>
 <LI>RFC 1179, Line Printer Daemon Protocol </LI>
 </UL>
-<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><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 TYPE=A VALUE=1><A NAME=5>A Glossary</A></H1>
 <H2><A NAME=5_1>A.1 Terms</A></H2>
 <DL>
@@ -1,61 +1,58 @@
 %PDF-1.2
 %âãÏÓ
-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
+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
 2 0 obj<</Type/Encoding/BaseEncoding/WinAnsiEncoding>>endobj
-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
+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
 11 0 R
 12 0 R
 13 0 R
@@ -98,32 +95,30 @@
 50 0 R
 51 0 R
 52 0 R
-53 0 R
-54 0 R
 ]endobj
-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
+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
-115 0 R
+79 0 R
 82 0 R
 85 0 R
 88 0 R
@@ -133,10 +128,9 @@
 100 0 R
 103 0 R
 106 0 R
-109 0 R
 ]>>endobj
-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
+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
 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&ÙŒËÅ
5èé¹9kÉ�0¹˜ÃÅJ§æYÈäbòÜlHÆ�ù<®´m·8d+W4”
ž¼YdEêÁþ®†IÚ;'Ù`ÃàƒM-~æUHçÊGÀ"ƒùt.²Èûv®H
 cåhç	‹6£r¥#!Ç"—‹¶ qåV<$,2ra`oáõmaµdF†Ö"yËX¤ÛW
@@ -169,285 +163,284 @@ w
 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
-78 0 obj
+75 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
+76 0 obj<</Type/Page/Parent 72 0 R/Contents 77 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 7 0 R>>>>>>endobj
+77 0 obj<</Length 78 0 R/Filter/FlateDecode>>stream
 xÚ+ä2T0BCc3JÎår
 ár
á
 äHÉHendstream
 endobj
-81 0 obj
+78 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û
-/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¹\…|�¼¥ƒ
-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
+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
+80 0 obj<</Length 81 0 R/Filter/FlateDecode>>stream
+xÚ�UKo1¾ó+F9%RÙf�è-o!¥í6�ª.Æ;œx=[Û¢¿¾c/Bi«TpÁóú¾o|o¥pÊŸÎ;Ðíƒ,[—“ÖûÛ!¤C˜léŸ÷`’§0–TáÉä¹±ž%ƒÆÞ>$�G’Â(GãU¡¤ðŠLãÜƒ4]»vú�ëd®8*üRX‡²¶Ê¯ÀbEÖCei¡rt …^9ö¦*rNÍôN€$#ÑYðs„+*K2ðøiô-ç’i7é„’™UŒÌ<Áxå<–0=>ºzÌÆGÓøŠÖ1ZH“Óä¿îpÃ¯³	þ¼@»P¸üÁWX`¿ú–"Ê"°ª6>Z¬ÐFJ!vÚ9ë+oE4º˜À%0ò0n�åÑ@ŽÔ‘Ãl7Â`¼‘:³”×Ò;ð0”ä‘!8/L.l¾…àH×¡ƒ…Ðºa±@““
}É÷êÖŽ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
 endobj
-84 0 obj
+81 0 obj
 824
 endobj
-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
+82 0 obj<</Type/Page/Parent 72 0 R/Contents 83 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 7 0 R>>>>>>endobj
+83 0 obj<</Length 84 0 R/Filter/FlateDecode>>stream
 xÚ+ä2T0BCc3JÎår
 áÒw³P04TIS041T072PIÑp	rtQÐUp
VÎO+)O,JUNM.-Ê,©TJ-È/*ÑÉâÒiÒ…ê2‰˜˜˜é™)€ù†
 ÁÉù© Q×®@.ü7 £endstream
 endobj
-87 0 obj
+84 0 obj
 118
 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
-89 0 obj<</Length 90 0 R/Filter/FlateDecode>>stream
+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�–
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ï*Æ
 l™áÙt:… 
üÞc°ç›Ý
�¡×¶Ÿ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
 endobj
-90 0 obj
+87 0 obj
 522
 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
+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
-93 0 obj
+90 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
+91 0 obj<</Type/Page/Parent 72 0 R/Contents 92 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
+92 0 obj<</Length 93 0 R/Filter/FlateDecode>>stream
+xÚuRÛjÜ0}÷WÌc�ïnöòØ”
+¥´]úª•ÆY%²ÆÑÈMý÷�‘³]Xƒå3ç6z®¸‘§�Í–k°}u×V¾ì ÙAÛÉŸõf{·„odM€�Ö"3üòüÄWí£@WÐ43ôz¹«×
+ž¡f†&…‚IùH¬o“Ášü;òP¼ø|¡Œ�ŒI9hŒ¹†öèmöÁ2DÊj@d›e½PYã\REÏ<
+ 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
+93 0 obj
+447
+endobj
+94 0 obj<</Type/Page/Parent 72 0 R/Contents 95 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 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
+xÚ+ä2T0BCc3JÎår
+áÒw³P04TIS041T072PIÑp	rtQÐUp
VÎO+)O,JUNM.-Ê,©TJ-È/*ÑÉâÒiÒ…ê2‰[ë�ìò�|ò“s““S‹‹‚2‹³‹AJ\C¸¹Ñ€%3endstream
 endobj
 96 0 obj
-146
+131
 endobj
-97 0 obj<</Type/Page/Parent 75 0 R/Contents 98 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 6 0 R>>>>>>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
-xÚ-‹ËÂ D÷÷+f©´WLµK_MÜ)à44EŒñïcf6s2çNŒê†¬Kí•Ö†¦íÌ0<g,fL?ÚªUk °94tôùÕ%íì3…ü†r·˜òØœIIüºÙð¤ÆoK¨ð¸`ß»!l—CÊggèH]&endstream
+xÚ}WKo7¾ûWÌÑ$Ù’ßí©nÀ@[¤¶‚öàÅ¥$Æ\rCr½V~}¿!¹z¬í @‘¬È™ù3œ~?šÒþLézFçW$ë£»ùÑéç[šÞÒ|‰_®®/h^_Ðƒª]Tô›”*zÐá9œÌ¿áìM§ùìøüvrÅ§ËY‘Ïz>KÂ+Škø¿"’–ŠÔkcœŽª¢Nã×6’ ã¤0Ôå9‚k->ÚêÔyZzWã€ÏáÃ&DUO¸
+äžžOfœ{¾Ö�‚’Q;K•S�¬C€ªò\‹¡Å'¯Œà¤Ñ‘U±sþ™8¼öªÆðõÖë¸™d„`ãrr³Ã˜™Lée5JuKzTþEKÐ£�?aæOý^�BÛ¨<r#WºFàEÑï_¿<¦O/±Ê‹…Q\jµMW.‘ÈéF'M[i»ú…SÏ.i<»ÊuN'ÄŸŽ?…ˆ8:¬qˆêÖDÝ ªtÖf®gàJvÐ®Íþ‡N£l–´‰ ”jçUâ·Éù�–)‡º�‡N’‰+¡mÀÇM
+	z½‚®Á-cgLè>2ÞÆ… ZöÈ²�-\ƒä!à¸<Ð;3VâOk*N
`K½Âõ$²ÑµŽ)³mëÀ Ô>t(â:-àEÀq4H·Æ9f#"sÒ¥œ¹ñø�í
+© o-CO%ªÆÌUiV„yP�b3š
¹
+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
 99 0 obj
-130
+1404
 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
+100 0 obj<</Type/Page/Parent 72 0 R/Contents 101 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R>>>>>>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
+xÚ]Q]o›0}çWœÇU4NXš=®Ëò6ikØ0æÜ�Í|ífÙ¯ßuˆZ©Âºæ|ÝÃŸBa%�Âf›�™ŠÇ¦¸?ÔP
+M/_¶»ºÚ¡é>èn²Îr:ZïÐÈév¤½ÐãˆÁsä�ò:ÓØŸ0è‚F‰£€Å³¿!NLÐÆ3ŒÎ¢wÍs±B©6Õ:›Ck2Q`>tÖ�ÆKuC·U�QÍ@¢û7BŠn ‘4|�¯¿~q¶ŽÓ<û±·'Ñ„Nq Y¶¨ÌÈ7�0I}"´¾» ±x‚iÖ²ùû|ß÷ŸÊV¼:�Qpz’U]‡Y3Ë–R�‰+4ƒå%Æ|$ßÖI}Ó’âJ
Rž‹H.GôÁþ£î�é°.¢‡ñ“ˆN–o%÷¦Î×¦î»ÛïTµ‚Z©EfÿôåÐ \::ú>žµì~$“‚�<Qî+óËL+Ö«ÌÚå›ÍÃgiþ:×"öÊy¤Í@œ1ßšâgñ)Åõendstream
 endobj
 102 0 obj
-140
+381
 endobj
-103 0 obj<</Type/Page/Parent 75 0 R/Contents 104 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 6 0 R>>>>>>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Ú+ä2T0BCc3JÎår
-áÒw³P04TIS041T072PIÑp	rtQÐUp
VÎO+)O,JUNM.-Ê,©TJ-È/*ÑÉâÒiÒ…ê²‰[ë™*€ù&
-A™ÅÙ
-ŽÅÅ©ÅÅ¹©y`®!\�\g$‘endstream
-endobj
-105 0 obj
-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
+105 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
+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„!à•
Å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
+108 0 obj
 383
 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
+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ÚÕ˜Û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™
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
+114 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
+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 137 
+0 133 
 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 
-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 
+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 
+0000004848 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 
+0000015619 00000 n 
+0000015729 00000 n 
+0000015919 00000 n 
+0000015939 00000 n 
+0000016067 00000 n 
+0000016583 00000 n 
 0000016603 00000 n 
-0000016623 00000 n 
-0000016733 00000 n 
-0000016932 00000 n 
-0000016952 00000 n 
-0000017073 00000 n 
-0000017284 00000 n 
-0000017305 00000 n 
-0000017417 00000 n 
-0000017615 00000 n 
-0000017636 00000 n 
-0000017775 00000 n 
-0000018272 00000 n 
-0000018293 00000 n 
-0000018423 00000 n 
-0000018877 00000 n 
-0000018898 00000 n 
-0000019051 00000 n 
-0000020180 00000 n 
-0000020202 00000 n 
-0000020314 00000 n 
-0000020488 00000 n 
-0000020509 00000 n 
-0000020564 00000 n 
-0000020669 00000 n 
-0000020812 00000 n 
-0000020917 00000 n 
-0000021036 00000 n 
-0000021144 00000 n 
-0000021292 00000 n 
-0000021401 00000 n 
-0000021507 00000 n 
-0000021664 00000 n 
-0000021773 00000 n 
-0000021883 00000 n 
-0000022037 00000 n 
-0000022147 00000 n 
-0000022258 00000 n 
-0000022392 00000 n 
-0000022489 00000 n 
-0000022589 00000 n 
+0000016713 00000 n 
+0000016913 00000 n 
+0000016933 00000 n 
+0000017070 00000 n 
+0000018543 00000 n 
+0000018564 00000 n 
+0000018685 00000 n 
+0000019137 00000 n 
+0000019158 00000 n 
+0000019297 00000 n 
+0000019794 00000 n 
+0000019815 00000 n 
+0000019945 00000 n 
+0000020399 00000 n 
+0000020420 00000 n 
+0000020573 00000 n 
+0000021671 00000 n 
+0000021693 00000 n 
+0000021805 00000 n 
+0000021979 00000 n 
+0000022000 00000 n 
+0000022055 00000 n 
+0000022160 00000 n 
+0000022303 00000 n 
+0000022408 00000 n 
+0000022527 00000 n 
+0000022635 00000 n 
+0000022783 00000 n 
+0000022892 00000 n 
+0000022998 00000 n 
+0000023154 00000 n 
+0000023249 00000 n 
+0000023406 00000 n 
+0000023522 00000 n 
+0000023630 00000 n 
+0000023764 00000 n 
+0000023861 00000 n 
+0000023961 00000 n 
 trailer
-<</Size 137/Root 136 0 R/Info 1 0 R>>
+<</Size 133/Root 132 0 R/Info 1 0 R>>
 startxref
-22772
+24144
 %%EOF
@@ -41,8 +41,8 @@ can be used to support non-PostScript printers.
 <UL>
 	<LI>1 - Scope</LI>
 	<LI>2 - References</LI>
-	<LI>3 - Risk Identification</LI>
-	<LI>4 - Risk Assessment</LI>
+	<LI>3 - Local Access Risks</LI>
+	<LI>4 - Remote Access Risks</LI>
 	<LI>A - Glossary</LI>
 </UL>

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

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

-<H2>Local Access Risks</H2>
+<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>Remote Access Risks</H2>
+<H2>Security Breaches</H2>

-<H1>Risk Assessment</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.

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

-<H2>Remote 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.

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

@@ -24,8 +24,11 @@ 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>Filters</A></LI>
-<LI><A HREF=#2_4>Printer Drivers</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>
 </UL>
 <B><A HREF=#3>2 - Using the Printing System</A></B>
 <UL>
@@ -41,7 +44,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</A></LI>
+<LI><A HREF=#4_1_1>Selecting the Media Size, Type, and Source</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>
@@ -136,7 +139,17 @@ 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>Filters</A></H2>
+<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>
 <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 
@@ -152,12 +165,28 @@ 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_4>Printer Drivers</A></H2>
+<H2><A NAME=2_6>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>
@@ -288,15 +317,18 @@ 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</A></H3>
-<P>The &quot;-o media=size&quot; option sets the media size: </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>
 <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 depend on the printer, but most support at 
-least the following sizes (case is significant): </P>
+<P>The available media sizes, types, and sources depend on the printer, 
+but most support the following options (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>
@@ -304,7 +336,15 @@ least the following sizes (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>
@@ -325,13 +365,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-range=pages&quot; option selects a range of pages for 
+<P>The &quot;-o page-ranges=pages&quot; option selects a range of pages for 
 printing: </P>
 <UL>
 <PRE>
-% 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
+% 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
 </PRE>
 </UL>
 <P>As shown above, the <I>pages</I> value can be a single page, a range 
@@ -98,6 +98,19 @@ 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
@@ -126,6 +139,24 @@ 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
@@ -274,16 +305,19 @@ when printing with the <CODE>lp</CODE> command.

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

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

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

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

 <UL>

@@ -298,8 +332,22 @@ least the following sizes (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
@@ -323,12 +371,12 @@ suitable for portrait pages:

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

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

 <UL><PRE>
-% 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
+% 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
 </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
-#       44145 Airport View Drive, Suite 204
+#       44141 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) image.a
+	rm -f $(OBJS) $(TARGETS) $(LIBCUPSIMAGE)

 #
 # Install all targets...
@@ -55,46 +55,70 @@ 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.a
+hpgltops:	$(HPGLOBJS) common.o ../Makedefs ../cups/$(LIBCUPS)
+	echo Linking $@...
 	$(CC) $(LDFLAGS) -o $@ $(HPGLOBJS) common.o $(LIBS) -lm
 $(HPGLOBJS):	hpgltops.h

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

-image.a:	$(IMAGEOBJS) ../Makedefs ../cups/libcups.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 $@...
 	$(RM) $@
 	$(AR) $(ARFLAGS) $@ $(IMAGEOBJS)
 	$(RANLIB) $@
+
 $(IMAGEOBJS):	image.h

 #
 # imagetops
 #

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

 #
 # imagetoraster
 #

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

 #
 # pstops
 #

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

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

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

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

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

@@ -61,7 +61,7 @@ SetCommonOptions(int           num_options,	/* I - Number of options */
  float		temp;		/* Swapping variable */
  ppd_file_t	*ppd;		/* PPD file */
  ppd_size_t	*pagesize;	/* Current page size */
-  char		*val;		/* Option value */
+  const char	*val;		/* Option value */


  ppd = ppdOpenFile(getenv("PPD"));
@@ -236,9 +236,11 @@ SetCommonOptions(int           num_options,	/* I - Number of options */
  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)
+  else if ((val = cupsGetOption("Duplex", num_options, options)) != NULL &&
+           strcmp(val, "DuplexNoTumble") == 0)
+    Duplex = 1;
+  else if (ppdIsMarked(ppd, "Duplex", "DuplexNoTumble") ||
+           ppdIsMarked(ppd, "Duplex", "DuplexTumble"))
    Duplex = 1;

  return (ppd);
@@ -135,7 +135,7 @@ main(int  argc,		/* I - Number of command-line arguments */
 		name;		/* Name of command */
  int		num_options;	/* Number of print options */
  cups_option_t	*options;	/* Print options */
-  char		*val;		/* Option value */
+  const char	*val;		/* Option value */
  int		shading;	/* -1 = black, 0 = grey, 1 = color */
  float		penwidth;	/* Default pen width */

@@ -80,9 +80,9 @@ OutputProlog(char  *title,	/* I - Job title */
  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)
+  if ((prolog = fopen(CUPS_DATADIR "/data/HPGLprolog", "r")) == NULL)
  {
-    perror("ERROR: Unable to open HPGL prolog \"" CUPS_DATADIR "/HPGLprolog\" for reading");
+    perror("ERROR: Unable to open HPGL prolog \"" CUPS_DATADIR "/data/HPGLprolog\" for reading");
    exit(1);
  }

@@ -1,130 +0,0 @@
-# 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
@@ -284,11 +284,11 @@ ImageSetMaxTiles(image_t *img,		/* I - Image to set */
 */

 void
-ImageSetProfile(float density,		/* I - Ink/marker density */
+ImageSetProfile(float d,		/* I - Ink/marker density */
+                float g,		/* I - Ink/marker gamma */
                float matrix[3][3])	/* I - Color transform matrix */
 {
  int	i, j, k;			/* Looping vars */
-  float	g;				/* Gamma correction */


  ImageHaveProfile  = 1;
@@ -298,10 +298,8 @@ ImageSetProfile(float density,		/* I - Ink/marker density */
      for (k = 0; k < 256; k ++)
        ImageMatrix[i][j][k] = (int)(k * matrix[i][j] + 0.5);

-  g = 1.0 / density;
-
  for (k = 0; k < 256; k ++)
-    ImageDensity[k] = 255.0 * density * pow((float)k / 255.0, g) + 0.5;
+    ImageDensity[k] = 255.0 * d * pow((float)k / 255.0, g) + 0.5;
 }


@@ -701,7 +699,7 @@ flush_tile(image_t *img)

  if (img->cachefile == NULL)
  {
-    tmpnam(img->cachename);
+    cupsTempFile(img->cachename, sizeof(img->cachename));

 #ifdef DEBUG
    fprintf(stderr, "flush_tile: Creating cache file %s...\n", img->cachename);
@@ -156,7 +156,7 @@ extern image_t	*ImageOpen(char *filename, int primary, int secondary,
 		           int saturation, int hue, ib_t *lut);
 extern void	ImageClose(image_t *img);
 extern void	ImageSetMaxTiles(image_t *img, int max_tiles);
-extern void	ImageSetProfile(float density, float matrix[3][3]);
+extern void	ImageSetProfile(float d, float g, float matrix[3][3]);

 #define 	ImageGetDepth(img)	((img)->colorspace < 0 ? -(img)->colorspace : (img)->colorspace)
 extern int	ImageGetCol(image_t *img, int x, int y, int height, ib_t *pixels);
@@ -84,13 +84,14 @@ main(int  argc,		/* I - Number of command-line arguments */
  ppd_file_t	*ppd;		/* PPD file */
  int		num_options;	/* Number of print options */
  cups_option_t	*options;	/* Print options */
-  char		*val;		/* Option value */
+  const char	*val;		/* Option value */
  int		slowcollate;	/* Collate copies the slow way */
  float		g;		/* Gamma correction value */
  float		b;		/* Brightness factor */
  float		zoom;		/* Zoom facter */
  int		ppi;		/* Pixels-per-inch */
  int		hue, sat;	/* Hue and saturation adjustment */
+  int		realcopies;	/* Real copies being printed */


  if (argc != 7)
@@ -110,6 +111,8 @@ main(int  argc,		/* I - Number of command-line arguments */
  g    = 1.0;
  b    = 1.0;

+  Copies = atoi(argv[4]);
+
  options     = NULL;
  num_options = cupsParseOptions(argv[5], 0, &options);

@@ -118,9 +121,6 @@ main(int  argc,		/* I - Number of command-line arguments */
  ppdMarkDefaults(ppd);
  cupsMarkOptions(ppd, num_options, options);

-  if ((val = cupsGetOption("copies", num_options, options)) != NULL)
-    Copies = atoi(val);
-
  if ((val = cupsGetOption("multiple-document-handling", num_options, options)) != NULL)
  {
   /*
@@ -245,18 +245,25 @@ main(int  argc,		/* I - Number of command-line arguments */

  puts("%!");

+  if (ppd != NULL && ppd->patches != NULL)
+    puts(ppd->patches);
+
  ppdEmit(ppd, stdout, PPD_ORDER_DOCUMENT);
  ppdEmit(ppd, stdout, PPD_ORDER_ANY);
  ppdEmit(ppd, stdout, PPD_ORDER_PROLOG);

  if (g != 1.0 || b != 1.0)
-    printf("{ neg 1 add %.3f exp neg 1 add %.3f mul } bind settransfer\n", g, b);
+    printf("{ neg 1 add dup 0 lt { pop 1 } { %.3f exp neg 1 add } "
+           "ifelse %.3f mul } bind settransfer\n", g, b);

  if (Copies > 1 && !slowcollate)
  {
    printf("/#copies %d def\n", Copies);
-    Copies = 1;
+    realcopies = Copies;
+    Copies     = 1;
  }
+  else
+    realcopies = 1;

 /*
  * Output the pages...
@@ -270,6 +277,7 @@ main(int  argc,		/* I - Number of command-line arguments */
    for (xpage = 0; xpage < xpages; xpage ++)
      for (ypage = 0; ypage < ypages; ypage ++, page ++)
      {
+        fprintf(stderr, "PAGE: %d %d\n", page, realcopies);
        fprintf(stderr, "INFO: Printing page %d...\n", page);

        ppdEmit(ppd, stdout, PPD_ORDER_PAGE);
@@ -114,7 +114,7 @@ int	Floyd4x4[4][4] =
 ib_t	OnPixels[256],	/* On-pixel LUT */
 	OffPixels[256];	/* Off-pixel LUT */
 int	Planes[] =	/* Number of planes for each colorspace */
-	{ 1, 3, 4, 1, 3, 3, 4, 4, 4, 6 };
+	{ 1, 3, 4, 1, 3, 3, 4, 4, 4, 6, 4, 4, 1, 1, 1 };


 /*
@@ -169,7 +169,7 @@ main(int  argc,		/* I - Number of command-line arguments */
  cups_page_header_t header;	/* Page header */
  int		num_options;	/* Number of print options */
  cups_option_t	*options;	/* Print options */
-  char		*val;		/* Option value */
+  const char	*val;		/* Option value */
  int		slowcollate,	/* Collate copies the slow way */
 		slowcopies;	/* Make copies the "slow" way? */
  float		g;		/* Gamma correction value */
@@ -214,6 +214,8 @@ main(int  argc,		/* I - Number of command-line arguments */
  g    = 1.0;
  b    = 1.0;

+  Copies = atoi(argv[4]);
+
  options     = NULL;
  num_options = cupsParseOptions(argv[5], 0, &options);

@@ -222,9 +224,6 @@ main(int  argc,		/* I - Number of command-line arguments */
  ppdMarkDefaults(ppd);
  cupsMarkOptions(ppd, num_options, options);

-  if ((val = cupsGetOption("copies", num_options, options)) != NULL)
-    Copies = atoi(val);
-
  if ((val = cupsGetOption("multiple-document-handling", num_options, options)) != NULL)
  {
   /*
@@ -325,6 +324,9 @@ main(int  argc,		/* I - Number of command-line arguments */
 	break;

    case CUPS_CSPACE_K :
+    case CUPS_CSPACE_WHITE :
+    case CUPS_CSPACE_GOLD :
+    case CUPS_CSPACE_SILVER :
        primary   = IMAGE_BLACK;
 	secondary = IMAGE_BLACK;
        header.cupsBitsPerPixel = header.cupsBitsPerColor;
@@ -398,10 +400,7 @@ main(int  argc,		/* I - Number of command-line arguments */
    */

    if (i < ppd->num_profiles)
-    {
-      fputs("Setting color profile!\n", stderr);
-      ImageSetProfile(profile->density, profile->matrix);
-    }
+      ImageSetProfile(profile->density, profile->gamma, profile->matrix);
  }

 /*
@@ -552,6 +551,8 @@ main(int  argc,		/* I - Number of command-line arguments */

    Copies = 1;
  }
+  else
+    header.NumCopies = 1;

 /*
  * Create the dithering lookup tables...
@@ -713,6 +714,9 @@ main(int  argc,		/* I - Number of command-line arguments */
 		              yerr0, yerr1, r0, r1);
 		  break;
 	      case CUPS_CSPACE_K :
+	      case CUPS_CSPACE_WHITE :
+	      case CUPS_CSPACE_GOLD :
+	      case CUPS_CSPACE_SILVER :
 	          format_K(&header, row, y, plane, z->xsize, z->ysize,
 		           yerr0, yerr1, r0, r1);
 		  break;
@@ -729,6 +733,8 @@ main(int  argc,		/* I - Number of command-line arguments */
 		              yerr0, yerr1, r0, r1);
 		  break;
 	      case CUPS_CSPACE_YMCK :
+	      case CUPS_CSPACE_GMCK :
+	      case CUPS_CSPACE_GMCS :
 	          format_YMCK(&header, row, y, plane, z->xsize, z->ysize,
 		              yerr0, yerr1, r0, r1);
 		  break;
@@ -2238,7 +2244,7 @@ format_KCMYcm(cups_page_header_t *header,/* I - Page header */
 	        if (pk)
 		  *ptr++ ^= 32;	/* Black */
 		else if (pc && pm)
-		  *ptr++ ^= 3;	/* Blue (light cyan + light magenta) */
+		  *ptr++ ^= 17;	/* Blue (cyan + light magenta) */
 		else if (pc && py)
 		  *ptr++ ^= 6;	/* Green (light cyan + yellow) */
 		else if (pm && py)
@@ -2304,7 +2310,7 @@ format_KCMYcm(cups_page_header_t *header,/* I - Page header */
 		  *kptr ^= bitmask;	/* Black */
 		else if (pc && pm)
 		{
-		  *lcptr ^= bitmask;	/* Blue (light cyan + light magenta) */
+		  *cptr ^= bitmask;	/* Blue (cyan + light magenta) */
 		  *lmptr ^= bitmask;
 		}
 		else if (pc && py)
@@ -2395,7 +2401,6 @@ format_KCMYcm(cups_page_header_t *header,/* I - Page header */
        	    for (x = xsize; x > 0; x --, r0 += 4)
        	    {
        	      if (r0[0] > dither[x & 15] &&
-			  r0[1] < dither[x & 15] &&
 			  r0[2] < dither[x & 15])
        		*ptr ^= bitmask;

@@ -2449,7 +2454,6 @@ format_KCMYcm(cups_page_header_t *header,/* I - Page header */
        	    for (x = xsize; x > 0; x --, r0 += 4)
        	    {
        	      if (r0[0] > dither[x & 15] &&
-			  r0[1] < dither[x & 15] &&
 			  r0[2] > dither[x & 15])
        		*ptr ^= bitmask;

@@ -49,17 +49,17 @@
 * Globals...
 */

-int	NumPages = 0;		/* Number of pages in file */
-long	Pages[MAX_PAGES];	/* Offsets to each page */
-char	PageLabels[MAX_PAGES][64];
-				/* Page labels */
-char	*PageRanges = NULL;	/* Range of pages selected */
-char	*PageSet = NULL;	/* All, Even, Odd pages */
-int	Order = 0,		/* 0 = normal, 1 = reverse pages */
-	Flip = 0,		/* Flip/mirror pages */
-	NUp = 1,		/* Number of pages on each sheet (1, 2, 4) */
-	Collate = 0,		/* Collate copies? */
-	Copies = 1;		/* Number of copies */
+int		NumPages = 0;		/* Number of pages in file */
+long		Pages[MAX_PAGES];	/* Offsets to each page */
+char		PageLabels[MAX_PAGES][64];
+					/* Page labels */
+const char	*PageRanges = NULL;	/* Range of pages selected */
+const char	*PageSet = NULL;	/* All, Even, Odd pages */
+int		Order = 0,		/* 0 = normal, 1 = reverse pages */
+		Flip = 0,		/* Flip/mirror pages */
+		NUp = 1,		/* Number of pages on each sheet (1, 2, 4) */
+		Collate = 0,		/* Collate copies? */
+		Copies = 1;		/* Number of copies */


 /*
@@ -85,7 +85,7 @@ main(int  argc,			/* I - Number of command-line arguments */
  ppd_file_t	*ppd;		/* PPD file */
  int		num_options;	/* Number of print options */
  cups_option_t	*options;	/* Print options */
-  char		*val;		/* Option value */
+  const char	*val;		/* Option value */
  char		tempfile[255];	/* Temporary file name */
  FILE		*temp;		/* Temporary file */
  int		number;		/* Page number */
@@ -94,6 +94,10 @@ main(int  argc,			/* I - Number of command-line arguments */
  char		line[8192];	/* Line buffer */
  float		g;		/* Gamma correction value */
  float		b;		/* Brightness factor */
+  int		level;		/* Nesting level for embedded files */
+  int		nbytes,		/* Number of bytes read */
+		tbytes;		/* Total bytes to read for binary data */
+  int		page;		/* Current page sequence number */


  if (argc < 6 || argc > 7)
@@ -129,6 +133,8 @@ main(int  argc,			/* I - Number of command-line arguments */
  g = 1.0;
  b = 1.0;

+  Copies = atoi(argv[4]);
+
  ppd = ppdOpenFile(getenv("PPD"));

  options     = NULL;
@@ -145,9 +151,6 @@ main(int  argc,			/* I - Number of command-line arguments */
  if ((val = cupsGetOption("page-set", num_options, options)) != NULL)
    PageSet = val;

-  if ((val = cupsGetOption("copies", num_options, options)) != NULL)
-    Copies = atoi(val);
-
  if ((val = cupsGetOption("multiple-document-handling", num_options, options)) != NULL)
  {
   /*
@@ -202,7 +205,7 @@ main(int  argc,			/* I - Number of command-line arguments */

  if (sloworder || slowcollate)
  {
-    temp = fopen(tmpnam(tempfile), "wb+");
+    temp = fopen(cupsTempFile(tempfile, sizeof(tempfile)), "wb+");

    if (temp == NULL)
      slowcollate = sloworder = 0;
@@ -242,6 +245,9 @@ main(int  argc,			/* I - Number of command-line arguments */

  puts(line);

+  if (ppd != NULL && ppd->patches != NULL)
+    puts(ppd->patches);
+
  ppdEmit(ppd, stdout, PPD_ORDER_DOCUMENT);
  ppdEmit(ppd, stdout, PPD_ORDER_ANY);
  ppdEmit(ppd, stdout, PPD_ORDER_PROLOG);
@@ -253,7 +259,8 @@ main(int  argc,			/* I - Number of command-line arguments */
         "end");

  if (g != 1.0 || b != 1.0)
-    printf("{ neg 1 add %.3f exp neg 1 add %.3f mul } bind settransfer\n", g, b);
+    printf("{ neg 1 add dup 0 lt { pop 1 } { %.3f exp neg 1 add } "
+           "ifelse %.3f mul } bind settransfer\n", g, b);

  if (Copies > 1 && (!Collate || !slowcollate))
    printf("/#copies %d def\n", Copies);
@@ -264,9 +271,32 @@ main(int  argc,			/* I - Number of command-line arguments */
    * OK, we have DSC comments; read until we find a %%Page comment...
    */

+    level = 0;
+
    while (psgets(line, sizeof(line), fp) != NULL)
-      if (strncmp(line, "%%Page:", 7) == 0)
+      if (strncmp(line, "%%BeginDocument:", 16) == 0 ||
+          strncmp(line, "%%BeginDocument ", 16) == 0)	/* Adobe Acrobat BUG */
+        level ++;
+      else if (strcmp(line, "%%EndDocument") == 0 && level > 0)
+        level --;
+      else if (strncmp(line, "%%Page:", 7) == 0 && level == 0)
        break;
+      else if (strncmp(line, "%%BeginBinary:", 14) == 0 ||
+               (strncmp(line, "%%BeginData:", 12) == 0 &&
+	        strstr(line, "Binary") != NULL))
+      {
+       /*
+        * Copy binary data...
+	*/
+
+        tbytes = atoi(strchr(line, ':') + 1);
+	while (tbytes > 0)
+	{
+	  nbytes = fread(line, 1, sizeof(line), fp);
+	  fwrite(line, 1, nbytes, stdout);
+	  tbytes -= nbytes;
+	}
+      }
      else
        puts(line);

@@ -274,17 +304,28 @@ main(int  argc,			/* I - Number of command-line arguments */
    * Then read all of the pages, filtering as needed...
    */

-    for (;;)
+    for (page = 1;;)
    {
-      if (strncmp(line, "%%Page:", 7) == 0)
+      if (strncmp(line, "%%BeginDocument:", 16) == 0 ||
+          strncmp(line, "%%BeginDocument ", 16) == 0)	/* Adobe Acrobat BUG */
+        level ++;
+      else if (strcmp(line, "%%EndDocument") == 0 && level > 0)
+        level --;
+      else if (strncmp(line, "%%Page:", 7) == 0 && level == 0)
      {
        if (sscanf(line, "%*s%*s%d", &number) == 1)
 	{
 	  if (!check_range(number))
 	  {
 	    while (psgets(line, sizeof(line), fp) != NULL)
-	      if (strncmp(line, "%%Page:", 7) == 0)
+	      if (strncmp(line, "%%BeginDocument:", 16) == 0 ||
+        	  strncmp(line, "%%BeginDocument ", 16) == 0)	/* Adobe Acrobat BUG */
+        	level ++;
+	      else if (strcmp(line, "%%EndDocument") == 0 && level > 0)
+        	level --;
+	      else if (strncmp(line, "%%Page:", 7) == 0 && level == 0)
 	        break;
+
            continue;
          }

@@ -294,16 +335,44 @@ main(int  argc,			/* I - Number of command-line arguments */
 	  if (slowcollate || sloworder)
 	    Pages[NumPages] = ftell(temp);

-	  NumPages ++;
-
          if (!sloworder)
 	  {
-	    if (ppd == NULL || ppd->num_filters == 0)
-	      fprintf(stderr, "PAGE: %d %d\n", NumPages, Copies);
+	    if ((NumPages % NUp) == 0)
+	    {
+	      if (ppd == NULL || ppd->num_filters == 0)
+		fprintf(stderr, "PAGE: %d %d\n", page, Copies);

-	    ppdEmit(ppd, stdout, PPD_ORDER_PAGE);
-	    start_nup(NumPages - 1);
+              printf("%%%%Page: %d %d\n", page, page);
+	      page ++;
+	      ppdEmit(ppd, stdout, PPD_ORDER_PAGE);
+	    }
+
+	    start_nup(NumPages);
 	  }
+
+	  NumPages ++;
+	}
+      }
+      else if (strncmp(line, "%%BeginBinary:", 14) == 0 ||
+               (strncmp(line, "%%BeginData:", 12) == 0 &&
+	        strstr(line, "Binary") != NULL))
+      {
+       /*
+        * Copy binary data...
+	*/
+
+        tbytes = atoi(strchr(line, ':') + 1);
+	while (tbytes > 0)
+	{
+	  nbytes = fread(line, 1, sizeof(line), fp);
+
+          if (!sloworder)
+	    fwrite(line, 1, nbytes, stdout);
+
+          if (slowcollate || sloworder)
+	    fwrite(line, 1, nbytes, stdout);
+
+	  tbytes -= nbytes;
 	}
      }
      else
@@ -328,19 +397,26 @@ main(int  argc,			/* I - Number of command-line arguments */
    if (slowcollate || sloworder)
    {
      Pages[NumPages] = ftell(temp);
+      page = 1;

      if (!sloworder)
      {
-        while (Copies > 1)
+        while (Copies > 0)
 	{
 	  rewind(temp);

 	  for (number = 0; number < NumPages; number ++)
 	  {
-	    if (ppd == NULL || ppd->num_filters == 0)
-	      fprintf(stderr, "PAGE: %d 1\n", number + 1);
+	    if ((number % NUp) == 0)
+	    {
+	      if (ppd == NULL || ppd->num_filters == 0)
+		fprintf(stderr, "PAGE: %d 1\n", page);
+
+              printf("%%%%Page: %d %d\n", page, page);
+	      page ++;
+	      ppdEmit(ppd, stdout, PPD_ORDER_PAGE);
+	    }

-	    ppdEmit(ppd, stdout, PPD_ORDER_PAGE);
 	    start_nup(number);
 	    copy_bytes(temp, Pages[number + 1] - Pages[number]);
 	    end_nup(number);
@@ -355,11 +431,17 @@ main(int  argc,			/* I - Number of command-line arguments */
 	{
 	  for (number = NumPages - 1; number >= 0; number --)
 	  {
-	    if (ppd == NULL || ppd->num_filters == 0)
-	      fprintf(stderr, "PAGE: %d %d\n", NumPages - number,
-	              slowcollate ? 1 : Copies);
+	    if ((number % NUp) == 0)
+	    {
+	      if (ppd == NULL || ppd->num_filters == 0)
+		fprintf(stderr, "PAGE: %d %d\n", page,
+	        	slowcollate ? 1 : Copies);
+
+              printf("%%%%Page: %d %d\n", page, page);
+	      page ++;
+	      ppdEmit(ppd, stdout, PPD_ORDER_PAGE);
+	    }

-	    ppdEmit(ppd, stdout, PPD_ORDER_PAGE);
 	    start_nup(NumPages - 1 - number);
 	    fseek(temp, Pages[number], SEEK_SET);
 	    copy_bytes(temp, Pages[number + 1] - Pages[number]);
@@ -444,8 +526,8 @@ main(int  argc,			/* I - Number of command-line arguments */
 static int		/* O - 1 if selected, 0 otherwise */
 check_range(int page)	/* I - Page number */
 {
-  char	*range;		/* Pointer into range string */
-  int	lower, upper;	/* Lower and upper page numbers */
+  const char	*range;		/* Pointer into range string */
+  int		lower, upper;	/* Lower and upper page numbers */


  if (PageSet != NULL)
@@ -469,11 +551,11 @@ check_range(int page)	/* I - Page number */
    {
      lower = 1;
      range ++;
-      upper = strtol(range, &range, 10);
+      upper = strtol(range, (char **)&range, 10);
    }
    else
    {
-      lower = strtol(range, &range, 10);
+      lower = strtol(range, (char **)&range, 10);

      if (*range == '-')
      {
@@ -481,7 +563,7 @@ check_range(int page)	/* I - Page number */
 	if (!isdigit(*range))
 	  upper = 65535;
 	else
-	  upper = strtol(range, &range, 10);
+	  upper = strtol(range, (char **)&range, 10);
      }
      else
        upper = lower;
@@ -534,7 +616,8 @@ copy_bytes(FILE   *fp,		/* I - File to read from */
 static void
 end_nup(int number)	/* I - Page number */
 {
-  puts("grestore");
+  if (Flip || Orientation || NUp > 1)
+    puts("grestoreall");

  switch (NUp)
  {
@@ -621,7 +704,8 @@ start_nup(int number)	/* I - Page number */
 	tx, ty;		/* Translation values for subpage */


-  puts("gsave");
+  if (Flip || Orientation || NUp > 1)
+    puts("gsave");

  if (Flip)
    printf("%.0f 0 translate -1 1 scale\n", PageWidth);
@@ -1,107 +0,0 @@
-# Microsoft Developer Studio Project File - Name="pstops" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=pstops - 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 "pstops.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 "pstops.mak" CFG="pstops - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "pstops - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "pstops - 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)" == "pstops - 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:"pstops.exe"
-
-!ELSEIF  "$(CFG)" == "pstops - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "pstops___Win32_Debug"
-# PROP BASE Intermediate_Dir "pstops___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/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 /incremental:no /debug /machine:I386 /out:"pstopsd.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "pstops - Win32 Release"
-# Name "pstops - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\pstops.c
-
-!IF  "$(CFG)" == "pstops - Win32 Release"
-
-!ELSEIF  "$(CFG)" == "pstops - Win32 Debug"
-
-# ADD CPP /Zi
-
-!ENDIF 
-
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# End Target
-# End Project
@@ -39,13 +39,14 @@
 * Globals...
 */

-int	WrapLines = 0,		/* Wrap text in lines */
+int	WrapLines = 1,		/* Wrap text in lines */
 	SizeLines = 60,		/* Number of lines on a page */
 	SizeColumns = 80,	/* Number of columns on a line */
 	PageColumns = 1,	/* Number of columns on a page */
 	ColumnGutter = 0,	/* Number of characters between text columns */
 	ColumnWidth = 80,	/* Width of each column */
-	PrettyPrint = 0;	/* Do pretty code formatting */
+	PrettyPrint = 0,	/* Do pretty code formatting */
+	Copies = 1;		/* Number of copies */
 lchar_t	**Page = NULL;		/* Page characters */
 int	NumPages = 0;		/* Number of pages in document */
 int	CharsPerInch = 10;	/* Number of character columns per inch */
@@ -53,28 +54,46 @@ int	LinesPerInch = 6;	/* Number of lines per inch */
 int	UTF8 = 0;		/* Use UTF-8 encoding? */
 char	*Keywords[] =		/* List of known keywords... */
 	{
+	  "and",
+	  "and_eq",
+	  "asm",
 	  "auto",
+	  "bitand",
+	  "bitor",
+	  "bool",
 	  "break",
 	  "case",
+	  "catch",
 	  "char",
 	  "class",
+	  "compl",
 	  "const",
 	  "continue",
 	  "default",
 	  "delete",
-	  "double",
 	  "do",
+	  "double",
 	  "else",
 	  "enum",
+	  "explicit",
 	  "extern",
+	  "false",
 	  "float",
 	  "for",
 	  "friend",
 	  "goto",
 	  "if",
+	  "inline",
 	  "int",
 	  "long",
+	  "mutable",
+	  "namespace",
 	  "new",
+	  "not",
+	  "not_eq",
+	  "operator",
+	  "or",
+	  "or_eq",
 	  "private",
 	  "protected",
 	  "public",
@@ -86,12 +105,21 @@ char	*Keywords[] =		/* List of known keywords... */
 	  "static",
 	  "struct",
 	  "switch",
+	  "template",
+	  "this",
+	  "throw",
+	  "true",
+	  "try",
 	  "typedef",
+	  "typename",
 	  "union",
 	  "unsigned",
+	  "virtual",
 	  "void",
 	  "volatile",
-	  "while"
+	  "while",
+	  "xor",
+	  "xor_eq"
 	};


@@ -123,7 +151,7 @@ TextMain(char *name,		/* I - Name of filter */
  		page_column;	/* Current page column */
  int		num_options;	/* Number of print options */
  cups_option_t	*options;	/* Print options */
-  char		*val;		/* Option value */
+  const char	*val;		/* Option value */
  char		keyword[64],	/* Keyword string */
 		*keyptr;	/* Pointer into string */
  int		keycol;		/* Column where keyword starts */
@@ -165,10 +193,21 @@ TextMain(char *name,		/* I - Name of filter */
  options     = NULL;
  num_options = cupsParseOptions(argv[5], 0, &options);

+  if ((val = cupsGetOption("prettyprint", num_options, options)) != NULL)
+  {
+    PrettyPrint  = 1;
+    PageLeft     = 72.0f;
+    PageRight    = PageWidth - 36.0f;
+    PageBottom   = PageBottom > 36.0f ? PageBottom : 36.0f;
+    PageTop      = PageLength - 36.0f;
+    CharsPerInch = 12;
+    LinesPerInch = 8;
+  }
+
  if ((ppd = SetCommonOptions(num_options, options, 1)) != NULL)
    ppdClose(ppd);

-  WrapLines = cupsGetOption("wrap", num_options, options) != NULL;
+  WrapLines = cupsGetOption("nowrap", num_options, options) == NULL;

  if ((val = cupsGetOption("columns", num_options, options)) != NULL)
    PageColumns = atoi(val);
@@ -180,12 +219,11 @@ TextMain(char *name,		/* I - Name of filter */
    LinesPerInch = atoi(val);

  if ((val = cupsGetOption("prettyprint", num_options, options)) != NULL)
-  {
-    PrettyPrint = 1;
-    PageTop     -= 216.0f / LinesPerInch;
-  }
+    PageTop -= 216.0f / LinesPerInch;

-  WriteProlog(argv[3], argv[2]);
+  Copies = atoi(argv[4]);
+
+  WriteProlog(argv[3], argv[2], ppd);

 /*
  * Read text from the specified source and print it...
@@ -64,7 +64,8 @@ extern int	WrapLines,	/* Wrap text in lines */
 		PageColumns,	/* Number of columns on a page */
 		ColumnGutter,	/* Number of characters between text columns */
 		ColumnWidth,	/* Width of each column */
-		PrettyPrint;	/* Do pretty code formatting */
+		PrettyPrint,	/* Do pretty code formatting */
+		Copies;		/* Number of copies to produce */
 extern lchar_t	**Page;		/* Page characters */
 extern int	NumPages;	/* Number of pages in document */
 extern int	CharsPerInch,	/* Number of character columns per inch */
@@ -80,7 +81,7 @@ extern char	*Keywords[];	/* List of known keywords... */
 extern int	TextMain(char *name, int argc, char *argv[]);
 extern void	WriteEpilogue(void);
 extern void	WritePage(void);
-extern void	WriteProlog(char *title, char *user);
+extern void	WriteProlog(char *title, char *user, ppd_file_t *ppd);


 /*
@@ -113,8 +113,9 @@ WritePage(void)
 */

 void
-WriteProlog(char *title,	/* I - Title of job */
-	    char *user)		/* I - Username */
+WriteProlog(char       *title,	/* I - Title of job */
+	    char       *user,	/* I - Username */
+            ppd_file_t *ppd)	/* I - PPD file info */
 {
  int		line;		/* Current output line */
  char		*charset;	/* Character set string */
@@ -335,41 +336,43 @@ WriteProlog(char *title,	/* I - Title of job */
    printf("\t0 0 %.1f %.1f rectfill\n", PageRight - PageLeft,
 	   144.0f / LinesPerInch);

-    puts("\tFN setfont");
+    puts("\tFB setfont");
    puts("\t0 setgray");

    if (Duplex)
    {
      puts("\tdup 2 mod 0 eq {");
      printf("\t\tT stringwidth pop neg %.1f add %.1f } {\n",
-             PageRight - PageLeft - 36.0f / LinesPerInch, 54.0f / LinesPerInch);
+             PageRight - PageLeft - 36.0f / LinesPerInch,
+	     (0.5f + 0.157f) * 72.0f / LinesPerInch);
      printf("\t\t%.1f %.1f } ifelse\n", 36.0f / LinesPerInch,
-             54.0f / LinesPerInch);
+	     (0.5f + 0.157f) * 72.0f / LinesPerInch);
    }
    else
      printf("\t%.1f %.1f\n", 36.0f / LinesPerInch,
-             54.0f / LinesPerInch);
+	     (0.5f + 0.157f) * 72.0f / LinesPerInch);

    puts("\tmoveto T show");

    printf("\t(%s)\n", curdate);
    printf("\tdup stringwidth pop neg 2 div %.1f add %.1f\n",
-           (PageRight - PageLeft) * 0.5, 54.0f / LinesPerInch);
+           (PageRight - PageLeft) * 0.5,
+           (0.5f + 0.157f) * 72.0f / LinesPerInch);
    puts("\tmoveto show");

    if (Duplex)
    {
      puts("\tdup P cvs exch 2 mod 0 eq {");
      printf("\t\t%.1f %.1f } {\n", 36.0f / LinesPerInch,
-             54.0f / LinesPerInch);
+	     (0.5f + 0.157f) * 72.0f / LinesPerInch);
      printf("\t\tdup stringwidth pop neg %.1f add %.1f } ifelse\n",
             PageRight - PageLeft - 36.0f / LinesPerInch,
-             54.0f / LinesPerInch);
+	     (0.5f + 0.157f) * 72.0f / LinesPerInch);
    }
    else
      printf("\tP cvs dup stringwidth pop neg %.1f add %.1f\n",
             PageRight - PageLeft - 36.0f / LinesPerInch,
-             54.0f / LinesPerInch);
+	     (0.5f + 0.157f) * 72.0f / LinesPerInch);

    puts("\tmoveto show");
    puts("\tgrestore");
@@ -452,8 +455,8 @@ write_string(int     col,	/* I - Start column */
    y = PageTop;
  }

-  x += (float)col * 72.0 / (float)CharsPerInch;
-  y -= (float)(row + 1) * 72.0 / (float)LinesPerInch;
+  x += (float)col * 72.0f / (float)CharsPerInch;
+  y -= (float)(row + 0.843) * 72.0f / (float)LinesPerInch;

  attr = s->attr;

@@ -506,15 +509,6 @@ write_string(int     col,	/* I - Start column */
    }

    putchar('>');
-
-    if (attr & ATTR_RED)
-      puts("r");
-    else if (attr & ATTR_GREEN)
-      puts("g");
-    else if (attr & ATTR_BLUE)
-      puts("b");
-    else
-      puts("S");
  }
  else
  {
@@ -551,7 +545,10 @@ write_string(int     col,	/* I - Start column */
    }

    putchar(')');
+  }

+  if (PrettyPrint)
+  {
    if (attr & ATTR_RED)
      puts("r");
    else if (attr & ATTR_GREEN)
@@ -561,6 +558,8 @@ write_string(int     col,	/* I - Start column */
    else
      puts("S");
  }
+  else
+    puts("S");
 }


@@ -1,98 +0,0 @@
-# Microsoft Developer Studio Project File - Name="texttops" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=texttops - 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 "texttops.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 "texttops.mak" CFG="texttops - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "texttops - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "texttops - 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)" == "texttops - 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 /W1 /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:"texttops.exe"
-
-!ELSEIF  "$(CFG)" == "texttops - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "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 /W1 /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:"texttopsd.exe" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "texttops - Win32 Release"
-# Name "texttops - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\texttops.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# End Group
-# End Target
-# End Project
@@ -6,13 +6,11 @@ Quit
 Close
 Yes
 No
-Auto
 On
 Off
 Save
 Discard
 Default
-User-Defined
 Options
 More Info
 Black
@@ -20,47 +18,37 @@ Color
 Cyan
 Magenta
 Yellow
-Copyright
-All Rights Reserved
+Copyright 1993-1999 by Easy Software Products, All Rights Reserved.
 General
 Printer
-PostScript
-Image
-Text
-HPGL
-Advanced
-Print Banner Page
-Verbose Logging
-Print Pages
+Image Options
+HP-GL/2 Options
+Extra
 Document
+Other
+Print Pages: 
 Entire Document
-Page Range
-Reverse Order
-Page Format
+Page Range:
+Reverse Order: 
+Page Format: 
 1-Up
 2-Up
 4-Up
-Image Scaling
+Image Scaling: 
 Use Natural Image Size
 Zoom by Percent
 Zoom by PPI
-Mirror Image
-Rotate Image
-Best Fit
-Color Saturation
-Color Hue
-Number of Columns
-Margins
-Wrap Text
-Fit to Page
-Shading
-Default Pen Width
-Gamma Correction
-Brightness
-Color Profile
-Add Printer
-Delete Printer
-Modify Printer
+Mirror Image: 
+Color Saturation: 
+Color Hue: 
+Fit to Page: 
+Shading: 
+Pen Width: 
+Gamma Correction: 
+Brightness: 
+Add
+Delete
+Modify
 Printer URI
 Printer Name
 Printer Location
@@ -92,6 +80,25 @@ Custom Size
 Idle
 Processing
 Stopped
+All
+Odd
+Even Pages
+Darker                     Lighter
+Media Size
+Media Type
+Media Source
+Orientation: 
+Portrait
+Landscape
+Job State
+Job Name
+User Name
+Priority
+Copies
+File Size
+Pending
+Output Mode
+Resolution
 400 Your browser sent a request that this server could not understand.
 This server could not verify that you are authorized to access the resource.
 You must pay to access this server.
@@ -34,7 +34,7 @@ LOCALES	=	C de en es fr it
 # Make everything...
 #

-all:
+all:	translate

 #
 # Clean all config and object files...
@@ -55,6 +55,19 @@ install:
 		$(CP) cups_$$dir $(LIBDIR)/locale/$$dir ; \
 	done

+#
+# translate - a simple utility to use Bablefish to translate the POSIX message
+#             file to one of several languages.
+#
+# translate outfile language
+#
+
+translate:	translate.o ../cups/libcups.a
+	echo Linking $<...
+	$(CC) $(LDFLAGS) -o translate translate.o $(LIBS)
+
+translate.o:	../cups/http.h
+
 #
 # End of "$Id$".
 #
@@ -1,116 +1,123 @@
 iso-8859-1
 OK
-Cancel
-Help
-Quit
-Close
-Yes
-No
-Auto
-On
-Off
-Save
-Discard
-Default
-User-Defined
-Options
-More Info
-Black
-Colour
-Cyan
-Magenta
-Yellow
-Copyright
-All Rights Reserved
-General
-Printer
-PostScript
-Image
-Text
-HPGL
-Advanced
-Print Banner Page
-Verbose Logging
-Print Pages
-Document
-Entire Document
-Page Range
-Reverse Order
-Page Format
- 1-Up
- 2-Up
- 4-Up
-Image Scaling
-Use Natural Image Size
-Zoom by Percent
-Zoom by PPI
-Mirror Image
-Rotate Image
-Best Fit
-Colour Saturation
-Colour Hue
-Number of Columns
-Margins
-Wrap Text
-Fit to Page
-Shading
-Default Pen Width
-Gamma Correction
-Brightness
-Colour Profile
-Add Printer
-Delete Printer
-Modify Printer
-Printer URI
-Printer Name
-Printer Location
-Printer Info
-Printer Make and Model
-Device URI
-Formatting Page
-Printing Page
-Initializing Printer
-Printer State
-Accepting Jobs
-Not Accepting Jobs
-Print Jobs
-Class
-Local
-Remote
-Duplexing
-Stapling
-Fast Copies
-Collated Copies
-Hole Punching
-Covering
-Binding
-Sorting
-Small (up to 241x356mm)
-Medium (241x356mm to 330x483mm)
-Large (330x483mm and larger)
-Custom Size
-Idle
-Processing
-Stopped
-400 Your browser sent a request that this server could not understand.
-This server could not verify that you are authorized to access the resource.
-You must pay to access this server.
-You don't have permission to access the resource on this server.
-The requested resource was not found on this server.
-The requested method is not allowed with the resource.
-An appropriate representation for the resource was not found on this server.
-You don't have permission to use this server as a proxy host.
-The request has taken too long to complete and has been aborted.
-The requested resource has more than one value.
-The requested resource is gone and has not been replaced.
-The requested method requires a valid Content-Length.
-The precondition on the request evaluated to false.
-The request is too large for this server to process.
-The request URI is too large for this server to process.
-The request format is not understood by this server.
-500 The server has detected an unrecoverable error and cannot process your request.
-The requested method is not implemented by this server.
-The proxy server received an invalid response from an upstream server.
-The requested resource is currently unavailable on this server.
-The proxy server has taken too long to respond to this server.
-This server does not support the HTTP version required by your browser.
+Löschen 
+Hilfe 
+Beendet 
+Nah 
+Ja 
+Nein 
+Auf 
+Weg von 
+Außer 
+Ausschuß 
+Rückstellung 
+Optionen 
+Mehr INFO 
+Schwarzes 
+Farbe 
+Cyan-blau 
+Magenta 
+Gelb 
+Copyright 1993-1999 durch Easy Software Products, alle Rechte vorbehalten. 
+General 
+Drucker 
+BildOptionen 
+HP-GL/2 Optionen 
+Extrakosten 
+Dokument 
+Anderes 
+DruckSeiten: 
+Gesamtes Dokument 
+Seitenbereich: 
+RückOrdnung: 
+Seite Format: 
+ 1-Up 
+ 2-Up 
+ 4-Up 
+BildScaling: 
+Natürliche BildGröße Des Gebrauches 
+Zoom durch Percent 
+Zoom durch PPI 
+SpiegelBild: 
+Farbe Sättigung: 
+Farbe Farbe: 
+Passen Sie, um zu paginieren: 
+Schattierend: 
+FederBreite: 
+Gamma Korrektur: 
+Helligkeit: 
+Fügen Sie hinzu 
+Löschung 
+ändern Sie 
+DruckerURI 
+DruckerName 
+DruckerStandort 
+Drucker-cInfo 
+Drucker bilden und formen 
+EinheitURI 
+Formatierung Seite 
+Seite Druckend 
+InitialisierenDrucker 
+DruckerZustand 
+Jobs Annehmend 
+Jobs Nicht, Annehmend 
+Druckjobs 
+Kategorie 
+Lokal 
+Entfernte Station 
+Duplexing 
+Heftend 
+Schnelle Plattenkopierprogramme 
+Gemischte Exemplare 
+Bohrung Lochen 
+Bedeckung 
+Binden 
+Sortierend 
+Klein (bis 9.5x1în) 
+Medium (9.5x1în bis 13x19in) 
+Groß (13x19in und größeres) 
+Kundenspezifische Größe 
+Leerlauf 
+Verarbeitend 
+Gestoppt 
+Alles 
+Ungerade 
+Gleichmäßige Seiten 
+Dunkleres                  Heller
+MediaGröße 
+MediaArt 
+MediaQuelle 
+Lagebestimmung: 
+Portrait 
+Landschaft 
+Job State
+Job Name
+User Name
+Priority
+Copies
+File Size
+Pending
+Output Mode
+Resolution
+400 Ihre Datenbanksuchroutine sendete einen Antrag, den dieser Server nicht verstehen könnte. 
+Dieser Server könnte nicht überprüfen, daß Sie autorisiert sind, das Hilfsmittel zuzugreifen. 
+Sie müssen zahlen, diesen Server zuzugreifen. 
+Sie haben nicht Erlaubnis, das Hilfsmittel auf diesem Server zuzugreifen. 
+Das erbetene Hilfsmittel wurde nicht auf diesem Server gefunden. 
+Die erbetene Methode wird nicht mit dem Hilfsmittel erlaubt. 
+Eine passende Darstellung für das Hilfsmittel wurde nicht auf diesem Server gefunden. 
+Sie haben nicht Erlaubnis, diesen Server als Proxyhauptrechner zu benutzen. 
+Der Antrag hat zu lang genommen, um durchzuführen und ist abgebrochen worden. 
+Das erbetene Hilfsmittel hat mehr als einen Wert. 
+Das erbetene Hilfsmittel wird gegangen und ist nicht ersetzt worden. 
+Die erbetene Methode benötigt ein gültiges Content-Length. 
+Die Vorbedingung auf dem Antrag wertete zu falschem aus. 
+Der Antrag ist zu groß, damit dieser Server verarbeitet. 
+Der AntragcUri ist zu groß, damit dieser Server verarbeitet. 
+Das Antragformat wird nicht durch diesen Server verstanden. 
+500 Der Server hat einen unrecoverable Fehler ermittelt und nicht Ihren Antrag verarbeiten kann. 
+Die erbetene Methode wird nicht durch diesen Server eingeführt. 
+Das proxy server empfing eine unzulässige Antwort von einem aufwärts gerichteten Server. 
+Das erbetene Hilfsmittel ist aktuell auf diesem Server nicht erreichbar. 
+Das proxy server hat zu lang genommen, um auf diesen Server zu reagieren. 
+Dieser Server unterstützt nicht die HTTP-Version, die durch Ihre Datenbanksuchroutine angefordert wird. 
@@ -6,13 +6,11 @@ Quit
 Close
 Yes
 No
-Auto
 On
 Off
 Save
 Discard
 Default
-User-Defined
 Options
 More Info
 Black
@@ -20,47 +18,37 @@ Colour
 Cyan
 Magenta
 Yellow
-Copyright
-All Rights Reserved
+Copyright 1993-1999 by Easy Software Products, All Rights Reserved.
 General
 Printer
-PostScript
-Image
-Text
-HPGL
-Advanced
-Print Banner Page
-Verbose Logging
-Print Pages
+Image Options
+HP-GL/2 Options
+Extra
 Document
+Other
+Print Pages: 
 Entire Document
-Page Range
-Reverse Order
-Page Format
+Page Range:
+Reverse Order: 
+Page Format: 
 1-Up
 2-Up
 4-Up
-Image Scaling
+Image Scaling: 
 Use Natural Image Size
 Zoom by Percent
 Zoom by PPI
-Mirror Image
-Rotate Image
-Best Fit
-Colour Saturation
-Colour Hue
-Number of Columns
-Margins
-Wrap Text
-Fit to Page
-Shading
-Default Pen Width
-Gamma Correction
-Brightness
-Colour Profile
-Add Printer
-Delete Printer
-Modify Printer
+Mirror Image: 
+Colour Saturation: 
+Colour Hue: 
+Fit to Page: 
+Shading: 
+Pen Width: 
+Gamma Correction: 
+Brightness: 
+Add
+Delete
+Modify
 Printer URI
 Printer Name
 Printer Location
@@ -85,13 +73,32 @@ Hole Punching
 Covering
 Binding
 Sorting
-Small (up to 241x356mm)
-Medium (241x356mm to 330x483mm)
-Large (330x483mm and larger)
+Small (up to 9.5x14in)
+Medium (9.5x14in to 13x19in)
+Large (13x19in and larger)
 Custom Size
 Idle
 Processing
 Stopped
+All
+Odd
+Even Pages
+Darker                     Lighter
+Media Size
+Media Type
+Media Source
+Orientation: 
+Portrait
+Landscape
+Job State
+Job Name
+User Name
+Priority
+Copies
+File Size
+Pending
+Output Mode
+Resolution
 400 Your browser sent a request that this server could not understand.
 This server could not verify that you are authorized to access the resource.
 You must pay to access this server.
@@ -1,116 +1,123 @@
 iso-8859-1
 OK
-Cancel
-Help
-Quit
-Close
-Yes
-No
-Auto
-On
-Off
-Save
-Discard
-Default
-User-Defined
-Options
-More Info
-Black
-Colour
-Cyan
-Magenta
-Yellow
-Copyright
-All Rights Reserved
-General
-Printer
-PostScript
-Image
-Text
-HPGL
-Advanced
-Print Banner Page
-Verbose Logging
-Print Pages
-Document
-Entire Document
-Page Range
-Reverse Order
-Page Format
- 1-Up
- 2-Up
- 4-Up
-Image Scaling
-Use Natural Image Size
-Zoom by Percent
-Zoom by PPI
-Mirror Image
-Rotate Image
-Best Fit
-Colour Saturation
-Colour Hue
-Number of Columns
-Margins
-Wrap Text
-Fit to Page
-Shading
-Default Pen Width
-Gamma Correction
-Brightness
-Colour Profile
-Add Printer
-Delete Printer
-Modify Printer
-Printer URI
-Printer Name
-Printer Location
-Printer Info
-Printer Make and Model
-Device URI
-Formatting Page
-Printing Page
-Initializing Printer
-Printer State
-Accepting Jobs
-Not Accepting Jobs
-Print Jobs
-Class
-Local
-Remote
-Duplexing
-Stapling
-Fast Copies
-Collated Copies
-Hole Punching
-Covering
-Binding
-Sorting
-Small (up to 241x356mm)
-Medium (241x356mm to 330x483mm)
-Large (330x483mm and larger)
-Custom Size
-Idle
-Processing
-Stopped
-400 Your browser sent a request that this server could not understand.
-This server could not verify that you are authorized to access the resource.
-You must pay to access this server.
-You don't have permission to access the resource on this server.
-The requested resource was not found on this server.
-The requested method is not allowed with the resource.
-An appropriate representation for the resource was not found on this server.
-You don't have permission to use this server as a proxy host.
-The request has taken too long to complete and has been aborted.
-The requested resource has more than one value.
-The requested resource is gone and has not been replaced.
-The requested method requires a valid Content-Length.
-The precondition on the request evaluated to false.
-The request is too large for this server to process.
-The request URI is too large for this server to process.
-The request format is not understood by this server.
-500 The server has detected an unrecoverable error and cannot process your request.
-The requested method is not implemented by this server.
-The proxy server received an invalid response from an upstream server.
-The requested resource is currently unavailable on this server.
-The proxy server has taken too long to respond to this server.
-This server does not support the HTTP version required by your browser.
+Cancelación 
+Ayuda 
+Salido 
+Cercano 
+Sí 
+No 
+En 
+De 
+Excepto 
+Descarte 
+Valor por defecto 
+Opciones 
+Más Info 
+Negro 
+Color 
+Ciánico 
+Magenta 
+Amarillo 
+El copyright 1993-1999 por Easy Software Products, todos endereza reservado. 
+General 
+Impresora 
+Opciones De la Imagen
+Opciones De HP-GL/2
+Suplemento 
+Documento 
+Otro 
+Paginaciones De la Impresión: 
+Entero Documento 
+Rango De Paginación: 
+Orden Reversa: 
+Formato De la Paginación: 
+ 1-Up 
+ 2-Up 
+ 4-Up 
+Escalamiento De la Imagen: 
+Talla Natural De la Imagen Del Uso 
+Zoom de Percent 
+Zoom de PPI 
+Imagen Del Espejo: 
+Saturación Del Color: 
+Tonalidad Del Color: 
+Quepa para paginar: 
+Sombreando: 
+Anchura De la Pluma: 
+Corrección Gamma: 
+Brillo: 
+Agregue 
+Cancelación 
+Modifiqúese 
+URI De la Impresora 
+Nombre De la Impresora 
+Localización De la Impresora 
+Impresora Info 
+La impresora hace y modela 
+URI Del Dispositivo 
+Paginación Del Formato 
+Imprimiendo La Paginación 
+De Incialización Impresora 
+Estado De la Impresora 
+Validando Trabajos 
+No validando Trabajos 
+Trabajos De Impresión 
+Clase 
+Local 
+Telecontrol 
+Duplexing 
+Sujetando con grapa 
+Rápidas Copias 
+Clasificadas Copias 
+Perforación Del Agujero 
+Cubierta 
+Atando 
+Clasificando 
+Pequeño (los hasta 9.5x14in) 
+Media (los 9.5x14in a el 13x19in) 
+Grande (el 13x19in y más grande) 
+De encargo Talla 
+Marcha lenta 
+Procesando 
+Parado 
+Todo 
+Impar 
+Uniformes Paginaciones 
+Más Oscuro       Más Brillante
+Talla De Media 
+Tipo De Media 
+Fuente De los Media 
+Orientación: 
+Retrato 
+Paisaje 
+Job State
+Job Name
+User Name
+Priority
+Copies
+File Size
+Pending
+Output Mode
+Resolution
+400 Su browser envió una petición que este servidor no podría entender. 
+Este servidor no podría verificar que le autoricen a tener acceso al recurso. 
+Usted debe pagar tener acceso a este servidor. 
+Usted no tiene permiso de tener acceso al recurso en este servidor. 
+El recurso solicitado no fue encontrado en este servidor. 
+El método solicitado no se permite con el recurso. 
+Una representación apropiada para el recurso no fue encontrada en este servidor. 
+Usted no tiene permiso de utilizar este servidor como ordenador principal del poder. 
+La petición ha durado demasiado para terminar y se ha abortado. 
+El recurso solicitado tiene más de un valor. 
+Se va y no se ha substituido el recurso solicitado. 
+El método solicitado requiere un Content-Length válido. 
+La condición previa en la petición evaluó a falso. 
+La petición es demasiado grande para que este servidor procese. 
+El URI de la petición es demasiado grande para que este servidor procese. 
+El formato de la petición no es entendido por este servidor. 
+500 El servidor ha detectado un error irrecuperable y no puede procesar su petición. 
+El método solicitado no es puesto en ejecución por este servidor. 
+El proxy server recibió una respuesta inválida de un servidor por aguas arriba. 
+El recurso solicitado es actualmente inasequible en este servidor. 
+El proxy server ha durado demasiado para responder a este servidor. 
+Este servidor no utiliza la versión del HTTP requerida por su browser. 
@@ -1,116 +1,123 @@
 iso-8859-1
 OK
-Cancel
-Aide
+Annulation 
+Aide 
 Quitté 
-Fin
+Étroit
 Oui
 Non
-Automatique 
 Sur
-Outre
-Enregistrent
-Jettent
-Défaut
-User-Defined
-Options
-More Info
-Black
-Couleur
-Cyan
-Magenta
-Yellow
-Copyright
-Tous droits réservés
-General
-Imprimante
-PostScript
-Image
-Text
-HPGL
-Advanced
-Page D'Accueil D'Impression
-Bavard Enregistrement
-La Copie Pagine
-Document
-Entire Document
-Page Range
-Reverse Order
-Page Format
- 1-Up
- 2-Up
- 4-Up
-Image Scaling
-Use Natural Image Size
-Zoom by Percent
-Zoom by PPI
-Mirror Image
-Rotate Image
-Best Fit
-Saturation De Couleur
-Tonalité De Couleur
-Nombre de Colonnes
-Margins
-Wrap Text
-Fit to Page
-Shading
-Default Pen Width
-Gamma Correction
-Brightness
-Couleur Profile
-Add Imprimante
-Delete Imprimante
-Modify Imprimante
-URI D'Imprimante
-Nom D'Imprimante
-Emplacement D'Imprimante
-L'Information D'Imprimante
-L'imprimante Font et Modèlent
-URI De Dispositif
-Page de formatage
-Imprimant la page
-Imprimante D'Initialisation
-Mode D'Imprimante
-Les Travaux De Recevoir
-Ne recevant pas Les Travaux
-Print Jobs
-Class
-Local
-Remote
-Duplexing
-Stapling
-Fast Copies
-Collated Copies
-Hole Punching
-Covering
-Binding
-Sorting
-Petit (up to 241x356mm)
-Moyenne (241x356mm to 330x483mm)
-Grand (330x483mm and larger)
-Faite sur Commande Taille
-Idle
-Processing
-Stopped
-400 Votre browser a envoyé une demande que ce serveur ne pourrait pas comprendre.
-Ce serveur ne pourrait pas vérifier que vous êtes autorisés à accéder à la ressource.
-You must pay to access this server.
-You don't have permission to access the resource on this server.
-La ressource demandée n'a pas été trouvée sur ce serveur.
-The requested method is not allowed with the resource.
-An appropriate representation for the resource was not found on this server.
-You don't have permission to use this server as a proxy host.
-The request has taken too long to complete and has been aborted.
-The requested resource has more than one value.
-The requested resource is gone and has not been replaced.
-The requested method requires a valid Content-Length.
-The precondition on the request evaluated to false.
-The request is too large for this server to process.
-The request URI is too large for this server to process.
-The request format is not understood by this server.
-500 The server has detected an unrecoverable error and cannot process your request.
-The requested method is not implemented by this server.
-The proxy server received an invalid response from an upstream server.
-The requested resource is currently unavailable on this server.
-The proxy server has taken too long to respond to this server.
-This server does not support the HTTP version required by your browser.
+Outre de
+Économiser
+Écart
+Défaut 
+Options 
+Plus D'Information 
+Noir 
+Couleur 
+Cyan 
+Magenta 
+Jaune 
+Copyright 1993-1999 par Easy Software Products, tous droits réservés. 
+Général 
+Imprimante 
+Options D'Image
+Options D'HP-GL/2
+Frais supplémentaires 
+Document 
+Autre 
+Pages D'Impression: 
+Entier Document 
+Chaîne De Page 
+Commande D'Inversion: 
+Format De Page: 
+ 1-Up 
+ 2-Up 
+ 4-Up 
+Graduation D'Image: 
+Taille Normale D'Image D'Utilisation 
+Zoom par Percent 
+Zoom par PPI 
+Image De Miroir: 
+Saturation De Couleur: 
+Tonalité De Couleur: 
+Adaptez pour paginer: 
+Ombrageant: 
+Largeur De Crayon lecteur: 
+Gamma Correction: 
+Éclat: 
+Ajoutez 
+Effacement 
+Modifiez 
+URI D'Imprimante 
+Nom D'Imprimante 
+Emplacement D'Imprimante 
+Information D'Imprimante 
+L'imprimante font et modèlent 
+URI De Dispositif 
+Page De Formatage 
+Imprimant La Page 
+D' Initialisation Imprimante 
+État D'Imprimante 
+Recevant Les Travaux 
+Ne recevant pas Les Travaux 
+Tirages 
+Classe 
+Local 
+Périphérique 
+Duplexage 
+Agrafant 
+Rapides Copies 
+Assemblées Copies 
+Poinçon De Trou 
+Bâche 
+Liant 
+Triant 
+Petit (jusqu'à 9.5x1în) 
+Support (9.5x1în à 13x19in) 
+Grand (13x19in et plus grand) 
+Faite sur commande Taille 
+Ralenti 
+Traitant 
+Arrêté 
+Tout 
+Impair 
+Même Pages 
+Plus foncé       Plus Lumineux
+Taille De Medias 
+Type De Supports 
+Source De Medias 
+Orientation: 
+Verticale 
+Horizontal 
+Job State
+Job Name
+User Name
+Priority
+Copies
+File Size
+Pending
+Output Mode
+Resolution
+400 Votre browser a envoyé une demande que ce serveur ne pourrait pas comprendre. 
+Ce serveur ne pourrait pas vérifier que vous êtes autorisés à accéder à la ressource. 
+Vous devez payer pour accéder à ce serveur. 
+Vous n'avez pas la permission d'accéder à la ressource sur ce serveur. 
+La ressource demandée n'a pas été trouvée sur ce serveur. 
+On ne permet pas la méthode demandée avec la ressource. 
+Une représentation appropriée pour la ressource n'a pas été trouvée sur ce serveur. 
+Vous n'avez pas la permission d'utiliser ce serveur comme centre serveur de procuration. 
+La demande a pris trop longtemps pour se terminer et a été interrompue. 
+La ressource demandée a plus d'une valeur. 
+La ressource demandée est allée et n'a pas été substituée. 
+La méthode demandée exige un Content-Length valide. 
+La condition préalable sur la demande a évalué à faux. 
+La demande est trop grande pour que ce serveur traite. 
+L'cUri de demande est trop grand pour que ce serveur traite. 
+Le format de demande n'est pas compris par ce serveur. 
+500 Le serveur a détecté une erreur irrémédiable et ne peut pas traiter votre demande. 
+La méthode demandée n'est pas appliquée par ce serveur. 
+Le proxy server a reçu une réponse incorrecte d'un serveur ascendant. 
+La ressource demandée est actuel indisponible sur ce serveur. 
+Le proxy server a pris trop longtemps pour répondre à ce serveur. 
+Ce serveur ne supporte pas la version de HTTP exigée par votre browser. 
--- a/Mostrar Mais
+++ b/Mostrar Mais