diff --git a/COPYING b/COPYING
deleted file mode 100644
index f288702..0000000
--- a/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. 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
-them 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 prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. 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.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey 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;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If 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 convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU 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 that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- 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.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-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.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-
- Copyright (C)
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- Copyright (C)
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-.
diff --git a/NEWS b/NEWS
index c2f0156..a7d6325 100644
--- a/NEWS
+++ b/NEWS
@@ -39,13 +39,6 @@ the mouse as well as the keyboard.
the middle, and your fanned hand, with the legal cards you may play
ringed. Click a card to play it. Set ~cg-trick-svg-cards~ to nil
for the plain-text board.
- - Full SVG board for the rummy games (Gin Rummy, Rummy, Rummy 500):
- the stock and discard, the melds already down on the table, and your
- fanned hand with cursor, marks, and lay-off hints; click a card to
- select it. Honours ~cg-rummy-svg-cards~.
- - The same board now covers Hand & Foot (each team's books, and your
- hand or foot) and the fishing games Scopa and Casino (the loose
- table cards and the deck).
** Rummy-family rules completed
- Rummy 500: take a card from anywhere in the discard pile (key ~T~) --
diff --git a/cg-bid-ui.el b/cg-bid-ui.el
index 6803f80..ba7e578 100644
--- a/cg-bid-ui.el
+++ b/cg-bid-ui.el
@@ -651,7 +651,6 @@ progress must be played out (unlike the solitaire games)."
(define-key map [mouse-5] #'cg-bid-wheel)
(define-key map "v" #'cg-bid-toggle-svg-ui)
(define-key map [mouse-1] #'cg-bid-mouse)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-bid-mode' (Emacs style; see `cg-keys').")
diff --git a/cg-bridge.el b/cg-bridge.el
index 2d6feb8..14001ed 100644
--- a/cg-bridge.el
+++ b/cg-bridge.el
@@ -748,7 +748,6 @@ vulnerability, and TRICKS the declarer side's trick count. Keys:
(define-key map "n" #'cg-bridge-new)
(define-key map "g" #'cg-bridge-redraw)
(define-key map "?" #'cg-bridge-help)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-bridge-mode'.")
diff --git a/cg-core.el b/cg-core.el
index a831fe2..9ebe0e2 100644
--- a/cg-core.el
+++ b/cg-core.el
@@ -288,24 +288,5 @@ The clicked display string must carry a `cg-regions' text property."
(interactive)
(setq cg-card-scale 1.0) (cg-card-refresh))
-(defun cg-insert-legend (text)
- "Insert TEXT as a shadowed one-line control legend in the current buffer.
-Games call this at the foot of the board so the common controls -- a
-new deal, undo, help, and returning to the menu -- stay visible instead
-of hiding behind a keystroke."
- (insert (propertize (concat " " text "\n") 'face 'shadow)))
-
-(defun cg-quit-to-menu ()
- "Leave the current game and return to the `card-game' chooser.
-Buries the game buffer and reopens the game list, so `q' takes the
-player back to where they started rather than to whatever buffer
-happened to be underneath. Falls back to `quit-window' when the
-chooser is not available (for example a game loaded on its own)."
- (interactive)
- (let ((game (current-buffer)))
- (if (fboundp 'card-game)
- (progn (card-game) (bury-buffer game))
- (quit-window))))
-
(provide 'cg-core)
;;; cg-core.el ends here
diff --git a/cg-crapette.el b/cg-crapette.el
index 1faaeac..e659290 100644
--- a/cg-crapette.el
+++ b/cg-crapette.el
@@ -63,7 +63,6 @@
;;; Code:
(require 'cg-core)
-(require 'cg-svg)
(defconst cg-crap-ranks
["A" "2" "3" "4" "5" "6" "7" "8" "9" "10" "J" "Q" "K"]
@@ -77,11 +76,6 @@ available foundation move. When nil, such a slip is simply blocked with
a reminder and costs you nothing -- a gentler assist mode for learning."
:type 'boolean :group 'card-games)
-(defcustom cg-crapette-svg-cards t
- "When non-nil, draw the board with SVG cards on a graphical display.
-Set to nil to force the plain-text board everywhere."
- :type 'boolean :group 'card-games)
-
(defclass cg-crapette-game (cg-game)
((vname :initform "Russian Bank"))
"Two-player Russian Bank (Crapette): you (South) versus one AI opponent.")
@@ -104,10 +98,6 @@ Set to nil to force the plain-text board everywhere."
"Return non-nil when CARD is a red suit."
(and card (cg-red-suit-p (car card))))
-(defun cg-crap--spec (card)
- "Return the cg-svg display spec (RANK-STRING . SUIT) for CARD, or nil."
- (and card (cons (aref cg-crap-ranks (cdr card)) (car card))))
-
(defun cg-crap--deck ()
"Return one freshly shuffled 52-card deck."
(let (cards)
@@ -542,106 +532,13 @@ Empty when nothing (or a single card) is held from a house."
(concat " Holding: " (apply #'concat (nreverse parts))
(format "(moving top %d of %d)\n" held m)))))))
-(defun cg-crap--svg (g)
- "Return (DISPLAY-STRING . REGIONS) drawing Russian Bank game G as SVG.
-REGIONS maps clicked rectangles to (TYPE . INDEX) spots."
- (let* ((w cg-svg-card-width) (h cg-svg-card-height)
- (gap cg-svg-card-gap) (pad 12) (colgap 14)
- (vdown (max 16 (round (* h 0.26))))
- (spots (cg-crap--spots g))
- (cur (nth (cg-get g :cursor) spots))
- (sel (cg-get g :sel))
- (forced (cg-crap--forced g 0))
- (heldn (and sel (eq (car sel) 'house)
- (min (or (cg-get g :sel-n) 0)
- (length (cg-crap--house-run g (cdr sel))))))
- (houses (cg-get g :houses))
- (maxlen (apply #'max 1 (mapcar #'length (append houses nil))))
- (fx (+ w gap)) (hx (+ w colgap))
- (width (+ (* 2 pad) (* 8 w) (* 7 colgap)))
- (y-title 6) (y-opp 34)
- (y-found (+ y-opp h 30))
- (y-house (+ y-found h 30))
- (house-h (+ h (* (1- maxlen) vdown)))
- (y-you (+ y-house house-h 28))
- (height (+ y-you h 34))
- (svg (svg-create width height))
- (lc (cg-color 'shadow :foreground "gray50"))
- (regions '()))
- (cl-labels
- ((txt (str x y &optional sz bold)
- (apply #'svg-text svg str :x x :y y :font-size (or sz 12) :fill lc
- :font-family cg-svg-font-family
- (if bold (list :font-weight "bold") nil)))
- (curp (spot) (equal spot cur))
- (forcedp (spot) (and (member spot forced) t))
- (pile-cell (spot x y)
- (let ((spec (cg-crap--spec (cg-crap--spot-top g spot))))
- (if spec
- (cg-svg-card svg x y :rank (car spec) :suit (cdr spec)
- :highlight (curp spot) :hint (forcedp spot))
- (cg-svg-card svg x y :gap t :highlight (curp spot)))
- (push (cons (list x y w h) spot) regions))))
- (txt (format "Russian Bank -- %s"
- (cond ((eq (cg-get g :winner) 0) "you win!")
- ((eq (cg-get g :winner) 1) "you lose")
- ((= (cg-get g :turn) 0) "your turn")
- (t "opponent's turn")))
- pad (+ y-title 12) 13 t)
- (txt (format "North reserve %d waste %d hand %d"
- (length (cg-crap--reserve g 1)) (length (cg-crap--waste g 1))
- (length (cg-crap--hand g 1)))
- pad (- y-opp 4))
- (pile-cell '(res . 1) pad y-opp)
- (pile-cell '(was . 1) (+ pad fx) y-opp)
- (txt "Foundations" pad (- y-found 4))
- (dotimes (i 8) (pile-cell (cons 'found i) (+ pad (* i fx)) y-found))
- (txt "Houses" pad (- y-house 4))
- (dotimes (i 8)
- (let* ((x (+ pad (* i hx))) (s (cons 'house i))
- (pile (aref houses i)) (len (length pile)))
- (push (cons (list x y-house w house-h) s) regions)
- (if (= len 0)
- (cg-svg-card svg x y-house :gap t :highlight (curp s))
- (let ((y y-house) (k 0))
- (dolist (card pile)
- (let ((spec (cg-crap--spec card)) (topp (= k (1- len))))
- (cg-svg-card svg x y :rank (car spec) :suit (cdr spec)
- :highlight (and topp (curp s))
- :hint (and topp (forcedp s)))
- (when (and (equal sel s) heldn (>= k (- len heldn)))
- (svg-rectangle svg (- x 3) (- y 3) (+ w 6) (+ h 6)
- :rx 8 :fill "none" :stroke "#4a90d9" :stroke-width 3)))
- (setq y (+ y vdown) k (1+ k)))))))
- (txt (format "You reserve %d waste %d hand %d"
- (length (cg-crap--reserve g 0)) (length (cg-crap--waste g 0))
- (length (cg-crap--hand g 0)))
- pad (- y-you 4))
- (pile-cell '(res . 0) pad y-you)
- (pile-cell '(was . 0) (+ pad fx) y-you)
- (txt (cg-get g :message) pad (- height 10) 12))
- (let ((rev (nreverse regions)))
- (cons (propertize "*" 'display (cg-svg-image svg (cg-scale))
- 'cg-regions rev)
- rev))))
-
-(defun cg-crap-mouse (event)
- "Handle a click on the SVG board: select that pile and act on it."
- (interactive "e")
- (let* ((g cg-crap--game) (spot (cg-mouse-action event)))
- (when spot
- (let ((idx (cl-position spot (cg-crap--spots g) :test #'equal)))
- (when idx (cg-put g :cursor idx) (cg-crap-act))))))
-
(cl-defmethod cg-render ((game cg-crapette-game))
"Return a text depiction of GAME."
(cg-crap--render game))
(defun cg-crap--redisplay ()
- "Redraw the current Russian Bank buffer (SVG on a graphical display)."
+ "Redraw the current Russian Bank buffer."
(let ((g cg-crap--game) (inhibit-read-only t))
- (setq cg-current-game g)
- (setq-local cg-redisplay-function #'cg-crap--redisplay)
(setq-local mode-line-process
(format " [%s]"
(cond ((eq (cg-get g :winner) 0) "you win")
@@ -649,11 +546,9 @@ REGIONS maps clicked rectangles to (TYPE . INDEX) spots."
((= (cg-get g :turn) 0) "your turn")
(t "opponent"))))
(erase-buffer)
- (if (and cg-crapette-svg-cards (display-graphic-p))
- (insert (car (cg-crap--svg g)) "\n")
- (insert (cg-crap--render g)))
+ (insert (cg-crap--render g))
(cg-insert-legend
- "arrows/click move · RET pick up/drop · [ ] group size · f foundation · SPC turn · e end · u undo · n new · q menu")
+ "arrows move · RET pick up/drop · [ ] group size · f foundation · SPC turn a card · e end · u undo · n new · q menu")
(goto-char (point-min))))
@@ -810,11 +705,6 @@ If it fits nowhere your turn ends."
(define-key map (kbd "") #'cg-crap-left)
(define-key map (kbd "") #'cg-crap-right)
(define-key map (kbd "RET") #'cg-crap-act)
- (define-key map [mouse-1] #'cg-crap-mouse)
- (define-key map "+" #'cg-card-zoom-in)
- (define-key map "=" #'cg-card-zoom-in)
- (define-key map "-" #'cg-card-zoom-out)
- (define-key map "0" #'cg-card-zoom-reset)
(define-key map (kbd "SPC") #'cg-crap-draw)
(define-key map "f" #'cg-crap-found)
(define-key map "[" #'cg-crap-hold-less)
diff --git a/cg-cribbage.el b/cg-cribbage.el
index ecacb3c..9970086 100644
--- a/cg-cribbage.el
+++ b/cg-cribbage.el
@@ -426,7 +426,6 @@ TOTAL is the running count after the play."
(define-key map "n" #'cg-crib-new)
(define-key map "g" #'cg-crib-redraw)
(define-key map "?" #'cg-crib-help)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-cribbage-mode'.")
diff --git a/cg-eights.el b/cg-eights.el
index b78a9d8..7c1605b 100644
--- a/cg-eights.el
+++ b/cg-eights.el
@@ -361,7 +361,6 @@ Return the drawn card, or nil when none is available."
(define-key map "n" #'cg-eights-new)
(define-key map "g" #'cg-eights-redraw)
(define-key map "?" #'cg-eights-help)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-eights-mode'.")
diff --git a/cg-gaps.el b/cg-gaps.el
index f60feea..02f4012 100644
--- a/cg-gaps.el
+++ b/cg-gaps.el
@@ -131,9 +131,8 @@ Subclasses set the head rank and build direction by overriding
(cg-put game :cursor (cons 0 0))
(cg-put game :history nil)
(cg-put game :message
- (format
- "Each row one suit, %s. Move to a green + gap and press RET (or click it). ? = help."
- (if (> (cg-gaps--step game) 0) "2 up to K" "K down to 2")))
+ (format "Fill the gaps: each row one suit, %s. RET on a gap. ? = help."
+ (if (> (cg-gaps--step game) 0) "2 up to K" "K down to 2")))
game))
(defun cg-gaps--cell (board r c)
@@ -418,7 +417,6 @@ buttons (the keyboard hint *is* the button)."
(cg-gaps--key-button "r" "redeal" #'cg-gaps-redeal "Reshuffle the misplaced cards")
(cg-gaps--key-button "u" "undo" #'cg-gaps-undo "Undo the last move")
(cg-gaps--key-button "n" "new" #'cg-gaps-new "Deal a new game")
- (cg-gaps--key-button "q" "menu" #'cg-quit-to-menu "Back to the game list")
(cg-gaps--key-button "?" "help" #'cg-gaps-help "Show the rules and keys")
(insert "\n"))
@@ -816,7 +814,6 @@ The board scales to fill the area beside a proportional left panel."
(define-key map "0" #'cg-gaps-zoom-reset)
(define-key map "v" #'cg-gaps-toggle-svg-ui)
(define-key map [mouse-1] #'cg-gaps-mouse)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-gaps-mode' (Emacs style; see `cg-keys').")
diff --git a/cg-handfoot.el b/cg-handfoot.el
index 07acc06..d59d394 100644
--- a/cg-handfoot.el
+++ b/cg-handfoot.el
@@ -505,45 +505,8 @@ Return non-nil when the team goes down."
(defvar-local cg-hf--game nil "The Hand & Foot game in the current buffer.")
-(defun cg-hf--svg (game)
- "Return an SVG board for the Hand & Foot GAME."
- (let* ((scores (cg-get game :scores)) (infos '()) (melds '()))
- (dotimes (team (cg-get game :nteams))
- (push (format "Team %d (score %d)%s%s" team (aref scores team)
- (if (cg-hf--down-p game team) " down"
- (format " needs %d" (cg-hf--min-for-round game)))
- (let ((k (length (aref (cg-get game :redthrees) team))))
- (if (> k 0) (format " red3:%d" k) "")))
- infos)
- (dolist (bk (cg-hf--books game team))
- (push (cons (format "T%d%s" team
- (if (cg-hf--book-complete-p bk)
- (if (cg-hf--book-clean-p bk) " clean" " dirty") ""))
- bk)
- melds)))
- (dotimes (s (cg-get game :nplayers))
- (unless (= s 0)
- (push (format "%s: %d in hand%s" (aref cg-handfoot--names s)
- (length (cg-rummy--hand game s))
- (if (= (aref (cg-get game :stage) s) 1) " (on foot)" ""))
- infos)))
- (cg-rummy--board-svg
- :title (format "Hand & Foot target %d round %d (min %d)"
- cg-handfoot-target (1+ (or (cg-get game :round) 0))
- (cg-hf--min-for-round game))
- :infos (nreverse infos) :melds (nreverse melds)
- :discard (cg-rummy--top game) :stock (length (cg-get game :stock))
- :hand (cg-rummy--hand game 0) :cursor (cg-get game :cursor)
- :marks (cg-get game :marks) :message (cg-get game :message))))
-
(cl-defmethod cg-render ((game cg-handfoot-game))
- "Return a depiction of the Hand & Foot GAME: SVG board if graphical, else text."
- (if (and cg-rummy-svg-cards (display-graphic-p))
- (cg-hf--svg game)
- (cg-hf--render-text game)))
-
-(defun cg-hf--render-text (game)
- "Return a plain-text depiction of the Hand & Foot GAME."
+ "Return a propertized depiction of the Hand & Foot GAME."
(let* ((out '()) (scores (cg-get game :scores))
(hand (cg-rummy--hand game 0)) (cursor (cg-get game :cursor)))
(push (format " Hand & Foot target %d round %d (go-down minimum %d)\n\n"
@@ -764,7 +727,6 @@ action. After that, mark single books as usual."
(define-key map "n" #'cg-hf-new)
(define-key map "g" #'cg-hf-redraw)
(define-key map "?" #'cg-hf-help)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-handfoot-mode'.")
diff --git a/cg-match.el b/cg-match.el
index 3e67917..605b89a 100644
--- a/cg-match.el
+++ b/cg-match.el
@@ -218,54 +218,11 @@ Return non-nil when S can ask."
(`(hand . ,i) (cg-put g :cursor i))
(_ (cl-call-next-method))))
-(defun cg-gf--hand-ranks (game)
- "Return the distinct ranks in your hand, low to high (Ace..King)."
- (let ((seen (make-vector 13 nil)) (out '()))
- (dolist (c (cg-gf--hand game 0)) (aset seen (cdr c) t))
- (dotimes (r 13) (when (aref seen r) (push r out)))
- (nreverse out)))
-
-(defun cg-gf--pick-rank (button)
- "Select the rank stored on BUTTON, ready to ask a player for it.
-Moves the hand cursor to a card of that rank so the existing
-1-4 player keys ask for it."
- (let* ((g cg-gf--game) (rank (button-get button 'cg-gf-rank))
- (i (cl-position rank (cg-gf--hand g 0) :key #'cdr)))
- (when i (cg-put g :cursor i))
- (cg-put g :message
- (format "Ask which player for %s? Press 1-%d."
- (aref cg-rummy-ranks rank) (1- (cg-get g :nplayers))))
- (cg-gf--redisplay)))
-
-(defun cg-gf--insert-rank-picker (game)
- "Insert a row of clickable rank buttons for the ranks in your hand.
-Each rank is a large, easy target, so you pick what to ask for by rank
-instead of hunting for one overlapped card in a big hand."
- (let* ((ranks (cg-gf--hand-ranks game))
- (cur (nth (cg-get game :cursor) (cg-gf--hand game 0)))
- (cur-rank (and cur (cdr cur))))
- (when ranks
- (insert "\n Ask for: ")
- (dolist (r ranks)
- (insert-text-button
- (format " %s " (aref cg-rummy-ranks r))
- 'face (if (eql r cur-rank) 'cg-hint 'link)
- 'mouse-face 'highlight 'follow-link t
- 'help-echo (format "Ask a player for %ss" (aref cg-rummy-ranks r))
- 'cg-gf-rank r
- 'action #'cg-gf--pick-rank)
- (insert " "))
- (insert "\n"))))
-
(defun cg-gf--redisplay ()
(let ((game cg-gf--game) (inhibit-read-only t))
(setq cg-current-game game cg-redisplay-function #'cg-gf--redisplay)
(setq-local mode-line-process (format " [%s]" (cg-get game :phase)))
- (erase-buffer)
- (insert (cg-render game))
- (cg-gf--insert-rank-picker game)
- (cg-insert-legend "click a rank (or arrows) · 1-4 ask that player · n new · q menu · ? help")
- (goto-char (point-min))))
+ (erase-buffer) (insert (cg-render game)) (goto-char (point-min))))
(defun cg-gf-left ()
"Move the hand cursor left."
@@ -303,8 +260,7 @@ instead of hunting for one overlapped card in a big hand."
(cg-gf--deal cg-gf--game) (cg-gf--redisplay))
(defun cg-gf-redraw () "Redraw." (interactive) (cg-gf--redisplay))
(defun cg-gf-help () "Describe the controls." (interactive)
- (message
- "Click a rank (or arrows) to choose 1-4: ask that player n: new q: menu"))
+ (message "Arrows: choose a rank 1-4: ask that player n: new g: redraw"))
(defvar cg-go-fish-mode-map
(let ((map (make-sparse-keymap)))
@@ -319,7 +275,6 @@ instead of hunting for one overlapped card in a big hand."
(define-key map "n" #'cg-gf-new)
(define-key map "g" #'cg-gf-redraw)
(define-key map "?" #'cg-gf-help)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-go-fish-mode'.")
@@ -516,7 +471,6 @@ instead of hunting for one overlapped card in a big hand."
(define-key map "n" #'cg-om-new)
(define-key map "g" #'cg-om-redraw)
(define-key map "?" #'cg-om-help)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-old-maid-mode'.")
diff --git a/cg-patience.el b/cg-patience.el
index e3bb1e9..e9eb5db 100644
--- a/cg-patience.el
+++ b/cg-patience.el
@@ -422,7 +422,6 @@ matching spot); a card-size slider sits below."
(define-key map "n" #'cg-pat-new)
(define-key map "g" #'cg-pat-redraw)
(define-key map "?" #'cg-pat-help)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-pat-mode'.")
diff --git a/cg-president.el b/cg-president.el
index 80bc694..45e838c 100644
--- a/cg-president.el
+++ b/cg-president.el
@@ -400,7 +400,6 @@ Each rank maps to a (hand . INDEX) region and a card-size slider sits below."
(define-key map "n" #'cg-pres-new)
(define-key map "g" #'cg-pres-redraw)
(define-key map "?" #'cg-pres-help)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-pres-mode'.")
diff --git a/cg-rum500.el b/cg-rum500.el
index d5b9ada..be3b41b 100644
--- a/cg-rum500.el
+++ b/cg-rum500.el
@@ -351,38 +351,8 @@ Deep-pickup games show the whole pile with depth indices (0 = top)."
:ace-high (cg-tm--ace-high game)))
(cg-get game :table))))
-(defun cg-tm--svg (game)
- "Return an SVG board for the table-meld GAME."
- (let* ((scores (cg-get game :scores)) (laid (cg-get game :laid))
- (meldp (oref game score-style)))
- (cg-rummy--board-svg
- :title (format "%s (target %d)" (oref game vname) (oref game target))
- :infos (let (out)
- (dotimes (s (cg-get game :nplayers))
- (unless (= s 0)
- (push (format "Player %d: %d cards score %d%s"
- s (length (cg-rummy--hand game s)) (aref scores s)
- (if (eq meldp 'meld-points)
- (format " laid %d" (aref laid s)) ""))
- out)))
- (nreverse out))
- :melds (mapcar (lambda (rec)
- (cons (if (= (car rec) 0) "you" (format "P%d" (car rec)))
- (cdr rec)))
- (cg-get game :table))
- :discard (cg-rummy--top game) :stock (length (cg-get game :stock))
- :hand (cg-rummy--hand game 0) :cursor (cg-get game :cursor)
- :marks (cg-get game :marks) :hint-fn (cg-tm--layoff-hint game)
- :message (cg-get game :message))))
-
(cl-defmethod cg-render ((game cg-tablemeld-game))
- "Return a depiction of the table-meld GAME: SVG board if graphical, else text."
- (if (and cg-rummy-svg-cards (display-graphic-p))
- (cg-tm--svg game)
- (cg-tm--render-text game)))
-
-(defun cg-tm--render-text (game)
- "Return a plain-text depiction of the table-meld GAME."
+ "Return a propertized depiction of the table-meld GAME."
(let* ((out '()) (scores (cg-get game :scores))
(laid (cg-get game :laid)) (meldp (oref game score-style))
(hand (cg-rummy--hand game 0)) (cursor (cg-get game :cursor)))
@@ -598,7 +568,6 @@ melded or laid off at once, the rest go into your hand."
(define-key map "n" #'cg-tm-new)
(define-key map "g" #'cg-tm-redraw)
(define-key map "?" #'cg-tm-help)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-tm-mode'.")
diff --git a/cg-rummy.el b/cg-rummy.el
index c41450f..1be4dcd 100644
--- a/cg-rummy.el
+++ b/cg-rummy.el
@@ -325,102 +325,6 @@ and carries a card-size slider. Draws SVG cards on a graphical display
(setq i (1+ i)))
(apply #'concat (nreverse out)))))
-(defun cg-rummy--board-svg (&rest args)
- "Draw a rummy-style board; return a propertized display string.
-Keyword ARGS: :title :infos :melds :discard :stock :hand :cursor :marks
-:hint-fn :message. :melds is a list of (LABEL . CARDS), or the symbol
-`none' to hide the table area. The hand carries (hand . INDEX) regions."
- (let* ((title (or (plist-get args :title) ""))
- (infos (plist-get args :infos))
- (raw-melds (plist-get args :melds))
- (show-table (not (eq raw-melds 'none)))
- (melds (and show-table raw-melds))
- (raw-discard (plist-get args :discard))
- (show-discard (not (eq raw-discard 'none)))
- (discard (and show-discard raw-discard))
- (stock (or (plist-get args :stock) 0))
- (stock-label (or (plist-get args :stock-label) "Stock"))
- (hand (plist-get args :hand))
- (cursor (or (plist-get args :cursor) 0))
- (marks (plist-get args :marks))
- (hint-fn (plist-get args :hint-fn))
- (msg (or (plist-get args :message) ""))
- (w cg-svg-card-width) (h cg-svg-card-height) (gap cg-svg-card-gap)
- (pad 16) (label-w 46)
- (n (length hand))
- (overlap (cond ((> n 11) (- w 24)) ((> n 8) 20) (t 0)))
- (step (max 14 (- (+ w gap) overlap)))
- (fanw (if (> n 0) (+ (* (1- n) step) w) w))
- (mstep (max 16 (round (* w 0.5))))
- (n-info (length infos))
- (y-title 6) (y-info 26)
- (y-sd (+ y-info (* n-info 16) 8))
- (meld-rowh (+ h 8))
- (y-melds (+ y-sd h 26))
- (melds-area (if show-table (+ (* (max 1 (length melds)) meld-rowh) 16) 6))
- (y-hand (+ y-melds melds-area))
- (height (+ y-hand h 30))
- (meld-maxw (if melds
- (apply #'max 0
- (mapcar (lambda (m)
- (+ label-w
- (let ((k (length (cdr m))))
- (if (> k 0) (+ (* (1- k) mstep) w) w))))
- melds))
- 0))
- (width (max (+ fanw (* 2 pad)) (+ meld-maxw (* 2 pad)) 640))
- (svg (svg-create width height))
- (lc (cg-color 'shadow :foreground "gray50"))
- (regions '()))
- (cl-labels ((txt (str x y &optional sz bold)
- (apply #'svg-text svg str :x x :y y :font-size (or sz 12) :fill lc
- :font-family cg-svg-font-family
- (and bold '(:font-weight "bold"))))
- (drow (specs x y stp)
- (let ((xx x))
- (dolist (sp specs)
- (if sp (cg-svg-card svg xx y :rank (car sp) :suit (cdr sp))
- (cg-svg-card svg xx y :gap t))
- (setq xx (+ xx stp))))))
- (txt title pad (+ y-title 12) 13 t)
- (let ((yy (+ y-info 4)))
- (dolist (line infos) (txt line pad yy 12) (setq yy (+ yy 16))))
- (cg-svg-card svg pad y-sd :down (> stock 0) :gap (= stock 0))
- (txt (format "%s %d" stock-label stock) pad (+ y-sd h 13) 11)
- (when show-discard
- (let ((dx (+ pad w gap 24)))
- (if discard
- (let ((sp (cg-rummy--card-spec discard)))
- (cg-svg-card svg dx y-sd :rank (car sp) :suit (cdr sp)))
- (cg-svg-card svg dx y-sd :gap t))
- (txt "Discard" dx (+ y-sd h 13) 11)))
- (when show-table
- (txt "Table" pad (- y-melds 4) 11)
- (if (null melds)
- (txt "(no melds yet)" (+ pad label-w) (+ y-melds (round (* h 0.5))) 11)
- (let ((yy y-melds))
- (dolist (m melds)
- (txt (car m) pad (+ yy (round (* h 0.55))) 11)
- (drow (mapcar #'cg-rummy--card-spec (cdr m)) (+ pad label-w) yy mstep)
- (setq yy (+ yy meld-rowh))))))
- (txt "Your hand" pad (- y-hand 6) 11)
- (let ((x (max pad (- (/ width 2) (/ fanw 2)))) (i 0))
- (dolist (c hand)
- (let ((sp (cg-rummy--card-spec c))
- (curp (= i cursor))
- (markp (and marks (memq i marks)))
- (hintp (and hint-fn (funcall hint-fn c))))
- (cg-svg-card svg x y-hand :rank (car sp) :suit (cdr sp)
- :highlight curp :hint hintp)
- (when markp
- (svg-rectangle svg (- x 3) (- y-hand 3) (+ w 6) (+ h 6)
- :rx 8 :fill "none" :stroke "#4a90d9" :stroke-width 3))
- (push (cons (list x y-hand (if (= i (1- n)) w step) h) (cons 'hand i)) regions))
- (setq x (+ x step) i (1+ i))))
- (txt msg pad (- height 8) 12))
- (propertize "*" 'display (cg-svg-image svg (cg-scale))
- 'cg-regions (nreverse regions))))
-
(defun cg-rummy--melds-string (melds)
"Return a one-line depiction of MELDS (a list of card-lists)."
(mapconcat (lambda (m) (mapconcat #'cg-rummy-card-string m " "))
@@ -561,36 +465,8 @@ Keyword ARGS: :title :infos :melds :discard :stock :hand :cursor :marks
(defvar-local cg-gin--game nil "The Gin Rummy game in the current buffer.")
-(defun cg-gin--svg (game)
- "Return an SVG board for the Gin GAME."
- (let* ((scores (cg-get game :scores)) (reveal (cg-get game :reveal))
- (hand (cg-rummy--hand game 0)) (infos '()))
- (push (format "Opponent: %d cards score %d"
- (length (cg-rummy--hand game 1)) (aref scores 1)) infos)
- (when reveal
- (let ((pp (cg-rummy-best-partition (cg-rummy--hand game 1))))
- (push (format " melds %s deadwood %s (%d)"
- (cg-rummy--melds-string (plist-get pp :melds))
- (mapconcat #'cg-rummy-card-string (plist-get pp :deadwood) " ")
- (plist-get pp :count))
- infos)))
- (push (format "You: deadwood %d score %d"
- (cg-gin--deadwood hand) (aref scores 0)) infos)
- (cg-rummy--board-svg
- :title (format "Gin Rummy (first to %d)" cg-gin-target)
- :infos (nreverse infos) :melds 'none
- :discard (cg-rummy--top game) :stock (length (cg-get game :stock))
- :hand hand :cursor (cg-get game :cursor)
- :message (cg-get game :message))))
-
(cl-defmethod cg-render ((game cg-gin-game))
- "Return a depiction of the Gin GAME: SVG board if graphical, else text."
- (if (and cg-rummy-svg-cards (display-graphic-p))
- (cg-gin--svg game)
- (cg-gin--render-text game)))
-
-(defun cg-gin--render-text (game)
- "Return a plain-text depiction of the Gin GAME."
+ "Return a propertized depiction of the Gin GAME for a text display."
(let* ((out '()) (scores (cg-get game :scores))
(reveal (cg-get game :reveal))
(hand (cg-rummy--hand game 0)) (cursor (cg-get game :cursor)))
@@ -758,7 +634,6 @@ Keyword ARGS: :title :infos :melds :discard :stock :hand :cursor :marks
(define-key map "n" #'cg-gin-new)
(define-key map "g" #'cg-gin-redraw)
(define-key map "?" #'cg-gin-help)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-gin-mode'.")
diff --git a/cg-scopa.el b/cg-scopa.el
index 17d8a7c..38b4166 100644
--- a/cg-scopa.el
+++ b/cg-scopa.el
@@ -219,28 +219,8 @@ Only subsets of two or more cards are considered. Return nil if none."
(defvar-local cg-fish--game nil "The fishing game in the current buffer.")
-(defun cg-fish--svg (game)
- "Return an SVG board for the fishing GAME."
- (cg-rummy--board-svg
- :title (format "%s (to %d)" (oref game vname) (oref game target))
- :infos (list (format "Computer: %d cards captured %d (score %d)"
- (length (cg-fish--hand game 1)) (length (cg-fish--captured game 1))
- (aref (cg-get game :scores) 1))
- (format "Your captured: %d (score %d)"
- (length (cg-fish--captured game 0)) (aref (cg-get game :scores) 0)))
- :stock-label "Deck" :stock (length (cg-get game :deck)) :discard 'none
- :melds (list (cons "Table" (cg-rummy-sort-hand (cg-get game :table))))
- :hand (cg-fish--hand game 0) :cursor (cg-get game :cursor)
- :message (cg-get game :message)))
-
(cl-defmethod cg-render ((game cg-fish-game))
- "Return a depiction of the fishing GAME: SVG board if graphical, else text."
- (if (and cg-rummy-svg-cards (display-graphic-p))
- (cg-fish--svg game)
- (cg-fish--render-text game)))
-
-(defun cg-fish--render-text (game)
- "Return a plain-text depiction of the fishing GAME."
+ "Return a propertized depiction of the fishing GAME."
(let* ((out '()) (cursor (cg-get game :cursor)))
(push (format " %s to %d\n\n" (oref game vname) (oref game target)) out)
(push (format " Computer: %d cards captured %d (score %d)\n"
@@ -326,7 +306,6 @@ Only subsets of two or more cards are considered. Return nil if none."
(define-key map "n" #'cg-fish-new)
(define-key map "g" #'cg-fish-redraw)
(define-key map "?" #'cg-fish-help)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-fish-mode'.")
diff --git a/cg-solitaire.el b/cg-solitaire.el
index 2ead28f..0674a14 100644
--- a/cg-solitaire.el
+++ b/cg-solitaire.el
@@ -783,9 +783,6 @@ DISPLAY is a propertized one-image string; REGIONS is a click map of
(if s "carrying" "playing")))))
(erase-buffer)
(cg-render-game game)
- (insert "\n")
- (cg-insert-legend
- "arrows move · RET pick up/drop · f foundation · a auto · u undo · n new · q menu · ? help")
(goto-char (point-min))))
;;;; Mode and commands
@@ -813,7 +810,6 @@ DISPLAY is a propertized one-image string; REGIONS is a click map of
(define-key map "n" #'cg-sol-new)
(define-key map "g" #'cg-sol-redraw)
(define-key map "?" #'cg-sol-help)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-sol-mode'.")
@@ -943,56 +939,6 @@ DISPLAY is a propertized one-image string; REGIONS is a click map of
(cg-put game :reserve (butlast (cg-get game :reserve) 1))
(cg-sol--set-col game c (list card))))))
-
-;;;; Russian Bank (single-player patience)
-
-;; A one-deck patience in the spirit of Russian Bank (Crapette): eight
-;; "houses" build down in alternating colours, the four foundations build
-;; up by suit from the Ace, and a thirteen-card reserve feeds the houses.
-;; The competitive two-player game (with its "stops" and loading rules)
-;; is a separate, larger build; this is the solitaire adaptation.
-
-(defclass cg-russian-bank-game (cg-solitaire-game)
- ((ncols :initform 8) (nfound :initform 4) (has-stock :initform t)
- (has-waste :initform t) (has-reserve :initform t) (draw :initform 1)
- (redeal :initform t) (build :initform 'alt) (run-rule :initform 'alt)
- (empty-rule :initform 'any) (base :initform 0) (wrap :initform nil)
- (vname :initform "Russian Bank"))
- "Russian Bank patience: eight houses down by alternating colour, four
-foundations up by suit from the Ace, and a thirteen-card reserve.")
-
-(cl-defmethod cg-sol--deal ((game cg-russian-bank-game))
- "Deal a Russian Bank patience layout: reserve, eight houses, and a stock."
- (let* ((deck (cg-sol--make-deck 1))
- (reserve (cl-loop repeat 13 collect (pop deck)))
- (tableau (make-vector 8 nil))
- (down (make-vector 8 0)))
- (dotimes (c 8) (aset tableau c (list (pop deck))))
- (cg-put game :reserve reserve)
- (cg-put game :tableau tableau)
- (cg-put game :down down)
- (cg-put game :found (make-vector 4 nil))
- (cg-put game :free (make-vector 0 nil))
- (cg-put game :stock deck)
- (cg-put game :waste nil)
- (cg-put game :sets 0)
- (cg-put game :moves 0)
- (cg-put game :cursor 0)
- (cg-put game :sel nil)
- (cg-put game :sel-n 0)
- (cg-put game :history nil)
- (cg-put game :message
- "Russian Bank. Houses build down in alternating colours; foundations up by suit from the Ace.")
- game))
-
-(cl-defmethod cg-sol--autofill ((game cg-russian-bank-game))
- "Fill an empty house from the reserve, as Russian Bank does."
- (dotimes (c (oref game ncols))
- (when (and (null (cg-sol--col game c)) (cg-get game :reserve))
- (let ((card (car (last (cg-get game :reserve)))))
- (cg-put game :reserve (butlast (cg-get game :reserve) 1))
- (cg-sol--set-col game c (list card))))))
-
;;;###autoload
(defun cg-forty-thieves ()
"Play Forty Thieves solitaire (two decks)."
@@ -1008,10 +954,5 @@ foundations up by suit from the Ace, and a thirteen-card reserve.")
"Play Canfield solitaire."
(interactive) (cg-sol--play 'cg-canfield-game))
-;;;###autoload
-(defun cg-russian-bank ()
- "Play Russian Bank, the single-player patience adaptation."
- (interactive) (cg-sol--play 'cg-russian-bank-game))
-
(provide 'cg-solitaire)
;;; cg-solitaire.el ends here
diff --git a/cg-spite.el b/cg-spite.el
index 2ff7ee2..9ec04c2 100644
--- a/cg-spite.el
+++ b/cg-spite.el
@@ -413,7 +413,6 @@
(define-key map "n" #'cg-spite-new)
(define-key map "g" #'cg-spite-redraw)
(define-key map "?" #'cg-spite-help)
- (define-key map "q" #'cg-quit-to-menu)
map)
"Keymap for `cg-spite-mode'.")
diff --git a/cg-svg.el b/cg-svg.el
index 5141276..059d323 100644
--- a/cg-svg.el
+++ b/cg-svg.el
@@ -79,11 +79,9 @@
:type 'string :group 'cg-svg)
(defcustom cg-svg-theme-colors t
- "Derive the card back and move-hint ring from the active theme.
-When non-nil, those colours are taken from the active Emacs theme, with
-the colour variables below as fallbacks. The cursor/selection ring is
-not themed this way -- see `cg-svg--highlight' -- so it never picks up a
-theme's `region' colour."
+ "Derive the highlight ring and card back from the active theme.
+When non-nil, colours are taken from the active Emacs theme, with the
+colour variables below as fallbacks."
:type 'boolean :group 'cg-svg)
(defcustom cg-svg-card-back 'dots
@@ -113,13 +111,10 @@ hearts red."
(defvar cg-svg-gap-color "#95a5a6" "Empty-slot outline colour.")
(defun cg-svg--highlight ()
- "Resolve the cursor/selection ring colour.
-Always the configured `cg-svg-highlight-color' (a calm gold by
-default). This is deliberately not taken from the theme's `region'
-face: on many themes that face is a saturated colour, and a fat ring
-in it reads as an alarming frame flashing around the whole board on
-each redraw. Customize `cg-svg-highlight-color' to change it."
- cg-svg-highlight-color)
+ "Resolve the cursor/selection ring colour (theme-aware)."
+ (if cg-svg-theme-colors
+ (cg-color 'region :background cg-svg-highlight-color)
+ cg-svg-highlight-color))
(defun cg-svg--back-fill ()
"Resolve the card-back fill colour (theme-aware)."
diff --git a/test/card-games-tests.el b/test/card-games-tests.el
index e0a9165..9de16bf 100644
--- a/test/card-games-tests.el
+++ b/test/card-games-tests.el
@@ -855,45 +855,6 @@
(cg-put g :bids (vector 3 nil 4 nil)) (cg-put g :scores (vector 100 50 100 50))
(should (stringp (cg-trick--svg g)))))
-(ert-deftest cgt-gin-svg-smoke ()
- (let ((g (cg-gin-game)))
- (cg-gin--deal g)
- (cg-put g :cursor 0) (cg-put g :message "x") (cg-put g :scores (vector 0 0))
- (should (stringp (cg-gin--render-text g)))
- (let ((sres (cg-gin--svg g)))
- (should (get-text-property 0 'display sres))
- (should (rassoc '(hand . 0) (get-text-property 0 'cg-regions sres))))))
-
-(ert-deftest cgt-tm-svg-smoke ()
- (let ((g (cg-rum500-game)))
- (cg-tm--deal g)
- (cg-put g :cursor 1) (cg-put g :message "x")
- (cg-put g :table (list (cons 0 (list '(0 . 0) '(0 . 1) '(0 . 2)))
- (cons 2 (list '(1 . 5) '(2 . 5) '(3 . 5)))))
- (cg-put g :marks (list 0 2))
- (should (stringp (cg-tm--render-text g)))
- (let ((regs (get-text-property 0 'cg-regions (cg-tm--svg g))))
- (should (rassoc '(hand . 0) regs))
- (should (cl-every (lambda (r) (= 4 (length (car r)))) regs)))))
-
-(ert-deftest cgt-hf-svg-smoke ()
- (let ((g (cg-handfoot-game)))
- (cg-put g :nplayers 4) (cg-put g :nteams 2) (cg-put g :scores (make-vector 2 0))
- (cg-hf--deal g)
- (cg-put g :cursor 0) (cg-put g :message "x")
- (should (stringp (cg-hf--render-text g)))
- (let ((regs (get-text-property 0 'cg-regions (cg-hf--svg g))))
- (should (rassoc '(hand . 0) regs))
- (should (cl-every (lambda (r) (= 4 (length (car r)))) regs)))))
-
-(ert-deftest cgt-fish-svg-smoke ()
- (let ((g (cg-scopa-game)))
- (cg-fish--deal-round g)
- (cg-put g :cursor 0) (cg-put g :message "x")
- (should (stringp (cg-fish--render-text g)))
- (should (rassoc '(hand . 0)
- (get-text-property 0 'cg-regions (cg-fish--svg g))))))
-
(ert-deftest cgt-pat-golf-deal ()
(let ((g (cg-pat--deal (cg-golf-game))))
(should (= 35 (length (cg-get g :cards))))