From: Nick Bowler Date: Thu, 20 Dec 2018 20:53:25 +0000 (-0500) Subject: Initial commit X-Git-Tag: v1~8 X-Git-Url: http://git.draconx.ca/gitweb/slotifier.git/commitdiff_plain/51e1fbaa5ba49a66c8b03ffc199de042007fc919 Initial commit --- 51e1fbaa5ba49a66c8b03ffc199de042007fc919 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8434549 --- /dev/null +++ b/.gitignore @@ -0,0 +1,30 @@ +*.la +*.lo +*.o +.deps +.dirstamp +.libs +/aclocal.m4 +/atconfig +/autom4te.cache +/compile +/config.* +/configure +/depcomp +/exported.sh +/install-sh +/lib +/libtool +/ltmain.sh +/missing +/missing +/package.m4 +/slotifier +/snippet +/stamp-h1 +/testsuite +/testsuite.deps +/testsuite.dir +/testsuite.log +Makefile +Makefile.in diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c9ab366 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "common"] + path = common + url = https://git.draconx.ca/dxcommon.git +[submodule "gnulib"] + path = gnulib + url = https://git.sv.gnu.org/r/gnulib.git diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + 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/COPYING.WTFPL2 b/COPYING.WTFPL2 new file mode 100644 index 0000000..d23841b --- /dev/null +++ b/COPYING.WTFPL2 @@ -0,0 +1,13 @@ + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + + Copyright (C) 2004 Sam Hocevar + 22 rue de Plaisance, 75014 Paris, France + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. You just DO WHAT THE FUCK YOU WANT TO. diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..963a5fb --- /dev/null +++ b/Makefile.am @@ -0,0 +1,48 @@ +# Copyright © 2018 Nick Bowler +# +# License WTFPL2: Do What The Fuck You Want To Public License, version 2. +# This is free software: you are free to do what the fuck you want to. +# There is NO WARRANTY, to the extent permitted by law. + +ACLOCAL_AMFLAGS = -I m4 -I common/m4 + +CLEANFILES = +DISTCLEANFILES = +MOSTLYCLEANFILES = +MAINTAINERCLEANFILES = +noinst_LTLIBRARIES = +EXTRA_DIST = + +AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib \ + -DLOCALEDIR=\"$(localedir)\" +AM_CFLAGS = $(LIBGERBV_CFLAGS) $(CNEARTREE_CFLAGS) + +bin_PROGRAMS = slotifier + +slotifier_SOURCES = src/slotifier.c +slotifier_LDADD = $(LIBGERBV_LIBS) $(CNEARTREE_LIBS) libgnu.la \ + $(LTLIBICONV) $(LTLIBINTL) $(HYPOT_LIBM) +$(slotifier_OBJECTS): $(gnulib_headers) + +dist_man_MANS = doc/slotifier.1 + +# Supporting rules for gettext. +include $(top_srcdir)/common/snippet/gettext.mk +noinst_DATA = $(MOFILES) + +EXTRA_DIST += po/$(PACKAGE).pot +MAINTAINERCLEANFILES += po/$(PACKAGE).pot + +XGETTEXT_OPTS = -D $(builddir) -D $(srcdir) --from-code=utf-8 \ + --add-comments=TRANSLATORS: --foreign-user \ + --msgid-bugs-address=$(PACKAGE_BUGREPORT) \ + --package-version=$(PACKAGE_VERSION) \ + --package-name=$(PACKAGE) --keyword=_ + +po/$(PACKAGE).pot: $(SOURCES) + $(AM_V_at) $(MKDIR_P) $(@D) + $(AM_V_GEN) $(XGETTEXT) $(XGETTEXT_OPTS) -o $@.tmp $(SOURCES) + $(AM_V_at) mv -f $@.tmp $@ + +include $(top_srcdir)/common/snippet/autotest.mk +include $(top_srcdir)/lib/gnulib.mk diff --git a/bootstrap b/bootstrap new file mode 100755 index 0000000..460094f --- /dev/null +++ b/bootstrap @@ -0,0 +1,41 @@ +#!/bin/sh +# +# Copyright © 2011-2012 Nick Bowler +# +# Simple script to get started from a fresh git checkout. +# +# License WTFPL2: Do What The Fuck You Want To Public License, version 2. +# This is free software: you are free to do what the fuck you want to. +# There is NO WARRANTY, to the extent permitted by law. + +scriptname=$0 + +err() { + printf '%s: %s\n' "$scriptname" "$@" 1>&2 +} + +die() { + err "$@" + exit 1 +} + +: ${AUTORECONF=autoreconf} +: ${GNULIB=gnulib} +: ${GIT=git} +: ${PERL=perl} + +$GIT submodule update --init || err "Failed to update submodules from git." + +if test -x $GNULIB/gnulib-tool; then + $GNULIB/gnulib-tool --update -S || die "Failed to update Gnulib." +else + die "Gnulib sources are not properly installed in gnulib/." +fi + +$PERL common/scripts/fix-gnulib.pl -o lib/gnulib.mk -i lib/gnulib.mk.in \ + || die "Failed to fixup Gnulib makefile fragment." + +# Punt some automake-generated files so that Gentoo's wrapper script doesn't +# try to detect the automake version in use. +rm -f Makefile.in aclocal.m4 +$AUTORECONF -fis diff --git a/common b/common new file mode 160000 index 0000000..a90ed16 --- /dev/null +++ b/common @@ -0,0 +1 @@ +Subproject commit a90ed16c79278b21be93bf8dc93f6c40ee2575ea diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..d502421 --- /dev/null +++ b/configure.ac @@ -0,0 +1,37 @@ +dnl Copyright © 2018 Nick Bowler +dnl +dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2. +dnl This is free software: you are free to do what the fuck you want to. +dnl There is NO WARRANTY, to the extent permitted by law. + +AC_INIT([slotifier], [0], [nbowler@draconx.ca]) +AC_CONFIG_HEADER([config.h]) + +AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects]) +AM_SILENT_RULES([yes]) + +AC_PROG_CC +AM_PROG_CC_C_O +gl_EARLY + +LT_INIT +gl_INIT + +m4_include([lib/gnulib.mk]) + +dnl We provide our own makefile rules for gettext. Disable tracing of +dnl AM_GNU_GETTEXT to prevent autoreconf from running autopoint, and to +dnl prevent automake from growing gratuitous error conditions. +m4_traceoff([AM_GNU_GETTEXT]) +AM_GNU_GETTEXT([external]) +DX_LINGUAS + +DX_LIB_LIBGERBV +DX_LIB_CNEARTREE + +AC_CONFIG_TESTDIR([.]) +DX_PROG_AUTOTEST +AM_CONDITIONAL([HAVE_AUTOTEST], [test x"$dx_cv_autotest_works" = x"yes"]) + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/doc/slotifier.1 b/doc/slotifier.1 new file mode 100644 index 0000000..10e5c38 --- /dev/null +++ b/doc/slotifier.1 @@ -0,0 +1,56 @@ +.Dd December 20, 2018 +.Os slotifier +.Dt SLOTIFIER \&1 "Slotifier User's Manual" +.Sh NAME +.Nm slotifier +.Nd Generate drill slots from overlapping drill hits. +.Sh SYNOPSIS +.Nm +.Op Fl v +.Op Fl o Ar output-file +.Ar input-file +.Sh DESCRIPTION +.Nm +takes an input file in Excellon drill format, searches it for overlapping +drill hits, and converts those into a single drill slot (G85). +This is useful when using a PCB tool which does not generate such slots +directly, but you require this format for fabrication. +.Pp +Slots are detected by a simple heuristic: if two drill holes are positioned +such that the centre of one (or both) of the holes is located within the other +hole, then those holes are mergeable. +This property is extended transitively: if holes A, B are mergeable, and holes +B, C are mergeable, then A and C are mergeable. +.Pp +Each maximal group of at least two holes, such that all holes in the group are +mergeable with each of the others is then converted into a slot as follows. +Two holes within the group are chosen such that the distance between them is +maximized. +A G85 slot is created with endpoints matching those two holes, using the tool +with the greatest diameter of all the holes found in the group. +Then, all the original holes in the group are deleted. +.Pp +Thus, for best results, the designer should ensure that all holes in such +a group form roughly a straight line and all use the same tool. +.Sh OPTIONS +.Bl -tag -width indent +.It Fl o , -output Ar file +Write the processed output to the specified +.Ar file , +instead of standard output. +.It Fl v , -verbose +Increase verbosity. Can be specified multiple times for increased effect. +.It Fl V , -version +Print a version message to standard output and then exit. +.It Fl H , -help +Print a help message to standard output and then exit. +.El +.Sh AUTHORS +Nick Bowler +.Sh COPYRIGHT +Copyright \(co 2018 Nick Bowler +.Pp +Permission is granted to copy, distribute and/or modify this manual 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. diff --git a/gnulib b/gnulib new file mode 160000 index 0000000..233419c --- /dev/null +++ b/gnulib @@ -0,0 +1 @@ +Subproject commit 233419c39c6d13d84439b95766328a238ffb6518 diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 0000000..25fa67f --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,2 @@ +*.m4 +!gnulib-cache.m4 diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 new file mode 100644 index 0000000..1e35bf9 --- /dev/null +++ b/m4/gnulib-cache.m4 @@ -0,0 +1,54 @@ +# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# +# This file 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 file 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 file. If not, see . +# +# As a special exception to the GNU General Public License, +# this file may be distributed as part of a program that +# contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# Generated by gnulib-tool. +# +# This file represents the specification of how gnulib-tool is used. +# It acts as a cache: It is written and read by gnulib-tool. +# In projects that use version control, this file is meant to be put under +# version control, like the configure.ac and various Makefile.am files. + + +# Specification in the form of a command-line invocation: +# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk.in --conditional-dependencies --libtool --macro-prefix=gl --no-vc-files getopt-gnu gettext hypot localcharset striconv + +# Specification in the form of a few gnulib-tool.m4 macro invocations: +gl_LOCAL_DIR([]) +gl_MODULES([ + getopt-gnu + gettext + hypot + localcharset + striconv +]) +gl_AVOID([]) +gl_SOURCE_BASE([lib]) +gl_M4_BASE([m4]) +gl_PO_BASE([]) +gl_DOC_BASE([doc]) +gl_TESTS_BASE([tests]) +gl_LIB([libgnu]) +gl_MAKEFILE_NAME([gnulib.mk.in]) +gl_CONDITIONAL_DEPENDENCIES +gl_LIBTOOL +gl_MACRO_PREFIX([gl]) +gl_PO_DOMAIN([]) +gl_WITNESS_C_MACRO([]) +gl_VC_FILES([false]) diff --git a/po/.gitignore b/po/.gitignore new file mode 100644 index 0000000..6e85d37 --- /dev/null +++ b/po/.gitignore @@ -0,0 +1,2 @@ +*.mo +*.pot diff --git a/po/LINGUAS b/po/LINGUAS new file mode 100644 index 0000000..c574d07 --- /dev/null +++ b/po/LINGUAS @@ -0,0 +1 @@ +en diff --git a/po/en.po b/po/en.po new file mode 100644 index 0000000..36fecc3 --- /dev/null +++ b/po/en.po @@ -0,0 +1,176 @@ +# English "translation" for slotifier. +# This file is put in the public domain. +# Nick Bowler , 2018 +# +msgid "" +msgstr "" +"Project-Id-Version: slotifier 0\n" +"Report-Msgid-Bugs-To: nbowler@draconx.ca\n" +"POT-Creation-Date: 2018-12-20 15:42-0500\n" +"PO-Revision-Date: 2018-12-20 15:52-0500\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.1.1\n" +"Last-Translator: Nick Bowler \n" +"Language: en\n" + +#: lib/getopt.c:547 lib/getopt.c:576 +#, c-format +msgid "%s: option '%s' is ambiguous; possibilities:" +msgstr "" + +#: lib/getopt.c:624 lib/getopt.c:628 +#, c-format +msgid "%s: option '--%s' doesn't allow an argument\n" +msgstr "" + +#: lib/getopt.c:637 lib/getopt.c:642 +#, c-format +msgid "%s: option '%c%s' doesn't allow an argument\n" +msgstr "" + +#: lib/getopt.c:685 lib/getopt.c:704 +#, c-format +msgid "%s: option '--%s' requires an argument\n" +msgstr "" + +#: lib/getopt.c:742 lib/getopt.c:745 +#, c-format +msgid "%s: unrecognized option '--%s'\n" +msgstr "" + +#: lib/getopt.c:753 lib/getopt.c:756 +#, c-format +msgid "%s: unrecognized option '%c%s'\n" +msgstr "" + +#: lib/getopt.c:805 lib/getopt.c:808 +#, c-format +msgid "%s: invalid option -- '%c'\n" +msgstr "" + +#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106 +#, c-format +msgid "%s: option requires an argument -- '%c'\n" +msgstr "" + +#: lib/getopt.c:934 lib/getopt.c:950 +#, c-format +msgid "%s: option '-W %s' is ambiguous\n" +msgstr "" + +#: lib/getopt.c:974 lib/getopt.c:992 +#, c-format +msgid "%s: option '-W %s' doesn't allow an argument\n" +msgstr "" + +#: lib/getopt.c:1013 lib/getopt.c:1031 +#, c-format +msgid "%s: option '-W %s' requires an argument\n" +msgstr "" + +#: src/slotifier.c:76 +#, c-format +msgid "Usage: %s [options] [-o filename] filename\n" +msgstr "" + +#: src/slotifier.c:78 +#, c-format +msgid "Try %s --help for more information.\n" +msgstr "" + +#: src/slotifier.c:87 +msgid "" +"This is \"slotifier\": a tool to convert overlapping drill hits in Excellon\n" +"drill files to G85 drill slots." +msgstr "" +"This is “slotifier”: a tool to convert overlapping drill hits in Excellon\n" +"drill files to G85 drill slots." + +#: src/slotifier.c:91 +msgid "Options:" +msgstr "" + +#: src/slotifier.c:98 +msgid "FILE" +msgstr "" + +#: src/slotifier.c:101 +#, c-format +msgid " -%c, --%s=%s" +msgstr "" + +#: src/slotifier.c:104 +#, c-format +msgid " -%c, --%s" +msgstr "" + +#: src/slotifier.c:114 +msgid "Output to FILE, instead of standard output." +msgstr "" + +#: src/slotifier.c:117 +msgid "Increase verbosity (can be specified more than once)." +msgstr "" + +#: src/slotifier.c:120 +msgid "Print a version message and then exit." +msgstr "" + +#: src/slotifier.c:123 +msgid "Print this message and then exit." +msgstr "" + +#: src/slotifier.c:145 +msgid "For more information, see the slotifier(1) man page." +msgstr "" + +#: src/slotifier.c:148 +#, c-format +msgid "Report bugs to <%s>." +msgstr "" + +#: src/slotifier.c:206 src/slotifier.c:211 +#, c-format +msgid "%s: failed to allocate memory\n" +msgstr "" + +#: src/slotifier.c:238 +#, c-format +msgid "%s: fatal error searching holes\n" +msgstr "" + +#: src/slotifier.c:289 +#, c-format +msgid "%s: merged %zu hole into slot (%.4f,%.4f)-(%.4f,%.4f)\n" +msgid_plural "%s: merged %zu holes into slot (%.4f,%.4f)-(%.4f,%.4f)\n" +msgstr[0] "" +msgstr[1] "" + +#: src/slotifier.c:306 +#, c-format +msgid "%s: hole at (%.4f,%.4f) not merged\n" +msgstr "" + +#: src/slotifier.c:327 +#, c-format +msgid "%s: failed to build search tree\n" +msgstr "" + +#: src/slotifier.c:395 +#, c-format +msgid "%s: error: must specify a filename\n" +msgstr "" + +#: src/slotifier.c:402 +#, c-format +msgid "%s: error: excess command-line arguments\n" +msgstr "" + +#: src/slotifier.c:420 +#, c-format +msgid "%s: %s: error: not a drill file\n" +msgstr "" diff --git a/src/slotifier.c b/src/slotifier.c new file mode 100644 index 0000000..6ca3213 --- /dev/null +++ b/src/slotifier.c @@ -0,0 +1,436 @@ +/* + * Utility to convert overlapping Excellon drill hits into drill slots. + * Copyright © 2018 Nick Bowler + * + * 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 . + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if !ENABLE_NLS +# undef ENABLE_NLS +# define ENABLE_NLS 0 +#endif + +#define _(x) (gettext(x)) + +static unsigned verbose; + +static const char *progname = "slotifier"; +static const char sopts[] = "o:vVH"; +static const struct option lopts[] = { + { "output", 1, NULL, 'o' }, + { "verbose", 0, NULL, 'v' }, + { "version", 0, NULL, 'V' }, + { "help", 0, NULL, 'H' }, + { 0 } +}; + +static void print_version(void) +{ + const char *copysign = "(C)"; + void *convsign = NULL; + + puts(PACKAGE_STRING); + + if (ENABLE_NLS) { + convsign = str_iconv("\xc2\xa9", "UTF-8", locale_charset()); + if (convsign) + copysign = convsign; + } + + printf("Copyright %s 2018 Nick Bowler.\n", copysign); + puts("License GPLv3+: GNU GPL version 3 or any later version."); + puts("This is free software: you are free to change and redistribute it."); + puts("There is NO WARRANTY, to the extent permitted by law."); + + free(convsign); +} + +static void print_usage(FILE *f) +{ + fprintf(f, _("Usage: %s [options] [-o filename] filename\n"), progname); + if (f != stdout) + fprintf(f, _("Try %s --help for more information.\n"), + progname); +} + +static void print_help(void) +{ + const struct option *opt; + print_usage(stdout); + + puts(_("This is \"slotifier\": a tool to convert overlapping drill hits in Excellon\n" + "drill files to G85 drill slots.")); + putchar('\n'); + + puts(_("Options:")); + for (opt = lopts; opt->val; opt++) { + const char *line, *text = "ARG"; + int w = 0; + + if (opt->has_arg) { + switch (opt->val) { + case 'o': text = _("FILE"); + } + + w += printf(_(" -%c, --%s=%s"), + opt->val, opt->name, text); + } else { + w += printf(_(" -%c, --%s"), opt->val, opt->name); + } + + if (w > 18) { + putchar('\n'); + w = 0; + } + + switch (opt->val) { + case 'o': + text = _("Output to FILE, instead of standard output."); + break; + case 'v': + text = _("Increase verbosity (can be specified more than once)."); + break; + case 'V': + text = _("Print a version message and then exit."); + break; + case 'H': + text = _("Print this message and then exit."); + break; + default: + if (w) + putchar('\n'); + continue; + } + + for (line = text; line[0];) { + const char *nl = strchr(line, '\n'); + + if (!nl) { + printf("%*s%s\n", 20-w, "", line); + break; + } + + printf("%*s%.*s\n", 20-w, "", (int)(nl-line), line); + line = nl+1; + } + } + putchar('\n'); + + puts(_("For more information, see the slotifier(1) man page.")); + putchar('\n'); + + printf(_("Report bugs to <%s>."), PACKAGE_BUGREPORT); + putchar('\n'); +} + +static void init_i18n(void) +{ + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); +} + +static CNearTreeHandle build_search_tree(gerbv_image_t *drill) +{ + CNearTreeHandle t; + gerbv_net_t *x; + + if (CNearTreeCreate(&t, 2, CNEARTREE_TYPE_DOUBLE|CNEARTREE_NORM_L2)) + return 0; + + /* Build a search tree from all the holes. */ + for (x = drill->netlist; x; x = x->next) { + double xy[2] = { x->start_x, x->start_y }; + + assert(x->aperture >= 0 && x->aperture < APERTURE_MAX); + + /* Skip things that aren't drill hits */ + if (!drill->aperture[x->aperture]) + continue; + + /* Holes are marked as "flashing"; otherwise it's an existing + * slot; skip it. */ + if (x->aperture_state != GERBV_APERTURE_STATE_FLASH) + continue; + + if (CNearTreeInsert(t, xy, x)) { + CNearTreeFree(&t); + return 0; + } + } + + if (CNearTreeCompleteDelayedInsert(t)) { + CNearTreeFree(&t); + return 0; + } + + return t; +} + +static int combine_holes(gerbv_image_t *drill, gerbv_net_t *hole, + CNearTreeHandle t) +{ + int biggest_tool = hole->aperture; + CVectorHandle group, tmp; + gerbv_aperture_t *tool; + int ret = -1; + size_t i, j; + + if (CVectorCreate(&group, sizeof (gerbv_net_t *), 10)) { + fprintf(stderr, _("%s: failed to allocate memory\n"), progname); + return -1; + } + + if (CVectorCreate(&tmp, sizeof (void *), 10)) { + fprintf(stderr, _("%s: failed to allocate memory\n"), progname); + CVectorFree(&group); + return -1; + } + + /* + * Breadth-first nearest neighbour search of holes. We negate the + * aperture to indicate which holes have been previously visited. + */ + CVectorAddElement(group, &hole); + hole->aperture = -hole->aperture; + + for (i = 0; i < CVectorSize(group); i++) { + double xy[2], dia; + + CVectorGetElement(group, &hole, i); + tool = drill->aperture[abs(hole->aperture)]; + assert(tool->type == GERBV_APTYPE_CIRCLE); + + xy[0] = hole->start_x; xy[1] = hole->start_y; + dia = tool->parameter[0]; + + if (drill->aperture[biggest_tool]->parameter[0] < dia) + biggest_tool = abs(hole->aperture); + + if (CNearTreeFindInSphere(t, dia, 0, tmp, xy, 1) != 0) { + /* We should always should find at least one hole! */ + fprintf(stderr, _("%s: fatal error searching holes\n"), + progname); + goto err; + } + + for (j = 0; j < CVectorSize(tmp); j++) { + /* I don't know why, but CNearTree returns a list + * of pointers to its internal copies of pointers + * to the objects in the tree. So we need this + * double indirection to get the actual hole. */ + void *p; + CVectorGetElement(tmp, &p, j); + hole = *(void **)p; + + if (hole->aperture >= 0) { + CVectorAddElement(group, &hole); + hole->aperture = -hole->aperture; + } + } + } + + /* Compare each pair of matched points to find the longest slot. */ + if (CVectorSize(group) > 1) { + int biggest_slot = 0; + double bestlen = 0; + + for (i = 0; i < CVectorSize(group) - 1; i++) { + CVectorGetElement(group, &hole, i); + for (j = i+1; j < CVectorSize(group); j++) { + gerbv_net_t *h2; + double newlen; + + CVectorGetElement(group, &h2, j); + newlen = hypot(hole->start_x - h2->start_x, + hole->start_y - h2->start_y); + + if (newlen > bestlen) { + hole->stop_x = h2->start_x; + hole->stop_y = h2->stop_y; + bestlen = newlen; + biggest_slot = i; + } + } + } + + CVectorGetElement(group, &hole, biggest_slot); + hole->aperture = biggest_tool; + hole->aperture_state = GERBV_APERTURE_STATE_ON; + + if (verbose) { + const char *fmt = ngettext( + "%s: merged %zu hole into slot (%.4f,%.4f)-(%.4f,%.4f)\n", + "%s: merged %zu holes into slot (%.4f,%.4f)-(%.4f,%.4f)\n", + CVectorSize(group)); + + fprintf(stderr, fmt, progname, CVectorSize(group), + hole->start_x, hole->start_y, + hole->stop_x, hole->stop_y); + } + } else { + /* The only hole we found was our original one, restore + * initial state. */ + CVectorGetElement(group, &hole, 0); + + assert(hole->aperture < 0); + hole->aperture = -hole->aperture; + + if (verbose > 1) { + fprintf(stderr, _("%s: hole at (%.4f,%.4f) not merged\n"), + progname, hole->start_x, hole->start_y); + } + } + + ret = 0; +err: + CVectorFree(&tmp); + CVectorFree(&group); + return ret; +} + +static int slotify(gerbv_image_t *drill) +{ + CNearTreeHandle t; + CVectorHandle holes; + int ret = 0; + size_t i; + + t = build_search_tree(drill); + if (!t) { + fprintf(stderr, _("%s: failed to build search tree\n"), + progname); + return -1; + } + + CNearTreeObjects(t, &holes); + for (i = 0; i < CVectorSize(holes); i++) { + gerbv_net_t *hole; + + CVectorGetElement(holes, &hole, i); + /* Skip holes we've already looked at */ + if (hole->aperture < 0) + continue; + if (hole->aperture_state == GERBV_APERTURE_STATE_ON) + continue; + + if (combine_holes(drill, hole, t) < 0) { + ret = -1; + break; + } + } + + /* Clean out any holes we don't need anymore */ + for (i = 0; i < CVectorSize(holes); i++) { + gerbv_net_t *hole; + + CVectorGetElement(holes, &hole, i); + if (hole->aperture < 0) + gerbv_image_delete_net(hole); + } + + CNearTreeFree(&t); + return ret; +} + +int main(int argc, char **argv) +{ + const char *outfile = "/dev/stdout"; + gerbv_project_t *gp; + gerbv_image_t *drill; + int opt, ret = 0; + + if (argc > 0) + progname = argv[0]; + + init_i18n(); + + while ((opt = getopt_long(argc, argv, sopts, lopts, NULL)) != -1) { + switch (opt) { + case 'o': + outfile = optarg; + break; + case 'v': + verbose++; + break; + case 'V': + print_version(); + return EXIT_SUCCESS; + case 'H': + print_help(); + return EXIT_SUCCESS; + default: + print_usage(stderr); + return EXIT_FAILURE; + } + } + + if (!argv[optind]) { + fprintf(stderr, _("%s: error: must specify a filename\n"), + progname); + print_usage(stderr); + return EXIT_FAILURE; + } + + if (optind + 1 < argc) { + fprintf(stderr, _("%s: error: excess command-line arguments\n"), + progname); + print_usage(stderr); + return EXIT_FAILURE; + } + + gp = gerbv_create_project(); + if (!gp) + return EXIT_FAILURE; + + gerbv_open_layer_from_filename(gp, argv[optind]); + if (!gp->file[0]) { + ret = EXIT_FAILURE; + goto out; + } + + drill = gp->file[0]->image; + if (drill->layertype != GERBV_LAYERTYPE_DRILL) { + fprintf(stderr, _("%s: %s: error: not a drill file\n"), + progname, argv[optind]); + ret = EXIT_FAILURE; + goto out; + } + + if (slotify(drill) != 0) { + ret = EXIT_FAILURE; + goto out; + } + + if (!gerbv_export_drill_file_from_image(outfile, drill, NULL)) + ret = EXIT_FAILURE; +out: + gerbv_destroy_project(gp); + return 0; +} diff --git a/tests/simple.at b/tests/simple.at new file mode 100644 index 0000000..1b6c588 --- /dev/null +++ b/tests/simple.at @@ -0,0 +1,55 @@ +# Copyright © 2018 Nick Bowler +# +# 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 . + +AT_SETUP([basic operation]) + +AT_DATA([test.cnc], +[[M48 +INCH +T20C0.020 +T19C0.035 +% +T20 +X001000Y003000 +X001100Y003000 +X001200Y003000 +X001300Y003000 +X001400Y003000 +T19 +X001000Y002300 +X001000Y001600 +X001100Y002300 +X001200Y002300 +X001700Y002600 +M30 +]]) + +AT_CHECK([slotifier test.cnc], [0], +[[M48 +INCH,TZ +T10C0.035 +T11C0.020 +% +T10 +X001000Y002300G85X001200Y002300 +X001000Y001600 +X001700Y002600 +T11 +X001000Y003000G85X001400Y003000 +M30 + +]]) + +AT_CLEANUP diff --git a/testsuite.at b/testsuite.at new file mode 100644 index 0000000..d7e6a2b --- /dev/null +++ b/testsuite.at @@ -0,0 +1,21 @@ +AT_COPYRIGHT([Copyright © 2018 Nick Bowler]) +# +# 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 . + +AT_INIT +AT_COLOR_TESTS + +AT_TESTED([slotifier]) + +m4_include([tests/simple.at])