Import cups.org releases

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/tags/release-1.0b5@4306 a1ca3aef-8c08-0410-bb20-df032aa958be
2013-05-10 18:56:23 +00:00
@@ -0,0 +1,332 @@
+                Common UNIX Printing System License Agreement
+
+                Copyright 1997-1999 by Easy Software Products
+                        44141 AIRPORT VIEW DR STE 204
+                     HOLLYWOOD, MARYLAND 20636-3111 USA
+
+                           Voice: +1.301.373.9603
+                          Email: cups-info@cups.org
+                          WWW: http://www.cups.org
+
+Introduction
+
+The Common UNIX Printing SystemTM, or CUPSTM, is provided under the GNU
+General Public License, Version 2. A copy of this license follows this
+introduction.
+
+For those not familiar with the GNU General Public License, the license
+basically allows you to:
+
+   * Use the CUPS software at no charge.
+   * Distribute verbatim copies of the software in source or binary form.
+   * Sell verbatim copies of the software for a media fee, or sell support
+     for the software.
+   * Distribute or sell printer drivers and filters that use the CUPS API so
+     long as source code is made available under the GPL.
+
+What this license does not 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.
+
+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.
+
+Binary Distribution Rights
+
+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.
+
+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:
+
+     Miles Jones
+     Director of Marketing
+     Artifex Software Inc.
+     454 Las Gallinas Ave., Suite 108
+     San Rafael, CA 94903 USA
+     Voice: +1.415.492.9861
+     Fax: +1.415.492.9862
+     EMail: info@arsoft.com
+
+Support
+
+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.
+
+Trademarks
+
+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.
+
+                         GNU General Public License
+
+                            Version 2, June 1991
+
+             Copyright 1989, 1991 Free Software Foundation, Inc.
+           59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+                 document, but changing it is not allowed.
+
+Preamble
+
+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.
+
+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.
+
+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.
+
+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.
+
+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.
+
+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.
+
+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.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+GNU GENERAL PUBLIC LICENSE
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  1. 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".
+
+     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.
+  2. 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.
+
+     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.
+  3. 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:
+       a. You must cause the modified files to carry prominent notices
+          stating that you changed the files and the date of any change.
+       b. 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.
+       c. 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.)
+
+     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.
+
+     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.
+
+     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.
+  4. 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:
+       a. 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,
+       b. 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,
+       c. 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.)
+
+     The source code for a work means the preferred form of the work for
+     making modifications to it. For an executable work, complete source
+     code means all the source code for all modules it contains, plus any
+     associated interface definition files, plus the scripts used to control
+     compilation and installation of the executable. However, as a special
+     exception, the source code distributed need not include anything that
+     is normally distributed (in either source or binary form) with the
+     major components (compiler, kernel, and so on) of the operating system
+     on which the executable runs, unless that component itself accompanies
+     the executable.
+
+     If distribution of executable or object code is made by offering 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.
+  5. 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.
+  6. 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.
+  7. 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.
+  8. 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.
+
+     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.
+
+     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.
+
+     This section is intended to make thoroughly clear what is believed to
+     be a consequence of the rest of this License.
+  9. 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.
+ 10. 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.
+
+     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.
+ 11. 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.
+
+NO WARRANTY
+
+ 11. 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.
+ 12. 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.
+
+END OF TERMS AND CONDITIONS
@@ -69,8 +69,7 @@ CFLAGS	=	@CFLAGS@ $(OPTIM) -I.. $(OPTIONS)
 DSOLIBS	=	@DSOLIBS@
 IMGLIBS	=	@IMGLIBS@ -lm
 LDFLAGS	=	@LDFLAGS@ $(OPTIM)
-LIBS	=	-L../cups -lcups $(NETLIBS) @LIBS@
-NETLIBS	=	@NETLIBS@
+LIBS	=	-L../cups -lcups @LIBS@
 OPTIM	=	@OPTIM@
 OPTIONS	=

@@ -0,0 +1,139 @@
+<HTML>
+<HEAD>
+	<TITLE>README - Common UNIX Printing System</TITLE>
+</HEAD>
+<BODY>
+
+<H1>README - CUPS v1.0b4</H1>
+
+<H2>Contents</H2>
+
+<UL>
+	<LI><A HREF="#intro">Introduction</A>
+	<LI><A HREF="#require">Requirements</A>
+	<LI><A HREF="#use">Using CUPS</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="#legal">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="use">Using CUPS</A></H2>
+
+<P>Pre-compiled binary distributions are available for CUPS from our
+web site at
+<A HREF="http://www.cups.org/software.html">http://www.cups.org/software.html</A>.
+If you'd like to build CUPS from the source, please read the Software
+Administrator's Manual.
+
+<P>Once you have installed CUPS, the Software Administrator's Manual and
+Software User's Manual are excellent places to start setting things up. 
+
+<H2><A NAME="known">Known Problems</A></H2>
+
+The following known problems are being worked on and should be resolved for
+the fourth beta release of CUPS:
+
+<UL>
+
+	<LI>Documentation is not completed.
+
+	<LI>The lpc command currently only supports the help and status
+	commands.
+
+</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">GNU General Public License</A>
+which is located in the files "LICENSE.html" and "LICENSE.txt". For commercial
+support and "binary-only" licensing information, please contact:
+
+<UL>
+	Attn: CUPS Licensing Information
+	<BR>Easy Software Products
+	<BR>44141 Airport View Drive, Suite 204
+	<BR>Hollywood, Maryland 20636-3111 USA
+
+	<P>Voice: +1.301.373.9603
+	<BR>Email: <A HREF="mailto:cups-info@cups.org">cups-info@cups.org</A>
+	<BR>WWW: <A HREF="http://www.cups.org">http://www.cups.org</A>
+</UL>
+
+<P>If you're interested in a complete, commercial printing solution for UNIX,
+check out our ESP Print software at <A HREF="http://www.easysw.com/print.html">
+http://www.easysw.com/print.html</A>.
+
+</BODY>
+</HTML>
@@ -1,195 +1,120 @@
-README - CUPS v1.0b6 - 07/30/1999
---------------------------------
+README - CUPS v1.0b4
+--------------------

-BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE BETA SOFTWARE
+CONTENTS

-    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
+   * Using CUPS
+   * 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 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.
+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.


-SYSTEM REQUIREMENTS
+REQUIREMENTS

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

-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".
+For the image file filters you'll need the JPEG, PNG, TIFF, and ZLIB
+libraries. CUPS will build without these, but with reduced functionality.
+
+If you make changes to the man pages you'll need GNU groff or another
+nroff-like package.
+
+The documentation is formatted using the HTMLDOC software (again, not needed
+unless you make changes.)


-SOFTWARE REQUIREMENTS
+USING CUPS

-The following operating system software is required to install one of
-the binary distributions from Easy Software Products:
+Pre-compiled binary distributions are available for CUPS from our web site
+at http://www.cups.org/software.html. If you'd like to build CUPS from the
+source, please read the Software Administrator's Manual.

-    - 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)
+Once you have installed CUPS, the Software Administrator's Manual and
+Software User's Manual are excellent places to start setting things up.


-INSTALLING CUPS
+KNOWN PROBLEMS

-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.
+The following known problems are being worked on and should be resolved for
+the fourth beta release of CUPS:

-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.
+   * Documentation is not completed.
+   * The lpc command currently only supports the help and status commands.

-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:
+CUPS has been built and tested on the following operating systems:

-    ./cups.install ENTER
+   * 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)

-After asking you a few yes/no questions the CUPS software will be
-installed and the scheduler will be started automatically.
-
-
-SETTING UP PRINTER QUEUES
-
-CUPS works best with PPD (PostScript Printer Description) files.  In a
-pinch you can also use System V style printer interface scripts.
-
-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:
-
-    Digital UNIX:
-
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/lp0 -E
-
-    HP-UX:
-
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/c2t0d0_lp -E
-
-    IRIX:
-
-        /usr/lib/lpadmin -p DeskJet -m deskjet.ppd -v parallel:/dev/plp -E
-
-    Linux:
-
-        /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
-
-    Solaris:
-
-        /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
-
-Similarly, for the sample LaserJet driver you can use "LaserJet" and
-"laserjet.ppd".
-
-For other printers and interfaces see the CUPS System Administator's
-Manual included with this software.
-
-
-PRINTING FILES
-
-CUPS provides both the System V "lp" and Berkeley "lpr" commands for
-printing:
-
-    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 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:
+CUPS is provided under the terms of the GNU General Public License which is
+located in the files "LICENSE.html" and "LICENSE.txt". For commercial
+support and "binary-only" licensing information, please contact:

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

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

-If you're interested in a complete, commercial printing solution for
-UNIX, check out our ESP Print Pro software at:
-
-    http://www.easysw.com/printpro
+If you're interested in a complete, commercial printing solution for UNIX,
+check out our ESP Print software at http://www.easysw.com/print.html.
@@ -23,7 +23,6 @@
 *
 * Contents:
 *
- *   main() - Send a file to the printer or server.
 */

 /*
@@ -147,10 +146,12 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
               NULL, uri);

-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+  ippAddString(request, IPP_TAG_JOB, IPP_TAG_NAME, "requesting-user-name",
               NULL, argv[2]);

-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "job-name", NULL, argv[3]);
+  ippAddString(request, IPP_TAG_JOB, IPP_TAG_NAME, "job-name", NULL, argv[3]);
+
+  ippAddInteger(request, IPP_TAG_JOB, IPP_TAG_INTEGER, "copies", atoi(argv[4]));

 /*
  * Handle options on the command-line...
@@ -160,14 +161,12 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
  num_options = cupsParseOptions(argv[5], 0, &options);

  if (cupsGetOption("raw", num_options, options))
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
+    ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
        	 NULL, "application/vnd.cups-raw");
  else
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
+    ippAddString(request, IPP_TAG_JOB, 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 ++)
  {
   /*
@@ -280,9 +279,7 @@ main(int  argc,		/* I - Number of command-line arguments (6 or 7) */
    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...
  */
@@ -23,8 +23,6 @@
 *
 * Contents:
 *
- *   main()      - Parse options and commands.
- *   show_jobs() - Show jobs.
 */

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

-static int	show_jobs(http_t *, const char *, const char *, const int,
-		          const int);
+static int	show_jobs(http_t *, char *, char *, int, int);


 /*
@@ -61,7 +58,7 @@ main(int  argc,		/* I - Number of command-line arguments */
 {
  int		i;		/* Looping var */
  http_t	*http;		/* Connection to server */
-  const char	*dest,		/* Desired printer */
+  char		*dest,		/* Desired printer */
 		*user;		/* Desired user */
  int		id,		/* Desired job ID */
 		interval,	/* Reporting interval */
@@ -77,7 +74,7 @@ main(int  argc,		/* I - Number of command-line arguments */
  * Check for command-line options...
  */

-  dest       = cupsGetDefault();
+  dest       = NULL;
  user       = NULL;
  id         = 0;
  interval   = 0;
@@ -139,21 +136,21 @@ main(int  argc,		/* I - Number of command-line arguments */


 /*
- * 'show_jobs()' - Show jobs.
+ * 'show_jobs()' - Show printers.
 */

 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 */
+show_jobs(http_t *http,		/* I - HTTP connection to server */
+          char   *dest,		/* I - Destination */
+	  char   *user,		/* I - User */
+	  int    id,		/* I - Job ID */
+	  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 */
+  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 */
@@ -163,7 +160,7 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
 		jobcount,	/* Number of jobs */
 		rank;		/* Rank of job */
  char		resource[1024];	/* Resource string */
-  static const char *ranks[10] =/* Ranking strings */
+  static char	*ranks[10] =	/* Ranking strings */
 		{
 		  "th",
 		  "st",
@@ -46,7 +46,7 @@ main(int  argc,		/* I - Number of command-line arguments */
  int		i;		/* Looping var */
  int		job_id;		/* Job ID */
  const char	*dest;		/* Destination printer */
-  const char	*title;		/* Job title */
+  char		*title;		/* Job title */
  int		priority;	/* Job priority (1-100) */
  int		num_copies;	/* Number of copies per file */
  int		num_files;	/* Number of files printed */
@@ -225,7 +225,7 @@ main(int  argc,		/* I - Number of command-line arguments */

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

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

    if (job_id < 1)
    {
-      fputs("lpr: unable to print standard input.\n", stderr);
+      fprintf(stderr, "lpr: unable to print file \'%s\'.\n", argv[i]);
      return (1);
    }
  }
@@ -169,14 +169,7 @@ main(int  argc,			/* I - Number of command-line arguments */
        response = cupsDoRequest(http, request, "/jobs/");

      if (response != NULL)
-      {
-        if (response->request.status.status_code == IPP_NOT_FOUND)
-          fputs("lprm: Job or printer not found!\n", stderr);
-        else if (response->request.status.status_code > IPP_OK_CONFLICT)
-          fputs("lprm: Unable to cancel job(s)!\n", stderr);
-
        ippDelete(response);
-      }
      else
      {
        fputs("lprm: Unable to cancel job(s)!\n", stderr);
@@ -28,8 +28,7 @@ include ../Makedefs
 # Config files...
 #

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

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

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

 #
 # End of "$Id$".
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.convs 575 1999-07-30 13:57:16Z mike $"
+# "$Id: mime.convs 530 1999-07-13 14:11:17Z mike $"
 #
 #   MIME converts file for the Common UNIX Printing System (CUPS).
 #
@@ -42,7 +42,7 @@
 #

 #application/msword	application/postscript	50	mswordtops
-application/pdf		application/postscript	50	pdftops
+#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
@@ -58,5 +58,5 @@ image/*			application/vnd.cups-raster	50	imagetoraster
 application/vnd.cups-postscript	application/vnd.cups-raster	50	pstoraster

 #
-# End of "$Id: mime.convs 575 1999-07-30 13:57:16Z mike $".
+# End of "$Id: mime.convs 530 1999-07-13 14:11:17Z mike $".
 #
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.types 575 1999-07-30 13:57:16Z mike $"
+# "$Id: mime.types 487 1999-06-30 21:07:52Z mike $"
 #
 #   MIME types file for the Common UNIX Printing System (CUPS).
 #
@@ -92,9 +92,10 @@ image/x-sgi-rgb			rgb sgi bw icon short(0,474)
 image/x-xbitmap			xbm
 image/x-xpixmap			xpm ascii(0,1024) + string(3,"XPM")
 image/x-xwindowdump		xwd
-image/x-sun-raster		ras

-# TODO: Add Alias, SoftImage, GIMP??? files
+# TODO: Add Sun Raster, Alias, SoftImage, GIMP??? files
+
+image/x-sun-raster		ras
 #image/x-alias			pix
 #image/x-softimage
 #image/x-gimp-xcf		xcf xcf.gz
@@ -118,5 +119,5 @@ application/vnd.cups-raster	string(0,"RaSt") string(0,"tSaR")
 application/vnd.cups-raw

 #
-# End of "$Id: mime.types 575 1999-07-30 13:57:16Z mike $".
+# End of "$Id: mime.types 487 1999-06-30 21:07:52Z mike $".
 #
@@ -133,18 +133,15 @@ dnl Check for libraries...
 AC_CHECK_LIB(c,crypt,LIBS="$LIBS",AC_CHECK_LIB(crypt,crypt))
 AC_CHECK_HEADER(crypt.h, AC_DEFINE(HAVE_CRYPT_H))
 AC_CHECK_LIB(sec,getspent)
-
-NETLIBS=""
-AC_SUBST(NETLIBS)
 AC_CHECK_LIB(socket,socket,
 if test "$uname" != "IRIX"; then
-	NETLIBS="-lsocket"
+	LIBS="$LIBS -lsocket"
 else
 	echo "Not using -lsocket since you are running IRIX."
 fi)
 AC_CHECK_LIB(nsl,gethostbyaddr,
 if test "$uname" != "IRIX"; then
-	NETLIBS="$NETLIBS -lnsl"
+	LIBS="$LIBS -lnsl"
 else
 	echo "Not using -lnsl since you are running IRIX."
 fi)
@@ -241,19 +238,6 @@ if test "$DSO" != ":"; then
 	# 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)"
@@ -0,0 +1,345 @@
+#
+# "$Id: cups.list 529 1999-07-13 14:11:00Z mike $"
+#
+#   ESP Package Manager (EPM) file list for the Common UNIX Printing
+#   System (CUPS).
+#
+#   EPM can be found in the "epm" subdirectory of this distribution.
+#   Please report problems and fixes to Michael Sweet (mike@easysw.com).
+#
+#   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
+#
+
+%product Common UNIX Printing System
+%copyright 1993-1999 by Easy Software Products, All Rights Reserved.
+%vendor Easy Software Products
+%license LICENSE.cups
+%readme README.cups
+%version 1.0b5
+%incompat printpro
+
+%system all
+# Server files
+f 0555 root sys /var/cups/backend/ipp backend/ipp
+f 4555 root sys /var/cups/backend/lpd backend/lpd
+f 0555 root sys /var/cups/backend/parallel backend/parallel
+f 0555 root sys /var/cups/backend/serial backend/serial
+f 0555 root sys /var/cups/backend/smb backend/smb
+f 0555 root sys /var/cups/backend/socket backend/socket
+f 0500 root sys /usr/sbin/cupsd scheduler/cupsd
+f 0555 root sys /var/cups/cgi-bin/classes.cgi cgi-bin/classes.cgi
+f 0555 root sys /var/cups/cgi-bin/jobs.cgi cgi-bin/jobs.cgi
+f 0555 root sys /var/cups/cgi-bin/printers.cgi cgi-bin/printers.cgi
+f 0555 root sys /var/cups/filter/pstoraster pstoraster/pstoraster
+f 0555 root sys /var/cups/filter/imagetops filter/imagetops
+f 0555 root sys /var/cups/filter/pstops filter/pstops
+f 0555 root sys /var/cups/filter/texttops filter/texttops
+f 0555 root sys /var/cups/filter/rastertohp filter/rastertohp
+f 0555 root sys /var/cups/filter/hpgltops filter/hpgltops
+f 0555 root sys /var/cups/filter/imagetoraster filter/imagetoraster
+
+# User commands
+f 0555 root sys /usr/bin/lp systemv/lp
+f 0555 root sys /usr/bin/lpstat systemv/lpstat
+f 0555 root sys /usr/lib/lpadmin systemv/lpadmin
+f 0555 root sys /usr/bin/cancel systemv/cancel
+f 0555 root sys /usr/lib/accept systemv/accept
+l 0555 root sys /usr/lib/reject accept
+l 0555 root sys /usr/bin/disable /usr/lib/accept
+l 0555 root sys /usr/bin/enable /usr/lib/accept
+f 0555 root sys /usr/sbin/lpc berkeley/lpc
+f 0555 root sys /usr/bin/lpq berkeley/lpq
+f 0555 root sys /usr/bin/lpr berkeley/lpr
+f 0555 root sys /usr/bin/lprm berkeley/lprm
+
+# DSOs
+%system hpux
+f 0555 root sys /usr/lib/libcups.sl.1 cups/libcups.sl.1
+l 0555 root sys /usr/lib/libcups.sl libcups.sl.1
+f 0555 root sys /usr/lib/libcupsimage.sl.1 filter/libcupsimage.sl.1
+l 0555 root sys /usr/lib/libcupsimage.sl libcupsimage.sl.1
+%system irix irix64
+f 0555 root sys /usr/lib32/libcups.so.1 cups/libcups.so.1
+l 0555 root sys /usr/lib32/libcups.so libcups.so.1
+f 0555 root sys /usr/lib32/libcupsimage.so.1 filter/libcupsimage.so.1
+l 0555 root sys /usr/lib32/libcupsimage.so libcupsimage.so.1
+%system dunix linux solaris sunos
+f 0555 root sys /usr/lib/libcups.so.1 cups/libcups.so.1
+l 0555 root sys /usr/lib/libcups.so libcups.so.1
+f 0555 root sys /usr/lib/libcupsimage.so.1 filter/libcupsimage.so.1
+l 0555 root sys /usr/lib/libcupsimage.so libcupsimage.so.1
+%system all
+
+# Directories
+d 0755 root sys /var/cups/interfaces
+d 0755 root sys /var/cups/logs
+d 0755 root sys /var/cups/ppd
+d 0755 root sys /var/cups/requests
+
+# Data files
+f 0444 root sys /usr/lib/locale/C/cups_C locale/C/cups_C
+f 0444 root sys /usr/lib/locale/de/cups_de locale/de/cups_de
+f 0444 root sys /usr/lib/locale/en/cups_en locale/en/cups_en
+f 0444 root sys /usr/lib/locale/es/cups_es locale/es/cups_es
+f 0444 root sys /usr/lib/locale/fr/cups_fr locale/fr/cups_fr
+f 0444 root sys /usr/lib/locale/it/cups_it locale/it/cups_it
+f 0444 root sys /usr/share/cups/data/8859-1 data/8859-1
+f 0444 root sys /usr/share/cups/data/8859-14 data/8859-14
+f 0444 root sys /usr/share/cups/data/8859-15 data/8859-15
+f 0444 root sys /usr/share/cups/data/8859-2 data/8859-2
+f 0444 root sys /usr/share/cups/data/8859-3 data/8859-3
+f 0444 root sys /usr/share/cups/data/8859-4 data/8859-4
+f 0444 root sys /usr/share/cups/data/8859-5 data/8859-5
+f 0444 root sys /usr/share/cups/data/8859-6 data/8859-6
+f 0444 root sys /usr/share/cups/data/8859-7 data/8859-7
+f 0444 root sys /usr/share/cups/data/8859-8 data/8859-8
+f 0444 root sys /usr/share/cups/data/8859-9 data/8859-9
+f 0444 root sys /usr/share/cups/data/HPGLprolog data/HPGLprolog
+f 0444 root sys /usr/share/cups/data/psglyphs data/psglyphs
+f 0444 root sys /usr/share/cups/fonts/AvantGarde-Book fonts/AvantGarde-Book
+f 0444 root sys /usr/share/cups/fonts/AvantGarde-BookOblique fonts/AvantGarde-BookOblique
+f 0444 root sys /usr/share/cups/fonts/AvantGarde-Demi fonts/AvantGarde-Demi
+f 0444 root sys /usr/share/cups/fonts/AvantGarde-DemiOblique fonts/AvantGarde-DemiOblique
+f 0444 root sys /usr/share/cups/fonts/Bookman-Demi fonts/Bookman-Demi
+f 0444 root sys /usr/share/cups/fonts/Bookman-DemiItalic fonts/Bookman-DemiItalic
+f 0444 root sys /usr/share/cups/fonts/Bookman-Light fonts/Bookman-Light
+f 0444 root sys /usr/share/cups/fonts/Bookman-LightItalic fonts/Bookman-LightItalic
+f 0444 root sys /usr/share/cups/fonts/Courier fonts/Courier
+f 0444 root sys /usr/share/cups/fonts/Courier-Bold fonts/Courier-Bold
+f 0444 root sys /usr/share/cups/fonts/Courier-BoldOblique fonts/Courier-BoldOblique
+f 0444 root sys /usr/share/cups/fonts/Courier-Oblique fonts/Courier-Oblique
+f 0444 root sys /usr/share/cups/fonts/Helvetica fonts/Helvetica
+f 0444 root sys /usr/share/cups/fonts/Helvetica-Bold fonts/Helvetica-Bold
+f 0444 root sys /usr/share/cups/fonts/Helvetica-BoldOblique fonts/Helvetica-BoldOblique
+f 0444 root sys /usr/share/cups/fonts/Helvetica-Narrow fonts/Helvetica-Narrow
+f 0444 root sys /usr/share/cups/fonts/Helvetica-Narrow-Bold fonts/Helvetica-Narrow-Bold
+f 0444 root sys /usr/share/cups/fonts/Helvetica-Narrow-BoldOblique fonts/Helvetica-Narrow-BoldOblique
+f 0444 root sys /usr/share/cups/fonts/Helvetica-Narrow-Oblique fonts/Helvetica-Narrow-Oblique
+f 0444 root sys /usr/share/cups/fonts/Helvetica-Oblique fonts/Helvetica-Oblique
+f 0444 root sys /usr/share/cups/fonts/NewCenturySchlbk-Bold fonts/NewCenturySchlbk-Bold
+f 0444 root sys /usr/share/cups/fonts/NewCenturySchlbk-BoldItalic fonts/NewCenturySchlbk-BoldItalic
+f 0444 root sys /usr/share/cups/fonts/NewCenturySchlbk-Italic fonts/NewCenturySchlbk-Italic
+f 0444 root sys /usr/share/cups/fonts/NewCenturySchlbk-Roman fonts/NewCenturySchlbk-Roman
+f 0444 root sys /usr/share/cups/fonts/Palatino-Bold fonts/Palatino-Bold
+f 0444 root sys /usr/share/cups/fonts/Palatino-BoldItalic fonts/Palatino-BoldItalic
+f 0444 root sys /usr/share/cups/fonts/Palatino-Italic fonts/Palatino-Italic
+f 0444 root sys /usr/share/cups/fonts/Palatino-Roman fonts/Palatino-Roman
+f 0444 root sys /usr/share/cups/fonts/Symbol fonts/Symbol
+f 0444 root sys /usr/share/cups/fonts/Times-Bold fonts/Times-Bold
+f 0444 root sys /usr/share/cups/fonts/Times-BoldItalic fonts/Times-BoldItalic
+f 0444 root sys /usr/share/cups/fonts/Times-Italic fonts/Times-Italic
+f 0444 root sys /usr/share/cups/fonts/Times-Roman fonts/Times-Roman
+f 0444 root sys /usr/share/cups/fonts/Utopia-Bold fonts/Utopia-Bold
+f 0444 root sys /usr/share/cups/fonts/Utopia-BoldItalic fonts/Utopia-BoldItalic
+f 0444 root sys /usr/share/cups/fonts/Utopia-Italic fonts/Utopia-Italic
+f 0444 root sys /usr/share/cups/fonts/Utopia-Regular fonts/Utopia-Regular
+f 0444 root sys /usr/share/cups/fonts/ZapfChancery-MediumItalic fonts/ZapfChancery-MediumItalic
+f 0444 root sys /usr/share/cups/fonts/ZapfDingbats fonts/ZapfDingbats
+f 0444 root sys /usr/share/cups/pstoraster/Fontmap pstoraster/Fontmap
+f 0444 root sys /usr/share/cups/pstoraster/gs_l2img.ps pstoraster/gs_l2img.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_pfile.ps pstoraster/gs_pfile.ps
+f 0444 root sys /usr/share/cups/pstoraster/pfbtogs.ps pstoraster/pfbtogs.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_wl1_e.ps pstoraster/gs_wl1_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_wl2_e.ps pstoraster/gs_wl2_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_wl5_e.ps pstoraster/gs_wl5_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_wan_e.ps pstoraster/gs_wan_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_pdf_e.ps pstoraster/gs_pdf_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_sym_e.ps pstoraster/gs_sym_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_std_e.ps pstoraster/gs_std_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_dbt_e.ps pstoraster/gs_dbt_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_mex_e.ps pstoraster/gs_mex_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_mro_e.ps pstoraster/gs_mro_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_iso_e.ps pstoraster/gs_iso_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_ksb_e.ps pstoraster/gs_ksb_e.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_ttf.ps pstoraster/gs_ttf.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_pdf.ps pstoraster/gs_pdf.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_ccfnt.ps pstoraster/gs_ccfnt.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_sec.ps pstoraster/pdf_sec.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_res.ps pstoraster/gs_res.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_base.ps pstoraster/pdf_base.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_btokn.ps pstoraster/gs_btokn.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_diskf.ps pstoraster/gs_diskf.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_2ps.ps pstoraster/pdf_2ps.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_init.ps pstoraster/gs_init.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_kanji.ps pstoraster/gs_kanji.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_draw.ps pstoraster/pdf_draw.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_font.ps pstoraster/pdf_font.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_type1.ps pstoraster/gs_type1.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_fonts.ps pstoraster/gs_fonts.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_statd.ps pstoraster/gs_statd.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_lev2.ps pstoraster/gs_lev2.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_typ42.ps pstoraster/gs_typ42.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_pdfwr.ps pstoraster/gs_pdfwr.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_cidfn.ps pstoraster/gs_cidfn.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_cmdl.ps pstoraster/gs_cmdl.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_dps1.ps pstoraster/gs_dps1.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_setpd.ps pstoraster/gs_setpd.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_cmap.ps pstoraster/gs_cmap.ps
+f 0444 root sys /usr/share/cups/pstoraster/gs_fform.ps pstoraster/gs_fform.ps
+f 0444 root sys /usr/share/cups/pstoraster/pdf_main.ps pstoraster/pdf_main.ps
+f 0444 root sys /usr/share/cups/model/deskjet.ppd ppd/deskjet.ppd
+f 0444 root sys /usr/share/cups/model/laserjet.ppd ppd/laserjet.ppd
+
+# Config files
+c 0600 root sys /var/cups/conf/classes.conf conf/classes.conf
+c 0600 root sys /var/cups/conf/cupsd.conf conf/cupsd.conf
+c 0600 root sys /var/cups/conf/mime.convs conf/mime.convs
+c 0600 root sys /var/cups/conf/mime.types conf/mime.types
+c 0600 root sys /var/cups/conf/printers.conf conf/printers.conf
+
+# Developer files
+f 0444 root sys /usr/include/cups/cups.h cups/cups.h
+f 0444 root sys /usr/include/cups/http.h cups/http.h
+f 0444 root sys /usr/include/cups/ipp.h cups/ipp.h
+f 0444 root sys /usr/include/cups/language.h cups/language.h
+f 0444 root sys /usr/include/cups/mime.h cups/mime.h
+f 0444 root sys /usr/include/cups/ppd.h cups/ppd.h
+f 0444 root sys /usr/include/cups/raster.h cups/raster.h
+
+# This should only be done for IRIX 6.x (-n32)
+%system irix irix64
+f 0444 root sys /usr/lib32/libcups.a cups/libcups.a
+%system hpux solaris sunos dunix linux
+f 0444 root sys /usr/lib/libcups.a cups/libcups.a
+%system all
+
+# Documentation files
+f 0444 root sys /usr/share/cups/doc/cmp.html doc/cmp.html
+f 0444 root sys /usr/share/cups/doc/cmp.pdf doc/cmp.pdf
+f 0444 root sys /usr/share/cups/doc/cupsdoc.css doc/cupsdoc.css
+f 0444 root sys /usr/share/cups/doc/cups.css doc/cups.css
+f 0444 root sys /usr/share/cups/doc/documentation.html doc/documentation.html
+f 0444 root sys /usr/share/cups/doc/idd.html doc/idd.html
+f 0444 root sys /usr/share/cups/doc/idd.pdf doc/idd.pdf
+f 0444 root sys /usr/share/cups/doc/images/classes.gif doc/images/classes.gif
+f 0444 root sys /usr/share/cups/doc/images/cups-bar.gif doc/images/cups-bar.gif
+f 0444 root sys /usr/share/cups/doc/images/cups-block-diagram.gif doc/images/cups-block-diagram.gif
+f 0444 root sys /usr/share/cups/doc/images/cups-large.gif doc/images/cups-large.gif
+f 0444 root sys /usr/share/cups/doc/images/cups-medium.gif doc/images/cups-medium.gif
+f 0444 root sys /usr/share/cups/doc/images/cups-small.gif doc/images/cups-small.gif
+f 0444 root sys /usr/share/cups/doc/images/logo.gif doc/images/logo.gif
+f 0444 root sys /usr/share/cups/doc/images/navbar.gif doc/images/navbar.gif
+f 0444 root sys /usr/share/cups/doc/images/printer-idle.gif doc/images/printer-idle.gif
+f 0444 root sys /usr/share/cups/doc/images/printer-processing.gif doc/images/printer-processing.gif
+f 0444 root sys /usr/share/cups/doc/images/printer-stopped.gif doc/images/printer-stopped.gif
+f 0444 root sys /usr/share/cups/doc/index.html doc/index.html
+f 0444 root sys /usr/share/cups/doc/overview.html doc/overview.html
+f 0444 root sys /usr/share/cups/doc/overview.pdf doc/overview.pdf
+f 0444 root sys /usr/share/cups/doc/sam.html doc/sam.html
+f 0444 root sys /usr/share/cups/doc/sam.pdf doc/sam.pdf
+f 0444 root sys /usr/share/cups/doc/sdd.html doc/sdd.html
+f 0444 root sys /usr/share/cups/doc/sdd.pdf doc/sdd.pdf
+f 0444 root sys /usr/share/cups/doc/ssr.html doc/ssr.html
+f 0444 root sys /usr/share/cups/doc/ssr.pdf doc/ssr.pdf
+f 0444 root sys /usr/share/cups/doc/stp.html doc/stp.html
+f 0444 root sys /usr/share/cups/doc/stp.pdf doc/stp.pdf
+f 0444 root sys /usr/share/cups/doc/sum.html doc/sum.html
+f 0444 root sys /usr/share/cups/doc/sum.pdf doc/sum.pdf
+f 0444 root sys /usr/share/cups/doc/svd.html doc/svd.html
+f 0444 root sys /usr/share/cups/doc/svd.pdf doc/svd.pdf
+
+# Man pages
+%system irix irix64
+f 0444 root sys /usr/share/catman/a_man/cat1/accept.z man/accept.z
+l 0444 root sys /usr/share/catman/a_man/cat1/reject.z accept.z
+f 0444 root sys /usr/share/catman/u_man/cat1/backend.z man/backend.z
+f 0444 root sys /usr/share/catman/u_man/cat5/classes.conf.z man/classes.conf.z
+f 0444 root sys /usr/share/catman/u_man/cat5/cupsd.conf.z man/cupsd.conf.z
+f 0444 root sys /usr/share/catman/a_man/cat1/cupsd.z man/cupsd.z
+f 0444 root sys /usr/share/catman/a_man/cat1/enable.z man/enable.z
+l 0444 root sys /usr/share/catman/a_man/cat1/disable.z enable.z
+f 0444 root sys /usr/share/catman/u_man/cat1/filter.z man/filter.z
+f 0444 root sys /usr/share/catman/a_man/cat1/lpadmin.z man/lpadmin.z
+f 0444 root sys /usr/share/catman/a_man/cat1/lpc.z man/lpc.z
+f 0444 root sys /usr/share/catman/u_man/cat1/lprm.z man/lprm.z
+f 0444 root sys /usr/share/catman/u_man/cat1/lpr.z man/lpr.z
+f 0444 root sys /usr/share/catman/u_man/cat1/lpstat.z man/lpstat.z
+f 0444 root sys /usr/share/catman/u_man/cat1/lp.z man/lp.z
+l 0444 root sys /usr/share/catman/u_man/cat1/cancel.z lp.z
+f 0444 root sys /usr/share/catman/u_man/cat5/mime.convs.z man/mime.convs.z
+f 0444 root sys /usr/share/catman/u_man/cat5/mime.types.z man/mime.types.z
+f 0444 root sys /usr/share/catman/u_man/cat5/printers.conf.z man/printers.conf.z
+%system hpux linux dunix solaris sunos
+f 0444 root sys /usr/man/man8/accept.8 man/accept.8
+l 0444 root sys /usr/man/man8/reject.8 accept.8
+f 0444 root sys /usr/man/man1/backend.1 man/backend.1
+f 0444 root sys /usr/man/man1/classes.conf.5 man/classes.conf.5
+f 0444 root sys /usr/man/man8/cupsd.8 man/cupsd.8
+f 0444 root sys /usr/man/man5/cupsd.conf.5 man/cupsd.conf.5
+f 0444 root sys /usr/man/man8/enable.8 man/enable.8
+l 0444 root sys /usr/man/man8/disable.8 enable.8
+f 0444 root sys /usr/man/man1/filter.1 man/filter.1
+f 0444 root sys /usr/man/man8/lpadmin.8 man/lpadmin.8
+f 0444 root sys /usr/man/man8/lpc.8 man/lpc.8
+f 0444 root sys /usr/man/man1/lprm.1 man/lprm.1
+f 0444 root sys /usr/man/man1/lpr.1 man/lpr.1
+f 0444 root sys /usr/man/man1/lpstat.1 man/lpstat.1
+f 0444 root sys /usr/man/man1/lp.1 man/lp.1
+l 0444 root sys /usr/man/man1/cancel.1 lp.1
+f 0444 root sys /usr/man/man5/mime.convs.5 man/mime.convs.5
+f 0444 root sys /usr/man/man5/mime.types.5 man/mime.types.5
+f 0444 root sys /usr/man/man5/printers.conf.5 man/printers.conf.5
+
+# Startup scripts
+%system hpux
+%install /sbin/init.d/cups start
+%remove /sbin/init.d/cups stop
+%patch /sbin/init.d/cups stop
+f 0555 root sys /sbin/init.d/cups cups.sh
+l 0555 root sys /sbin/rc1.d/K280cups ../init.d/cups
+l 0555 root sys /sbin/rc2.d/S720cups ../init.d/cups
+%system irix irix64
+%install /sbin/chkconfig -f cups on
+%install /etc/init.d/cups start
+%remove /etc/init.d/cups stop
+%patch /etc/init.d/cups stop
+f 0555 root sys /etc/init.d/cups cups.sh
+l 0555 root sys /etc/rc0.d/K25cups ../init.d/cups
+l 0555 root sys /etc/rc2.d/S60cups ../init.d/cups
+%system linux
+%install /etc/rc.d/init.d/cups start
+%remove /etc/rc.d/init.d/cups stop
+%patch /etc/rc.d/init.d/cups stop
+f 0555 root sys /etc/rc.d/init.d/cups cups.sh
+l 0555 root sys /etc/rc.d/rc2.d/S60cups ../init.d/cups
+l 0555 root sys /etc/rc.d/rc3.d/S60cups ../init.d/cups
+l 0555 root sys /etc/rc.d/rc4.d/S60cups ../init.d/cups
+l 0555 root sys /etc/rc.d/rc5.d/S60cups ../init.d/cups
+l 0555 root sys /etc/rc.d/rc0.d/K60cups ../init.d/cups
+l 0555 root sys /etc/rc.d/rc1.d/K60cups ../init.d/cups
+l 0555 root sys /etc/rc.d/rc6.d/K60cups ../init.d/cups
+%system dunix
+%install /sbin/init.d/cups start
+%remove /sbin/init.d/cups stop
+%patch /sbin/init.d/cups stop
+f 0555 root sys /sbin/init.d/cups cups.sh
+l 0555 root sys /sbin/rc0.d/K05cups ../init.d/cups
+l 0555 root sys /sbin/rc2.d/K00cups ../init.d/cups
+l 0555 root sys /sbin/rc3.d/S65cups ../init.d/cups
+%system sunos solaris
+%install /etc/init.d/cups start
+%remove /etc/init.d/cups stop
+%patch /etc/init.d/cups stop
+f 0555 root sys /etc/init.d/cups cups.sh
+l 0555 root sys /etc/rc0.d/K20cups ../init.d/cups
+l 0555 root sys /etc/rc2.d/S80cups ../init.d/cups
+
+#
+# End of "$Id: cups.list 529 1999-07-13 14:11:00Z mike $".
+#
@@ -4,12 +4,6 @@
 #
 #   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
@@ -29,26 +23,7 @@
 #         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...
+# See if the CUPS daemon is running, and if so stop it...
 case "`uname`" in
 	IRIX* | HP-UX | SunOS)
 		pid=`ps -e | awk '{print $1,$4}' | grep cupsd | awk '{print $1}'`
@@ -64,49 +39,26 @@ case "`uname`" in
 		;;
 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
-		;;
+	start | restart)
+	if test "$pid" != ""; then
+		echo "Restarting CUPS scheduler..."
+		kill -HUP $pid
+	else
+		echo "Starting CUPS scheduler..."
+		/usr/sbin/cupsd 2>&1 >/dev/null &
+	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
-		;;
+	if test "$pid" != ""; then
+		echo "Stopping CUPS scheduler..."
+		kill $pid
+		sleep 1
+	fi
+	;;
 esac

-exit 0
-
-
 #
 # End of "$Id$".
 #
@@ -0,0 +1,307 @@
+#
+# "$Id: cups.spec 505 1999-07-08 15:00:20Z mike $"
+#
+#   RPM "spec" file for the Common UNIX Printing System (CUPS).
+#
+#   Original version by Jason McMullan <jmcc@ontv.com>.
+#
+#   Copyright 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
+#
+
+Summary: Common Unix Printing System
+Name: cups
+Version: 1.0b5
+Release: 0
+Copyright: GPL
+Group: System Environment/Daemons
+Source: ftp://ftp.easysw.com/pub/cups/beta/cups-1.0b5-source.tar.gz
+Url: http://www.cups.org
+Packager: Michael Sweet <mike@easysw.com>
+Vendor: Easy Software Products
+# use buildroot so as not to disturb the version already installed
+BuildRoot: /tmp/rpmbuild
+Conflicts: lpr
+
+%package devel
+Summary: Common Unix Printing System - development environment
+Group: Development/Libraries
+
+%description
+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. 
+
+%description devel
+The Common UNIX Printing System provides a portable printing layer for 
+UNIX® operating systems. This is the development package for creating
+additional printer drivers, and other CUPS services.
+
+%prep
+%setup
+
+%build
+./configure
+
+# If we got this far, all prerequisite libraries must be here.
+make
+
+%install
+# these lines just make sure the directory structure in the
+# RPM_BUILD_ROOT exists
+rm -rf $RPM_BUILD_ROOT
+mkdir $RPM_BUILD_ROOT/etc
+mkdir $RPM_BUILD_ROOT/etc/rc.d
+mkdir $RPM_BUILD_ROOT/etc/rc.d/init.d
+mkdir $RPM_BUILD_ROOT/usr
+mkdir $RPM_BUILD_ROOT/usr/bin
+mkdir $RPM_BUILD_ROOT/usr/lib
+mkdir $RPM_BUILD_ROOT/usr/man
+mkdir $RPM_BUILD_ROOT/usr/man/man1
+mkdir $RPM_BUILD_ROOT/usr/man/man5
+mkdir $RPM_BUILD_ROOT/usr/man/man8
+mkdir $RPM_BUILD_ROOT/usr/share/locale
+mkdir $RPM_BUILD_ROOT/var/cups
+mkdir $RPM_BUILD_ROOT/var/cups/conf
+mkdir $RPM_BUILD_ROOT/var/cups/logs
+mkdir $RPM_BUILD_ROOT/var/logs
+
+ln -sf /var/cups/logs $RPM_BUILD_ROOT/var/logs/cups
+ln -sf /var/cups/conf $RPM_BUILD_ROOT/etc/cups
+
+make prefix=$RPM_BUILD_ROOT/usr DATADIR=$RPM_BUILD_ROOT/usr/share/cups LOCALEDIR=$RPM_BUILD_ROOT/usr/share/locale SERVERROOT=$RPM_BUILD_ROOT/var/cups install
+
+install -m 755 -o root -g root $RPM_SOURCE_DIR/cups.sh $RPM_BUILD_ROOT/etc/rc.d/init.d/cups
+
+%post
+/sbin/chkconfig --add cups
+
+%preun
+/sbin/chkconfig --del cups
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+/etc/rc.d/init.d/cups
+%config /var/cups/conf/classes.conf
+%config /var/cups/conf/cupsd.conf
+%config /var/cups/conf/mime.convs
+%config /var/cups/conf/mime.types
+%config /var/cups/conf/printers.conf
+/usr/lib/accept
+/usr/lib/lpadmin
+/usr/lib/reject
+/usr/bin/lpr
+/usr/bin/lprm
+/usr/bin/disable
+/usr/bin/enable
+/usr/bin/cancel
+/usr/bin/lp
+/usr/bin/lpstat
+/usr/man/man1/backend.1
+/usr/man/man1/filter.1
+/usr/man/man1/lprm.1
+/usr/man/man1/lpr.1
+/usr/man/man1/lpstat.1
+/usr/man/man1/lp.1
+/usr/man/man1/cancel.1
+/usr/man/man5/classes.conf.5
+/usr/man/man5/cupsd.conf.5
+/usr/man/man5/mime.convs.5
+/usr/man/man5/mime.types.5
+/usr/man/man5/printers.conf.5
+/usr/man/man8/accept.8
+/usr/man/man8/cupsd.8
+/usr/man/man8/enable.8
+/usr/man/man8/lpadmin.8
+/usr/man/man8/lpc.8
+/usr/man/man8/reject.8
+/usr/man/man8/disable.8
+/usr/sbin/lpc
+/usr/sbin/cupsd
+/usr/lib/libcups.so.1
+/usr/lib/libcupsimage.so.1
+%dir /usr/share/cups
+/usr/share/cups/8859-1
+/usr/share/cups/8859-14
+/usr/share/cups/8859-15
+/usr/share/cups/8859-2
+/usr/share/cups/8859-3
+/usr/share/cups/8859-4
+/usr/share/cups/8859-5
+/usr/share/cups/8859-6
+/usr/share/cups/8859-7
+/usr/share/cups/8859-8
+/usr/share/cups/8859-9
+/usr/share/cups/HPGLprolog
+/usr/share/cups/doc/cmp.html
+/usr/share/cups/doc/cmp.pdf
+/usr/share/cups/doc/cups.css
+/usr/share/cups/doc/cupsdoc.css
+/usr/share/cups/doc/documentation.html
+/usr/share/cups/doc/idd.html
+/usr/share/cups/doc/idd.pdf
+/usr/share/cups/doc/images/classes.gif
+/usr/share/cups/doc/images/cups-block-diagram.gif
+/usr/share/cups/doc/images/cups-large.gif
+/usr/share/cups/doc/images/cups-medium.gif
+/usr/share/cups/doc/images/cups-small.gif
+/usr/share/cups/doc/images/logo.gif
+/usr/share/cups/doc/images/navbar.gif
+/usr/share/cups/doc/images/printer-idle.gif
+/usr/share/cups/doc/images/printer-processing.gif
+/usr/share/cups/doc/images/printer-stopped.gif
+/usr/share/cups/doc/index.html
+/usr/share/cups/doc/overview.html
+/usr/share/cups/doc/overview.pdf
+/usr/share/cups/doc/sam.html
+/usr/share/cups/doc/sam.pdf
+/usr/share/cups/doc/sdd.html
+/usr/share/cups/doc/sdd.pdf
+/usr/share/cups/doc/ssr.html
+/usr/share/cups/doc/ssr.pdf
+/usr/share/cups/doc/stp.html
+/usr/share/cups/doc/stp.pdf
+/usr/share/cups/doc/sum.html
+/usr/share/cups/doc/sum.pdf
+/usr/share/cups/doc/svd.html
+/usr/share/cups/doc/svd.pdf
+/usr/share/cups/fonts/AvantGarde-Book
+/usr/share/cups/fonts/AvantGarde-BookOblique
+/usr/share/cups/fonts/AvantGarde-Demi
+/usr/share/cups/fonts/AvantGarde-DemiOblique
+/usr/share/cups/fonts/Bookman-Demi
+/usr/share/cups/fonts/Bookman-DemiItalic
+/usr/share/cups/fonts/Bookman-Light
+/usr/share/cups/fonts/Bookman-LightItalic
+/usr/share/cups/fonts/Courier
+/usr/share/cups/fonts/Courier-Bold
+/usr/share/cups/fonts/Courier-BoldOblique
+/usr/share/cups/fonts/Courier-Oblique
+/usr/share/cups/fonts/Helvetica
+/usr/share/cups/fonts/Helvetica-Bold
+/usr/share/cups/fonts/Helvetica-BoldOblique
+/usr/share/cups/fonts/Helvetica-Narrow
+/usr/share/cups/fonts/Helvetica-Narrow-Bold
+/usr/share/cups/fonts/Helvetica-Narrow-BoldOblique
+/usr/share/cups/fonts/Helvetica-Narrow-Oblique
+/usr/share/cups/fonts/Helvetica-Oblique
+/usr/share/cups/fonts/NewCenturySchlbk-Bold
+/usr/share/cups/fonts/NewCenturySchlbk-BoldItalic
+/usr/share/cups/fonts/NewCenturySchlbk-Italic
+/usr/share/cups/fonts/NewCenturySchlbk-Roman
+/usr/share/cups/fonts/Palatino-Bold
+/usr/share/cups/fonts/Palatino-BoldItalic
+/usr/share/cups/fonts/Palatino-Italic
+/usr/share/cups/fonts/Palatino-Roman
+/usr/share/cups/fonts/Symbol
+/usr/share/cups/fonts/Times-Bold
+/usr/share/cups/fonts/Times-BoldItalic
+/usr/share/cups/fonts/Times-Italic
+/usr/share/cups/fonts/Times-Roman
+/usr/share/cups/fonts/Utopia-Bold
+/usr/share/cups/fonts/Utopia-BoldItalic
+/usr/share/cups/fonts/Utopia-Italic
+/usr/share/cups/fonts/Utopia-Regular
+/usr/share/cups/fonts/ZapfChancery-MediumItalic
+/usr/share/cups/fonts/ZapfDingbats
+/usr/share/cups/model/deskjet.ppd
+/usr/share/cups/model/laserjet.ppd
+/usr/share/cups/pstoraster/Fontmap
+/usr/share/cups/pstoraster/gs_btokn.ps
+/usr/share/cups/pstoraster/gs_ccfnt.ps
+/usr/share/cups/pstoraster/gs_cidfn.ps
+/usr/share/cups/pstoraster/gs_cmap.ps
+/usr/share/cups/pstoraster/gs_cmdl.ps
+/usr/share/cups/pstoraster/gs_dbt_e.ps
+/usr/share/cups/pstoraster/gs_diskf.ps
+/usr/share/cups/pstoraster/gs_dps1.ps
+/usr/share/cups/pstoraster/gs_fform.ps
+/usr/share/cups/pstoraster/gs_fonts.ps
+/usr/share/cups/pstoraster/gs_init.ps
+/usr/share/cups/pstoraster/gs_iso_e.ps
+/usr/share/cups/pstoraster/gs_kanji.ps
+/usr/share/cups/pstoraster/gs_ksb_e.ps
+/usr/share/cups/pstoraster/gs_l2img.ps
+/usr/share/cups/pstoraster/gs_lev2.ps
+/usr/share/cups/pstoraster/gs_mex_e.ps
+/usr/share/cups/pstoraster/gs_mro_e.ps
+/usr/share/cups/pstoraster/gs_pdf.ps
+/usr/share/cups/pstoraster/gs_pdf_e.ps
+/usr/share/cups/pstoraster/gs_pdfwr.ps
+/usr/share/cups/pstoraster/gs_pfile.ps
+/usr/share/cups/pstoraster/gs_res.ps
+/usr/share/cups/pstoraster/gs_setpd.ps
+/usr/share/cups/pstoraster/gs_statd.ps
+/usr/share/cups/pstoraster/gs_std_e.ps
+/usr/share/cups/pstoraster/gs_sym_e.ps
+/usr/share/cups/pstoraster/gs_ttf.ps
+/usr/share/cups/pstoraster/gs_typ42.ps
+/usr/share/cups/pstoraster/gs_type1.ps
+/usr/share/cups/pstoraster/gs_wan_e.ps
+/usr/share/cups/pstoraster/gs_wl1_e.ps
+/usr/share/cups/pstoraster/gs_wl2_e.ps
+/usr/share/cups/pstoraster/gs_wl5_e.ps
+/usr/share/cups/pstoraster/pdf_2ps.ps
+/usr/share/cups/pstoraster/pdf_base.ps
+/usr/share/cups/pstoraster/pdf_draw.ps
+/usr/share/cups/pstoraster/pdf_font.ps
+/usr/share/cups/pstoraster/pdf_main.ps
+/usr/share/cups/pstoraster/pdf_sec.ps
+/usr/share/cups/pstoraster/pfbtogs.ps
+%dir /var/cups
+/var/cups/backend/http
+/var/cups/backend/ipp
+/var/cups/backend/lpd
+/var/cups/backend/parallel
+/var/cups/backend/serial
+/var/cups/backend/smb
+/var/cups/backend/socket
+/var/cups/cgi-bin/classes.cgi
+/var/cups/cgi-bin/jobs.cgi
+/var/cups/cgi-bin/printers.cgi
+/var/cups/conf
+/var/cups/filter/hpgltops
+/var/cups/filter/imagetops
+/var/cups/filter/imagetoraster
+/var/cups/filter/pstops
+/var/cups/filter/pstoraster
+/var/cups/filter/rastertohp
+/var/cups/filter/texttops
+%dir /var/cups/interfaces
+%dir /var/cups/logs
+%dir /var/cups/ppd
+%dir /var/cups/requests
+
+%files devel
+%dir /usr/include/cups
+/usr/include/cups/cups.h
+/usr/include/cups/http.h
+/usr/include/cups/ipp.h
+/usr/include/cups/language.h
+/usr/include/cups/mime.h
+/usr/include/cups/ppd.h
+/usr/include/cups/raster.h
+/usr/lib/libcups.so
+/usr/lib/libcupsimage.so
+
+#
+# End of "$Id: cups.spec 505 1999-07-08 15:00:20Z mike $".
+#
@@ -28,10 +28,9 @@ include ../Makedefs
 # Object files...
 #

-LIBOBJS	=	emit.o filter.o http.o ipp.o language.o mark.o mime.o \
+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 usersys.o \
 		util.o
-OBJS	=	$(LIBOBJS) testhttp.o testmime.o testppd.o

 #
 # Header files to install...
@@ -43,7 +42,7 @@ HEADERS	=	cups.h http.h ipp.h language.h mime.h ppd.h raster.h
 # Targets in this directory...
 #

-TARGETS	=	$(LIBCUPS) testhttp testmime testppd
+TARGETS	=	$(LIBCUPS) testmime testppd testhttp

 #
 # Make all targets...
@@ -68,26 +67,26 @@ install:	all
 	-$(MKDIR) $(LIBDIR)
 	$(CP) $(LIBCUPS) $(LIBDIR)
 	if test $(LIBCUPS) != "libcups.a"; then \
-		$(LN) $(LIBCUPS) `basename $(LIBCUPS) .1`; \
+		$(LN) $(LIBCUPS) `basename $(LIBCUPS) .1` \
 	fi

 #
 # libcups.so.1, libcups.sl.1
 #

-libcups.so.1 libcups.sl.1:	$(LIBOBJS) ../Makedefs
+libcups.so.1 libcups.sl.1:	$(OBJS) ../Makedefs
 	echo Linking $@...
-	$(DSO) $@ $(LIBOBJS)
-	-$(LN) $@ `basename $@ .1`
+	$(DSO) $@ $(OBJS)
+	$(LN) $@ `basename $@ .1`

 #
 # libcups.a
 #

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

 #
@@ -121,7 +120,7 @@ util.o:		cups.h http.h ipp.h ../config.h ../Makedefs

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

 testhttp.o:	http.h ../Makedefs

@@ -131,7 +130,7 @@ testhttp.o:	http.h ../Makedefs

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

 testmime.o:	mime.h ../Makedefs

@@ -141,7 +140,7 @@ testmime.o:	mime.h ../Makedefs

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

 testppd.o:	ppd.h ../Makedefs

@@ -1,176 +0,0 @@
-# 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
@@ -1,123 +0,0 @@
-"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.",
@@ -66,7 +66,6 @@
 #include <ctype.h>
 #include "string.h"
 #include <fcntl.h>
-#include <errno.h>

 #include "http.h"
 #include "ipp.h"
@@ -1093,13 +1092,6 @@ 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...
  */
@@ -1342,7 +1334,7 @@ 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\r\n", codes[request], buf) < 1)
+  if (httpPrintf(http, "%s %s HTTP/1.1\n", codes[request], buf) < 1)
  {
   /*
    * Might have lost connection; try to reconnect...
@@ -1355,7 +1347,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\r\n", codes[request], buf,
+    if (httpPrintf(http, "%s %s HTTP/%d.%d\n", codes[request], buf,
                   http->version / 100, http->version % 100) < 1)
      return (-1);
  }
@@ -1365,11 +1357,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\r\n", http_fields[i], http->fields[i]) < 1)
+      if (httpPrintf(http, "%s: %s\n", http_fields[i], http->fields[i]) < 1)
        return (-1);
    }

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

  httpClearFields(http);
@@ -87,12 +87,11 @@ 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 = 0x44,
+  IPP_TAG_KEYWORD,
  IPP_TAG_URI,
  IPP_TAG_URISCHEME,
  IPP_TAG_CHARSET,
@@ -70,8 +70,6 @@
 #  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 */
@@ -121,14 +119,14 @@ ppdClose(ppd_file_t *ppd)	/* I - PPD file record */
  * Free all strings at the top level...
  */

-  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(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);

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

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

 /*
@@ -154,7 +152,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);

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

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

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

 /*
  * Free any constraints...
  */

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

 /*
  * Free any fonts...
@@ -178,9 +176,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 ++)
-      safe_free(*font);
+      free(*font);

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

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

  return (size);
 }
@@ -451,12 +449,14 @@ ppdOpen(FILE *fp)		/* I - File to read from */
    * Either this is not a PPD file, or it is not a 4.x PPD file.
    */

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

    return (NULL);
  }

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

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

      memset(profile, 0, sizeof(ppd_profile_t));
-      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),
+      strcpy(profile->resolution, name);
+      strcpy(profile->media_type, text);
+      sscanf(string, "%f%f%f%f%f%f%f%f%f%f", &(profile->density),
 	     profile->matrix[0] + 0, profile->matrix[0] + 1,
 	     profile->matrix[0] + 2, profile->matrix[1] + 0,
 	     profile->matrix[1] + 1, profile->matrix[1] + 2,
@@ -647,26 +646,25 @@ ppdOpen(FILE *fp)		/* I - File to read from */
                                                CUPS_MSG_GENERAL))) == NULL)
      {
        ppdClose(ppd);
-	safe_free(string);
+	free(string);
 	return (NULL);
      }

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

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

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

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

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

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

@@ -845,28 +843,23 @@ ppdOpen(FILE *fp)		/* I - File to read from */

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

      option->section = PPD_ORDER_ANY;
@@ -882,7 +875,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      if (group == NULL)
      {
        ppdClose(ppd);
-	safe_free(string);
+	free(string);
 	return (NULL);
      }

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

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

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

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

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

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

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

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

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

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

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

 	case 2 : /* Two options... */
@@ -1168,7 +1160,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */

      if (mask & PPD_TEXT)
      {
-        strncpy(choice->text, text, sizeof(choice->text) - 1);
+        strcpy(choice->text, text);
        ppd_fix(choice->text);
      }
      else if (strcmp(name, "True") == 0)
@@ -1176,7 +1168,7 @@ ppdOpen(FILE *fp)		/* I - File to read from */
      else if (strcmp(name, "False") == 0)
        strcpy(choice->text, "No");
      else
-        strncpy(choice->text, name, sizeof(choice->text) - 1);
+        strcpy(choice->text, name);

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

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

 #ifdef DEBUG
@@ -1273,7 +1266,7 @@ ppdOpenFd(int fd)		/* I - File to read from */

    ppd = ppdOpen(fp);

-    safe_free(fp);
+    free(fp);
  }
  else
    ppd = NULL;
@@ -1361,11 +1354,7 @@ compare_strings(char *s,	/* I - First string */
      * 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))
+      if (!isdigit(*s) || !isdigit(*t))
        continue;     

      if (*s < *t)
@@ -153,7 +153,6 @@ 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;

@@ -686,8 +686,8 @@ checkrules(const char   *filename,	/* I - Filename */
          bufptr = buffer + rules->offset - bufoffset;
 	  while (n > 0)
 	    if ((*bufptr >= 32 && *bufptr <= 126) ||
-	        (*bufptr >= 8 && *bufptr <= 13) ||
-		*bufptr == 26 || *bufptr == 27)
+	        (*bufptr >= 8 && *bufptr <= 10) ||
+		*bufptr == 13 || *bufptr == 26)
 	    {
 	      n --;
 	      bufptr ++;
@@ -729,8 +729,8 @@ checkrules(const char   *filename,	/* I - Filename */
 	  while (n > 0)
 	    if ((*bufptr >= 160 && *bufptr <= 254) ||
 	        (*bufptr >= 32 && *bufptr <= 126) ||
-	        (*bufptr >= 8 && *bufptr <= 13) ||
-		*bufptr == 26 || *bufptr == 27)
+	        (*bufptr >= 8 && *bufptr <= 10) ||
+		*bufptr == 13 || *bufptr == 26)
 	    {
 	      n --;
 	      bufptr ++;
@@ -118,7 +118,7 @@ cupsCancelJob(const char *name,	/* I - Name of printer or class */
  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_URI, "printer-uri",
               NULL, uri);

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

 /*
  * Do the request...
@@ -152,6 +152,7 @@ cupsDoFileRequest(http_t     *http,	/* I - HTTP connection to server */
  const char	*password;	/* Password string */
  char		plain[255],	/* Plaintext username:password */
 		encode[255];	/* Encoded username:password */
+  char		junk[8192];	/* Junk buffer for error data */
  static char	authstring[255] = "";
 				/* Authorization string */

@@ -723,17 +724,17 @@ cupsPrintFile(const char    *name,	/* I - Printer or class name */
  */

  if (cupsGetOption("raw", num_options, options))
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
+    ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
        	 NULL, "application/vnd.cups-raw");
  else
-    ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_MIMETYPE, "document-format",
+    ippAddString(request, IPP_TAG_JOB, IPP_TAG_MIMETYPE, "document-format",
        	 NULL, "application/octet-stream");

-  ippAddString(request, IPP_TAG_OPERATION, IPP_TAG_NAME, "requesting-user-name",
+  ippAddString(request, IPP_TAG_JOB, IPP_TAG_NAME, "requesting-user-name",
               NULL, cupsUser());

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

 /*
  * Then add all options on the command-line...
@@ -0,0 +1,62 @@
+%%BeginResource: procset hpgltops 1.0 0
+%
+% "$Id: HPGLprolog 312 1999-05-11 19:45:40Z mike $"
+%
+%   HP-GL/2 filter procset for the Common UNIX Printing System (CUPS).
+%
+%   This procset contains the basic drawing commands that are used to
+%   reduce output size.  Note the 'MP' (make newpath) definition - this
+%   should be called 'NP' (newpath), but GhostScript uses the 'NP' name
+%   for 'noaccess put' in some of its font files...
+%
+%   Copyright 1993-1999 Easy Software Products
+%
+%   These coded instructions, statements, and computer programs are the
+%   property of Easy Software Products and are protected by Federal
+%   copyright law.  Distribution and use rights are outlined in the file
+%   "LICENSE.txt" which should have been included with this file.  If this
+%   file is missing or damaged please contact Easy Software Products
+%   at:
+%
+%       Attn: CUPS Licensing Information
+%       Easy Software Products
+%       44141 Airport View Drive, Suite 204
+%       Hollywood, Maryland 20636-3111 USA
+%
+%       Voice: (301) 373-9603
+%       EMail: cups-info@cups.org
+%         WWW: http://www.cups.org
+%
+/MO { moveto } bind def
+/LI { lineto } bind def
+/FI { fill } bind def
+/ST { stroke } bind def
+/CP { closepath } bind def
+/MP { newpath } bind def
+%
+% If you have more than 8 pens defined for your HP-GL/2 output you'll
+% need to add P# definitions (# = pen number) to set the appropriate color.
+% If you don't you'll get errors.  The default 8 pens cover the primary
+% colors (white, black, red, green, yellow, blue, magenta, cyan).  Ditto
+% for pen widths (W#).
+%
+% PC and PW commands in the input stream will define/redefine these
+% appropriately, but some packages don't generate them...
+%
+/P0 { 1.0 1.0 1.0 setrgbcolor } bind def
+/P1 { 0.0 0.0 0.0 setrgbcolor } bind def
+/P2 { 1.0 0.0 0.0 setrgbcolor } bind def
+/P3 { 0.0 1.0 0.0 setrgbcolor } bind def
+/P4 { 1.0 1.0 0.0 setrgbcolor } bind def
+/P5 { 0.0 0.0 1.0 setrgbcolor } bind def
+/P6 { 1.0 0.0 1.0 setrgbcolor } bind def
+/P7 { 0.0 1.0 1.0 setrgbcolor } bind def
+/W0 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+/W1 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+/W2 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+/W3 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+/W4 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+/W5 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+/W6 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+/W7 { DefaultPenWidth PenScaling mul setlinewidth } bind def
+%%EndResource
@@ -48,8 +48,8 @@ clean:
 #

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

 #
 # End of "$Id$".
@@ -243,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 gamma m00 m01 m02 m10 m11 m12 m20 m21 m22
+resolution/type density m00 m01 m02 m10 m11 m12 m20 m21 m22
 </PRE>
 </UL>
 <P>The <I>resolution</I> and <I>type</I> values may be &quot;-&quot; to act as a 
 wildcard. Otherwise they must match one of the <CODE>Resolution</CODE>
 or <CODE>MediaType</CODE> attributes defined in the PPD file. </P>
-<P>The <I>density</I> and <I>gamma</I> values define gamma and density 
-adjustment function such that: </P>
+<P>The <I>density</I> value defines a gamma and density adjustment 
+function such that: </P>
 <UL>
 <PRE>
-f(x) = density * x<SUP>gamma</SUP>
+f(x) = d * x<SUP>1/d</SUP>
 </PRE>
 </UL>
 <P>The <I>m00</I> through <I>m22</I> values define a 3x3 transformation 
@@ -662,8 +662,6 @@ lpadmin</CODE>, and <CODE>reject</CODE> commands reside here. </DD>
 <DT>/usr/sbin </DT>
 <DD>The <CODE>lpc</CODE> and <CODE>cupsd</CODE> commands resize here. </DD>
 <DT>/usr/share/cups </DT>
-<DD>This is the root directory of the CUPS static data. </DD>
-<DT>/usr/share/cups/data </DT>
 <DD>The character set and filter data files reside here. </DD>
 <DT>/usr/share/cups/fonts </DT>
 <DD>The <CODE>pstoraster</CODE> font files reside here. </DD>
@@ -1,6 +1,6 @@
 %PDF-1.2
 %âãÏÓ
-1 0 obj<</Producer(htmldoc 2.0b1 Copyright 1997-1999 Michael Sweet, All Rights Reserved.)/CreationDate(D:19990730151722Z)/Title(DRAFT - CUPS Interface Design Description)/Author(Easy Software Products)>>endobj
+1 0 obj<</Producer(htmldoc 2.0b1 Copyright 1997-1999 Michael Sweet, All Rights Reserved.)/CreationDate(D:19990709142832Z)/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
@@ -794,11 +794,13 @@ endobj
 424 0 obj<</Type/Page/Parent 408 0 R/Contents 425 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F8 7 0 R>>>>>>endobj
 425 0 obj<</Length 426 0 R/Filter/FlateDecode>>stream
 xÚ-‹Á
-Â0DïûsÔC´›”êµZÞ´® q#ŒšöÿÑˆÌÀ03¼71ª¯®)öÚ-û5˜!ìV¶‚\gÝÐöƒíùpÂ>MšÃÅ+:ã-•ð9¾¦øLs¹“) ù“uYjË‹¿n1hÐ¬ÉëX®�Ð‘>H.#ùendstream
-endobj
-426 0 obj
-123
-endobj
+Â0DïûsÔC´›”êµZÞ´® q#ŒšöÿÑˆÌÀ03¼71ª¯®)öÚ-û5˜!ìV¶‚\gÝÐöƒíùpÂ>MšÃÅ+:ã-•ð9¾¦øLs¹“) ù“uYjË‹¿n1hÐ¬ÉëX®�Ð‘>H.#ùendstream
+endobj
+426 0 obj
+123
+endobj
+427 0 obj<</Type/Page/Parent 408 0 R/Contents 428 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R/F9 8 0 R/Fc 9 0 R>>>>>>endobj
+428 0 obj<</Length 429 0 R/Filter/FlateDecode>>stream
 xÚ�VÑn›0}ÏW\õ©•
 $!d{ÚªVŠ´j›Bß"MŽ±O`˜m¶t_¿k„Ð¨ÝP_\¸çÜË¹Ç§ý9	`Š?,C˜E@óÉ§dòîaÁ
 Žo¢å’ôzki˜’$sN(Ó7ÉW»ðcWí-bßÕûÜˆ"‹aÃ<ˆ¬EÌ!šúÙÊ�l}r`@»z�õÜÖCÊ¸�ä¤,…ÜÃŽ™ßŒIˆ½�0'ˆ"S0Èò$-Ò›ØàˆbvìÌüÐö•$g)TÚR[ôzó´A.¢R�U¾C¼›!^¨ºfÀ|Oè¡žh!µÐFCÁ¡*Á."Èl
@@ -927,21 +929,19 @@ endobj
 endobj
 451 0 obj<</Type/Page/Parent 408 0 R/Contents 452 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R>>>>>>endobj
 452 0 obj<</Length 453 0 R/Filter/FlateDecode>>stream
-451 0 obj<</Type/Page/Parent 408 0 R/Contents 452 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F4 4 0 R/F8 7 0 R>>>>>>endobj
-452 0 obj<</Length 453 0 R/Filter/FlateDecode>>stream
+xÚ�˜Ks£8…÷ùZÎT5n$ñòb“¤=�®N:“¸+kbËD=Ñ<Ò�_?Wº@æ¡JUl£Ì9\]ùû%.üQ2Â²;^\n/Þo<B)ÙˆOIñUD¶û?Xà9,ÿÜ~»ðB8]©4�+¡Q×Çc.ù‹ìÉTEv8¯¹¥¦\âP¾bš£À�¶îÊ…[êþ=üC¼hå’ ðVñBxËùÊ#… �#ìÚïX¸¥˜¹nG3õhðA«÷]8`ÔGiO}]ÝŠ½ŒÏäß‰WQ�]]‘c;>§’Ä“øPz�©Pìœú¦ž?‡JQ
+ ïÊãDÌ»í¯iëvÈáßœÛÈ¢Ûs0º�4ºýF£Û~6n‡ÜöOÝ¾®óTü<óú¾�YEJ™%©pJ¹û»Ú«úùšQïGp²]!k[kH�×šï5Ú‡EüTûÇ§Qª´®¤Êz|T…ü²*†'›í	”]%wð¡èp"3^•N.
 Gf»—Õ‚tskF:sáVg¥¥ÏÁ�tC£ô7º‘ÎÚ�‰ dÖëSñ7Ç8�Ç{©êlo^ûE°Qu"+‘ˆ¢$‰|†T/‚¤âP½#ÏªªÔñ)dòµK•Ê5’«Rj³J¢æ\=AàTüFxóSÛ˜+øš…”ò]û”BÖºrÜé”òÖMJq×u¸Û«�›¬„ªx|½És�9-
 Ñ‘ÇE\)M�öÍ49í‰RëÙ„¬'HOxâ‡èˆŽôVO*w61�~Lú§vl>³‡Øxh©&µg<¤äý5L•Y
-Gf»—Õ‚tskF:sáVg¥¥ÏÁ�tC£ô7º‘ÎÚ�‰ dÖëSñ7Ç8�Ç{©êlo^ûE°Qu"+‘ˆ¢$‰|†T/‚¤âP½#ÏªªÔñ)dòµK•Ê5’«Rj³J¢æ\=AàTüFxóSÛ˜+øš…”ò]û”BÖºrÜé”òÖMJq×u¸Û«�›¬„ªx|½És�9-
+‹ÎÁ�‡†Fßhô�¯ÃæžÝÈá´·ú}±žöÉùú¿U90@d	>e5âçƒž�³”¶óÒLßYLûùæú94m'÷»åmÑNdmíDzÂNÞ,oœ2°³—r·q)Wö¬4ªtbaˆ{`tFÉ£(ËLâ¼«�ÅHGÖ6Ò‘�tNÛÚa�IŒ÷Åfuœn®Ãc‘t4Dú‹šl£nÇ©i+Øº[Ý£YÛ(Bz<ŠXÛBsaÄzad:Èûfýé¹q“åÐµ•)¸Ñ®OäP@¸°‚‘»¡ÐIE–ÏYÛgŽôø3g‡â7B!/8=ú$ô¬ïÉ4ÇÉ3 +:)âcI [�çi¢ñ{K
 óÃv>/Ë5¬µ\COÈõx3Ÿ9ÌgÞkWoeQ¨Â4ž“5n’íV÷p|F?ó¬—XdëÚÐuM]T€ú^šÝ‰$®ä«˜Õ/3Ý¯Në¿ŽOë§ÐE–ú‘µÕ�ô¸~M¹{q^/âîêãU·«íÔS=u™>¤÷Øº²`“Íü\«©¤n7àX‚#Ä!tÁ„ÐµžÈÚN¤Ç'õƒæÖ=7¯n_
 )`srm'EP¨JÿÐîH‡MÂÛ(ÙA;�àìRµûï‡,Çº¯m]dH×¹ÞçÁÖçG6Ò/ô®{z½wiWb‹-²¶-Òã-Ãº«0T¿¨_ê
 ˆM¼_ó3wq�`tÌ:@ê|^¼Ù—ÛM/ƒÚÎ.OüòÒ>.²Õï¥Ë=<¶Gù»ßw>É}õbº¥Td	¼µÝ±…mr.ïwÃ.8-¶»a—›Ã)ãq#,€Ðz¡ñˆû*½�ø¡c§Ž¦ØNþÖ±S©Þ�õ¯7³~pëø4¨õêÁÇÃóý&jŽrNB†¿ð<ü½ÙBÌ]}½„ð‡¹njóZ”2ÉôË®�y›%Ž>ÑiÎôàÒæ¬‡¸Ô=Ã¦Ù›y¡ß�ÉËþ½ø×Àþ[endstream
-)`srm'EP¨JÿÐîH‡MÂÛ(ÙA;�àìRµûï‡,Çº¯m]dH×¹ÞçÁÖçG6Ò/ô®{z½wiWb‹-²¶-Òã-Ãº«0T¿¨_ê
-ˆM¼_ó3wq�`tÌ:@ê|^¼Ù—ÛM/ƒÚÎ.OüòÒ>.²Õï¥Ë=<¶Gù»ßw>É}õbº¥Td	¼µÝ±…mr.ïwÃ.8-¶»a—›Ã)ãq#,€Ðz¡ñˆû*½�ø¡c§Ž¦ØNþÖ±S©Þ�õ¯7³~pëø4¨õêÁÇÃóý&jŽrNB†¿ð<ü½ÙBÌ]}½„ð‡¹njóZ”2ÉôË®�y›%Ž>ÑiÎôàÒæ¬‡¸Ô=Ã¦Ù›y¡ß�ÉËþ½ø×Àþ[endstream
-endobj
-453 0 obj
+endobj
+453 0 obj
 1348
 endobj
-454 0 obj<</Type/Page/Parent 408 0 R/Contents 455 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 4 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
+454 0 obj<</Type/Page/Parent 408 0 R/Contents 455 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 4 0 R/F8 7 0 R/F9 8 0 R>>>>>>endobj
 455 0 obj<</Length 456 0 R/Filter/FlateDecode>>stream
 xÚÅ—Msâ8†ïüŠ>fªb�dÉ_‡=LÈdf*Cm–°µEÕ\#@;`¼¶Ã¿ß–Ú$x÷’JÊ†æmÙïÓrKþ§Ç�áÙÿ|Ù»õ>ÞIàFS9D‰ðM®D$=ÅF÷dŒ9UÙöq£M>·QÎB
 3ø
@@ -1507,71 +1507,71 @@ xref
 0000034654 00000 n 
 0000034758 00000 n 
 0000034863 00000 n 
-0000033284 00000 n 
-0000034654 00000 n 
-0000034758 00000 n 
-0000034863 00000 n 
-0000034967 00000 n 
-0000035072 00000 n 
-0000035122 00000 n 
-0000035156 00000 n 
-0000035190 00000 n 
-0000035785 00000 n 
-0000035834 00000 n 
-0000035883 00000 n 
+0000034967 00000 n 
+0000035072 00000 n 
+0000035122 00000 n 
+0000035156 00000 n 
+0000035190 00000 n 
+0000035785 00000 n 
+0000035834 00000 n 
+0000035883 00000 n 
+0000035932 00000 n 
+0000035981 00000 n 
+0000036030 00000 n 
+0000036079 00000 n 
+0000036128 00000 n 
 0000036177 00000 n 
-0000035981 00000 n 
-0000036030 00000 n 
-0000036079 00000 n 
-0000036128 00000 n 
-0000036177 00000 n 
-0000036226 00000 n 
-0000036275 00000 n 
-0000036324 00000 n 
-0000036373 00000 n 
-0000036422 00000 n 
-0000036471 00000 n 
-0000036520 00000 n 
-0000036569 00000 n 
-0000036618 00000 n 
-0000036667 00000 n 
-0000036716 00000 n 
-0000036765 00000 n 
-0000036814 00000 n 
-0000036863 00000 n 
-0000036912 00000 n 
-0000036961 00000 n 
-0000037010 00000 n 
-0000037059 00000 n 
-0000037108 00000 n 
-0000037157 00000 n 
-0000037206 00000 n 
-0000037255 00000 n 
-0000037304 00000 n 
-0000037353 00000 n 
-0000037402 00000 n 
-0000037451 00000 n 
-0000037500 00000 n 
-0000037549 00000 n 
-0000037598 00000 n 
-0000037647 00000 n 
-0000037696 00000 n 
-0000037745 00000 n 
-0000037794 00000 n 
-0000037843 00000 n 
-0000037892 00000 n 
-0000037941 00000 n 
-0000038218 00000 n 
-0000038370 00000 n 
-0000044766 00000 n 
-0000044788 00000 n 
-0000044901 00000 n 
-0000045003 00000 n 
-0000045023 00000 n 
-0000045163 00000 n 
-0000046071 00000 n 
+0000036226 00000 n 
+0000036275 00000 n 
+0000036324 00000 n 
+0000036373 00000 n 
+0000036422 00000 n 
+0000036471 00000 n 
+0000036520 00000 n 
+0000036569 00000 n 
+0000036618 00000 n 
+0000036667 00000 n 
+0000036716 00000 n 
+0000036765 00000 n 
+0000036814 00000 n 
+0000036863 00000 n 
+0000036912 00000 n 
+0000036961 00000 n 
+0000037010 00000 n 
+0000037059 00000 n 
+0000037108 00000 n 
+0000037157 00000 n 
+0000037206 00000 n 
+0000037255 00000 n 
+0000037304 00000 n 
+0000037353 00000 n 
+0000037402 00000 n 
+0000037451 00000 n 
+0000037500 00000 n 
+0000037549 00000 n 
+0000037598 00000 n 
+0000037647 00000 n 
+0000037696 00000 n 
+0000037745 00000 n 
+0000037794 00000 n 
+0000037843 00000 n 
+0000037892 00000 n 
+0000037941 00000 n 
+0000038218 00000 n 
+0000038370 00000 n 
+0000044766 00000 n 
+0000044788 00000 n 
+0000044901 00000 n 
+0000045003 00000 n 
+0000045023 00000 n 
+0000045163 00000 n 
+0000046071 00000 n 
+0000046092 00000 n 
+0000046205 00000 n 
+0000046396 00000 n 
+0000046417 00000 n 
 0000046557 00000 n 
 0000047157 00000 n 
 0000047178 00000 n 
-0000046417 00000 n 
+0000047291 00000 n 
 0000047485 00000 n 
@@ -210,18 +210,18 @@ printer.
 <P>This string attribute specifies a color profile of the form:

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

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

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

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

 <P>The <I>m00</I> through <I>m22</I> values define a 3x3 transformation
@@ -1091,9 +1091,6 @@ System (CIFS) protocols are described at
 	<DD>The <CODE>lpc</CODE> and <CODE>cupsd</CODE> commands resize here.

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

 	<DT>/usr/share/cups/fonts
@@ -345,8 +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>http://[username:password@]hostname[:port]/resource </DT>
-<DT>ipp://[username:password@]hostname[:port]/resource </DT>
+<DT>http://hostname[:port]/resource </DT>
+<DT>ipp://hostname[:port]/resource </DT>
 <DD>Sends all output to the specified IPP printer or server.  The <I>
 port</I> parameters defaults to 631. </DD>
 <DT>lpd://hostname/queue </DT>
@@ -365,9 +365,6 @@ character:
 <LI><CODE>parity=<I>none</I></CODE> - Turns parity  checking off. </LI>
 </UL>
 </DD>
-<DT>smb://[username:password@]hostname/queue </DT>
-<DD>Sends all output to the specified SMB (Windows) printer queue 
- using the SAMBA software. </DD>
 <DT>socket://hostname[:port] </DT>
 <DD>Sends all output to the specified printer using the  AppSocket 
 protocol. The <I>port</I> parameter defaults to 9100. </DD>
@@ -601,21 +598,7 @@ Allow from nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
 </UL>
 <P><CODE>Allow</CODE> directives are cummulative, so multiple <CODE>
 Allow</CODE> directives can be used to allow access for multiple hosts 
-or networks.  The <CODE>/mm</CODE> notation specifies a CIDR netmask: 
-<CENTER>
-<TABLE BORDER=1 WIDTH=80%>
-<TR><TH>mm</TH><TH>netmask</TH></TR>
-<TR><TD>0</TD><TD>0.0.0.0</TD></TR>
-<TR><TD>1</TD><TD>128.0.0.0</TD></TR>
-<TR><TD>2</TD><TD>192.0.0.0</TD></TR>
-<TR><TD>...</TD><TD>...</TD></TR>
-<TR><TD>8</TD><TD>255.0.0.0</TD></TR>
-<TR><TD>16</TD><TD>255.255.0.0</TD></TR>
-<TR><TD>24</TD><TD>255.255.255.0</TD></TR>
-<TR><TD>32</TD><TD>255.255.255.255</TD></TR>
-</TABLE>
-</CENTER>
-</P>
+or networks. </P>
 <P>The <CODE>Allow</CODE> directive must appear inside a <CODE>Location</CODE>
 directive. </P>
 <H3><A NAME=5_4_4>Deny</A></H3>
@@ -637,22 +620,7 @@ Deny from nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
 </PRE>
 </UL>
 <P><CODE>Deny</CODE> directives are cummulative, so multiple <CODE>Deny</CODE>
- directives can be used to allow access for multiple hosts or networks. 
- The <CODE>/mm</CODE> notation specifies a CIDR netmask: 
-<CENTER>
-<TABLE BORDER=1 WIDTH=80%>
-<TR><TH>mm</TH><TH>netmask</TH></TR>
-<TR><TD>0</TD><TD>0.0.0.0</TD></TR>
-<TR><TD>1</TD><TD>128.0.0.0</TD></TR>
-<TR><TD>2</TD><TD>192.0.0.0</TD></TR>
-<TR><TD>...</TD><TD>...</TD></TR>
-<TR><TD>8</TD><TD>255.0.0.0</TD></TR>
-<TR><TD>16</TD><TD>255.255.0.0</TD></TR>
-<TR><TD>24</TD><TD>255.255.255.0</TD></TR>
-<TR><TD>32</TD><TD>255.255.255.255</TD></TR>
-</TABLE>
-</CENTER>
-</P>
+ directives can be used to allow access for multiple hosts or networks. </P>
 <P>The <CODE>Deny</CODE> directive must appear inside a <CODE>Location</CODE>
 directive. </P>
 <H3><A NAME=5_4_5>AuthType</A></H3>
@@ -1,6 +1,6 @@
 %PDF-1.2
 %âãÏÓ
-1 0 obj<</Producer(htmldoc 2.0b1 Copyright 1997-1999 Michael Sweet, All Rights Reserved.)/CreationDate(D:19990730151724Z)/Title(DRAFT - CUPS Software Administrators Manual)/Author(Easy Software Products)>>endobj
+1 0 obj<</Producer(htmldoc 2.0b1 Copyright 1997-1999 Michael Sweet, All Rights Reserved.)/CreationDate(D:19990624171520Z)/Title(DRAFT - CUPS Software Administrators Manual)/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
@@ -85,27 +85,27 @@
 76 0 obj<</Subtype/Link/Rect[143.8 369.6 162.4 382.6]/Border[0 0 0]/Dest[244 0 R/XYZ null 311 0]>>endobj
 77 0 obj<</Subtype/Link/Rect[162.4 369.6 212.2 382.6]/Border[0 0 0]/Dest[244 0 R/XYZ null 311 0]>>endobj
 78 0 obj<</Subtype/Link/Rect[212.2 369.6 246.4 382.6]/Border[0 0 0]/Dest[244 0 R/XYZ null 311 0]>>endobj
-79 0 obj<</Subtype/Link/Rect[144.0 356.4 173.0 369.4]/Border[0 0 0]/Dest[247 0 R/XYZ null 172 0]>>endobj
-80 0 obj<</Subtype/Link/Rect[173.0 356.4 214.9 369.4]/Border[0 0 0]/Dest[247 0 R/XYZ null 172 0]>>endobj
-81 0 obj<</Subtype/Link/Rect[214.9 356.4 247.6 369.4]/Border[0 0 0]/Dest[247 0 R/XYZ null 172 0]>>endobj
-82 0 obj<</Subtype/Link/Rect[247.6 356.4 280.6 369.4]/Border[0 0 0]/Dest[247 0 R/XYZ null 172 0]>>endobj
-83 0 obj<</Subtype/Link/Rect[108.0 343.2 156.6 356.2]/Border[0 0 0]/Dest[250 0 R/XYZ null 666 0]>>endobj
-84 0 obj<</Subtype/Link/Rect[156.6 343.2 190.8 356.2]/Border[0 0 0]/Dest[250 0 R/XYZ null 666 0]>>endobj
-85 0 obj<</Subtype/Link/Rect[108.0 330.0 140.7 343.0]/Border[0 0 0]/Dest[250 0 R/XYZ null 563 0]>>endobj
-86 0 obj<</Subtype/Link/Rect[140.7 330.0 173.7 343.0]/Border[0 0 0]/Dest[250 0 R/XYZ null 563 0]>>endobj
-87 0 obj<</Subtype/Link/Rect[108.0 316.8 141.9 329.8]/Border[0 0 0]/Dest[250 0 R/XYZ null 356 0]>>endobj
-88 0 obj<</Subtype/Link/Rect[141.9 316.8 158.1 329.8]/Border[0 0 0]/Dest[250 0 R/XYZ null 356 0]>>endobj
-89 0 obj<</Subtype/Link/Rect[158.1 316.8 193.9 329.8]/Border[0 0 0]/Dest[250 0 R/XYZ null 356 0]>>endobj
-90 0 obj<</Subtype/Link/Rect[193.9 316.8 223.8 329.8]/Border[0 0 0]/Dest[250 0 R/XYZ null 356 0]>>endobj
-91 0 obj<</Subtype/Link/Rect[108.0 303.6 145.6 316.6]/Border[0 0 0]/Dest[250 0 R/XYZ null 213 0]>>endobj
-92 0 obj<</Subtype/Link/Rect[145.6 303.6 164.2 316.6]/Border[0 0 0]/Dest[250 0 R/XYZ null 213 0]>>endobj
-93 0 obj<</Subtype/Link/Rect[164.2 303.6 206.7 316.6]/Border[0 0 0]/Dest[250 0 R/XYZ null 213 0]>>endobj
-94 0 obj<</Subtype/Link/Rect[206.7 303.6 240.9 316.6]/Border[0 0 0]/Dest[250 0 R/XYZ null 213 0]>>endobj
-95 0 obj<</Subtype/Link/Rect[108.0 290.4 156.0 303.4]/Border[0 0 0]/Dest[253 0 R/XYZ null 703 0]>>endobj
-96 0 obj<</Subtype/Link/Rect[156.0 290.4 174.6 303.4]/Border[0 0 0]/Dest[253 0 R/XYZ null 703 0]>>endobj
-97 0 obj<</Subtype/Link/Rect[174.6 290.4 219.5 303.4]/Border[0 0 0]/Dest[253 0 R/XYZ null 703 0]>>endobj
-98 0 obj<</Subtype/Link/Rect[219.5 290.4 243.7 303.4]/Border[0 0 0]/Dest[253 0 R/XYZ null 703 0]>>endobj
-99 0 obj<</Subtype/Link/Rect[243.7 290.4 263.2 303.4]/Border[0 0 0]/Dest[253 0 R/XYZ null 703 0]>>endobj
+79 0 obj<</Subtype/Link/Rect[144.0 356.4 173.0 369.4]/Border[0 0 0]/Dest[247 0 R/XYZ null 224 0]>>endobj
+80 0 obj<</Subtype/Link/Rect[173.0 356.4 214.9 369.4]/Border[0 0 0]/Dest[247 0 R/XYZ null 224 0]>>endobj
+81 0 obj<</Subtype/Link/Rect[214.9 356.4 247.6 369.4]/Border[0 0 0]/Dest[247 0 R/XYZ null 224 0]>>endobj
+82 0 obj<</Subtype/Link/Rect[247.6 356.4 280.6 369.4]/Border[0 0 0]/Dest[247 0 R/XYZ null 224 0]>>endobj
+83 0 obj<</Subtype/Link/Rect[108.0 343.2 156.6 356.2]/Border[0 0 0]/Dest[250 0 R/XYZ null 730 0]>>endobj
+84 0 obj<</Subtype/Link/Rect[156.6 343.2 190.8 356.2]/Border[0 0 0]/Dest[250 0 R/XYZ null 730 0]>>endobj
+85 0 obj<</Subtype/Link/Rect[108.0 330.0 140.7 343.0]/Border[0 0 0]/Dest[250 0 R/XYZ null 627 0]>>endobj
+86 0 obj<</Subtype/Link/Rect[140.7 330.0 173.7 343.0]/Border[0 0 0]/Dest[250 0 R/XYZ null 627 0]>>endobj
+87 0 obj<</Subtype/Link/Rect[108.0 316.8 141.9 329.8]/Border[0 0 0]/Dest[250 0 R/XYZ null 420 0]>>endobj
+88 0 obj<</Subtype/Link/Rect[141.9 316.8 158.1 329.8]/Border[0 0 0]/Dest[250 0 R/XYZ null 420 0]>>endobj
+89 0 obj<</Subtype/Link/Rect[158.1 316.8 193.9 329.8]/Border[0 0 0]/Dest[250 0 R/XYZ null 420 0]>>endobj
+90 0 obj<</Subtype/Link/Rect[193.9 316.8 223.8 329.8]/Border[0 0 0]/Dest[250 0 R/XYZ null 420 0]>>endobj
+91 0 obj<</Subtype/Link/Rect[108.0 303.6 145.6 316.6]/Border[0 0 0]/Dest[250 0 R/XYZ null 277 0]>>endobj
+92 0 obj<</Subtype/Link/Rect[145.6 303.6 164.2 316.6]/Border[0 0 0]/Dest[250 0 R/XYZ null 277 0]>>endobj
+93 0 obj<</Subtype/Link/Rect[164.2 303.6 206.7 316.6]/Border[0 0 0]/Dest[250 0 R/XYZ null 277 0]>>endobj
+94 0 obj<</Subtype/Link/Rect[206.7 303.6 240.9 316.6]/Border[0 0 0]/Dest[250 0 R/XYZ null 277 0]>>endobj
+95 0 obj<</Subtype/Link/Rect[108.0 290.4 156.0 303.4]/Border[0 0 0]/Dest[253 0 R/XYZ null 767 0]>>endobj
+96 0 obj<</Subtype/Link/Rect[156.0 290.4 174.6 303.4]/Border[0 0 0]/Dest[253 0 R/XYZ null 767 0]>>endobj
+97 0 obj<</Subtype/Link/Rect[174.6 290.4 219.5 303.4]/Border[0 0 0]/Dest[253 0 R/XYZ null 767 0]>>endobj
+98 0 obj<</Subtype/Link/Rect[219.5 290.4 243.7 303.4]/Border[0 0 0]/Dest[253 0 R/XYZ null 767 0]>>endobj
+99 0 obj<</Subtype/Link/Rect[243.7 290.4 263.2 303.4]/Border[0 0 0]/Dest[253 0 R/XYZ null 767 0]>>endobj
 100 0 obj<</Subtype/Link/Rect[72.0 264.0 80.2 277.0]/Border[0 0 0]/Dest[256 0 R/XYZ null 818 0]>>endobj
 101 0 obj<</Subtype/Link/Rect[80.2 264.0 89.3 277.0]/Border[0 0 0]/Dest[256 0 R/XYZ null 818 0]>>endobj
 102 0 obj<</Subtype/Link/Rect[89.3 264.0 131.1 277.0]/Border[0 0 0]/Dest[256 0 R/XYZ null 818 0]>>endobj
@@ -128,10 +128,10 @@
 119 0 obj<</Subtype/Link/Rect[144.0 145.2 183.1 158.2]/Border[0 0 0]/Dest[262 0 R/XYZ null 482 0]>>endobj
 120 0 obj<</Subtype/Link/Rect[144.0 132.0 169.7 145.0]/Border[0 0 0]/Dest[265 0 R/XYZ null 782 0]>>endobj
 121 0 obj<</Subtype/Link/Rect[144.0 118.8 171.5 131.8]/Border[0 0 0]/Dest[265 0 R/XYZ null 617 0]>>endobj
-122 0 obj<</Subtype/Link/Rect[144.0 105.6 167.8 118.6]/Border[0 0 0]/Dest[268 0 R/XYZ null 782 0]>>endobj
-123 0 obj<</Subtype/Link/Rect[144.0 92.4 188.6 105.4]/Border[0 0 0]/Dest[268 0 R/XYZ null 274 0]>>endobj
-124 0 obj<</Subtype/Link/Rect[144.0 79.2 189.8 92.2]/Border[0 0 0]/Dest[271 0 R/XYZ null 782 0]>>endobj
-125 0 obj<</Subtype/Link/Rect[144.0 66.0 220.4 79.0]/Border[0 0 0]/Dest[271 0 R/XYZ null 577 0]>>endobj
+122 0 obj<</Subtype/Link/Rect[144.0 105.6 167.8 118.6]/Border[0 0 0]/Dest[265 0 R/XYZ null 331 0]>>endobj
+123 0 obj<</Subtype/Link/Rect[144.0 92.4 188.6 105.4]/Border[0 0 0]/Dest[268 0 R/XYZ null 713 0]>>endobj
+124 0 obj<</Subtype/Link/Rect[144.0 79.2 189.8 92.2]/Border[0 0 0]/Dest[268 0 R/XYZ null 561 0]>>endobj
+125 0 obj<</Subtype/Link/Rect[144.0 66.0 220.4 79.0]/Border[0 0 0]/Dest[268 0 R/XYZ null 357 0]>>endobj
 126 0 obj[23 0 R
 24 0 R
 25 0 R
@@ -236,11 +236,11 @@
 124 0 R
 125 0 R
 ]endobj
-127 0 obj<</Subtype/Link/Rect[108.0 673.2 168.5 686.2]/Border[0 0 0]/Dest[271 0 R/XYZ null 479 0]>>endobj
-128 0 obj<</Subtype/Link/Rect[72.0 660.0 91.9 673.0]/Border[0 0 0]/Dest[271 0 R/XYZ null 408 0]>>endobj
-129 0 obj<</Subtype/Link/Rect[91.9 660.0 127.9 673.0]/Border[0 0 0]/Dest[271 0 R/XYZ null 408 0]>>endobj
-130 0 obj<</Subtype/Link/Rect[108.0 646.8 159.0 659.8]/Border[0 0 0]/Dest[271 0 R/XYZ null 288 0]>>endobj
-131 0 obj<</Subtype/Link/Rect[108.0 633.6 161.5 646.6]/Border[0 0 0]/Dest[274 0 R/XYZ null 488 0]>>endobj
+127 0 obj<</Subtype/Link/Rect[108.0 673.2 168.5 686.2]/Border[0 0 0]/Dest[268 0 R/XYZ null 259 0]>>endobj
+128 0 obj<</Subtype/Link/Rect[72.0 660.0 91.9 673.0]/Border[0 0 0]/Dest[271 0 R/XYZ null 800 0]>>endobj
+129 0 obj<</Subtype/Link/Rect[91.9 660.0 127.9 673.0]/Border[0 0 0]/Dest[271 0 R/XYZ null 800 0]>>endobj
+130 0 obj<</Subtype/Link/Rect[108.0 646.8 159.0 659.8]/Border[0 0 0]/Dest[271 0 R/XYZ null 679 0]>>endobj
+131 0 obj<</Subtype/Link/Rect[108.0 633.6 161.5 646.6]/Border[0 0 0]/Dest[271 0 R/XYZ null 202 0]>>endobj
 132 0 obj<</Subtype/Link/Rect[36.0 607.2 44.2 620.2]/Border[0 0 0]/Dest[280 0 R/XYZ null 818 0]>>endobj
 133 0 obj<</Subtype/Link/Rect[44.2 607.2 53.3 620.2]/Border[0 0 0]/Dest[280 0 R/XYZ null 818 0]>>endobj
 134 0 obj<</Subtype/Link/Rect[53.3 607.2 90.2 620.2]/Border[0 0 0]/Dest[280 0 R/XYZ null 818 0]>>endobj
@@ -308,12 +308,12 @@
 172 0 obj<</D[244 0 R/XYZ null 818 null]>>endobj
 173 0 obj<</D[244 0 R/XYZ null 416 null]>>endobj
 174 0 obj<</D[244 0 R/XYZ null 311 null]>>endobj
-175 0 obj<</D[247 0 R/XYZ null 172 null]>>endobj
-176 0 obj<</D[250 0 R/XYZ null 666 null]>>endobj
-177 0 obj<</D[250 0 R/XYZ null 563 null]>>endobj
-178 0 obj<</D[250 0 R/XYZ null 356 null]>>endobj
-179 0 obj<</D[250 0 R/XYZ null 213 null]>>endobj
-180 0 obj<</D[253 0 R/XYZ null 703 null]>>endobj
+175 0 obj<</D[247 0 R/XYZ null 224 null]>>endobj
+176 0 obj<</D[250 0 R/XYZ null 730 null]>>endobj
+177 0 obj<</D[250 0 R/XYZ null 627 null]>>endobj
+178 0 obj<</D[250 0 R/XYZ null 420 null]>>endobj
+179 0 obj<</D[250 0 R/XYZ null 277 null]>>endobj
+180 0 obj<</D[253 0 R/XYZ null 767 null]>>endobj
 181 0 obj<</D[256 0 R/XYZ null 818 null]>>endobj
 182 0 obj<</D[256 0 R/XYZ null 416 null]>>endobj
 183 0 obj<</D[256 0 R/XYZ null 234 null]>>endobj
@@ -326,14 +326,14 @@
 190 0 obj<</D[262 0 R/XYZ null 482 null]>>endobj
 191 0 obj<</D[265 0 R/XYZ null 782 null]>>endobj
 192 0 obj<</D[265 0 R/XYZ null 617 null]>>endobj
-193 0 obj<</D[268 0 R/XYZ null 782 null]>>endobj
-194 0 obj<</D[268 0 R/XYZ null 274 null]>>endobj
-195 0 obj<</D[271 0 R/XYZ null 782 null]>>endobj
-196 0 obj<</D[271 0 R/XYZ null 577 null]>>endobj
-197 0 obj<</D[271 0 R/XYZ null 479 null]>>endobj
-198 0 obj<</D[271 0 R/XYZ null 408 null]>>endobj
-199 0 obj<</D[271 0 R/XYZ null 288 null]>>endobj
-200 0 obj<</D[274 0 R/XYZ null 488 null]>>endobj
+193 0 obj<</D[265 0 R/XYZ null 331 null]>>endobj
+194 0 obj<</D[268 0 R/XYZ null 713 null]>>endobj
+195 0 obj<</D[268 0 R/XYZ null 561 null]>>endobj
+196 0 obj<</D[268 0 R/XYZ null 357 null]>>endobj
+197 0 obj<</D[268 0 R/XYZ null 259 null]>>endobj
+198 0 obj<</D[271 0 R/XYZ null 800 null]>>endobj
+199 0 obj<</D[271 0 R/XYZ null 679 null]>>endobj
+200 0 obj<</D[271 0 R/XYZ null 202 null]>>endobj
 201 0 obj<</D[280 0 R/XYZ null 818 null]>>endobj
 202 0 obj<</D[280 0 R/XYZ null 429 null]>>endobj
 203 0 obj<</D[280 0 R/XYZ null 337 null]>>endobj
@@ -517,32 +517,30 @@ endobj
 ;(¿H¤0e…²¾¸8ŒA;öÆ"¨£,"Ì�·Å0
 žÄMyBøËˆG1LÈºz	¹Ó?¼=0
 FÏ]yÞíâq”g÷Ú·[V›î‰ÔëÓ—LúxM|¤ÕXÆ�ÀiHêõ)Ù=§•¬¶(³^a‡¦dô¢ÙÜë›;Ø�ç€•dJc¤E/:…@�
-ŠIQ#P¼t+{d¢`²nÓÕ´;ŸÉÓO¸D†ÿûOh0‰qãø2Œëö|iýíû=endstream
-endobj
-234 0 obj
-831
-endobj
-235 0 obj<</Type/Page/Parent 207 0 R/Contents 236 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 5 0 R/F8 8 0 R/F9 9 0 R>>>>/Annots 22 0 R>>endobj
+ŠIQ#P¼t+{d¢`²nÓÕ´;ŸÉÓO¸D†ÿûOh0‰qãø2Œëö|iýíû=endstream
+endobj
+234 0 obj
+831
+endobj
 235 0 obj<</Type/Page/Parent 207 0 R/Contents 236 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 5 0 R/F8 8 0 R/F9 9 0 R>>>>/Annots 22 0 R>>endobj
 236 0 obj<</Length 237 0 R/Filter/FlateDecode>>stream
-3÷¡´M	JiÍË^[N¶d©!ÿž]9n\ÓÞ“Œ[ûuÎ¾bˆðÃñ˜¾Y5x›.ÓAÄ"|OKLËíî²Æ	ÄIÌ’ÝS	wäÔó0K§LØÒ‚B�“×�æÃÂ®ß„!®l©Óf®Ý"\]¯Ò¯�(Ñ.J|rŠ©"ò%ƒpzqL1ƒ¦ˆàxÂÆ´›®ä:s•P–[©È
+xÚ�U]sÓ:}Ï¯Øa†¹a¦–í´
 3÷¡´M	JiÍË^[N¶d©!ÿž]9n\ÓÞ“Œ[ûuÎ¾bˆðÃñ˜¾Y5x›.ÓAÄ"|OKLËíî²Æ	ÄIÌ’ÝS	wäÔó0K§LØÒ‚B�“×�æÃÂ®ß„!®l©Óf®Ý"\]¯Ò¯�(Ñ.J|rŠ©"ò%ƒpzqL1ƒ¦ˆàxÂÆ´›®ä:s•P–[©È
 m*nÈÁÕR-Á¢Ñ»ôÃüâã9Ôº°nƒY[í@	´³*þM@¶âj)j¿‘qKaÉÛ‰¹�	X>ìÇ‚ÂèêMShýƒmý¿Ñ¤áw2BPÍÓ³ü©±'fe=«›Í†	^oë
 Ët®lU"!ÏÐz:ÆZ'Ð”HÄúìÁñ¨!ö\WkY{çŸoî7!ÚóO›È2Rvuý¸³:Óª >éW.²Cô»…,ÑŽ«‰s&C¶u.¨YD·„`EÅ íú¶É;ì÷Àn×âùäÓÃK`á>úåuzyÛ¹>R—(¸+-HU[^–�È6²,aí¼8|�{-Hå_¶5Q‡¡«ÍãDCÏDßìžÿb–K#2«�Dò0uúlV2[õøñµé{a6FZ�Y¶ ~ÈÚR/×F*ÿ¥Raþ~DÏþéÓØ¸ÒøÞôr–:kˆA)<?Öûÿ£�M¯Éë/»×ý—È
-(LÉx€{�GEáyÄŒSªQÖ®?ÐU¬sAS/¼fa+¶Êß¾xÚ~W6:Ì8teÃ;(“�
-Ç]+~/ö��ìb¬�à««íŸNÃÊŒL.œ,sßÏ‡Ëª?£ý ž5òlï¹»�Ë³»wÀÎöß€iu@%»ŒI‚nãQÌ&dq{6M!hÆI["œå•T8™ÇžÕð�+ÇK
-Ä£t^�ü]•Ð»“8a§ÍÝu+¾;ì4é²Þ]Ÿ?´N�endstream
+©„ò`GñÐSy7×WGðþæ×t6�ù^ü7Ÿ½…R.÷\`ÛÒ�S‚à·ªkeñ€üË…(±†rû|‡&_¨TYérñ;jð¸ä¢gúåµììP;»êfLõýÏ§ó³«»ßH4¿xÒR¨{i´¢Ù
+(LÉx€{�GEáyÄŒSªQÖ®?ÐU¬sAS/¼fa+¶Êß¾xÚ~W6:Ì8teÃ;(“�
 Ç]+~/ö��ìb¬�à««íŸNÃÊŒL.œ,sßÏ‡Ëª?£ý ž5òlï¹»�Ë³»wÀÎöß€iu@%»ŒI‚nãQÌ&dq{6M!hÆI["œå•T8™ÇžÕð�+ÇK
 Ä£t^�ü]•Ð»“8a§ÍÝu+¾;ì4é²Þ]Ÿ?´N�endstream
-858
+endobj
 237 0 obj
 858
 endobj
-xÚ�TIo1¾ó+>EjE¤0¬aÉ�lUM[2U.¹xÆp3ØÄdþ}¼Ì  jUqñð–oy~~kõÑs¿>&ÇÈ×ë´Õ½Ÿ¡?LHOûþHÛ+K˜Ã“,ÌŽ(vžþqé#ôû1¹3'#ŸüCä•´X‘-Ú�²d4ëº8Äs"à‚Ê„ÐÍïŸO „¥@VÁT‡xQz˜ENŽh'ò£mr°Ÿ¶¿ kµêêŒ‹nn7šâ+îÓ»ElàT]&Sß¡ã[g‘êC$ç¥\sAT…[®�â™5\ŠO]áØ>3x¹UŠ	SV û*×+HÉb;zÐN;7�Î(¤Zƒ7«Æ â@…rlI	�+¾1:‰$.kž~ãôó|ñøðøíê¯£8Ð8íxYBn™Ú)nÂØ»cè36Š‹pÐ•6l�à¡cbï¦8óS¥¼(xnKÃ™ŽìÝäš9Ôc	@û9{A‚ùéK,%2’¿úc@–%=½ˆ�fSì`û+r‚¶jØ¸ŽrË©«�þÕ–Ö.×G˜(”\×ŒœRrº¹�þ7·&?•8lw,øÿŒ¡”Ë¥ûpÃ'JJƒ—6•áÖ	œi{®�;’‚	i—«—óÍ�èõ4t±š©(+Â_G©ï]ùïJÂæ$�¶ƒõi®Ö‘
-óÂ0å½z!^6AÁv¨˜î
+238 0 obj<</Type/Page/Parent 207 0 R/Contents 239 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 5 0 R/F5 6 0 R/F8 8 0 R/F9 9 0 R>>>>>>endobj
+239 0 obj<</Length 240 0 R/Filter/FlateDecode>>stream
 xÚ�TIo1¾ó+>EjE¤0¬aÉ�lUM[2U.¹xÆp3ØÄdþ}¼Ì  jUqñð–oy~~kõÑs¿>&ÇÈ×ë´Õ½Ÿ¡?LHOûþHÛ+K˜Ã“,ÌŽ(vžþqé#ôû1¹3'#ŸüCä•´X‘-Ú�²d4ëº8Äs"à‚Ê„ÐÍïŸO „¥@VÁT‡xQz˜ENŽh'ò£mr°Ÿ¶¿ kµêêŒ‹nn7šâ+îÓ»ElàT]&Sß¡ã[g‘êC$ç¥\sAT…[®�â™5\ŠO]áØ>3x¹UŠ	SV û*×+HÉb;zÐN;7�Î(¤Zƒ7«Æ â@…rlI	�+¾1:‰$.kž~ãôó|ñøðøíê¯£8Ð8íxYBn™Ú)nÂØ»cè36Š‹pÐ•6l�à¡cbï¦8óS¥¼(xnKÃ™ŽìÝäš9Ôc	@û9{A‚ùéK,%2’¿úc@–%=½ˆ�fSì`û+r‚¶jØ¸ŽrË©«�þÕ–Ö.×G˜(”\×ŒœRrº¹�þ7·&?•8lw,øÿŒ¡”Ë¥ûpÃ'JJƒ—6•áÖ	œi{®�;’‚	i—«—óÍ�èõ4t±š©(+Â_G©ï]ùïJÂæ$�¶ƒõi®Ö‘
 óÂ0å½z!^6AÁv¨˜î
-Íã…9]sáW“©4¾aI&Ë;“Aï_/ßhÚKf)3ÿ}—¶~µ>ùq°endstream
+‰7Ët¼óŸ=
 þd‡oƒRxò£¶t}›œð@0zjƒ5ÒmÏ]yUoÈ´&ÙŒ\Òp2‰;p»˜ß§èD
 Íã…9]sáW“©4¾aI&Ë;“Aï_/ßhÚKf)3ÿ}—¶~µ>ùq°endstream
 endobj
@@ -577,59 +575,51 @@ endobj
 ;10é’ÚÁ‹•Om?Ð$Us•DU$x¿~wå8JìµË�‰tº{ž{î…ü>JaŒ?)LfôË«ÑÛ|”¼›BšB^ ev1�/ çùFÂ«ü/4Î‚ñ\Èâ²{Ù{œk¿ºJÖL#¹*”4`Ñ·ûînßƒn¡P¥¬Y%¡À27ªlc œB—¥¾Wõ×àe0¨ÇC”NâŒø×4ºµR€ª�ÁšÅñ_cYY2«t
 º€ßï–«ÅcÖ˜e”Íâ)Å ‹1’žOé?xb{Hô0ÎJÖ9–%hggÁjŸT¯€ðùÆ�‰D‡6Ö6‹$Ùhc	êÓ‚rû’´Òh×ò!-ÕüÛÇÿ•çûå²/•ÉÈvÛeP|Â–¾a-òA_ƒ…+˜+!ˆÙ$=•{Ùˆƒl’ïNºåðay½ÏÁ;N”ËR–‹ÿÔ}D …BŸb€+6ÀÿôF7ÔÃæËK˜t‘ñx®’jXLÎjXK`õŽ&ÉŽåp%åL£¸ÞuÃ\:ŸÏ_~|ƒ&Ž¥XØñ~µìý×Ì‰ß:kÖÃS¼!£VÒvÛ„\€¾Ù/�>Áã(Êš!ÊœšüâNíª5�B‚YÜ2ãÊ ìn"·²>A&è¼P)É¿¡¸?_q$<Z^½Öõ3…È][›al”©8Ùéš“öéæzÑ´…Aw†�íªiVmÚj®ËŸß_ƒ?\f—éxì“Œæ¦wÏŽœŽM#~ðh\¢+ÞªÆÂ2¤s-�Aç-Bv¦ïveÎË�~@»Æ™3Žoì™�J
 ÅÀ¨¿å¯ -�q0ïªZkëg|ËTÉÖ£
-öÌB&¸d`åOñ
+ØiºR6à0\aþwîm&*õ¤µ¹®*V‹Ð—ÐÑð�6É:µî|±V?cxHºUxÚÑø9‘�uŽ¾7>¥ à™	¨g°Äs‚´Å«é�
 †W”Ny¥æ,Ü/0û£c“8Ó&×œL¸kLRi!Ë!!¡ZÉnw¨»Ýx5Ï¢ê,nÑ¿ì¤¢èÃ÷ÅLéáðh¥Z'!sˆš~`ƒsŠžS$HÝ	;Œ>Ç�·CtÑvà�E
-ã™üm “eLóÐgPÑ(çc8¨Ôº*‹;|�ü1éBâÙXŸý§D~&êlÞ2¥ àP_ÀO7ÒLÓ	)¤/`•ò”IX¸=aöÄ$@Dƒf5žL*‰/¾Ì>,p˜é6q˜5inWƒ9VÊ3U¶NåŽÔ'ïh@‡£~wåƒç$Ñº4\¦úT*åy¿h}ný•÷4endstream
-endobj
-249 0 obj
-883
+î‡÷»ñS3DÕz†½í@„½g6~7ä7·�ñ¢ßé<�S˜Í³î¶y}{õ.Ç=C8XéÂÞ£¾pE+cqñk¼c`ë;æQ¢4›"Ž¤GH3z9™ŽãIy%uÕù£ªØÑSh;ßo7ùèÏÑ?†f@-endstream
+endobj
+249 0 obj
+952
+endobj
 250 0 obj<</Type/Page/Parent 207 0 R/Contents 251 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F2 4 0 R/F4 5 0 R/F6 7 0 R/F8 8 0 R/F9 9 0 R>>>>>>endobj
 251 0 obj<</Length 252 0 R/Filter/FlateDecode>>stream
-251 0 obj<</Length 252 0 R/Filter/FlateDecode>>stream
+xÚ½VmoÛ8þž_A8\¨“ØIó²o½¥Å0Ü†\›á>+ÝªgKž$'Í¿)ÛiÎI‡--ÐÚ&Eòy’úÞ‹aH?1LM -z®zƒ›1Ä1¬2ú2™�û3XÉóÕÂ«Gú8i>žFb^¿kÎAØûª@íÁ•˜ªL¡O®Z&ÿ/—ÈTNÏ”öh3‘"¸ÔªÒ÷á†Þâ“(Ê/ÀR‚€ÒK¨œÒ÷sQ<ê'œŸé‚|ZÂÝ¿Ÿ‘â£åàÒª
 ù¥FkL=J>²Vä9æPë©øJK2ùKéê	v¦‚©rI¡ðC]Ýæ)cˆöQÛ$b~ø
-ZøÁ"yÇ;~ßwG~�Ä0¥_‹f)äÕäC6‰®h&†¬ •t9—�ñó¨1:2wLc”7µ‰*Å±ü=»'ëyg}\hÌÒØ{öá,¨Î@ÕV(ù®5ŸÂ*Lœ=â™ûæçniJÃØ
+•³ƒ\y)d¡4De›It
 Ñ¦�ùa q3 §¢B’Å#ú~YJ¸þºº¾ãÍ!¾dÔ3ˆ8âhÞs�[,Ì†Ê‡e
-Ž‚å&×¢¶!\Ñ,>°ª.ñ-XŒs`Ð�ò¶g #Äíi¼ü±�5š/"ÅGí‚s-vä—+)‰oänËšiV–XB´%E5’“É_B6pP
-ìUSr
-…?&ƒ>Ïió]D$F4Š‰-N÷hÃºæCV_8)."Q0wA®±R;:>lZ0Ì·ØOd)ÐÎÈÑ¹?~ÚÜøAh@7ÒÒŸ²ã°;Á˜Ù\U“|X/¯R/?P/§Q‹—‹N»¸/øX2cðiØ<>Ä’ÚAv«US;¼DÉt�¥!Ù²£rè�Î]”x!|¾CçC¢Ò$MÉMO
-Ü«×yëøÖCKs#‘ïEYÂÉGåH§à°=xÓBhc�íe¸-ñÈ·pÜ2Ûîv»%i‹H6®«ÿxU�ÔgàfÎ‚¼WŠùu5²9({asœM)îsÍñ”
+†û/öÃ`9	d°lŒÈQÝ¿-ïB�NZ;°•„´U66t™MMQ-a«üCp;‹žÎÀ”^ý& žjç¤uŽÉsLå�y“|÷ô)¡¾¿€Z<›’å¸/ø˜çðeØ>Ä’ÙºAvoMU2^*¶ÅÒ‘l	ÙN;´@§¥^þy@ö!QY’¦–®¥Í:è¼v¼ÐÒ»ŽÈ·*Ïa�äcR¤*$¬wÁ4SÖyA®sÜó˜[áëSûÍiÉ¤FdÕí«çÞU åð›³(m•âÞÖSo�J”v�'ô7|; lï™L�%ÖÖ%£!Å}î·ãáxJ ¤�!QyS¯RÒÛTÊƒ4èôïžÆŸr4	»¸¦æ±"ªIBÿWû½—ÃÖ›Nd‚ÐîÐ{Yœð3Qå¾_?›^ŽÆ&»ÈÆ¥•©iÚëÝ*ßBù2„4â	Á!:.çÍi‰
+géÏ$vtô‰-¬Ž×oË~—Ãá}^ØÀÃvçMY¾nÿS‚š§ÓQžtlÇP*wÊ²áŽ˜ç”‚££|öÕ|¯°Bšžùâáiéç»_åtô Î:„Î§í¨xýF¢P—'4õu#ÄÃ„°ûå¥·—ËsßMVž«w€°ÔJu\	…Øt¼NDšb�ƒÌ4ë�¾€uåéÄ³H¤¾
+#ª^VBïÂÝÍÑ¥‰Î`AíøøÎ¶"˜&”4ÅHƒôKc+«ržt‡",DžU:
 ›!�ÊÛG#ßÓI–ÖRj¬%B/C%}¸¢4jÆCö5³‹8S“yRç²¸½ºYATß~îLæ·Çw.�Y+¼!˜¾MeÖ´÷hš°¿ñ…“¤O¹	+[éÃ"\+CàñtÜ2�øÅõª÷wï€XNUendstream
 endobj
-½¾~•AÐ^Ç7ª°{zªÂ{'%ª{ÍèUjào&æ_WAœÌÝm¶H|€OîD\LóžXûwŽ§d¾˜÷ÙÄ37q™Mþ�üKŽ0Àendstream
+252 0 obj
 1000
 endobj
 253 0 obj<</Type/Page/Parent 207 0 R/Contents 254 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F2 4 0 R/F4 5 0 R/F8 8 0 R/F9 9 0 R>>>>>>endobj
-endobj
-253 0 obj<</Type/Page/Parent 207 0 R/Contents 254 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F2 4 0 R/F4 5 0 R/F8 8 0 R/F9 9 0 R>>>>>>endobj
-254 0 obj<</Length 255 0 R/Filter/FlateDecode>>stream
+254 0 obj<</Length 255 0 R/Filter/FlateDecode>>stream
+xÚSK�Ú0¾ó+æR)+-�@–GoiË*µÚBzÛ‹“L£Äfm´ÿ¾3v€õX%ÊÃ3ß÷Íóm”À”®æ¾Ënô%MžSHÈk²,Vi¼‚¼Š„A8©V j‡\s>1 - EKÆ×È:aÈíõ!~È÷Ä¶†ä‰I˜o<_Ç)óee‰'Õª‚-î±ô/Ìßuaø
+CÍI8§ƒ1žíyæ;Gã…îKÝuäl!ðx`ðÂžâ�Z‡¤•è(Ï!õGr´þˆíûç³Ü:ž15ÕtœÌù»ŠØDY°f}‚IoÍ¤•ÅdÐÈÙ¹^Ò{Ê®ƒÐ=ó’Jêí°ù™o¶l&©§™ü�kÍÆÉ2¹v$³ ´ŸŒBñÄe0J¡ @°Nd/z7Ô˜{ðô¡¾1d70ÑZÍXs™
 ò?q¨é‡îœÙ"HµTÒ6h©WÚ"=…ƒF‘¸PÁ[�=V1ä
 Í,Ý½Åºo}oO
-äÆZÌ}Weh„:‚Ñxo°!Ì¾‡Îã€DÉ0×�Äu�âmØÑ|»‹‚žKHHgR4nÅœq¿U«	Ó2|Å-ñáÈð#pYF|ÙCZ�6wÁaPý¶bØvî%Ú¨Ÿ˜›º¦dwÚ†ÌnEçuòÐZÔ4g7ú=%º“ß£:~êØü¢àIÐäêx•ÌÆfïv—úýÇÓ%¨‡¿t“ü€o$—�¬hÓ^Fföxâ|¹Ð�!yÃìvgˆóæ5®ô¥¼)Ê®µçÛ üÞU^mçP‘…@z²’–®B¶©qÌZ‰=R/ÔáÂÿ´ïöPQœ½R7Ž�–Ö=ÀZ0A-tŽ`ô�øhü
+Ùßu]o©ñhè°»ì¨„*´ºÙš“l[.E¤`ÄQÈ–œf-ÆH@«)!Ò�º]ƒ“ë²JœÌRÒœÑîø…ù¶ÍžsÃ×ß/;ØéÚ�x%³ªãt�N÷¡zÑ†Yððñræ{˜¤|8O§ñ<4uÇKz^¿·ç²}$;oòÑ¯Ñ_ÙD=rendstream
 endobj
-g$@ˆ0¤)À”3;»<v'“aNË€üõuõ”Â¾ü|ÞÀÆ”þÀ–\5�ëð†zšÞ,áÚòÑbÒî0™ñÃé,Ž¦a©6éÉ~^ÏÙ}D’“×éàeð„u²ˆendstream
+255 0 obj
 522
-255 0 obj
-652
-endobj
-256 0 obj<</Type/Page/Parent 207 0 R/Contents 257 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 5 0 R/F8 8 0 R/F9 9 0 R>>>>>>endobj
-257 0 obj<</Length 258 0 R/Filter/FlateDecode>>stream
-xÚ…T]�Ú0|çW¬NªJ88úÖž8µ½Ò’û&qˆÛÄvm”ß];ÉÝ…û2agvg<›£fø‰a=‡Å
-Òjô5Mï6o É!^/`µ^B’�—0��Ò	y„}c¯à“ìÈ+.Ý§äÂ–Ç›n²XÎ"M
-a!-˜vÜ€-ÔÙ~A£jH™„TÉ\kÃÁnv{°Üœ¸‰+sÝïI7�ó¶`òH£xLËÀœPîDÉíó�pEÀ/e	*÷°Ð¥ïÐ9¡�á4¥J™ãé«ã¬eOOÌLÓZÛ)áŸ·C&O�2M?eÊ½Ö‚�8T,ãÀ¨gŠÑœfJIÊWÀ|_.9öÆG†[ÇŒš‡O2#„Cà·‡Xq”õ¨mgŽµ.rÙÔí¯²HQd‹�ž«Ï]Ù†`9e¥§ècúñ¢iËÑO¾½O¶¿	!‚îJœò $3
-úf�‡Ú_…�ˆ/Kdøé_¹!…‹²W/ÎÂ'Yu.õˆþ]Ô\²sÝÚ¯äÀTêtÂ?•™ôîënw¬ß�·²�ðJ+Cv¼å{e*ô§	±ÐµÃÜ†t<ºž%D�{)Â®Ê�à{N	ü˜A)þúXv¥E~t•jÊr ½‹-Ï„{oü)‹^Z!š:jÉç«àÌÞç	“ŸÎ\—pÉÏOÔ>ÎÇ$†ž»¾ŽimÞn5hn*a-ÆÌ¶Ù¾ybð<üþ;o¹^âõÍ¨8¾¦Ûdôkô9åšõendstream
-endobj
-258 0 obj
+endobj
+256 0 obj<</Type/Page/Parent 207 0 R/Contents 257 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 5 0 R/F8 8 0 R/F9 9 0 R>>>>>>endobj
+257 0 obj<</Length 258 0 R/Filter/FlateDecode>>stream
+xÚ…T]�Ú0|çW¬NªJ88úÖž8µ½Ò’û&qˆÛÄvm”ß];ÉÝ…û2agvg<›£fø‰a=‡Å
 Òjô5Mï6o É!^/`µ^B’�—0��Ò	y„}c¯à“ìÈ+.Ý§äÂ–Ç›n²XÎ"M
 a!-˜vÜ€-ÔÙ~A£jH™„TÉ\kÃÁnv{°Üœ¸‰+sÝïI7�ó¶`òH£xLËÀœPîDÉíó�pEÀ/e	*÷°Ð¥ïÐ9¡�á4¥J™ãé«ã¬eOOÌLÓZÛ)áŸ·C&O�2M?eÊ½Ö‚�8T,ãÀ¨gŠÑœfJIÊWÀ|_.9öÆG†[ÇŒš‡O2#„Cà·‡Xq”õ¨mgŽµ.rÙÔí¯²HQd‹�ž«Ï]Ù†`9e¥§ècúñ¢iËÑO¾½O¶¿	!‚îJœò $3
-259 0 obj<</Type/Page/Parent 207 0 R/Contents 260 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F2 4 0 R/F4 5 0 R/F8 8 0 R/F9 9 0 R>>>>>>endobj
+úf�‡Ú_…�ˆ/Kdøé_¹!…‹²W/ÎÂ'Yu.õˆþ]Ô\²sÝÚ¯äÀTêtÂ?•™ôîënw¬ß�·²�ðJ+Cv¼å{e*ô§	±ÐµÃÜ†t<ºž%D�{)Â®Ê�à{N	ü˜A)þúXv¥E~t•jÊr ½‹-Ï„{oü)‹^Z!š:jÉç«àÌÞç	“ŸÎ\—pÉÏOÔ>ÎÇ$†ž»¾ŽimÞn5hn*a-ÆÌ¶Ù¾ybð<üþ;o¹^âõÍ¨8¾¦Ûdôkô9åšõendstream
 endobj
-xÚ¥VÛrÛ6}×Wl2‘§/’BÉy‹kš™4ã&ì›_`´P“€fô÷ÝH]ÙS·#ÍH{9çì‚ORHð“Â"£oQO®óI¼Ià*šC^ÒZ¶^AÎ§ù_“fiJo ~äÒ-Æ›ù`½\àoBq©u|ÏLìê&í]fËhŒàæk~ó�¶gi²>ø.¶µæÀ~5Ý7±NÿS€x³r_b”uŠû³ÅU”‘M¾
+258 0 obj
 587
-ˆ(œ| Õ¹cEÛX¡ër|Òioh³Ã'æ`§Û·ObÀ� Åt#˜üý¨fäiorÂTŸëÿdjáryp#«ªÝ%a3Î—b…y˜Ý:‚” ”ÒX‡ûˆ”V K\”–hœ0Qté;�¡gIq¾
-×ió@ùÐFNKNh.JÖVŽØ<œ!|üóöû�f%ÊB©
+endobj
 259 0 obj<</Type/Page/Parent 207 0 R/Contents 260 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F2 4 0 R/F4 5 0 R/F8 8 0 R/F9 9 0 R>>>>>>endobj
 260 0 obj<</Length 261 0 R/Filter/FlateDecode>>stream
-YJäŠª|µÄ4‘G\µJ#¸Vr´?ËÜM‘ë»B
+xÚ¥VÛrÛ6}×Wl2‘§/’BÉy‹kš™4ã&ì›_`´P“€fô÷ÝH]ÙS·#ÍH{9çì‚ORHð“Â"£oQO®óI¼Ià*šC^ÒZ¶^AÎ§ù_“fiJo ~äÒ-Æ›ù`½\àoBq©u|ÏLìê&í]fËhŒàæk~ó�¶gi²>ø.¶µæÀ~5Ý7±NÿS€x³r_b”uŠû³ÅU”‘M¾
 #2õ ÀmTR	(´rL*©üÚ x˜æ¢n>Isêw
 ˆ(œ| Õ¹cEÛX¡ër|Òioh³Ã'æ`§Û·ObÀ� Åt#˜üý¨fäiorÂTŸëÿdjáryp#«ªÝ%a3Î—b…y˜Ý:‚” ”ÒX‡ûˆ”V K\”–hœ0Qté;�¡gIq¾
 ×ió@ùÐFNKNh.JÖVŽØ<œ!|üóöû�f%ÊB©
@@ -669,33 +659,31 @@ endobj
 ¹FK¡—
 wÕÞ²çQ]·î²r“Ý7}bOíV„ú}~þy|Ï�Ëáô¯ÿ1¼VWwv�ÈYt�Por�”ËŒ¡ÜYç�kbcð±œvf{YíÈ;V^ím¾».Š|ÙÜnñŠ|ýõîîebö6¤›˜3�·¢"F*
 ˆÈI±cŽç/íe·òçv´Ú—Ë—!›7þ7½ÝN>Oþ‘EÇ6endstream
-ía©õéÝ³Ó*¸ì5ƒ¤-Ë¶ êÅ)HøÐäUq˜ë$$”Ã/D¡}:CõvÊÐqoÝª’ý@��Þ)mqüY?È÷Ô\4È,øÀï×—·ª§’Ê'cÛ¹iáz�áÄ8¶¯2êÝÈÇ—ŽzaZ©·Ÿ—3Çvðó}û»ý~d;à»»q€÷ÄÁ[œ¿»1ñý5õ| îö�~s|§r:ž8Ð4Ø‘úí¦ñbõ?•¦WoÐ ƒy8˜×P¸$šÄ†Øz2‡Q�ržö-rÄdÇ<ÄÖ“9Œz”Ã÷´MlÛ�˜ç^ˆ-'3õ(1G4  óù¤¹pÃœÚ«G9¯[ƒ`Ã ì!qx€I{õ‰ˆ6)ñGQ:œ=0ap€S{õ(L@´S=²¯=8óàÃöê
-õè©9¸Z([Ù*FkÈ¹ÌS†Ûè‡¾Š¤Ûj·öbëÈzqcyf~m³Z¾Vì�g¼Í:vÊ²œã–¯ª”• 2 ØŠñ&×°êªX�GOiN‚ÄôCÔ®l‘@á$?æï‹”õÜ–.SÈ•h‹T{&ž}GÈFñ°³Ž‡y×Î»±¤çTæÉfÖîõ”ÄÌùc7!÷ß¯BE¥ÄK:žÂc-Ú
-²¼`²[+KÏÁ?-ÁÿtNÔÒÄG® ðMõr»¸Zâ\ÜßÜÁ�ÈšU°,Ò2ç¹ljÚˆZÂ7Ê[Ú•›–nn…ÄY¯}üðí�wcóAþ˜ý¦õÞendstream
-endobj
-270 0 obj
-816
-endobj
-271 0 obj<</Type/Page/Parent 207 0 R/Contents 272 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 5 0 R/F8 8 0 R/F9 9 0 R/Fc 10 0 R>>>>>>endobj
-272 0 obj<</Length 273 0 R/Filter/FlateDecode>>stream
-xÚµVÛrÛ6}×WlõdOMF¤YÎd:ã8v“™8Mkå¡3z�IHD
-JÑßwM‰””4ÛcËÀb÷œ³àS/�~'0ÓOVö^M{Ïî® Æ)Lç¸7ž$ô1?»®\q#™µçÓÐfI,¢áU<&‹iÁ!l¶›Ç�A.ÏœXqÈù\(na]0’¯¸=oûyÅ¬ÈÚ>X–qkAX0üS…óÁ$Ûš¤„¥ãxDðféø²ƒOiµ)uÕÁÁ{
+endobj
+267 0 obj
+636
+endobj
+268 0 obj<</Type/Page/Parent 207 0 R/Contents 269 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 5 0 R/F8 8 0 R/F9 9 0 R/Fc 10 0 R>>>>>>endobj
+269 0 obj<</Length 270 0 R/Filter/FlateDecode>>stream
+xÚ½VMsÚ0½ó+vr"3±‹
+ÃGo$i:™i™¦˜™¸(¶ÀjmÉñÊaø÷]Y`0	LÚ'´Ú}OoßÊzjyÐ¡Ÿº}ÓÖuÐútG+Šô‡=wAÔ¾år}ü¦`¯
+¶!9µxæ,çiZ$Ì,\* ?Zd	›÷RôR!“ðÈ¡@�VÀ’D€…!G„…Ê·ec…M¡8^×õ
+MŠK®W*ÿƒnòûnÏ„‚ø<&„X–q–ƒ�("l¿Â7Ò�•<ZÅµ‘X†FS§ë»}Ãh\è8Xg¼žl6Œì†ÊÍ9»´#¾’tÔ”¬i'¨0ÊâRKÖÈšñœÄL?Û:aUÇÉ�bs¿?ØÇŸ(y€íÀDíC`¬Š$2�¬�¨›ó6qcÔ>w~YÇÝé`è5C¢–Ë§(ä²d6¹ÿC$‹DÀdË\,DÂc«Á»Zð!Î¹IèçZ§!©É;«˜iHø3OŒ{NéF5 !çOŒÎ¶ÖX*¹NU�î¯òütÏ,Æ=<—,å¥]6ÞÙ9©{Øt�š§ï€»*#ÆÍ›¥áy¢ŒÍU»À5^”]àBÖíó¶ŽÅæ¦
+c&—µ)idüÕ¤µÎU	¿Ú“Â©�7©ÑXõŸ‹±|A©ñ1»ÉBë¦3›a)¹MhÓë3êÐ—ó�s÷!Æ‘ã¼}i¼ ×¸UÚÈNí(?×§ô»>Û'|¸Odõße=:¯‹zÊ@m%eQ*¤@�Û›Ï*\>�V¤ZM¼×æwÉ¼
 \¸×{/¨ê
 ÅÚ=bA+%†U	ÏïQJßëÙsÞþß4º7³S˜ª…^™GáxK^åß™,XRN�Mw~g÷}Ù˜g¹ä�ÌÂ— õÐú†Vendstream
-z
+endobj
 270 0 obj
 680
 endobj
-273 0 obj
-974
-endobj
-274 0 obj<</Type/Page/Parent 207 0 R/Contents 275 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 5 0 R/F6 7 0 R/F8 8 0 R/F9 9 0 R/Fc 10 0 R>>>>>>endobj
-275 0 obj<</Length 276 0 R/Filter/FlateDecode>>stream
-xÚ�WKSã8¾ó+z}Ù›„$„³'CU3ÙÓfŠ-Û[òHr2ù÷Ó-%Æ1’)8Äv«ûëî¯úq0„þ
-átÇóƒËéÁÑÍ†C˜Æøer6îŸÁ4êLS±ÐÆ‚]*ÐeÆ
+271 0 obj<</Type/Page/Parent 207 0 R/Contents 272 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 5 0 R/F8 8 0 R/F9 9 0 R/Fc 10 0 R>>>>>>endobj
+272 0 obj<</Length 273 0 R/Filter/FlateDecode>>stream
+xÚ�W]sê6}Ï¯Øë—’^ð‡�¤ÓéL>§™ÉW÷¡3¼[Æjl‰J2\þ}w%0Æ!sá&™$È«Ý³gWGëÿŽÐÇïœŒè')�®â£ow08
+Ï!ÎðÙèì,AœvîDÁáNé’Ysÿ‹fC¼QïäÂ]ÿýò3æ"å<Þ?Þö&Ìð2Úo—3!§À¤ûl¹¦O%Or&…)Á*H”œsm�¹¡†þ„´l‚Û3žþŒ;8	#ŠËY’{;®Cˆsb±SŠ’‡�·°w–]Æäƒ±G•òLHLÃ¬³â�œvŽ(™ÆÅ9…ƒ®d2í6Kcyú(Èº{ä	�<¡Ÿánp~P¶ºqØß¥ZÈM&„[¢± ÜT¶IÏX¦�…°¹[¤¢nr.Ù&¼•\¦ŠB-°ê“%fŽî4”J7éÒ<QS)¬PtUPtl.àßY9+x×jeeùwû-·e±«*Þ«X'f~[ï¿ð´b‡××x®kÇ°þãñ–Ô_u3Ž;ýî 
+ÇÇðÆc©—i1øýÏøñá�4¿Ü<_Çÿ¼Üâúøx;ƒ!k–3ÚX°å©ƒûž’KŸ+“È—åÒ‰X± $ü±íþ
 ˆÇíò'ÃæB§Þq«jÆ´ãäÊ¬ñP¶€GU³Äu95øæl‰®!ÚíâI0°æ>œÞ9-ÄXEXð¢W;¢Q8üŒ¤”³Œ*x±Ü—¬Ünæ	'É¡fI‰‡?•áYU`²\:K¥ÅTHtG[ÈE0nq‡§9v9êI’çb-\”8×ô(UÜÈ_�›bAüælŽiÕžIâJ¿;Èí�eïª”ï.%„1SÆˆ‰(„]:òYeJ¤HXQP	§•F4ª²-µòš\Í”OÅû«Ö¤JHT'–îâ~£k–ëZauÚ’UOGçˆ¶Þ3ŽFgíã<î`÷Î4´OCzð‚%1˜bæda†y¸>ŸjUÑ%²®ÁÏ®X_?†xPSb	.ŸnrÕm»Bx‹\ 3–ð†ãç×ƒü~ùâÓs|�+l€$w‚³xPe°›a÷œ-jôV«ï©–Ÿ=¿†µypPf!Æ•e†Û.ÂœÚ|WN±®°k3¼t,÷ò4g…H"uùv}�j}ýÚ…§‡.Ä—W]¸zëÂIÔD£µÓ=q5î‚ŸÀ¶AuÞ›ë”ÕìÀF¾Îp«¡x¬]Œú½ètØÝÛ2Þ…{}-@þs°lœì¤ÓR.¿ó Ò(Í:4Ö§â?ŠK
 ]G=(–É•¶ûŒ\!hŠœ¢p7Ãb]$·N¨év�ˆi�ËT08ˆj¤tÊõá•ÁÐûÃÅ>øI¸°ÞÈ,:ÆVß§]’J“€ƒßã5€æ˜F»lÆÝž¿+¶FÞÓ÷#ï§3{=÷âµØ¸ãP èmeªYÙÚý\ŒÝÝÑ£1ÁkÉÝ•{O˜FU:!Æâ\á†ÞDáô²
-³OþÃ&ÍèÁwT(ˆA)´$ÈÑS„›hU˜Ãmsµø´Ùúëµ‰¯*¡(ÁÅýõ^ªºMUo™
+¾eë}ž¯ðŸ7£‹(¼ g7¯—w1òìÞ³ÞTfø2-¾?YÍ¬B	yd²òubHÔžE}Úõiq�¢³þ®wºÛøè¯£ÿ¶ý$Ôendstream
 endobj
 273 0 obj
 1206
@@ -720,12 +708,12 @@ endobj
 279 0 obj
 129
 endobj
-279 0 obj
-257
-endobj
-280 0 obj<</Type/Page/Parent 207 0 R/Contents 281 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 5 0 R/F6 7 0 R/F8 8 0 R/F9 9 0 R>>>>>>endobj
-281 0 obj<</Length 282 0 R/Filter/FlateDecode>>stream
-xÚ…TaoÚ0ýÎ¯8åS§‰$¾mU«Vê4¦fš¦ušŒcˆWÇf¶Ó*ÿ~w	mZJY,…8ðÞó½»Çßƒƒy“ˆzô©%9°Š5dóIÌ`6ŸBQž|€1,�2A:ø(„mLPfó®øƒ€)0F€q�O²yœ¨¨”Qñ-¡Jé…S+é!TÎ¾-o@Û
+280 0 obj<</Type/Page/Parent 207 0 R/Contents 281 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 5 0 R/F6 7 0 R/F8 8 0 R/F9 9 0 R>>>>>>endobj
+281 0 obj<</Length 282 0 R/Filter/FlateDecode>>stream
+xÚ…TaoÚ0ýÎ¯8åS§‰$¾mU«Vê4¦fš¦ušŒcˆWÇf¶Ó*ÿ~w	mZJY,…8ðÞó½»Çßƒƒy“ˆzô©%9°Š5dóIÌ`6ŸBQž|€1,�2A:ø(„mLPfó®øƒ€)0F€q�O²yœ¨¨”Qñ-¡Jé…S+é!TÎ¾-o@Û
+¬•–>î‰PùC|JT)²äq§ü½’NB°p¡LÙa¯vA°—ò=fÖË�8â�u5×º¬“%(ÓQõéŽá$¹ç.ÍÖ'ˆÞ£?�R9)ÞÆðÃ6 ¸¡âÌOG…®Z�¥"[ˆú%3ž�MzS
+aÍº{*czÜ—£wjÓ8”5])Çl¢’¹ÒûßzçÏQ{ö* ûÇ aÐÊ’‹
+.‹b	NzÛ8A•óX|�GcÑr+g<öÝº®ÙÉÕr	B+iBçHD:ÏlÑÊH"Ú5ÆÛ±À~!atfë
 èºN]4;¥š›¶C¡{éð8"´wrk]ß
 kµ_<V›“Øš¦ýIøñŒ6•õ6Î6[ÒÀ¡åAŽƒª%ÜÞFµ•-‡ÚI[ƒßàTñÐÐ„~*Ÿ_l#Å…Áõ3K“Ï¼MXžç–/²t‘åð>ÅëDË/7$¼¬•I:Ï³¦)†öMÒZÝÉC¼ö?Þ,M{Þgq&—^�Ììq2È«×Ã"5v@i=$Î¼p:
 \-�—%è¡1š>ZRÅïå.IåÑè\¢¢áµ¼¶öcs8Ÿ
@@ -738,14 +726,14 @@ endobj
 284 0 obj<</Length 285 0 R/Filter/FlateDecode>>stream
 xÚ¥VmSã6þÎ¯ØÉ`JÛ¤¹$ßh7M�+f:íÑé(öTl)'ÉäÒ_»VlòäÚ�Iˆ¼oÏ³«GúrAHœöø�?%�‹.D$SzÒëwƒ>$ÙQò€pœüC{Ë‡G¥Eã—jû#˜JÌ3�Ù‹’>•“©p˜›+Q èiõÔà—“ê¾zÀÕ”~6*ƒ™°v®MÑ–³Y.1ã”!´£Ó æÂ¦Ú¬†ãÿ}�ƒ¯%ÕÊ	©,´Ú`é÷‚î 2ªµíd�¯"c«ª@¶ÜRÁ{ƒ¨æ2}€1
 	[Ý‰à1üyûËíÝqåNá$W‹Û 
-284 0 obj<</Length 285 0 R/Filter/FlateDecode>>stream
-xÚ¥VmSã6þÎ¯ØÉ`JÛ¤¹$ßh7M�+f:íÑé(öTl)'ÉäÒ_»VlòäÚ�Iˆ¼oÏ³«GúrAHœöø�?%�‹.D$SzÒëwƒ>$ÙQò€pœüC{Ë‡G¥Eã—jû#˜JÌ3�Ù‹’>•“©p˜›+Q èiõÔà—“ê¾zÀÕ”~6*ƒ™°v®MÑ–³Y.1ã”!´£Ó æÂ¦Ú¬†ãÿ}�ƒ¯%ÕÊ	©,´Ú`é÷‚î 2ªµíd�¯"c«ª@¶ÜRÁ{ƒ¨æ2}€1
-	[Ý‰à1üyûËíÝqåNá$W‹Û 
-á†¾†¼:å5µCÄ?>�F�ñÇ_;Ðkxy9�‡77ðCH¯¿Öq´9Æé è½¿@÷ ³W±_&É5x;nVFÀZïÏ“Ö	´®oý×ÇþF—wÇoSnÐêÒ¤¯3>•9î˜J_»ïÑÜ'4Vjõ6<;ÃTNypÉ–nídQ™¥4ŠÊpAã÷óíõÍrÁúÑ›Ë<‘ÏÅÂÂd³¹-NÑ‰‚hŸy´N¸Òî®¸í¦nâ¢Ìx§
-ª¸µ¥ÈóHÇ`[qR—&¥Mff‰¼É·Rqª3´ ÂL[+'9zàøU³O F5Rñ¾×FþKl‰4Ek[uE~Øk?ý´Oß&‡ûp ÊbB@wåQ§kàšy8ëïõß’mP´™Z³˜©öÕõ5‹… Q±n0EùDÌL�.V'Ég@ô#.k/ïÓ†4F›¿s}´ÖËwmé°®½ñÜÆD-È%ÓPP“Ä=•ÝTeÓÌÊœ ÝùöæÂ(’k[oí½õ)Ç'Ì¡‘Ö:ÝšÍÚ�+ø‡�±Xt¢Á`0ŒèÝÆý¥¤Á=¡3‹ZX‘´1Gh? ;äÝyXÈG<ÞˆGÃ0^�ÿÏxñ0î®Ç›©P)æ¹×�•Hû+rÅÝ³ï³J—Ü.{“.]â>µ¥ÙbwqïÝæ˜œoæhÃ™òc:MKc0Öƒ®Œÿ®ˆ¿oGd|t¾“ Vì�T�–€Ó0CÃgXÍ'Ê²û}É®¶“])ŒR,‘×¼|_ÔÑvÔNÊû{¾µ¬Fl{‚_éã‹µ^n]/æþRCúK	YL
-Ÿ|3#ßŸ‚ŠWÖ‹~sû‘›R.3#Ë™u·³LñÚýG854y•IcöøAØÊiŸ¹¤OˆíjR~uåV_ûKß(îÞ^<à„£ßÎ.j]uNßè©›óQv–R‘úáHÝ`,…«zé�Ûïâ�½ã./žöYäÂºþgÄ�Ÿ'Ÿ¾‰AH`endstream
-endobj
-285 0 obj
+á†¾†¼:å5µCÄ?>�F�ñÇ_;Ðkxy9�‡77ðCH¯¿Öq´9Æé è½¿@÷ ³W±_&É5x;nVFÀZïÏ“Ö	´®oý×ÇþF—wÇoSnÐêÒ¤¯3>•9î˜J_»ïÑÜ'4Vjõ6<;ÃTNypÉ–nídQ™¥4ŠÊpAã÷óíõÍrÁúÑ›Ë<‘ÏÅÂÂd³¹-NÑ‰‚hŸy´N¸Òî®¸í¦nâ¢Ìx§
+ª¸µ¥ÈóHÇ`[qR—&¥Mff‰¼É·Rqª3´ ÂL[+'9zàøU³O F5Rñ¾×FþKl‰4Ek[uE~Øk?ý´Oß&‡ûp ÊbB@wåQ§kàšy8ëïõß’mP´™Z³˜©öÕõ5‹… Q±n0EùDÌL�.V'Ég@ô#.k/ïÓ†4F›¿s}´ÖËwmé°®½ñÜÆD-È%ÓPP“Ä=•ÝTeÓÌÊœ ÝùöæÂ(’k[oí½õ)Ç'Ì¡‘Ö:ÝšÍÚ�+ø‡�±Xt¢Á`0ŒèÝÆý¥¤Á=¡3‹ZX‘´1Gh? ;äÝyXÈG<ÞˆGÃ0^�ÿÏxñ0î®Ç›©P)æ¹×�•Hû+rÅÝ³ï³J—Ü.{“.]â>µ¥ÙbwqïÝæ˜œoæhÃ™òc:MKc0Öƒ®Œÿ®ˆ¿oGd|t¾“ Vì�T�–€Ó0CÃgXÍ'Ê²û}É®¶“])ŒR,‘×¼|_ÔÑvÔNÊû{¾µ¬Fl{‚_éã‹µ^n]/æþRCúK	YL
+Ÿ|3#ßŸ‚ŠWÖ‹~sû‘›R.3#Ë™u·³LñÚýG854y•IcöøAØÊiŸ¹¤OˆíjR~uåV_ûKß(îÞ^<à„£ßÎ.j]uNßè©›óQv–R‘úáHÝ`,…«zé�Ûïâ�½ã./žöYäÂºþgÄ�Ÿ'Ÿ¾‰AH`endstream
+endobj
+285 0 obj
+1010
+endobj
+286 0 obj<</Type/Page/Parent 207 0 R/Contents 287 0 R/Resources<</ProcSet[/PDF/Text]/Font<</F0 3 0 R/F4 5 0 R/F6 7 0 R/F8 8 0 R/F9 9 0 R>>>>>>endobj
 287 0 obj<</Length 288 0 R/Filter/FlateDecode>>stream
 xÚ•UQo›@~Ï¯ðž–j…I“’·nm¤VªÔìi�¦Éu—»”;†òïks�švY"ˆ}öçÏŸÍó „¿!L#M ]>'ƒ³yá¹IŽ¶ÉtêO É†ÉŠÃ†-ù/©—0’Ÿ$Oè;†0tžÞ(Þ{:cÐ‡íÁî™!ä¤0ÖgéªNvÅ,†+VƒM!”å…×ä$…â�je™P½9äZJ]	µ¡r]¬™ZÍZ±Q6,ÐGtŸ
 É„ˆ	F6l¢CiðçI/<‘AÆ,÷¬X»š=U®hÄ‹—ê�à¦ ópÅÍï[n¡ÐÚB?¢àìŽmÏÂ8Žga<‹ÂYpŸüüDâƒ.#�|ÍãdÇ£ƒúšF.³.%Š!v�×÷m�5±î!s¬Í‡›¶º$º3ä	è�©dÆœ¶56Ú6È¥„”mî÷SWÌÆKÕäÇ\~8šøã7Š¦¾ügÅu+‡t{sßWcÁŸKn,êÅ#G�Nö0k±(-<qàM¹X‹ÌfB’
@@ -1003,112 +991,112 @@ xref
 0000015201 00000 n 
 0000015307 00000 n 
 0000015411 00000 n 
-0000014044 00000 n 
-0000014148 00000 n 
-0000014252 00000 n 
-0000014357 00000 n 
-0000014462 00000 n 
-0000014568 00000 n 
-0000014674 00000 n 
-0000014780 00000 n 
-0000014886 00000 n 
-0000014992 00000 n 
-0000015096 00000 n 
-0000015201 00000 n 
-0000015307 00000 n 
-0000015411 00000 n 
-0000015516 00000 n 
-0000015622 00000 n 
-0000015726 00000 n 
-0000015831 00000 n 
-0000015937 00000 n 
-0000016147 00000 n 
-0000016181 00000 n 
-0000016215 00000 n 
-0000016916 00000 n 
-0000016965 00000 n 
-0000017014 00000 n 
-0000017063 00000 n 
-0000017112 00000 n 
-0000017161 00000 n 
-0000017210 00000 n 
-0000017259 00000 n 
-0000017308 00000 n 
-0000017357 00000 n 
-0000017406 00000 n 
-0000017455 00000 n 
-0000017504 00000 n 
-0000017553 00000 n 
-0000017602 00000 n 
-0000017651 00000 n 
-0000017700 00000 n 
-0000017749 00000 n 
-0000017798 00000 n 
-0000017847 00000 n 
-0000017896 00000 n 
-0000017945 00000 n 
-0000017994 00000 n 
-0000018043 00000 n 
-0000018092 00000 n 
-0000018141 00000 n 
-0000018190 00000 n 
-0000018239 00000 n 
-0000018288 00000 n 
-0000018337 00000 n 
-0000018386 00000 n 
-0000018435 00000 n 
-0000018484 00000 n 
-0000018533 00000 n 
-0000018582 00000 n 
-0000018631 00000 n 
-0000018680 00000 n 
-0000018729 00000 n 
-0000018778 00000 n 
-0000018827 00000 n 
-0000018876 00000 n 
-0000018925 00000 n 
-0000018974 00000 n 
-0000019023 00000 n 
-0000019072 00000 n 
-0000019121 00000 n 
-0000019170 00000 n 
-0000019219 00000 n 
-0000019268 00000 n 
-0000019317 00000 n 
-0000019366 00000 n 
-0000019415 00000 n 
-0000019464 00000 n 
-0000019773 00000 n 
-0000019925 00000 n 
-0000026317 00000 n 
-0000026339 00000 n 
-0000026452 00000 n 
-0000026554 00000 n 
-0000026574 00000 n 
-0000026705 00000 n 
-0000027474 00000 n 
-0000027495 00000 n 
-0000027636 00000 n 
-0000028014 00000 n 
-0000028035 00000 n 
-0000028175 00000 n 
-0000029089 00000 n 
-0000029110 00000 n 
-0000029250 00000 n 
-0000030693 00000 n 
-0000030715 00000 n 
-0000030855 00000 n 
-0000031753 00000 n 
-0000031774 00000 n 
-0000031887 00000 n 
-0000032089 00000 n 
-0000032110 00000 n 
-0000032264 00000 n 
-0000033166 00000 n 
-0000033187 00000 n 
-0000033341 00000 n 
+0000015516 00000 n 
+0000015622 00000 n 
+0000015726 00000 n 
+0000015831 00000 n 
+0000015937 00000 n 
+0000016147 00000 n 
+0000016181 00000 n 
+0000016215 00000 n 
+0000016916 00000 n 
+0000016965 00000 n 
+0000017014 00000 n 
+0000017063 00000 n 
+0000017112 00000 n 
+0000017161 00000 n 
+0000017210 00000 n 
+0000017259 00000 n 
+0000017308 00000 n 
+0000017357 00000 n 
+0000017406 00000 n 
+0000017455 00000 n 
+0000017504 00000 n 
+0000017553 00000 n 
+0000017602 00000 n 
+0000017651 00000 n 
+0000017700 00000 n 
+0000017749 00000 n 
+0000017798 00000 n 
+0000017847 00000 n 
+0000017896 00000 n 
+0000017945 00000 n 
+0000017994 00000 n 
+0000018043 00000 n 
+0000018092 00000 n 
+0000018141 00000 n 
+0000018190 00000 n 
+0000018239 00000 n 
+0000018288 00000 n 
+0000018337 00000 n 
+0000018386 00000 n 
+0000018435 00000 n 
+0000018484 00000 n 
+0000018533 00000 n 
+0000018582 00000 n 
+0000018631 00000 n 
+0000018680 00000 n 
+0000018729 00000 n 
+0000018778 00000 n 
+0000018827 00000 n 
+0000018876 00000 n 
+0000018925 00000 n 
+0000018974 00000 n 
+0000019023 00000 n 
+0000019072 00000 n 
+0000019121 00000 n 
+0000019170 00000 n 
+0000019219 00000 n 
+0000019268 00000 n 
+0000019317 00000 n 
+0000019366 00000 n 
+0000019415 00000 n 
+0000019464 00000 n 
+0000019773 00000 n 
+0000019925 00000 n 
+0000026317 00000 n 
+0000026339 00000 n 
+0000026452 00000 n 
+0000026554 00000 n 
+0000026574 00000 n 
+0000026705 00000 n 
+0000027474 00000 n 
+0000027495 00000 n 
+0000027636 00000 n 
+0000028014 00000 n 
+0000028035 00000 n 
+0000028175 00000 n 
+0000029089 00000 n 
+0000029110 00000 n 
+0000029250 00000 n 
+0000030693 00000 n 
+0000030715 00000 n 
+0000030855 00000 n 
+0000031753 00000 n 
+0000031774 00000 n 
+0000031887 00000 n 
+0000032089 00000 n 
+0000032110 00000 n 
+0000032264 00000 n 
+0000033166 00000 n 
+0000033187 00000 n 
+0000033341 00000 n 
+0000034270 00000 n 
+0000034291 00000 n 
+0000034440 00000 n 
+0000035151 00000 n 
+0000035172 00000 n 
+0000035285 00000 n 
+0000035488 00000 n 
+0000035509 00000 n 
+0000035667 00000 n 
+0000036420 00000 n 
+0000036441 00000 n 
+0000036599 00000 n 
+0000037622 00000 n 
+0000037643 00000 n 
 0000037801 00000 n 
 0000038872 00000 n 
 0000038894 00000 n 
-0000035151 00000 n 
+0000039043 00000 n 
 0000039636 00000 n 
@@ -315,8 +315,8 @@ CUPS:
 	<DT>/dev/filename
 	<DD>Sends all output to the specified file.

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

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

-	<DT>smb://[username:password@]hostname/queue
-	<DD>Sends all output to the specified SMB (Windows) printer queue
-	using the SAMBA software.
-
 	<DT>socket://hostname[:port]
 	<DD>Sends all output to the specified printer using the
 	AppSocket protocol. The <I>port</I> parameter defaults to 9100.
@@ -637,47 +633,7 @@ Allow from nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm
 </PRE></UL>

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

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

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

 <P>The <CODE>Deny</CODE> directive must appear inside a
 <CODE>Location</CODE> directive.
@@ -57,8 +57,8 @@ install:
 	$(CP) $(TARGETS) $(SERVERROOT)/filter
 	-$(MKDIR) $(LIBDIR)
 	$(CP) $(LIBCUPSIMAGE) $(LIBDIR)
-	-if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \
-		$(LN) $(LIBCUPSIMAGE) `basename $(LIBCUPSIMAGE) .1`; \
+	if test $(LIBCUPSIMAGE) != "libcupsimage.a"; then \
+		$(LN) $(LIBCUPSIMAGE) `basename $(LIBCUPSIMAGE) .1` \
 	fi

 #
@@ -76,8 +76,8 @@ $(HPGLOBJS):	hpgltops.h

 libcupsimage.so.1 libcupsimage.sl.1:	$(IMAGEOBJS) ../Makedefs
 	echo Linking $@...
-	$(DSO) $@ $(IMAGEOBJS) $(DSOLIBS) -lm
-	-$(LN) $@ `basename $@ .1`
+	$(DSO) $@ $(IMAGEOBJS) $(DSOLIBS)
+	$(LN) $@ `basename $@ .1`

 #
 # libcupsimage.a
@@ -236,11 +236,9 @@ SetCommonOptions(int           num_options,	/* I - Number of options */
  if ((val = cupsGetOption("sides", num_options, options)) != NULL &&
      strncmp(val, "two-", 4) == 0)
    Duplex = 1;
-  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"))
+
+  if ((val = cupsGetOption("Duplex", num_options, options)) != NULL &&
+      strcmp(val, "DuplexNoTumble") == 0)
    Duplex = 1;

  return (ppd);
@@ -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 "/data/HPGLprolog", "r")) == NULL)
+  if ((prolog = fopen(CUPS_DATADIR "/HPGLprolog", "r")) == NULL)
  {
-    perror("ERROR: Unable to open HPGL prolog \"" CUPS_DATADIR "/data/HPGLprolog\" for reading");
+    perror("ERROR: Unable to open HPGL prolog \"" CUPS_DATADIR "/HPGLprolog\" for reading");
    exit(1);
  }

@@ -0,0 +1,130 @@
+# Microsoft Developer Studio Project File - Name="hpgltops" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=hpgltops - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "hpgltops.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "hpgltops.mak" CFG="hpgltops - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "hpgltops - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "hpgltops - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF  "$(CFG)" == "hpgltops - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I ".." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 ../cups/cups.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /out:"hpgltops.exe"
+
+!ELSEIF  "$(CFG)" == "hpgltops - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "hpgltops___Win32_Debug"
+# PROP BASE Intermediate_Dir "hpgltops___Win32_Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I ".." /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ  /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 ../cups/cupsd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /debug /machine:I386 /out:"hpgltopsd.exe" /pdbtype:sept
+
+!ENDIF 
+
+# Begin Target
+
+# Name "hpgltops - Win32 Release"
+# Name "hpgltops - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=".\hpgl-attr.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hpgl-char.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hpgl-config.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hpgl-input.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hpgl-main.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hpgl-polygon.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hpgl-prolog.c"
+# End Source File
+# Begin Source File
+
+SOURCE=".\hpgl-vector.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\hpgltops.h
+# End Source File
+# End Group
+# End Target
+# End Project
@@ -284,11 +284,11 @@ ImageSetMaxTiles(image_t *img,		/* I - Image to set */
 */

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


  ImageHaveProfile  = 1;
@@ -298,8 +298,10 @@ ImageSetProfile(float d,		/* 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 * d * pow((float)k / 255.0, g) + 0.5;
+    ImageDensity[k] = 255.0 * density * pow((float)k / 255.0, g) + 0.5;
 }


@@ -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 d, float g, float matrix[3][3]);
+extern void	ImageSetProfile(float density, 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);
@@ -402,7 +402,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->gamma, profile->matrix);
+      ImageSetProfile(profile->density, profile->matrix);
    }
  }

@@ -2245,7 +2245,7 @@ format_KCMYcm(cups_page_header_t *header,/* I - Page header */
 	        if (pk)
 		  *ptr++ ^= 32;	/* Black */
 		else if (pc && pm)
-		  *ptr++ ^= 17;	/* Blue (cyan + light magenta) */
+		  *ptr++ ^= 3;	/* Blue (light cyan + light magenta) */
 		else if (pc && py)
 		  *ptr++ ^= 6;	/* Green (light cyan + yellow) */
 		else if (pm && py)
@@ -2311,7 +2311,7 @@ format_KCMYcm(cups_page_header_t *header,/* I - Page header */
 		  *kptr ^= bitmask;	/* Black */
 		else if (pc && pm)
 		{
-		  *cptr ^= bitmask;	/* Blue (cyan + light magenta) */
+		  *lcptr ^= bitmask;	/* Blue (light cyan + light magenta) */
 		  *lmptr ^= bitmask;
 		}
 		else if (pc && py)
@@ -2402,6 +2402,7 @@ 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;

@@ -2455,6 +2456,7 @@ 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;

@@ -97,7 +97,6 @@ main(int  argc,			/* I - Number of command-line arguments */
  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)
@@ -277,7 +276,7 @@ main(int  argc,			/* I - Number of command-line arguments */
      if (strncmp(line, "%%BeginDocument:", 16) == 0 ||
          strncmp(line, "%%BeginDocument ", 16) == 0)	/* Adobe Acrobat BUG */
        level ++;
-      else if (strcmp(line, "%%EndDocument") == 0 && level > 0)
+      else if (strcmp(line, "%%EndDocument") == 0)
        level --;
      else if (strncmp(line, "%%Page:", 7) == 0 && level == 0)
        break;
@@ -304,12 +303,12 @@ main(int  argc,			/* I - Number of command-line arguments */
    * Then read all of the pages, filtering as needed...
    */

-    for (page = 1;;)
+    for (;;)
    {
      if (strncmp(line, "%%BeginDocument:", 16) == 0 ||
          strncmp(line, "%%BeginDocument ", 16) == 0)	/* Adobe Acrobat BUG */
        level ++;
-      else if (strcmp(line, "%%EndDocument") == 0 && level > 0)
+      else if (strcmp(line, "%%EndDocument") == 0)
        level --;
      else if (strncmp(line, "%%Page:", 7) == 0 && level == 0)
      {
@@ -321,7 +320,7 @@ main(int  argc,			/* I - Number of command-line arguments */
 	      if (strncmp(line, "%%BeginDocument:", 16) == 0 ||
        	  strncmp(line, "%%BeginDocument ", 16) == 0)	/* Adobe Acrobat BUG */
        	level ++;
-	      else if (strcmp(line, "%%EndDocument") == 0 && level > 0)
+	      else if (strcmp(line, "%%EndDocument") == 0)
        	level --;
 	      else if (strncmp(line, "%%Page:", 7) == 0 && level == 0)
 	        break;
@@ -335,22 +334,16 @@ main(int  argc,			/* I - Number of command-line arguments */
 	  if (slowcollate || sloworder)
 	    Pages[NumPages] = ftell(temp);

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

-              printf("%%%%Page: %d %d\n", page, page);
-	      page ++;
-	      ppdEmit(ppd, stdout, PPD_ORDER_PAGE);
-	    }
-
-	    start_nup(NumPages);
+	    ppdEmit(ppd, stdout, PPD_ORDER_PAGE);
+	    start_nup(NumPages - 1);
 	  }
-
-	  NumPages ++;
 	}
      }
      else if (strncmp(line, "%%BeginBinary:", 14) == 0 ||
@@ -397,26 +390,19 @@ main(int  argc,			/* I - Number of command-line arguments */
    if (slowcollate || sloworder)
    {
      Pages[NumPages] = ftell(temp);
-      page = 1;

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

 	  for (number = 0; number < NumPages; number ++)
 	  {
-	    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);
-	    }
+	    if (ppd == NULL || ppd->num_filters == 0)
+	      fprintf(stderr, "PAGE: %d 1\n", number + 1);

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

+	    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]);
@@ -616,8 +596,7 @@ copy_bytes(FILE   *fp,		/* I - File to read from */
 static void
 end_nup(int number)	/* I - Page number */
 {
-  if (Flip || Orientation || NUp > 1)
-    puts("grestoreall");
+  puts("grestore");

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


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

  if (Flip)
    printf("%.0f 0 translate -1 1 scale\n", PageWidth);
@@ -0,0 +1,107 @@
+# 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,14 +39,13 @@
 * Globals...
 */

-int	WrapLines = 1,		/* Wrap text in lines */
+int	WrapLines = 0,		/* 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 */
-	Copies = 1;		/* Number of copies */
+	PrettyPrint = 0;	/* Do pretty code formatting */
 lchar_t	**Page = NULL;		/* Page characters */
 int	NumPages = 0;		/* Number of pages in document */
 int	CharsPerInch = 10;	/* Number of character columns per inch */
@@ -54,46 +53,28 @@ 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",
-	  "do",
 	  "double",
+	  "do",
 	  "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",
@@ -105,21 +86,12 @@ char	*Keywords[] =		/* List of known keywords... */
 	  "static",
 	  "struct",
 	  "switch",
-	  "template",
-	  "this",
-	  "throw",
-	  "true",
-	  "try",
 	  "typedef",
-	  "typename",
 	  "union",
 	  "unsigned",
-	  "virtual",
 	  "void",
 	  "volatile",
-	  "while",
-	  "xor",
-	  "xor_eq"
+	  "while"
 	};


@@ -196,31 +168,24 @@ TextMain(char *name,		/* I - Name of filter */
  if ((ppd = SetCommonOptions(num_options, options, 1)) != NULL)
    ppdClose(ppd);

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

  if ((val = cupsGetOption("columns", num_options, options)) != NULL)
    PageColumns = atoi(val);

-  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 - 216.0f / LinesPerInch;
-    CharsPerInch = 12;
-    LinesPerInch = 8;
-  }
-
  if ((val = cupsGetOption("cpi", num_options, options)) != NULL)
    CharsPerInch = atoi(val);

  if ((val = cupsGetOption("lpi", num_options, options)) != NULL)
    LinesPerInch = atoi(val);

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

-  WriteProlog(argv[3], argv[2], ppd);
+  WriteProlog(argv[3], argv[2]);

 /*
  * Read text from the specified source and print it...
@@ -64,8 +64,7 @@ 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 */
-		Copies;		/* Number of copies to produce */
+		PrettyPrint;	/* Do pretty code formatting */
 extern lchar_t	**Page;		/* Page characters */
 extern int	NumPages;	/* Number of pages in document */
 extern int	CharsPerInch,	/* Number of character columns per inch */
@@ -81,7 +80,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, ppd_file_t *ppd);
+extern void	WriteProlog(char *title, char *user);


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

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

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

    if (Duplex)
@@ -453,8 +452,8 @@ write_string(int     col,	/* I - Start column */
    y = PageTop;
  }

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

  attr = s->attr;

@@ -507,6 +506,15 @@ 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
  {
@@ -543,10 +551,7 @@ write_string(int     col,	/* I - Start column */
    }

    putchar(')');
-  }

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


@@ -0,0 +1,98 @@
+# 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
@@ -1,5 +1,5 @@
 %
-% "$Id: Fontmap 569 1999-07-30 12:57:12Z mike $"
+% "$Id: Fontmap 309 1999-05-10 21:34:54Z mike $"
 %
 %   Fontmap file for the Common UNIX Printing System (CUPS).
 %
@@ -94,5 +94,5 @@
 /Times				/Times-Roman			;

 %
-% End of "$Id: Fontmap 569 1999-07-30 12:57:12Z mike $".
+% End of "$Id: Fontmap 309 1999-05-10 21:34:54Z mike $".
 %
@@ -34,7 +34,7 @@ include ../Makedefs
 # Object files...
 #

-LIBOBJS	=	gconf.o gdevabuf.o gdevcups.o gdevddrw.o gdevdflt.o \
+OBJS	=	gconf.o gdevabuf.o gdevcups.o gdevddrw.o gdevdflt.o \
 		gdevemap.o gdevm1.o gdevm16.o gdevm2.o gdevm24.o \
 		gdevm32.o gdevm4.o gdevm8.o gdevmem.o gdevmpla.o \
 		gdevmrop.o gdevnfwd.o gdevpipe.o gdevprn.o gp_nofb.o \
@@ -58,7 +58,7 @@ LIBOBJS	=	gconf.o gdevabuf.o gdevcups.o gdevddrw.o gdevdflt.o \
 		idparam.o igc.o igcref.o igcstr.o iinit.o ilocate.o \
 		imain.o iname.o interp.o iparam.o ireclaim.o isave.o \
 		iscan.o iscanbin.o iscannum.o iscantab.o istack.o \
-		iutil.o iutil2.o sbcp.o sbhc.o sbwbs.o \
+		iutil.o iutil2.o pstoraster.o sbcp.o sbhc.o sbwbs.o \
 		scfd.o scfdtab.o scfe.o scfetab.o sdctc.o sdctd.o \
 		sdcte.o seexec.o sfile.o sfilter1.o sfilter2.o shc.o \
 		shcgen.o siscale.o sjpegc.o sjpegd.o sjpege.o \
@@ -77,7 +77,6 @@ LIBOBJS	=	gconf.o gdevabuf.o gdevcups.o gdevddrw.o gdevdflt.o \
 		zpacked.o zpaint.o zpath.o zpath1.o zpcolor.o zrelbit.o \
 		zstack.o zstring.o zsysvm.o ztoken.o ztype.o zupath.o \
 		zusparam.o zvmem.o zvmem2.o
-OBJS	=	$(LIBOBJS) genarch.o pstoraster.o

 #
 # Data files...
@@ -99,7 +98,7 @@ DFILES	=	Fontmap gs_btokn.ps gs_ccfnt.ps gs_cidfn.ps gs_cmap.ps \
 # Targets...
 #

-TARGETS	=	genarch arch.h libgs.a pstoraster
+TARGETS	=	genarch arch.h pstoraster

 #
 # Make everything...
@@ -122,7 +121,6 @@ clean:
 install:	$(TARGETS)
 	-$(MKDIR) $(SERVERROOT)/filter
 	$(CP) pstoraster $(SERVERROOT)/filter
-	-$(LN) pstoraster $(SERVERROOT)/filter/pdftops
 	-$(MKDIR) $(DATADIR)/pstoraster
 	$(CP) $(DFILES) $(DATADIR)/pstoraster

@@ -138,29 +136,16 @@ arch.h:		genarch
 	./genarch arch.h

 #
-# libgs.a - GhostScript interpreter library...
+# pstoraster - PostScript conversion filter.
 #

-libgs.a:	$(LIBOBJS) ../Makedefs
-	echo Archiving $@...
-	$(RM) $@
-	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
-	$(RANLIB) $@
+pstoraster:	$(OBJS) ../Makedefs ../cups/$(LIBCUPS)
+	echo Linking $@...
+	$(CC) $(LDFLAGS) -o pstoraster $(OBJS) $(LIBJPEG) $(LIBZ) $(LIBS) -lm

 gdevcups.o:	../cups/raster.h
+$(OBJS):	arch.h ../config.h ../Makedefs
 gconf.o iconf.o gscdef.o:	gconfig.h
-$(LIBOBJS):	arch.h ../config.h ../Makedefs
-
-
-#
-# pstoraster - PostScript RIP filter.
-#
-
-pstoraster:	pstoraster.o libgs.a ../Makedefs ../cups/$(LIBCUPS)
-	echo Linking $@...
-	$(CC) $(LDFLAGS) -o pstoraster pstoraster.o libgs.a \
-		$(LIBJPEG) $(LIBZ) $(LIBS) -lm
-pstoraster.o:	arch.h ../config.h ../Makedefs

 #
 # End of "$Id$".
@@ -102,7 +102,6 @@ private dev_proc_open_device(cups_open);
 private int cups_print_pages(gx_device_printer *, FILE *, int);
 private int cups_put_params(gx_device *, gs_param_list *);
 private void cups_set_color_info(gx_device *);
-private dev_proc_sync_output(cups_sync_output);

 /*
 * The device descriptors...
@@ -122,7 +121,7 @@ private gx_device_procs	cups_procs =
 {
   cups_open,
   cups_get_matrix,
-   cups_sync_output,
+   gx_default_sync_output,
   gdev_prn_output_page,
   cups_close,
   cups_map_rgb_color,
@@ -938,7 +937,7 @@ cups_map_rgb_color(gx_device      *pdev,	/* I - Device info */
 	  if (ik)
 	    i = 32;
 	  else if (ic && im)
-	    i = 17;
+	    i = 3;
 	  else if (ic && iy)
 	    i = 6;
 	  else if (im && iy)
@@ -1114,14 +1113,7 @@ cups_print_pages(gx_device_printer *pdev,	/* I - Device info */
  */

  srcbytes = gdev_prn_raster(pdev);
-
-#ifdef DEBUG
-  fprintf(stderr, "DEBUG: cupsBitsPerPixel = %d, cupsWidth = %d, cupsBytesPerLine = %d, srcbytes = %d\n",
-          cups->header.cupsBitsPerPixel, cups->header.cupsWidth,
-	  cups->header.cupsBytesPerLine, srcbytes);
-#endif /* DEBUG */
-
-  src = (unsigned char *)gs_malloc(srcbytes, 1, "cups_print_pages");
+  src       = (unsigned char *)gs_malloc(srcbytes, 1, "cups_print_pages");

  if (src == NULL)	/* can't allocate input buffer */
    return_error(gs_error_VMerror);
@@ -1499,8 +1491,8 @@ cups_set_color_info(gx_device *pdev)	/* I - Device info */
        if (cups->header.cupsBitsPerColor == 1)
 	{
 	  cups->header.cupsBitsPerPixel   = 8;
-	  cups->color_info.depth          = 4;
-	  cups->color_info.num_components = 4;
+	  cups->color_info.depth          = 8;
+	  cups->color_info.num_components = 6;
 	  break;
 	}

@@ -1610,7 +1602,7 @@ cups_set_color_info(gx_device *pdev)	/* I - Device info */
          }

      d = profile->density;
-      g = profile->gamma;
+      g = 1.0 / profile->density;

      for (k = 0; k <= gx_max_color_value; k ++)
      {
@@ -1627,19 +1619,6 @@ cups_set_color_info(gx_device *pdev)	/* I - Device info */
 }


-/*
- * 'cups_sync_output()' - Keep the user informed of our status...
- */
-
-private int				/* O - Error status */
-cups_sync_output(gx_device *pdev)	/* I - Device info */
-{
-  fprintf(stderr, "INFO: Processing page %d...\n", cups->page);
-
-  return (0);
-}
-
-
 /*
 * 'cups_print_chunked()' - Print a page of chunked pixels.
 */
@@ -61,8 +61,8 @@ const char gp_current_directory_name[] = ".";
 FILE *
 gp_open_scratch_file(const char *prefix, char *fname, const char *mode)
 {	char *temp;
-	if ( (temp = getenv("TMPDIR")) == NULL )
-		strcpy(fname, "/var/tmp/");
+	if ( (temp = getenv("TEMP")) == NULL )
+		strcpy(fname, "/tmp/");
 	else
 	{	strcpy(fname, temp);
 		if ( strlen(fname) != 0 && fname[strlen(fname) - 1] != '/' )
@@ -231,9 +231,8 @@ pdfdict begin
   [ (%%Pages: (atend)) #dsc
   [ (%%EndComments) #dsc
   [ (%%BeginProlog) #dsc
-%%%% MRS - Sorry, because we have a two-line copyright now this doesn't work!
-%   [ (% This copyright applies to everything between here and the %%EndProlog:) #dsc
-%   [ (% ) copyright #dsc
+   [ (% This copyright applies to everything between here and the %%EndProlog:) #dsc
+   [ (% ) copyright #dsc
   (gs_pdf.ps) #dscfile
   PSLevel1 { (gs_l2img.ps) #dscfile } if
   [ (%%EndProlog) #dsc
@@ -31,8 +31,6 @@
 *
 * Contents:
 *
- *   main()          - Main entry for pstoraster.
- *   define_string() - Define a string value...
 */

 /*
@@ -40,7 +38,6 @@
 */

 #include <cups/string.h>
-#include <stdlib.h>
 #include "ghost.h"
 #include "imain.h"
 #include "iminst.h"
@@ -70,15 +67,8 @@ main(int  argc,		/* I - Number of command-line arguments */
  int			code;		/* Run status code */
  int			exit_code;	/* Exit code */
  ref			error_object;	/* Error object */
-  char			*content_type;	/* CONTENT_TYPE environment variable */


- /*
-  * Force the locale to "C" to avoid bugs...
-  */
-
-  putenv("LANG=C");
-
 /*
  * Create a PostScript interpreter instance...
  */
@@ -116,14 +106,7 @@ main(int  argc,		/* I - Number of command-line arguments */
  gs_main_init1(minst);
  initial_enter_name("QUIET", &vtrue);
  initial_enter_name("NOPAUSE", &vtrue);
-  if ((content_type = getenv("CONTENT_TYPE")) != NULL &&
-      strcmp(content_type, "application/pdf") == 0)
-  {
-    define_string("PSFile", "%stdout");
-    initial_enter_name("NODISPLAY", &vtrue);
-  }
-  else
-    define_string("OutputFile", "-");
+  define_string("OutputFile", "-");
  define_string("FONTPATH", CUPS_DATADIR "/fonts");

 /*
@@ -1239,10 +1239,10 @@ decode_basic_auth(client_t *con)	/* I - Client to decode to */

  httpDecode64(value, s);

-  sscanf(value, "%[^:]:%[^\n]", con->username, con->password);
+  LogMessage(LOG_DEBUG, "decode_basic_auth() %d Authorization=\"%s\"",
+             con->http.fd, value);

-  LogMessage(LOG_DEBUG, "decode_basic_auth() %d username=\"%s\"",
-             con->http.fd, con->username);
+  sscanf(value, "%[^:]:%[^\n]", con->username, con->password);
 }


@@ -90,7 +90,7 @@ StartBrowsing(void)
  addr.sin_family      = AF_INET;
  addr.sin_port        = htons(BrowsePort);

-  if (bind(BrowseSocket, (struct sockaddr *)&addr, sizeof(addr)))
+  if (bind(BrowseSocket, &addr, sizeof(addr)))
  {
    LogMessage(LOG_ERROR, "StartBrowsing: Unable to bind broadcast socket - %s.",
               strerror(errno));
@@ -177,8 +177,7 @@ UpdateBrowseList(void)


  len = sizeof(addr);
-  if ((bytes = recvfrom(BrowseSocket, packet, sizeof(packet), 0, 
-                        (struct sockaddr *)&addr, &len)) <= 0)
+  if ((bytes = recvfrom(BrowseSocket, packet, sizeof(packet), 0, &addr, &len)) <= 0)
  {
    LogMessage(LOG_ERROR, "UpdateBrowseList: recv failed - %s.",
               strerror(errno));
@@ -352,8 +351,7 @@ UpdateBrowseList(void)
  p->browse_time = time(NULL);

 /*
-  * See if we have a default printer...  If not, make the first printer the
-  * default.
+  * See if we have a default printer...
  */

  if (DefaultPrinter == NULL && Printers != NULL)
@@ -530,8 +528,8 @@ SendBrowseList(void)
      */

      for (i = 0; i < NumBrowsers; i ++)
-	if (sendto(BrowseSocket, packet, bytes, 0,
-	           (struct sockaddr *)Browsers + i, sizeof(Browsers[0])) <= 0)
+	if (sendto(BrowseSocket, packet, bytes, 0, Browsers + i,
+	           sizeof(Browsers[0])) <= 0)
 	  LogMessage(LOG_ERROR, "SendBrowseList: sendto failed for browser %d - %s.",
 	             i + 1, strerror(errno));
    }
@@ -422,42 +422,7 @@ add_class(client_t        *con,		/* I - Client connection */
  */

  if ((pclass = FindClass(resource + 9)) == NULL)
-  {
-   /*
-    * Class doesn't exist; see if we have a printer of the same name...
-    */
-
-    if (FindPrinter(resource + 9) != NULL)
-    {
-     /*
-      * Yes, return an error...
-      */
-
-      send_ipp_error(con, IPP_NOT_POSSIBLE);
-      return;
-    }
-    else
-    {
-     /*
-      * No, add the pclass...
-      */
-
-      pclass = AddClass(resource + 9);
-    }
-  }
-  else if (pclass->type & CUPS_PRINTER_REMOTE)
-  {
-   /*
-    * We found a remote class; rename it and then add the pclass.
-    */
-
-    strcat(pclass->name, "@");
-    strcat(pclass->name, pclass->hostname);
-    SetPrinterAttrs(pclass);
-    SortPrinters();
-
    pclass = AddClass(resource + 9);
-  }

 /*
  * Look for attributes and copy them over as needed...
@@ -469,38 +434,6 @@ add_class(client_t        *con,		/* I - Client connection */
    strcpy(pclass->info, attr->values[0].string.text);
  if ((attr = ippFindAttribute(con->request, "printer-more-info", IPP_TAG_URI)) != NULL)
    strcpy(pclass->more_info, attr->values[0].string.text);
-  if ((attr = ippFindAttribute(con->request, "printer-is-accepting-jobs", IPP_TAG_BOOLEAN)) != NULL)
-  {
-    LogMessage(LOG_INFO, "Setting %s printer-is-accepting-jobs to %d (was %d.)",
-               pclass->name, attr->values[0].boolean, pclass->accepting);
-
-    pclass->accepting = attr->values[0].boolean;
-  }
-  if ((attr = ippFindAttribute(con->request, "printer-state", IPP_TAG_ENUM)) != NULL)
-  {
-    LogMessage(LOG_INFO, "Setting %s printer-state to %d (was %d.)", pclass->name,
-               attr->values[0].integer, pclass->state);
-
-    if (pclass->state == IPP_PRINTER_STOPPED &&
-        attr->values[0].integer != IPP_PRINTER_STOPPED)
-      pclass->state = IPP_PRINTER_IDLE;
-    else if (pclass->state != IPP_PRINTER_STOPPED &&
-             attr->values[0].integer == IPP_PRINTER_STOPPED)
-    {
-      if (pclass->state == IPP_PRINTER_PROCESSING)
-        StopJob(((job_t *)pclass->job)->id);
-
-      pclass->state = IPP_PRINTER_STOPPED;
-    }
-
-    pclass->browse_time = 0;
-  }
-  if ((attr = ippFindAttribute(con->request, "printer-state-message", IPP_TAG_TEXT)) != NULL)
-  {
-    strncpy(pclass->state_message, attr->values[0].string.text,
-            sizeof(pclass->state_message) - 1);
-    pclass->state_message[sizeof(pclass->state_message) - 1] = '\0';
-  }

  if ((attr = ippFindAttribute(con->request, "member-uris", IPP_TAG_URI)) != NULL)
  {
@@ -550,6 +483,20 @@ add_class(client_t        *con,		/* I - Client connection */
    }
  }

+ /*
+  * See if we have all required attributes...
+  */
+
+  if (pclass->num_printers == 0)
+  {
+   /*
+    * Nope, return an error...
+    */
+
+    send_ipp_error(con, IPP_ATTRIBUTES);
+    return;
+  }
+
 /*
  * Update the printer class attributes and return...
  */
@@ -621,42 +568,7 @@ add_printer(client_t        *con,	/* I - Client connection */
  */

  if ((printer = FindPrinter(resource + 10)) == NULL)
-  {
-   /*
-    * Printer doesn't exist; see if we have a class of the same name...
-    */
-
-    if (FindClass(resource + 10) != NULL)
-    {
-     /*
-      * Yes, return an error...
-      */
-
-      send_ipp_error(con, IPP_NOT_POSSIBLE);
-      return;
-    }
-    else
-    {
-     /*
-      * No, add the printer...
-      */
-
-      printer = AddPrinter(resource + 10);
-    }
-  }
-  else if (printer->type & CUPS_PRINTER_REMOTE)
-  {
-   /*
-    * We found a remote printer; rename it and then add the printer.
-    */
-
-    strcat(printer->name, "@");
-    strcat(printer->name, printer->hostname);
-    SetPrinterAttrs(printer);
-    SortPrinters();
-
    printer = AddPrinter(resource + 10);
-  }

 /*
  * Look for attributes and copy them over as needed...
@@ -779,13 +691,6 @@ add_printer(client_t        *con,	/* I - Client connection */
    }
  }

- /*
-  * Make this printer the default if there is none...
-  */
-
-  if (DefaultPrinter == NULL)
-    DefaultPrinter = printer;
-
 /*
  * Update the printer attributes and return...
  */
@@ -1782,16 +1687,13 @@ print_job(client_t        *con,		/* I - Client connection */
    DEBUG_puts("print_job: auto-typing request using magic rules.");
    filetype = mimeFileType(MimeDatabase, con->filename);

-    if (filetype != NULL)
-    {
-     /*
-      * Replace the document-format attribute value with the auto-typed one.
-      */
+   /*
+    * Replace the document-format attribute value with the auto-typed one.
+    */

-      free(format->values[0].string.text);
-      sprintf(mimetype, "%s/%s", filetype->super, filetype->type);
-      format->values[0].string.text = strdup(mimetype);
-    }
+    free(format->values[0].string.text);
+    sprintf(mimetype, "%s/%s", filetype->super, filetype->type);
+    format->values[0].string.text = strdup(mimetype);
  }
  else
    filetype = mimeType(MimeDatabase, super, type);
@@ -301,10 +301,9 @@ StartJob(int       id,		/* I - Job ID */
 				/* Job title string */
 		copies[255],	/* # copies string */
 		options[16384],	/* Full list of options */
-		*envp[13],	/* Environment variables */
+		*envp[12],	/* Environment variables */
 		language[255],	/* LANG environment variable */
 		charset[255],	/* CHARSET environment variable */
-		content_type[255],/* CONTENT_TYPE environment variable */
 		ppd[1024],	/* PPD environment variable */
 		root[1024],	/* SERVER_ROOT environment variable */
 		cache[255],	/* RIP_MAX_CACHE environment variable */
@@ -533,8 +532,6 @@ StartJob(int       id,		/* I - Job ID */
  sprintf(root, "SERVER_ROOT=%s", ServerRoot);
  sprintf(cache, "RIP_MAX_CACHE=%s", RIPCache);
  sprintf(tmpdir, "TMPDIR=%s", TempDir);
-  sprintf(content_type, "CONTENT_TYPE=%s/%s", current->filetype->super,
-          current->filetype->type);

  envp[0]  = "PATH=/bin:/usr/bin";
  envp[1]  = "SOFTWARE=CUPS/1.0";
@@ -547,8 +544,7 @@ StartJob(int       id,		/* I - Job ID */
  envp[8]  = root;
  envp[9]  = cache;
  envp[10] = tmpdir;
-  envp[11] = content_type;
-  envp[12] = NULL;
+  envp[11] = NULL;

  DEBUG_puts(envp[0]);
  DEBUG_puts(envp[1]);
@@ -561,7 +557,6 @@ StartJob(int       id,		/* I - Job ID */
  DEBUG_puts(envp[8]);
  DEBUG_puts(envp[9]);
  DEBUG_puts(envp[10]);
-  DEBUG_puts(envp[11]);

 /*
  * Now create processes for all of the filters...
@@ -571,16 +566,12 @@ StartJob(int       id,		/* I - Job ID */
  {
    LogMessage(LOG_ERROR, "StartJob: unable to create status pipes - %s.",
 	       strerror(errno));
-    StopPrinter(printer);
-    sprintf(printer->state_message, "Unable to create status pipes - %s.",
-            strerror(errno));
    return;
  }

  DEBUG_printf(("statusfds = %d, %d\n", statusfds[0], statusfds[1]));

-  current->pipe   = statusfds[0];
-  current->status = 0;
+  current->pipe = statusfds[0];
  memset(current->procs, 0, sizeof(current->procs));

  if (num_filters > 0 && strcmp(filters[num_filters - 1].filter, "-") == 0)
@@ -629,11 +620,7 @@ StartJob(int       id,		/* I - Job ID */

    if (pid == 0)
    {
-      LogMessage(LOG_ERROR, "Unable to start filter \"%s\" - %s.",
-                 filters[i].filter, strerror(errno));
      StopPrinter(current->printer);
-      sprintf(printer->state_message, "Unable to start filter \"%s\" - %s.",
-              filters[i].filter, strerror(errno));
      return;
    }
    else
@@ -677,11 +664,7 @@ StartJob(int       id,		/* I - Job ID */

    if (pid == 0)
    {
-      LogMessage(LOG_ERROR, "Unable to start backend \"%s\" - %s.",
-                 method, strerror(errno));
      StopPrinter(current->printer);
-      sprintf(printer->state_message, "Unable to start backend \"%s\" - %s.",
-              method, strerror(errno));
      return;
    }
    else
@@ -848,7 +831,7 @@ UpdateJob(job_t *job)		/* I - Job to check */
 	if (loglevel != LOG_INFO)
 	  LogMessage(loglevel, "%s", message);

-	if ((loglevel >= LOG_INFO && !job->state) ||
+	if ((loglevel <= LOG_INFO && !job->state) ||
 	    loglevel == LOG_ERROR)
          strncpy(job->printer->state_message, message,
                  sizeof(job->printer->state_message) - 1);
@@ -196,14 +196,7 @@ main(int  argc,			/* I - Number of command-line arguments */
        response = cupsDoRequest(http, request, "/jobs/");

      if (response != NULL)
-      {
-        if (response->request.status.status_code == IPP_NOT_FOUND)
-          fputs("cancel: Job or printer not found!\n", stderr);
-        else if (response->request.status.status_code > IPP_OK_CONFLICT)
-          fputs("cancel: Unable to cancel job(s)!\n", stderr);
-
        ippDelete(response);
-      }
      else
      {
        fputs("cancel: Unable to cancel job(s)!\n", stderr);
@@ -49,12 +49,12 @@
 * Local functions...
 */

-static void	show_accepting(http_t *, const char *);
-static void	show_classes(http_t *, const char *);
+static void	show_accepting(http_t *, char *);
+static void	show_classes(http_t *, char *);
 static void	show_default(http_t *);
-static void	show_devices(http_t *, const char *);
-static void	show_jobs(http_t *, const char *, const char *);
-static void	show_printers(http_t *, const char *);
+static void	show_devices(http_t *, char *);
+static void	show_jobs(http_t *, char *, char *);
+static void	show_printers(http_t *, char *);
 static void	show_scheduler(http_t *);


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

  if (argc == 1)
-    show_jobs(http, NULL, cupsUser());
+    show_jobs(http, NULL, cuserid(NULL));

  return (0);
 }
@@ -213,17 +213,17 @@ main(int  argc,		/* I - Number of command-line arguments */
 */

 static void
-show_accepting(http_t     *http,	/* I - HTTP connection to server */
-               const char *dests)	/* I - Destinations */
+show_accepting(http_t *http,	/* I - HTTP connection to server */
+               char   *dests)	/* I - Destinations */
 {
  ipp_t		*request,	/* IPP Request */
 		*response;	/* IPP Response */
  ipp_attribute_t *attr;	/* Current attribute */
  cups_lang_t	*language;	/* Default language */
-  const char	*printer,	/* Printer name */
+  char		*printer,	/* Printer name */
 		*message;	/* Printer device URI */
  int		accepting;	/* Accepting requests? */
-  const char	*dptr,		/* Pointer into destination list */
+  char		*dptr,		/* Pointer into destination list */
 		*ptr;		/* Pointer into printer name */
  int		match;		/* Non-zero if this job matches */

@@ -391,17 +391,17 @@ show_accepting(http_t     *http,	/* I - HTTP connection to server */
 */

 static void
-show_classes(http_t     *http,	/* I - HTTP connection to server */
-             const char *dests)	/* I - Destinations */
+show_classes(http_t *http,	/* I - HTTP connection to server */
+             char   *dests)	/* I - Destinations */
 {
  int		i;		/* Looping var */
  ipp_t		*request,	/* IPP Request */
 		*response;	/* IPP Response */
  ipp_attribute_t *attr;	/* Current attribute */
  cups_lang_t	*language;	/* Default language */
-  const char	*printer;	/* Printer class name */
+  char		*printer;	/* Printer class name */
  ipp_attribute_t *members;	/* Printer members */
-  const char	*dptr,		/* Pointer into destination list */
+  char		*dptr,		/* Pointer into destination list */
 		*ptr;		/* Pointer into printer name */
  int		match;		/* Non-zero if this job matches */

@@ -619,16 +619,16 @@ show_default(http_t *http)	/* I - HTTP connection to server */
 */

 static void
-show_devices(http_t     *http,	/* I - HTTP connection to server */
-             const char *dests)	/* I - Destinations */
+show_devices(http_t *http,	/* I - HTTP connection to server */
+             char   *dests)	/* I - Destinations */
 {
  ipp_t		*request,	/* IPP Request */
 		*response;	/* IPP Response */
  ipp_attribute_t *attr;	/* Current attribute */
  cups_lang_t	*language;	/* Default language */
-  const char	*printer,	/* Printer name */
-		*device,	/* Printer device URI */
-		*dptr,		/* Pointer into destination list */
+  char		*printer,	/* Printer name */
+		*device;	/* Printer device URI */
+  char		*dptr,		/* Pointer into destination list */
 		*ptr;		/* Pointer into printer name */
  int		match;		/* Non-zero if this job matches */

@@ -790,19 +790,19 @@ show_devices(http_t     *http,	/* I - HTTP connection to server */
 */

 static void
-show_jobs(http_t     *http,	/* I - HTTP connection to server */
-          const char *dests,	/* I - Destinations */
-          const char *users)	/* I - Users */
+show_jobs(http_t *http,		/* I - HTTP connection to server */
+          char   *dests,	/* I - Destinations */
+          char   *users)	/* I - Users */
 {
  ipp_t		*request,	/* IPP Request */
 		*response;	/* IPP Response */
  ipp_attribute_t *attr;	/* Current attribute */
  cups_lang_t	*language;	/* Default language */
-  const char	*dest,		/* Pointer into job-printer-uri */
+  char		*dest,		/* Pointer into job-printer-uri */
 		*username;	/* Pointer to job-originating-user-name */
  int		jobid,		/* job-id */
 		size;		/* job-k-octets */
-  const char	*dptr,		/* Pointer into destination list */
+  char		*dptr,		/* Pointer into destination list */
 		*ptr;		/* Pointer into printer name */
  int		match;		/* Non-zero if this job matches */

@@ -1014,19 +1014,19 @@ show_jobs(http_t     *http,	/* I - HTTP connection to server */
 */

 static void
-show_printers(http_t     *http,	/* I - HTTP connection to server */
-              const char *dests)/* I - Destinations */
+show_printers(http_t *http,	/* I - HTTP connection to server */
+              char   *dests)	/* I - Destinations */
 {
  ipp_t		*request,	/* IPP Request */
 		*response,	/* IPP Response */
 		*jobs;		/* IPP Get Jobs response */
  ipp_attribute_t *attr;	/* Current attribute */
  cups_lang_t	*language;	/* Default language */
-  const char	*printer,	/* Printer name */
+  char		*printer,	/* Printer name */
 		*message;	/* Printer state message */
  ipp_pstate_t	pstate;		/* Printer state */
  int		jobid;		/* Job ID of current job */
-  const char	*dptr,		/* Pointer into destination list */
+  char		*dptr,		/* Pointer into destination list */
 		*ptr;		/* Pointer into printer name */
  int		match;		/* Non-zero if this job matches */
  char		printer_uri[HTTP_MAX_URI];
@@ -1208,7 +1208,7 @@ show_printers(http_t     *http,	/* I - HTTP connection to server */
                       "attributes-natural-language", NULL,
 		       language->language);

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