diff options
author | Karl Berry <karl@freefriends.org> | 2018-06-11 22:21:12 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-06-11 22:21:12 +0000 |
commit | d250c96cb182d3df2332b196e3a5b040e9fd50ad (patch) | |
tree | 2ecafd5ac6678875fbd8d6ebe08d6455bc58341b /Master | |
parent | 97fd3780f5c37e7667a82e30184b6c91469ad1ac (diff) |
cellprops (11jun18)
git-svn-id: svn://tug.org/texlive/trunk@47990 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r-- | Master/texmf-dist/doc/latex/cellprops/LICENSE | 674 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/cellprops/README.md | 12 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/cellprops/cellprops.pdf | bin | 0 -> 507792 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/cellprops/cellprops.dtx | 866 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/cellprops/cellprops.ins | 24 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/cellprops/cellprops.sty | 587 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tlpkg-ctan-check | 2 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/cellprops.tlpsrc | 0 | ||||
-rw-r--r-- | Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc | 1 |
9 files changed, 2165 insertions, 1 deletions
diff --git a/Master/texmf-dist/doc/latex/cellprops/LICENSE b/Master/texmf-dist/doc/latex/cellprops/LICENSE new file mode 100644 index 00000000000..c47740c712b --- /dev/null +++ b/Master/texmf-dist/doc/latex/cellprops/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + 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. + + cellprops + Copyright (C) 2018 Julien "_FrnchFrgg_" RIVAUD + + 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 <http://www.gnu.org/licenses/>. + +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: + + cellprops Copyright (C) 2018 Julien "_FrnchFrgg_" RIVAUD + 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 +<http://www.gnu.org/licenses/>. + + 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 +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/Master/texmf-dist/doc/latex/cellprops/README.md b/Master/texmf-dist/doc/latex/cellprops/README.md new file mode 100644 index 00000000000..04259f9eb9c --- /dev/null +++ b/Master/texmf-dist/doc/latex/cellprops/README.md @@ -0,0 +1,12 @@ +The `cellprops` package +======================= + +This package reworks the internals of `tabular`, `array`, and similar +constructs, and adds a `\cellprops` command accepting CSS-like selectors and +properties. It depends on `mdwtab`, `xcolor` and of course `expl3` and +`xparse`. + +You can use most constructs of `mdwtab`, but some too hackish usage might +alter the function of cellprops. + +Look at the PDF documentation to see examples and detailed usage. diff --git a/Master/texmf-dist/doc/latex/cellprops/cellprops.pdf b/Master/texmf-dist/doc/latex/cellprops/cellprops.pdf Binary files differnew file mode 100644 index 00000000000..66e7a6ed74e --- /dev/null +++ b/Master/texmf-dist/doc/latex/cellprops/cellprops.pdf diff --git a/Master/texmf-dist/source/latex/cellprops/cellprops.dtx b/Master/texmf-dist/source/latex/cellprops/cellprops.dtx new file mode 100644 index 00000000000..6786f616db4 --- /dev/null +++ b/Master/texmf-dist/source/latex/cellprops/cellprops.dtx @@ -0,0 +1,866 @@ +% \iffalse meta-comment +% vim: tw=80 spl=en +% +%% File: cellprops.dtx (C) Copyright 2016 RIVAUD Julien +%% +%% It may be distributed and/or modified under the conditions of the +%% General Public License (GPL), either version 3 of this +%% license or (at your option) any later version. +% +%<*driver|package> +% The version of expl3 required is tested as early as possible, as +% some really old versions do not define \ProvidesExplPackage. +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\RequirePackage{expl3}[2016/01/19] +\def\ExplFileName{cellprops} +\def\ExplFileDescription{CSS-like cell and table properties} +\def\ExplFileDate{2016/04/05} +\def\ExplFileVersion{1.0} +%</driver|package> +%<*driver> +\documentclass[full]{l3doc} +\usepackage{cellprops} +\begin{document} + \DocInput{\jobname.dtx} +\end{document} +%</driver> +% \fi +% +% \title{^^A +% The \textsf{\ExplFileName} package\\ \ExplFileDescription^^A +% \thanks{This file describes v\ExplFileVersion, +% last revised \ExplFileDate.}^^A +% } +% +% \author{^^A +% Julien ``\_FrnchFrgg\_'' \textsc{Rivaud}\thanks +% {^^A +% E-mail: +% \href{mailto:frnchfrgg@free.fr} +% {frnchfrgg@free.fr}^^A +% }^^A +% } +% +% \date{Released \ExplFileDate} +% +% \maketitle +% +% \begin{documentation} +% +% +% +% \section{\pkg{\ExplFileName} documentation} +% +% This package reworks the internals of \env{tabular}, \env{array}, and similar +% constructs, and adds a \cs{cellprops} command accepting CSS-like selectors and +% properties. +% +% It depends on \pkg{mdwtab}, \pkg{xcolor} and of course \pkg{expl3} and +% \pkg{xparse}. +% +% \subsection{Example} +% +% The code: +% +%\begin{verbatim} +% \[ +% \cellprops{ +% td { padding: 1ex; } +% td:nth-child(4) { color: red; } +% tr:nth-child(2) { color: red; } +% tr:nth-child(1) td:nth-child(4) { color: inherit; } +% td:nth-child(even) { background-color: black!5!white; } +% tr:nth-child(2n+1) { background-color: yellow!30!white; } +% tr:nth-child(odd) td:nth-child(even) { +% background-color: black!20!yellow!20!white; +% } +% } +% \begin{array}{Tlccc} +% \hline +% This is text & A_2 & A_3 & A_4 \\ +% \hline +% B1 & This is maths & B_3 & \\ +% C1 & C_2 & X & Y \\ +% D1 & D_2 & DX & v \\ +% E & F & \int_a^b f(t) dt & v \\ +% \hline +% \end{array}\] +%\end{verbatim} +% +% produces: +% +% \[ +% \cellprops{ +% td { padding: 1ex; } +% td:nth-child(4) { color: red; } +% tr:nth-child(2) { color: red; } +% tr:nth-child(1) td:nth-child(4) { color: inherit; } +% td:nth-child(even) { background-color: black!5!white; } +% tr:nth-child(2n+1) { background-color: yellow!30!white; } +% tr:nth-child(odd) td:nth-child(even) { +% background-color: black!20!yellow!20!white; +% } +% } +% \begin{array}{Tlccc} +% \hline +% This is text & A_2 & A_3 & A_4 \\ +% \hline +% B1 & This is maths & B_3 & \\ +% C1 & C_2 & X & Y \\ +% D1 & D_2 & DX & v \\ +% E & F & \int_a^b f(t) dt & v \\ +% \hline +% \end{array}\] +% +% +% +% +% \subsection{Usage guide} +% +% \def\OR{\string| } +% +% \def\bracket#1{\<#1>:} +% \def\<#1>{{\normalfont<\textsl{#1}>}} +% \begin{description}[format=\bracket, +% wide,leftmargin=9em,labelwidth=!,labelsep=0pt, +% ] +% \item[usage] "'\cellprops{'" [ \<selectors> "'{'" \<properties> "'}'" ]* "'}'" +% \item[selectors] \<selector> ["," \<selectors> ] +% \item[selector] [\<environment> "' '"] \<element1> +% \item[element1] +% "'table'" \OR +% "'tr'"[\<pseudo-class>] ["' '" \<element2>] \OR +% \<element2> +% \item[element2] "'td'"[\<pseudo-class>] +% \item[pseudo-class] "':nth-child('"\<nth>"')" +% \item[nth] \<number> \OR "'odd'" \OR "'even'" \OR \<number>"'n+'"\<number> +% \item[properties] [ \<property> "';'" ]* +% \item[property] +% "'padding: '" \<dimension> [ "' '" \<dimension> ]* \OR \\ +% "'padding-top: '" \<dimension> \OR \\ +% "'padding-left: '" \<dimension> \OR \\ +% "'padding-bottom: '" \<dimension> \OR \\ +% "'padding-right: '" \<dimension> \OR \\ +% "'min-height: '" \<dimension> \OR \\ +% "'min-depth: '" \<dimension> \OR \\ +% "'min-width: '" \<dimension> \OR \\ +% "'text-align: '" ( "'left'" \OR "'right'" \OR "'center'" ) \OR \\ +% "'math-mode: '" ( "'text'" \OR "'math'" \OR "'auto'" ) \OR \\ +% "'color: '" ( \<xcolor-expression> \OR "'inherit'" ) \OR \\ +% "'background-color: '" ( \<xcolor-expression> \OR "'transparent'" ) \\ +% \end{description} +% +% Most of these properties are straight-forward. Some explanations: +% +% Here are the supported column types: +% \begin{itemize} +% \item "n": The most basic cell type, hbox, honoring all properties. +% \item "l", "c", and "r": Same as "n" but with forced "text-align". +% \item "M"\<coltype>: Same as \<coltype> but enforces "math-mode: math". The +% net effect is that "Mc" will create a centered column whose contents are +% in non-display math mode. +% \item "T"\<coltype>: Same as \<coltype> but enforces "math-mode: text". +% \item "p{"\<width>"}", "m"\<width> and "b"\<width>: parbox cell with the +% corresponding vertical alignment (\cs{vtop}, \cs{vcenter} or \cs{vbox}). +% \item "*{"\<count>"}{"\<coltypes>"}": same as in \pkg{array} or +% \pkg{mdwtab}. +% \item You can try to use constructs of \pkg{array} or \pkg{mdwtab}, but they +% might alter the function of \pkg{cellprops}. Most should be fine though. +% \end{itemize} +% The intended usage is to use "n"-type columns and set the properties with CSS, +% but \LaTeX-like columns in the preamble are often less verbose. +% +% Details for some properties: +% +% \begin{itemize} +% \item "math-mode: auto" means that the cell will be in math mode in +% environments \env{array}, \env{matrix}, \dots, and in text mode in +% environments like \env{tabular}, \dots +% \item "background-color" is only painted on the cell, and "transparent" +% actually means "inherit" except that if all values encountered are +% "inherit"/"transparent" no background is painted at all. That means that +% (currently) you cannot paint a row in some color and rely on +% transparency to have it bleed through a cell background. +% \item There are no columns in the CSS object model so you have to use +% "td:nth-child()" to select a column. Currently, cells spanning several +% columns actually increase the child count by the number of column they +% span, so that nth-child can still be used to select columns. +% This is not consistent with the CSS specification. +% \item Currently, only "2n", "2n+1", "3n", "3n+1" and "3n+2" are supported, +% without any space, as arguments of "nth-child()" other than a single +% number, "odd" or "even" without any space. Supporting others is trivial, +% but increase the running time. In a near-future release, I intend to +% detect which multiples are actually used and automatically support +% those. +% \end{itemize} +% +% \subsection{TODO} +% +% Add "border" properties. Add automatic support of ":nth-child(an+b)" for +% $"a"\ge 4$. +% +% \end{documentation} +% +% \begin{implementation} +% +% \section{\pkg{\ExplFileName} implementation} +% +% \begin{macrocode} +%<*package> +% \end{macrocode} +% +% \begin{macrocode} +%<@@=cellprops> +% \end{macrocode} +% +% \begin{macrocode} +\ProvidesExplPackage + {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} + +\RequirePackage{xparse} +\RequirePackage{xcolor} +% \end{macrocode} +% \subsection{Loading and fixing \pkg{mdwtab}} +% +% There is a bug in the command \cs{colpop} of \pkg{mdwtab}: instead of just +% popping one name in the stack of column sets currently used, it empties it +% completely because one \cs{expandafter} is missing. This is proof that not +% many package authors really use this API as recommended by Mark +% \textsc{Wooding}\ldots We thus load \pkg{mdwtab} and fix \cs{colpop}. +% \begin{macrocode} +\RequirePackage{mdwtab} +\cs_set_nopar:Npn \tab@pop #1 { \tl_set:Nx #1 { \tl_tail:N #1 } } + + +% \end{macrocode} +% +% \subsection{Parsing CSS properties} +% +% Properties are parsed once at setting time, by expandable parsers that leave +% definitions in the input stream. All these resulting definitions are saved +% in a token list that will be expanded when we need the values. The goal is +% to have multiple token lists for multiple contexts, yet not to do the full +% parsing dance once per cell. +% +% \begin{variable}{\l_@@_property_value_<name>_tl} +% \begin{macro}{\@@_generic_setter:nnn} +% \begin{macro}{\@@_get_property:n} +% \begin{macro}{\@@_get_property:nN} +% We first define a generic setter which just uses +% \cs{l_@@_property_value_<name>_tl} to store the value of the property. We +% define getters, one that leaves the value in the stream, and one saving the +% value in a token list. +% +% \begin{macrocode} +\cs_set:Nn \@@_generic_setter:nnn { + \exp_not:N \tl_set:Nn + \exp_not:c { l_@@_property_value_#2_tl } + {#1 {#3}} +} + +\cs_set_nopar:Nn \@@_get_property:n { + \tl_use:c { l_@@_property_value_#1_tl } +} + +\cs_set_protected_nopar:Nn \@@_get_property:nN { + \tl_set_eq:Nc #2 { l_@@_property_value_#1_tl } +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{variable} +% +% \begin{macro}{\@@_property_type_<name>:nn} +% \begin{macro}{\@@_define_properties:nn} +% The control sequence \cs{_@@_property_type_<name>:nn} holds the setter for +% the property \meta{name}. It can be set by the following helper: +% \begin{macrocode} +\cs_set_protected:Nn \@@_define_properties:nn { + \clist_map_inline:nn {#2} { + \cs_set:cpn { _@@_property_type_##1:nn } {#1} + } +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\@@_use_setter:nn} +% Sometimes we need to use a setter right away rather than save its action +% somewhere. The following helper does that with an x-expansion. +% \begin{macrocode} +\cs_set_protected:Nn \@@_use_setter:nn { + \use:x { + \use:c {_@@_property_type_#1:nn} {#1} {#2} + } +} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\cs_set_protected:Nn \@@_parse_properties:nn { + \tl_if_exist:cF { l_@@_property_group_#1_tl } { + \tl_clear:c { l_@@_property_group_#1_tl } + } + \seq_set_split:Nnn \l_tmpa_seq {;} {#2} + \seq_map_inline:Nn \l_tmpa_seq { + \tl_if_empty:nF {##1} { + \exp_args:NNV \seq_set_split:Nnn \l_tmpb_seq \c_colon_str {##1} + \int_compare:nNnTF {\seq_count:N \l_tmpb_seq} = \c_two { + \seq_get_left:NN \l_tmpb_seq \l_tmpa_tl + \exp_args:NNV \str_set:Nn \l_tmpa_str \l_tmpa_tl + \seq_get_right:NN \l_tmpb_seq \l_tmpa_tl + \cs_if_exist:cTF { _@@_property_type_\l_tmpa_str :nn } { + \tl_put_right:cx { l_@@_property_group_#1_tl } { + \exp_args:Nc \exp_args:NVV + { _@@_property_type_\l_tmpa_str :nn } + \l_tmpa_str \l_tmpa_tl + } + }{ + % TODO: ERROR-no property with that name + } + }{ + % TODO: ERROR-too many : or none at all + } + } + } +} + +\cs_set:Nn \@@_fourdim_setter:nn { + \@@_fourdim_setter_aux:w + {#1}#2~{\q_no_value}~{\q_no_value}~{\q_no_value}~\q_stop +} +\cs_set:Npn \@@_fourdim_setter_aux:w #1#2~#3~#4~#5~#6\q_stop { + \@@_generic_setter:nnn \exp_not:n {#1-top} {#2} + \quark_if_no_value:nTF {#3} { + \@@_generic_setter:nnn \exp_not:n {#1-right} {#2} + \@@_generic_setter:nnn \exp_not:n {#1-left} {#2} + }{ + \@@_generic_setter:nnn \exp_not:n {#1-right} {#3} + \quark_if_no_value:nTF {#5} { + \@@_generic_setter:nnn \exp_not:n {#1-left} {#3} + }{ + \@@_generic_setter:nnn \exp_not:n {#1-left} {#5} + } + } + \quark_if_no_value:nTF {#4} { + \@@_generic_setter:nnn \exp_not:n {#1-bottom} {#2} + }{ + \@@_generic_setter:nnn \exp_not:n {#1-bottom} {#4} + } +} + +\tl_const:Nn \c_@@_inherit_color_tl { \q_nil } + +\cs_new_nopar:Nn \@@_color_setter:nn { + \str_if_eq:nnTF {#2} {inherit} { + \@@_generic_setter:nnn \exp_not:n {#1} {\c_@@_inherit_color_tl} + }{ + \str_case_x:nnF { \str_range:nnn {#2} {1} {4} } { + {rgb(} { + \@@_generic_setter:nnn \use:n {#1} { + \exp_not:n {\color[RGB]} {\str_range:nnn {#2} {5} {-2}} + }} + {hsl(} { + \@@_generic_setter:nnn \use:n {#1} { + \exp_not:n {\color[Hsb]} {\str_range:nnn {#2} {5} {-2}} + }} + }{ + \@@_generic_setter:nnn \exp_not:n {#1} { + \color{#2} + } + } + } +} +\cs_new_nopar:Nn \@@_bgcolor_setter:nn { + \str_if_eq:nnTF {#2} {transparent} { + \@@_color_setter:nn {#1} {inherit} + }{ + \@@_color_setter:nn {#1} {#2} + } +} + + +\@@_define_properties:nn { + \@@_generic_setter:nnn \exp_not:n +}{ + padding-top, + padding-right, + padding-bottom, + padding-left, + min-height, + min-depth, + min-width, +} + +\@@_define_properties:nn { + \@@_fourdim_setter:nn +}{ + padding +} + +\@@_define_properties:nn { + \@@_generic_setter:nnn \tl_to_str:n +}{ + text-align, + math-mode, +} + +\@@_define_properties:nn { + \@@_color_setter:nn +}{ + color, +} + +\@@_define_properties:nn { + \@@_bgcolor_setter:nn +}{ + background-color, +} + + +% TODO: properties for array +\NewDocumentCommand \cellprops { m } { + \@@_parse_css:n {#1} +} + +\cs_new_protected:Nn \@@_parse_css:n { + \@@_parse_css:w #1 \q_mark {\q_nil} \q_stop +} +\NewDocumentCommand \@@_parse_css:w { lmu{\q_stop} } { + \quark_if_nil:nF {#2} { + \clist_map_inline:nn {#1} { + \@@_parse_properties:nn {##1} {#2} + } + \@@_parse_css:w #3 \q_stop + } +} + +\cs_set_protected:Nn \@@_recall_properties:n { + \tl_if_exist:cT { l_@@_property_group_#1_tl } { + \tl_use:c { l_@@_property_group_#1_tl } + } + \clist_map_inline:nn { \@currenvir } { + \tl_if_exist:cT { l_@@_property_group_##1~#1_tl } { + \tl_use:c { l_@@_property_group_##1~#1_tl } + } + } +} + +\dim_new:N \l_@@_colsep_dim +\ExplSyntaxOff +\cellprops{ + td { + padding: 0pt \csname l_@@_colsep_dim\endcsname; + min-height: 0pt; + min-depth: 0pt; + min-width: 0pt; + text-align: left; + math-mode: auto; + color: inherit; + background-color: transparent; + } + tr { + color: inherit; + background-color: transparent; + } + table { + padding: 0pt; % No change at load time + color: inherit; + background-color: transparent; + } +} +\ExplSyntaxOn + +\int_new:N \g_@@_row_int +\int_new:N \g_@@_col_int +\bool_new:N \g_@@_inrow_bool +\bool_gset_false:N \g_@@_inrow_bool + +\box_new:N \l_@@_cell_box +\skip_new:N \l_@@_left_skip +\skip_new:N \l_@@_right_skip +\dim_new:N \g_@@_ht_dim +\dim_new:N \g_@@_dp_dim + +\tl_new:N \l_@@_restore_tl + +\dim_new:N \l_@@_tablepadding_top_dim +\dim_new:N \l_@@_tablepadding_bottom_dim +\tl_new:N \l_@@_color_tl +\tl_new:N \l_@@_bgcolor_tl + +% To count rows and columns +\cs_set_eq:NN \@@_orig_array: \@array +\cs_set_protected_nopar:Npn \@array[#1]#2 { + \tl_set:Nx \l_@@_restore_tl { + \bool_if:NTF \g_@@_inrow_bool { + \exp_not:n {\bool_gset_true:N \g_@@_inrow_bool} + }{ + \exp_not:n {\bool_gset_false:N \g_@@_inrow_bool} + } + \exp_not:n { \int_gset:Nn \g_@@_row_int } + { \int_use:N \g_@@_row_int } + \exp_not:n { \int_gset:Nn \g_@@_col_int } + { \int_use:N \g_@@_col_int } + \exp_not:n { \dim_gset:Nn \g_@@_ht_dim } + { \dim_use:N \g_@@_ht_dim } + \exp_not:n { \dim_gset:Nn \g_@@_dp_dim } + { \dim_use:N \g_@@_dp_dim } + } + \int_gzero:N \g_@@_row_int + \bool_gset_false:N \g_@@_inrow_bool + \cs_set_eq:NN \@@_orig_tab@initread: \tab@initread + \cs_set_protected_nopar:Npn \tab@initread { + \cs_set_eq:NN \tab@initread \@@_orig_tab@initread: + \tab@initread + \tl_put_left:Nn \tab@tabtext {\int_gincr:N \g_@@_col_int} + } +% \end{macrocode} +% Zero \cs{col@sep} but remember its value for the default padding. +% \begin{macrocode} + \dim_set_eq:NN \l_@@_colsep_dim \col@sep + \dim_zero:N \col@sep +% \end{macrocode} +% Also ignore \cs{*extrasep} dimensions that are not part of cellprop +% interface and should be replaced by CSS equivalents. +% \begin{macrocode} + \dim_zero:N \tab@extrasep + \group_begin: + \@@_recall_properties:n {table} + \dim_gset:Nn \g_tmpa_dim { \@@_get_property:n {padding-top} } + \dim_gset:Nn \g_tmpb_dim { \@@_get_property:n {padding-bottom} } + \@@_update_colors: + \tl_gset_eq:NN \g_tmpa_tl \l_@@_color_tl + \tl_gset_eq:NN \g_tmpb_tl \l_@@_bgcolor_tl + \group_end: + \dim_set_eq:NN \l_@@_tablepadding_top_dim \g_tmpa_dim + \dim_set_eq:NN \l_@@_tablepadding_bottom_dim \g_tmpb_dim + \tl_set_eq:NN \l_@@_color_tl \g_tmpa_tl + \tl_set_eq:NN \l_@@_bgcolor_tl \g_tmpb_tl + \@@_recall_properties:n {tr} + \@@_orig_array:[{#1}]{#2} + \hlx{s[\l_@@_tablepadding_top_dim]} +} + +% \end{macrocode} +% The color inheritance is handled with \cs{l_@@_inherit_color_tl}, +% \cs{l_@@_color_tl} and \cs{l_@@_bgcolor_tl}. The role of +% \cs{@@_update_color:Nn} is to set the inherit fallback to the already +% existing value of \verb|#1| then set \verb|#1| to the CSS value, which can be +% the inherit variable. +% \begin{macrocode} + +\cs_new_protected_nopar:Nn \@@_update_color:Nn { + \@@_get_property:nN {#2} \l_tmpc_tl + \exp_args:NV \tl_if_eq:NNF \l_tmpc_tl \c_@@_inherit_color_tl { + \tl_set_eq:NN #1 \l_tmpc_tl + } +} + +\cs_set_protected_nopar:Nn \@@_update_colors: { + \@@_update_color:Nn \l_@@_color_tl {color} + \@@_update_color:Nn \l_@@_bgcolor_tl {background-color} +} + +\cs_set_eq:NN \@@_orig_endarray: \endarray +\cs_set_nopar:Npn \endarray { + \crcr + \hlx{s[\l_@@_tablepadding_bottom_dim]} + \@@_orig_endarray: + \tl_use:N \l_@@_restore_tl +} + +\cs_set_eq:NN \@@_orig_tab@startrow: \tab@startrow +\cs_set_nopar:Npn \tab@startrow { + \@@_orig_tab@startrow: + \bool_if:NF \g_@@_inrow_bool { + \bool_gset_true:N \g_@@_inrow_bool + \int_gincr:N \g_@@_row_int + \int_gset_eq:NN \g_@@_col_int \c_one + \dim_gzero:N \g_@@_ht_dim + \dim_gzero:N \g_@@_dp_dim + } +} + +\cs_set_eq:NN \@@_orig_tab@arraycr: \tab@arraycr +\cs_set_protected_nopar:Npn \tab@arraycr { + \bool_if:NT \g_@@_inrow_bool { + \bool_gset_false:N \g_@@_inrow_bool + \@@_fix_valign_end: + } + \@@_orig_tab@arraycr: +} + + + +\cs_set_eq:NN \@@_orig_multicolumn:w \multicolumn +\cs_set:Npn \multicolumn#1#2#3 { + \@@_orig_multicolumn:w {#1}{#2}{ + #3 + \int_gadd:Nn \g_@@_col_int {#1} + } +} + + +\cs_new_protected_nopar:Nn \@@_fix_valign_end: { + \exp_args:NV \tl_if_eq:nnTF \tab@hlstate {b} { + \dim_gadd:Nn \tab@endheight { + \g_@@_dp_dim - \box_dp:N \@arstrutbox + } + }{ + \int_compare:nNnT \g_@@_row_int = \c_one { + \dim_gadd:Nn \tab@endheight { + \g_@@_ht_dim - \box_ht:N \@arstrutbox + } + } + } +} + +\colpush{tabular} + +\coldef n{\tabcoltype{ + \@@_begincell:n{} +}{ + \@@_endcell: +}} +\coldef l{\tabcoltype{ + \@@_begincell:n + {\@@_use_setter:nn {text-align} {left}} +}{ + \@@_endcell: +}} +\coldef c{\tabcoltype{ + \@@_begincell:n + {\@@_use_setter:nn {text-align} {center}} +}{ + \@@_endcell: +}} +\coldef r{\tabcoltype{ + \@@_begincell:n + {\@@_use_setter:nn {text-align} {right}} +}{ + \@@_endcell: +}} +\coldef M#1{\@@_MTcol:nn {math}{#1}} +\coldef T#1{\@@_MTcol:nn {text}{#1}} +\cs_new_protected_nopar:Nn \@@_MTcol:nn { + % TODO: error if align not l, c, or r + \exp_args:Nx \tabcoltype { + \exp_not:N \@@_begincell:n { + \exp_not:n {\@@_use_setter:nn {math-mode} {#1} } + \exp_not:n {\@@_use_setter:nn {text-align}} { + \str_case:nn {#2} { + {l} {left} + {c} {center} + {r} {right} + } + } + } + }{ + \@@_endcell: + } +} + +\coldef p#1{\tabcoltype{ + \@@_begin_par_cell:nn \vtop {#1} +}{ + \@@_end_par_cell:n {} +}} +\coldef m#1{\tabcoltype{ + \@@_begin_par_cell:nn {\c_math_toggle_token\vcenter} {#1} +}{ + \@@_end_par_cell:n{\c_math_toggle_token} +}} +\coldef b#1{\tabcoltype{ + \@@_begin_par_cell:nn \vbox {#1} +}{ + \@@_end_par_cell:n {} +}} + + +\colpop + +% \end{macrocode} +% Handle various \verb|:nth-child()| forms. +% \begin{macrocode} + +\cs_new_protected_nopar:Nn \@@_nthchild_anb:Nnn { + \tl_set:Nx \l_tmpa_tl { +\int_eval:n{\int_mod:nn{#2}{#3}} } + \exp_args:NV \tl_if_eq:nnT \l_tmpa_tl { +0 } { + \tl_clear:N \l_tmpa_tl + } + \seq_put_right:Nx #1 { #3n\l_tmpa_tl } +} + +\cs_new_protected_nopar:Nn \@@_seq_nthchild:Nn { + \seq_clear:N #1 + \seq_put_right:Nx #1 { + \int_compare:nNnTF{\int_mod:nn{#2}{2}}={0}{even}{odd} + } + \@@_nthchild_anb:Nnn #1 {#2} {2} + \@@_nthchild_anb:Nnn #1 {#2} {3} + \seq_put_right:Nx #1 { \int_eval:n{#2} } +} + +\cs_new_protected_nopar:Nn \@@_begincell:n { + \@@_begin_raw_cell:n { + \@@_seq_nthchild:Nn \l_tmpa_seq { \g_@@_row_int } + \@@_seq_nthchild:Nn \l_tmpb_seq { \g_@@_col_int } + \seq_map_inline:Nn \l_tmpa_seq { + \@@_recall_properties:n {tr:nth-child(##1)} + } + \@@_update_colors: + \@@_recall_properties:n {td} + \@@_recall_properties:n {tr~td} + \seq_map_inline:Nn \l_tmpb_seq { + \@@_recall_properties:n {td:nth-child(##1)} + } + \seq_map_inline:Nn \l_tmpa_seq { + \@@_recall_properties:n {tr:nth-child(##1)~td} + } + \seq_map_inline:Nn \l_tmpa_seq { + \seq_map_inline:Nn \l_tmpb_seq { + \@@_recall_properties:n {tr:nth-child(##1)~ + td:nth-child(####1)} + } + } + \@@_update_colors: + #1 + \hbox_set:Nw \l_@@_cell_box + \str_case_x:nnF {\@@_get_property:n {math-mode}} { + { text } { \tab@btext } + { math } { \tab@bmaths } + }{% any other treated as |auto| + \tab@bgroup + } + } +} + +\cs_new_protected_nopar:Nn \@@_endcell: { + \str_case_x:nnF {\@@_get_property:n {math-mode}} { + { text } { \tab@etext } + { math } { \tab@emaths } + }{% any other treated as |auto| + \tab@egroup + } + \hbox_set_end: + \@@_end_raw_cell: +} + +\cs_new_protected_nopar:Nn \@@_begin_par_cell:nn { + \savenotes + \@@_begin_raw_cell:n{ + \hbox_set:Nw \l_@@_cell_box + #1 + \bgroup + \hsize#2\relax + \@arrayparboxrestore + \global\@minipagetrue + \everypar{ + \global\@minipagefalse + \everypar{} + } + \@@_recall_properties:n {td~p} + } +} +\cs_new_protected_nopar:Nn \@@_end_par_cell:n { + \ifhmode\@maybe@unskip\par\fi + \unskip + \egroup + #1 + \hbox_set_end: + \@@_end_raw_cell: + \spewnotes\hfil +} + +\cs_new_protected_nopar:Nn \@@_begin_raw_cell:n { + \group_begin: + % Additional init code + #1 + % Install the cell color + \@@_update_colors: + \tl_use:N \l_@@_color_tl +} + +\cs_new_protected_nopar:Nn \@@_end_raw_cell: { + % Here \l_@@_cell_box must contain the contents of the cell + % + % Handle vpadding and min-height/depth + \box_set_ht:Nn \l_@@_cell_box { + \dim_max:nn + {\box_ht:N \l_@@_cell_box} + {\@@_get_property:n {min-height}} + + (\@@_get_property:n {padding-top}) + } + \box_set_dp:Nn \l_@@_cell_box { + \dim_max:nn + {\box_dp:N \l_@@_cell_box} + {\@@_get_property:n {min-depth}} + + (\@@_get_property:n {padding-bottom}) + } + % To fix vertical alignment later + \dim_gset:Nn \g_@@_ht_dim { + \dim_max:nn + {\g_@@_ht_dim} + {\box_ht:N \l_@@_cell_box} + } + \dim_gset:Nn \g_@@_dp_dim { + \dim_max:nn + {\g_@@_dp_dim} + {\box_dp:N \l_@@_cell_box} + } + % Handle hpadding and halign + \skip_set:Nn \l_tmpa_skip { + \dim_max:nn + {0pt} + { (\@@_get_property:n {min-width}) + - \box_wd:N \l_@@_cell_box } + } + \skip_add:Nn \l_tmpa_skip { + 0pt plus 1fil + } + \skip_set:Nn \l_@@_left_skip + {\@@_get_property:n {padding-left}} + \skip_set:Nn \l_@@_right_skip + {\@@_get_property:n {padding-right}} + \str_case_x:nnF {\@@_get_property:n {text-align}} { + { right } { + \skip_add:Nn \l_@@_left_skip { \l_tmpa_skip } + } + { center } { + \skip_add:Nn \l_@@_left_skip { \l_tmpa_skip / 2 } + \skip_add:Nn \l_@@_right_skip { \l_tmpa_skip / 2 } + } + }{% any other treated as |left| + \skip_add:Nn \l_@@_right_skip { \l_tmpa_skip } + } + \kern\c_zero_dim + \tl_if_empty:NF \l_@@_bgcolor_tl { + \group_begin: + % Paint a background with leaders + \tl_use:N \l_@@_bgcolor_tl % install the color + \skip_set:Nn \l_tmpa_skip { + \l_@@_left_skip + + \box_wd:N \l_@@_cell_box + + \l_@@_right_skip + } + \leaders + \vrule + \skip_horizontal:N \l_tmpa_skip + \skip_horizontal:n {-\l_tmpa_skip} + \group_end: + } + \skip_horizontal:N \l_@@_left_skip + \box_use_clear:N \l_@@_cell_box + \skip_horizontal:N \l_@@_right_skip + \kern\c_zero_dim + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +%</package> +% \end{macrocode} +% +% \end{implementation} diff --git a/Master/texmf-dist/source/latex/cellprops/cellprops.ins b/Master/texmf-dist/source/latex/cellprops/cellprops.ins new file mode 100644 index 00000000000..6e7e57d725a --- /dev/null +++ b/Master/texmf-dist/source/latex/cellprops/cellprops.ins @@ -0,0 +1,24 @@ +\iffalse meta-comment + +File cellprops.ins (C) Copyright 2016 RIVAUD Julien + +It may be distributed and/or modified under the conditions of the +General Public License (GPL), either version 3 of this +license or (at your option) any later version. + +\fi + +\input l3docstrip.tex +\askforoverwritefalse + +\preamble +\endpreamble +% stop docstrip adding \endinput +\postamble +\endpostamble + +\keepsilent + +\generate{\file{cellprops.sty} {\from{cellprops.dtx} {package}}} + +\endbatchfile diff --git a/Master/texmf-dist/tex/latex/cellprops/cellprops.sty b/Master/texmf-dist/tex/latex/cellprops/cellprops.sty new file mode 100644 index 00000000000..78777063c4d --- /dev/null +++ b/Master/texmf-dist/tex/latex/cellprops/cellprops.sty @@ -0,0 +1,587 @@ +%% +%% This is file `cellprops.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% cellprops.dtx (with options: `package') +%% +%% File: cellprops.dtx (C) Copyright 2016 RIVAUD Julien +%% +%% It may be distributed and/or modified under the conditions of the +%% General Public License (GPL), either version 3 of this +%% license or (at your option) any later version. +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\RequirePackage{expl3}[2016/01/19] +\def\ExplFileName{cellprops} +\def\ExplFileDescription{CSS-like cell and table properties} +\def\ExplFileDate{2016/04/05} +\def\ExplFileVersion{1.0} +\ProvidesExplPackage + {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} + +\RequirePackage{xparse} +\RequirePackage{xcolor} +\RequirePackage{mdwtab} +\cs_set_nopar:Npn \tab@pop #1 { \tl_set:Nx #1 { \tl_tail:N #1 } } + +\cs_set:Nn \__cellprops_generic_setter:nnn { + \exp_not:N \tl_set:Nn + \exp_not:c { l__cellprops_property_value_#2_tl } + {#1 {#3}} +} + +\cs_set_nopar:Nn \__cellprops_get_property:n { + \tl_use:c { l__cellprops_property_value_#1_tl } +} + +\cs_set_protected_nopar:Nn \__cellprops_get_property:nN { + \tl_set_eq:Nc #2 { l__cellprops_property_value_#1_tl } +} +\cs_set_protected:Nn \__cellprops_define_properties:nn { + \clist_map_inline:nn {#2} { + \cs_set:cpn { __cellprops_property_type_##1:nn } {#1} + } +} +\cs_set_protected:Nn \__cellprops_use_setter:nn { + \use:x { + \use:c {__cellprops_property_type_#1:nn} {#1} {#2} + } +} +\cs_set_protected:Nn \__cellprops_parse_properties:nn { + \tl_if_exist:cF { l__cellprops_property_group_#1_tl } { + \tl_clear:c { l__cellprops_property_group_#1_tl } + } + \seq_set_split:Nnn \l_tmpa_seq {;} {#2} + \seq_map_inline:Nn \l_tmpa_seq { + \tl_if_empty:nF {##1} { + \exp_args:NNV \seq_set_split:Nnn \l_tmpb_seq \c_colon_str {##1} + \int_compare:nNnTF {\seq_count:N \l_tmpb_seq} = \c_two { + \seq_get_left:NN \l_tmpb_seq \l_tmpa_tl + \exp_args:NNV \str_set:Nn \l_tmpa_str \l_tmpa_tl + \seq_get_right:NN \l_tmpb_seq \l_tmpa_tl + \cs_if_exist:cTF { __cellprops_property_type_\l_tmpa_str :nn } { + \tl_put_right:cx { l__cellprops_property_group_#1_tl } { + \exp_args:Nc \exp_args:NVV + { __cellprops_property_type_\l_tmpa_str :nn } + \l_tmpa_str \l_tmpa_tl + } + }{ + % TODO: ERROR-no property with that name + } + }{ + % TODO: ERROR-too many : or none at all + } + } + } +} + +\cs_set:Nn \__cellprops_fourdim_setter:nn { + \__cellprops_fourdim_setter_aux:w + {#1}#2~{\q_no_value}~{\q_no_value}~{\q_no_value}~\q_stop +} +\cs_set:Npn \__cellprops_fourdim_setter_aux:w #1#2~#3~#4~#5~#6\q_stop { + \__cellprops_generic_setter:nnn \exp_not:n {#1-top} {#2} + \quark_if_no_value:nTF {#3} { + \__cellprops_generic_setter:nnn \exp_not:n {#1-right} {#2} + \__cellprops_generic_setter:nnn \exp_not:n {#1-left} {#2} + }{ + \__cellprops_generic_setter:nnn \exp_not:n {#1-right} {#3} + \quark_if_no_value:nTF {#5} { + \__cellprops_generic_setter:nnn \exp_not:n {#1-left} {#3} + }{ + \__cellprops_generic_setter:nnn \exp_not:n {#1-left} {#5} + } + } + \quark_if_no_value:nTF {#4} { + \__cellprops_generic_setter:nnn \exp_not:n {#1-bottom} {#2} + }{ + \__cellprops_generic_setter:nnn \exp_not:n {#1-bottom} {#4} + } +} + +\tl_const:Nn \c__cellprops_inherit_color_tl { \q_nil } + +\cs_new_nopar:Nn \__cellprops_color_setter:nn { + \str_if_eq:nnTF {#2} {inherit} { + \__cellprops_generic_setter:nnn \exp_not:n {#1} {\c__cellprops_inherit_color_tl} + }{ + \str_case_x:nnF { \str_range:nnn {#2} {1} {4} } { + {rgb(} { + \__cellprops_generic_setter:nnn \use:n {#1} { + \exp_not:n {\color[RGB]} {\str_range:nnn {#2} {5} {-2}} + }} + {hsl(} { + \__cellprops_generic_setter:nnn \use:n {#1} { + \exp_not:n {\color[Hsb]} {\str_range:nnn {#2} {5} {-2}} + }} + }{ + \__cellprops_generic_setter:nnn \exp_not:n {#1} { + \color{#2} + } + } + } +} +\cs_new_nopar:Nn \__cellprops_bgcolor_setter:nn { + \str_if_eq:nnTF {#2} {transparent} { + \__cellprops_color_setter:nn {#1} {inherit} + }{ + \__cellprops_color_setter:nn {#1} {#2} + } +} + +\__cellprops_define_properties:nn { + \__cellprops_generic_setter:nnn \exp_not:n +}{ + padding-top, + padding-right, + padding-bottom, + padding-left, + min-height, + min-depth, + min-width, +} + +\__cellprops_define_properties:nn { + \__cellprops_fourdim_setter:nn +}{ + padding +} + +\__cellprops_define_properties:nn { + \__cellprops_generic_setter:nnn \tl_to_str:n +}{ + text-align, + math-mode, +} + +\__cellprops_define_properties:nn { + \__cellprops_color_setter:nn +}{ + color, +} + +\__cellprops_define_properties:nn { + \__cellprops_bgcolor_setter:nn +}{ + background-color, +} + +\NewDocumentCommand \cellprops { m } { + \__cellprops_parse_css:n {#1} +} + +\cs_new_protected:Nn \__cellprops_parse_css:n { + \__cellprops_parse_css:w #1 \q_mark {\q_nil} \q_stop +} +\NewDocumentCommand \__cellprops_parse_css:w { lmu{\q_stop} } { + \quark_if_nil:nF {#2} { + \clist_map_inline:nn {#1} { + \__cellprops_parse_properties:nn {##1} {#2} + } + \__cellprops_parse_css:w #3 \q_stop + } +} + +\cs_set_protected:Nn \__cellprops_recall_properties:n { + \tl_if_exist:cT { l__cellprops_property_group_#1_tl } { + \tl_use:c { l__cellprops_property_group_#1_tl } + } + \clist_map_inline:nn { \@currenvir } { + \tl_if_exist:cT { l__cellprops_property_group_##1~#1_tl } { + \tl_use:c { l__cellprops_property_group_##1~#1_tl } + } + } +} + +\dim_new:N \l__cellprops_colsep_dim +\ExplSyntaxOff +\cellprops{ + td { + padding: 0pt \csname l__cellprops_colsep_dim\endcsname; + min-height: 0pt; + min-depth: 0pt; + min-width: 0pt; + text-align: left; + math-mode: auto; + color: inherit; + background-color: transparent; + } + tr { + color: inherit; + background-color: transparent; + } + table { + padding: 0pt; % No change at load time + color: inherit; + background-color: transparent; + } +} +\ExplSyntaxOn + +\int_new:N \g__cellprops_row_int +\int_new:N \g__cellprops_col_int +\bool_new:N \g__cellprops_inrow_bool +\bool_gset_false:N \g__cellprops_inrow_bool + +\box_new:N \l__cellprops_cell_box +\skip_new:N \l__cellprops_left_skip +\skip_new:N \l__cellprops_right_skip +\dim_new:N \g__cellprops_ht_dim +\dim_new:N \g__cellprops_dp_dim + +\tl_new:N \l__cellprops_restore_tl + +\dim_new:N \l__cellprops_tablepadding_top_dim +\dim_new:N \l__cellprops_tablepadding_bottom_dim +\tl_new:N \l__cellprops_color_tl +\tl_new:N \l__cellprops_bgcolor_tl + +\cs_set_eq:NN \__cellprops_orig_array: \@array +\cs_set_protected_nopar:Npn \@array[#1]#2 { + \tl_set:Nx \l__cellprops_restore_tl { + \bool_if:NTF \g__cellprops_inrow_bool { + \exp_not:n {\bool_gset_true:N \g__cellprops_inrow_bool} + }{ + \exp_not:n {\bool_gset_false:N \g__cellprops_inrow_bool} + } + \exp_not:n { \int_gset:Nn \g__cellprops_row_int } + { \int_use:N \g__cellprops_row_int } + \exp_not:n { \int_gset:Nn \g__cellprops_col_int } + { \int_use:N \g__cellprops_col_int } + \exp_not:n { \dim_gset:Nn \g__cellprops_ht_dim } + { \dim_use:N \g__cellprops_ht_dim } + \exp_not:n { \dim_gset:Nn \g__cellprops_dp_dim } + { \dim_use:N \g__cellprops_dp_dim } + } + \int_gzero:N \g__cellprops_row_int + \bool_gset_false:N \g__cellprops_inrow_bool + \cs_set_eq:NN \__cellprops_orig_tab@initread: \tab@initread + \cs_set_protected_nopar:Npn \tab@initread { + \cs_set_eq:NN \tab@initread \__cellprops_orig_tab@initread: + \tab@initread + \tl_put_left:Nn \tab@tabtext {\int_gincr:N \g__cellprops_col_int} + } + \dim_set_eq:NN \l__cellprops_colsep_dim \col@sep + \dim_zero:N \col@sep + \dim_zero:N \tab@extrasep + \group_begin: + \__cellprops_recall_properties:n {table} + \dim_gset:Nn \g_tmpa_dim { \__cellprops_get_property:n {padding-top} } + \dim_gset:Nn \g_tmpb_dim { \__cellprops_get_property:n {padding-bottom} } + \__cellprops_update_colors: + \tl_gset_eq:NN \g_tmpa_tl \l__cellprops_color_tl + \tl_gset_eq:NN \g_tmpb_tl \l__cellprops_bgcolor_tl + \group_end: + \dim_set_eq:NN \l__cellprops_tablepadding_top_dim \g_tmpa_dim + \dim_set_eq:NN \l__cellprops_tablepadding_bottom_dim \g_tmpb_dim + \tl_set_eq:NN \l__cellprops_color_tl \g_tmpa_tl + \tl_set_eq:NN \l__cellprops_bgcolor_tl \g_tmpb_tl + \__cellprops_recall_properties:n {tr} + \__cellprops_orig_array:[{#1}]{#2} + \hlx{s[\l__cellprops_tablepadding_top_dim]} +} + + +\cs_new_protected_nopar:Nn \__cellprops_update_color:Nn { + \__cellprops_get_property:nN {#2} \l_tmpc_tl + \exp_args:NV \tl_if_eq:NNF \l_tmpc_tl \c__cellprops_inherit_color_tl { + \tl_set_eq:NN #1 \l_tmpc_tl + } +} + +\cs_set_protected_nopar:Nn \__cellprops_update_colors: { + \__cellprops_update_color:Nn \l__cellprops_color_tl {color} + \__cellprops_update_color:Nn \l__cellprops_bgcolor_tl {background-color} +} + +\cs_set_eq:NN \__cellprops_orig_endarray: \endarray +\cs_set_nopar:Npn \endarray { + \crcr + \hlx{s[\l__cellprops_tablepadding_bottom_dim]} + \__cellprops_orig_endarray: + \tl_use:N \l__cellprops_restore_tl +} + +\cs_set_eq:NN \__cellprops_orig_tab@startrow: \tab@startrow +\cs_set_nopar:Npn \tab@startrow { + \__cellprops_orig_tab@startrow: + \bool_if:NF \g__cellprops_inrow_bool { + \bool_gset_true:N \g__cellprops_inrow_bool + \int_gincr:N \g__cellprops_row_int + \int_gset_eq:NN \g__cellprops_col_int \c_one + \dim_gzero:N \g__cellprops_ht_dim + \dim_gzero:N \g__cellprops_dp_dim + } +} + +\cs_set_eq:NN \__cellprops_orig_tab@arraycr: \tab@arraycr +\cs_set_protected_nopar:Npn \tab@arraycr { + \bool_if:NT \g__cellprops_inrow_bool { + \bool_gset_false:N \g__cellprops_inrow_bool + \__cellprops_fix_valign_end: + } + \__cellprops_orig_tab@arraycr: +} + +\cs_set_eq:NN \__cellprops_orig_multicolumn:w \multicolumn +\cs_set:Npn \multicolumn#1#2#3 { + \__cellprops_orig_multicolumn:w {#1}{#2}{ + #3 + \int_gadd:Nn \g__cellprops_col_int {#1} + } +} + +\cs_new_protected_nopar:Nn \__cellprops_fix_valign_end: { + \exp_args:NV \tl_if_eq:nnTF \tab@hlstate {b} { + \dim_gadd:Nn \tab@endheight { + \g__cellprops_dp_dim - \box_dp:N \@arstrutbox + } + }{ + \int_compare:nNnT \g__cellprops_row_int = \c_one { + \dim_gadd:Nn \tab@endheight { + \g__cellprops_ht_dim - \box_ht:N \@arstrutbox + } + } + } +} + +\colpush{tabular} + +\coldef n{\tabcoltype{ + \__cellprops_begincell:n{} +}{ + \__cellprops_endcell: +}} +\coldef l{\tabcoltype{ + \__cellprops_begincell:n + {\__cellprops_use_setter:nn {text-align} {left}} +}{ + \__cellprops_endcell: +}} +\coldef c{\tabcoltype{ + \__cellprops_begincell:n + {\__cellprops_use_setter:nn {text-align} {center}} +}{ + \__cellprops_endcell: +}} +\coldef r{\tabcoltype{ + \__cellprops_begincell:n + {\__cellprops_use_setter:nn {text-align} {right}} +}{ + \__cellprops_endcell: +}} +\coldef M#1{\__cellprops_MTcol:nn {math}{#1}} +\coldef T#1{\__cellprops_MTcol:nn {text}{#1}} +\cs_new_protected_nopar:Nn \__cellprops_MTcol:nn { + % TODO: error if align not l, c, or r + \exp_args:Nx \tabcoltype { + \exp_not:N \__cellprops_begincell:n { + \exp_not:n {\__cellprops_use_setter:nn {math-mode} {#1} } + \exp_not:n {\__cellprops_use_setter:nn {text-align}} { + \str_case:nn {#2} { + {l} {left} + {c} {center} + {r} {right} + } + } + } + }{ + \__cellprops_endcell: + } +} + +\coldef p#1{\tabcoltype{ + \__cellprops_begin_par_cell:nn \vtop {#1} +}{ + \__cellprops_end_par_cell:n {} +}} +\coldef m#1{\tabcoltype{ + \__cellprops_begin_par_cell:nn {\c_math_toggle_token\vcenter} {#1} +}{ + \__cellprops_end_par_cell:n{\c_math_toggle_token} +}} +\coldef b#1{\tabcoltype{ + \__cellprops_begin_par_cell:nn \vbox {#1} +}{ + \__cellprops_end_par_cell:n {} +}} + +\colpop + + +\cs_new_protected_nopar:Nn \__cellprops_nthchild_anb:Nnn { + \tl_set:Nx \l_tmpa_tl { +\int_eval:n{\int_mod:nn{#2}{#3}} } + \exp_args:NV \tl_if_eq:nnT \l_tmpa_tl { +0 } { + \tl_clear:N \l_tmpa_tl + } + \seq_put_right:Nx #1 { #3n\l_tmpa_tl } +} + +\cs_new_protected_nopar:Nn \__cellprops_seq_nthchild:Nn { + \seq_clear:N #1 + \seq_put_right:Nx #1 { + \int_compare:nNnTF{\int_mod:nn{#2}{2}}={0}{even}{odd} + } + \__cellprops_nthchild_anb:Nnn #1 {#2} {2} + \__cellprops_nthchild_anb:Nnn #1 {#2} {3} + \seq_put_right:Nx #1 { \int_eval:n{#2} } +} + +\cs_new_protected_nopar:Nn \__cellprops_begincell:n { + \__cellprops_begin_raw_cell:n { + \__cellprops_seq_nthchild:Nn \l_tmpa_seq { \g__cellprops_row_int } + \__cellprops_seq_nthchild:Nn \l_tmpb_seq { \g__cellprops_col_int } + \seq_map_inline:Nn \l_tmpa_seq { + \__cellprops_recall_properties:n {tr:nth-child(##1)} + } + \__cellprops_update_colors: + \__cellprops_recall_properties:n {td} + \__cellprops_recall_properties:n {tr~td} + \seq_map_inline:Nn \l_tmpb_seq { + \__cellprops_recall_properties:n {td:nth-child(##1)} + } + \seq_map_inline:Nn \l_tmpa_seq { + \__cellprops_recall_properties:n {tr:nth-child(##1)~td} + } + \seq_map_inline:Nn \l_tmpa_seq { + \seq_map_inline:Nn \l_tmpb_seq { + \__cellprops_recall_properties:n {tr:nth-child(##1)~ + td:nth-child(####1)} + } + } + \__cellprops_update_colors: + #1 + \hbox_set:Nw \l__cellprops_cell_box + \str_case_x:nnF {\__cellprops_get_property:n {math-mode}} { + { text } { \tab@btext } + { math } { \tab@bmaths } + }{% any other treated as |auto| + \tab@bgroup + } + } +} + +\cs_new_protected_nopar:Nn \__cellprops_endcell: { + \str_case_x:nnF {\__cellprops_get_property:n {math-mode}} { + { text } { \tab@etext } + { math } { \tab@emaths } + }{% any other treated as |auto| + \tab@egroup + } + \hbox_set_end: + \__cellprops_end_raw_cell: +} + +\cs_new_protected_nopar:Nn \__cellprops_begin_par_cell:nn { + \savenotes + \__cellprops_begin_raw_cell:n{ + \hbox_set:Nw \l__cellprops_cell_box + #1 + \bgroup + \hsize#2\relax + \@arrayparboxrestore + \global\@minipagetrue + \everypar{ + \global\@minipagefalse + \everypar{} + } + \__cellprops_recall_properties:n {td~p} + } +} +\cs_new_protected_nopar:Nn \__cellprops_end_par_cell:n { + \ifhmode\@maybe@unskip\par\fi + \unskip + \egroup + #1 + \hbox_set_end: + \__cellprops_end_raw_cell: + \spewnotes\hfil +} + +\cs_new_protected_nopar:Nn \__cellprops_begin_raw_cell:n { + \group_begin: + % Additional init code + #1 + % Install the cell color + \__cellprops_update_colors: + \tl_use:N \l__cellprops_color_tl +} + +\cs_new_protected_nopar:Nn \__cellprops_end_raw_cell: { + % Here \l__cellprops_cell_box must contain the contents of the cell + % + % Handle vpadding and min-height/depth + \box_set_ht:Nn \l__cellprops_cell_box { + \dim_max:nn + {\box_ht:N \l__cellprops_cell_box} + {\__cellprops_get_property:n {min-height}} + + (\__cellprops_get_property:n {padding-top}) + } + \box_set_dp:Nn \l__cellprops_cell_box { + \dim_max:nn + {\box_dp:N \l__cellprops_cell_box} + {\__cellprops_get_property:n {min-depth}} + + (\__cellprops_get_property:n {padding-bottom}) + } + % To fix vertical alignment later + \dim_gset:Nn \g__cellprops_ht_dim { + \dim_max:nn + {\g__cellprops_ht_dim} + {\box_ht:N \l__cellprops_cell_box} + } + \dim_gset:Nn \g__cellprops_dp_dim { + \dim_max:nn + {\g__cellprops_dp_dim} + {\box_dp:N \l__cellprops_cell_box} + } + % Handle hpadding and halign + \skip_set:Nn \l_tmpa_skip { + \dim_max:nn + {0pt} + { (\__cellprops_get_property:n {min-width}) + - \box_wd:N \l__cellprops_cell_box } + } + \skip_add:Nn \l_tmpa_skip { + 0pt plus 1fil + } + \skip_set:Nn \l__cellprops_left_skip + {\__cellprops_get_property:n {padding-left}} + \skip_set:Nn \l__cellprops_right_skip + {\__cellprops_get_property:n {padding-right}} + \str_case_x:nnF {\__cellprops_get_property:n {text-align}} { + { right } { + \skip_add:Nn \l__cellprops_left_skip { \l_tmpa_skip } + } + { center } { + \skip_add:Nn \l__cellprops_left_skip { \l_tmpa_skip / 2 } + \skip_add:Nn \l__cellprops_right_skip { \l_tmpa_skip / 2 } + } + }{% any other treated as |left| + \skip_add:Nn \l__cellprops_right_skip { \l_tmpa_skip } + } + \kern\c_zero_dim + \tl_if_empty:NF \l__cellprops_bgcolor_tl { + \group_begin: + % Paint a background with leaders + \tl_use:N \l__cellprops_bgcolor_tl % install the color + \skip_set:Nn \l_tmpa_skip { + \l__cellprops_left_skip + + \box_wd:N \l__cellprops_cell_box + + \l__cellprops_right_skip + } + \leaders + \vrule + \skip_horizontal:N \l_tmpa_skip + \skip_horizontal:n {-\l_tmpa_skip} + \group_end: + } + \skip_horizontal:N \l__cellprops_left_skip + \box_use_clear:N \l__cellprops_cell_box + \skip_horizontal:N \l__cellprops_right_skip + \kern\c_zero_dim + \group_end: +} +%% +%% +%% End of file `cellprops.sty'. diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check index 951d435e65e..ab0a51fe2cc 100755 --- a/Master/tlpkg/bin/tlpkg-ctan-check +++ b/Master/tlpkg/bin/tlpkg-ctan-check @@ -139,7 +139,7 @@ my @TLP_working = qw( cbcoptic cbfonts cbfonts-fd cc-pl ccaption ccfonts ccicons cclicenses cd cd-cover cdpbundl - cell cellspace celtic censor cesenaexam cfr-initials cfr-lm + cell cellprops cellspace celtic censor cesenaexam cfr-initials cfr-lm changebar changelayout changepage changes chappg chapterfolder chbibref cheatsheet checkcites checklistings chem-journal chemarrow chembst chemcompounds chemcono chemexec diff --git a/Master/tlpkg/tlpsrc/cellprops.tlpsrc b/Master/tlpkg/tlpsrc/cellprops.tlpsrc new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/Master/tlpkg/tlpsrc/cellprops.tlpsrc diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc index dad9a96a4ba..7106b1249d8 100644 --- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc +++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc @@ -137,6 +137,7 @@ depend cclicenses depend cd depend cd-cover depend cdpbundl +depend cellprops depend cellspace depend censor depend changebar |