From 4a68164a544897aa6fc54b5eb61b23135e44d4df Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 14 Dec 2022 03:01:10 +0000 Subject: CTAN sync 202212140301 --- macros/latex/contrib/styledcmd/LICENSE | 619 ----------------------- macros/latex/contrib/styledcmd/styledcmd.dtx | 706 ++++++++++++++++----------- macros/latex/contrib/styledcmd/styledcmd.ins | 1 + macros/latex/contrib/styledcmd/styledcmd.pdf | Bin 338113 -> 433243 bytes 4 files changed, 423 insertions(+), 903 deletions(-) delete mode 100644 macros/latex/contrib/styledcmd/LICENSE (limited to 'macros/latex/contrib/styledcmd') diff --git a/macros/latex/contrib/styledcmd/LICENSE b/macros/latex/contrib/styledcmd/LICENSE deleted file mode 100644 index 281d399f13..0000000000 --- a/macros/latex/contrib/styledcmd/LICENSE +++ /dev/null @@ -1,619 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. diff --git a/macros/latex/contrib/styledcmd/styledcmd.dtx b/macros/latex/contrib/styledcmd/styledcmd.dtx index 79da85718a..c11714952a 100644 --- a/macros/latex/contrib/styledcmd/styledcmd.dtx +++ b/macros/latex/contrib/styledcmd/styledcmd.dtx @@ -1,4 +1,4 @@ -% \iffalse meta-comment + % \iffalse meta-comment % % styledcmd Handle multiple versions for user-defined macros in LaTeX % Copyright (C) 2021 Paolo De Donato @@ -22,11 +22,12 @@ % % \iffalse %<*driver> -\ProvidesFile{styledcmd.dtx}[2021/08/20 1.1 Command with different styles] +\ProvidesFile{styledcmd.dtx}[2022/12/13 2.0 Command with different styles] % %\NeedsTeXFormat{LaTeX2e} -%\RequirePackage{expl3}[2018-04-12] -%\ProvidesExplPackage{styledcmd}{2021/08/20}{1.1}{Command with different styles} +%\RequirePackage{expl3}[2022-04-10] +%\ProvidesExplPackage{styledcmd}{2022/12/13}{2.0}{Command with different styles} +%\RequirePackage{lt3rawobjects}[2022-12-12] %\RequirePackage{xparse} %<*driver> \documentclass[full]{l3doc} @@ -44,7 +45,7 @@ % %\title{styledcmd} %\author{Paolo De Donato} -%\date{23 August 2021} +%\date{13 December 2022} % %\maketitle % @@ -64,16 +65,19 @@ %You can create a formatted macro via the following command %\begin{function}{\newstyledcmd, \renewstyledcmd, \providestyledcmd} %\begin{syntax} -%|\newstyledcmd| \marg{macro name} \marg{format name} \oarg{number of arguments} \marg{code} +%\tn{newstyledcmd} \{\tn{\meta{macro name}}\} \marg{style name} \oarg{number of arguments} \marg{code} %\end{syntax} +%it has the same syntax of \tn{newcommand} except for the \meta{style name} argument that specify the style. This macro alone creates commands \tn{\meta{macro name}} and \tn{\meta{macro name}}\oarg{style name} that both expand as \meta{code}. %\end{function} % -%You can repeat that command for the same macro in order to create different styles, for example these commands +%The most important feature is that you can call \tn{newstyledcmd} multiple times with the same \meta{macro name} but different \meta{style name}, in this way each of \tn{\meta{macro name}}\oarg{style name} expands to \meta{code} associated to specified \meta{style name}. Notice that if you don't specify a style with just calling \tn{meta{macro name}} then it expands as the first created style, that style is the \emph{default} one for such command. +% +%As an example these commands %\begin{verbatim} % \newstyledcmd{\saluto}{informal}[1]{Hi #1} % \newstyledcmd{\saluto}{formal}[1]{Good morning #1} %\end{verbatim} -%define the two formats \verb+informal+ and \verb+formal+ for macro \tn{saluto}. You can directly use the command \tn{saluto} and use the default format (the first declared one) or using a specific style by passing it as an optional argument. So commands +%define the two formats \verb+informal+ and \verb+formal+ for macro \tn{saluto}. Once you've created these two styles for \tn{saluto} you can use it with or without the style name argument, for example these commands %\begin{verbatim} % \saluto{uncle} % \saluto[informal]{uncle} @@ -82,22 +86,22 @@ %will be expanded respectively as \saluto{uncle}, \saluto[informal]{uncle}, \saluto[formal]{uncle}. With the same syntax you can use \tn{renewstyledcmd} and \tn{providestyledcmd} with the same meaning of \tn{renewcommand} and \tn{providecommand} respectively. % %\section{How do you change the default style?} -%In order to change the default style (the one used when you don't choose explicitily a format) you need to execute the following command -%\begin{function}{\setGlobalStyle} +%In order to change the default style (the one used when you don't choose explicitily a style) you need to execute the following command +%\begin{function}{\SetGlobalStyle} %\begin{syntax} -%|\setGlobalStyle| \marg{command name} \marg{new default format name} +%\tn{SetGlobalStyle} \{\cs{\meta{command name}}\} \marg{new default style name} %\end{syntax} %\end{function} -%\setGlobalStyle{\saluto}{formal} +%\SetGlobalStyle{\saluto}{formal} % -%For example in order to change the default style of command \tn{saluto} from \verb+informal+ to \verb+formal+ you need to execute command \verb+\setGlobalStyle{\saluto}{formal}+. With this command the output of preceding commands will instead be \saluto{uncle}, \saluto[informal]{uncle}, \saluto[formal]{uncle}. +%For example in order to change the default style of command \tn{saluto} from \verb+informal+ to \verb+formal+ you need to execute command \tn{SetGlobalStyle}\{\cs{saluto}\}\{\verb+formal+\}. With this command the output of preceding commands will instead be \saluto{uncle}, \saluto[informal]{uncle}, \saluto[formal]{uncle}. % %\section{Customize parameters with \pkg{xparse}} %\thpkg{} loads automatically the \pkg{xparse} package for internal reasons. You can also define new styled commands with the same syntax used by \tn{NewDocumentCommand} with the following command % %\begin{function}{\NewDocStyledCMD, \RenewDocStyledCMD, \ProvideDocStyledCMD} %\begin{syntax} -%|\NewDocStyledCMD| \marg{command name} \marg{format name} \marg{arguments format} \marg{code} +%\tn{NewDocStyledCMD} \Arg{\cs{\meta{command name}}} \Arg{format name} \Arg{arguments format} \Arg{code} %\end{syntax} %\end{function} % @@ -114,116 +118,132 @@ % \prova[stylea] % \prova[styleb] %\end{verbatim} -%which are expanded respectively as \prova; \prova[stylea]; \prova[styleb]. Notice that the first optional argument passed to a command defined via \tn{NewDocStyleCMD} will always be interpreted as a style argument, so you should use another syntax for optional arguments or use a mandatory argument for the first place. +%which are expanded respectively as \prova; \prova[stylea]; \prova[styleb]. Notice that the first optional argument passed to a command defined via \tn{NewDocStyledCMD} will always be interpreted as a style argument, so you should use another syntax for optional arguments or use a mandatory argument for the first place. % %For example this declaration \verb+\NewDocStyledCMD{\bad}{style}{o m}{Bad declaration}+ should be avoided since for example \verb+\bad[arg1]{arg2}+ will interpret \verb+arg1+ as a style name and not as the first optional argument for \tn{bad}. % +%\section{Expandable commands} +%Coomands created by \tn{newstyledcmd} doesn't work very well in expansion only context due to the presence of optional style argument. In order to be able to create expandable commands you should instead use % -%\section{Commands group} -%You can define also a commands group in which defined commands will share the same styles, that allow you to change the style for all commands in that group. -% -%To start a group you have to use the following macro -%\begin{function}{\styBeginGroup} -%\begin{syntax} -%|\styBeginGroup| \marg{group name} -%\end{syntax} -%\end{function} -%any group should be terminated via the following macro -%\begin{function}{\styEndGroup} +%\begin{function}{\newstyledcmdExp, \renewstyledcmdExp, \providestyledcmdExp} %\begin{syntax} -%|\styEndGroup| +%\tn{newstyledcmdExp} \{\tn{\meta{macro name}}\} \marg{style name} \oarg{number of arguments} \marg{code} %\end{syntax} %\end{function} +% Despite commands created with \tn{newstyledcmd} the style name of commands created by \tn{newstyledcmdExp} are always mandatory and must be passed inside curly braces. In order to use the default style just pass an empty string as style name. % -%In each group commands are grouped toghether according to the used style. So inside a group you can define a style with the command -%\begin{function}{\styBeginStyle} -%\begin{syntax} -%|\styBeginStyle| \marg{format name} -%\end{syntax} -%\end{function} -%and once you've finished to define command with that style you have to close it with the command -%\begin{function}{\styEndStyle} -%\begin{syntax} -%|\styEndStyle| -%\end{syntax} -%\end{function} +% For example this code +%\begin{verbatim} +% \newstyledcmdExp{\expCMD}{sty1}{Style 1} +% \newstyledcmdExp{\expCMD}{sty2}{Style 2} % -%In order to define a command inside a \tn{styBeginStyle} ... \tn{styEndStyle} you can use +% \expCMD{} +% \expCMD{sty1} +% \expCMD{sty2} +%\end{verbatim} +%expand as \newstyledcmdExp{\expCMD}{sty1}{Style 1}\newstyledcmdExp{\expCMD}{sty2}{Style 2} \expCMD{} \expCMD{sty1} \expCMD{sty2} % -%\begin{function}{\newGstyledcmd} +%\section{Groups} +%The group mechanism is very different from \thpkg\ |1.2| and preceding versions. From |2.0| styled commands can be added to a group in order to change toghether their style. Groups are automatically created when you're tying to add commands to it: +%\begin{function}{\AddCMDToGroup} %\begin{syntax} -%|\newGstyledcmd| \marg{command name} \oarg{arguments number} \marg{code} +% \tn{AddCMDToGroup} \Arg{group name} \Arg{comma list of commands} %\end{syntax} %\end{function} -%or -%\begin{function}{\NewGDocStyledCMD} +% You can change the default style for each member of a group with +%\begin{function}{\SetGroupStyle} %\begin{syntax} -%|\NewGDocStyledCMD| \marg{command name} \marg{arguments format} \marg{code} +% \tn{SetGroupStyle} \Arg{group name} \Arg{style name} %\end{syntax} %\end{function} -%if you want to use the \tn{NewDocumentCommand} syntax. -% -%Notice that in this case you mustn't define the style name in \tn{newGstyledcmd} or in \tn{NewGDocStyledCMD} since they use the format defined in the enclosing \tn{styBeginStyle} ... \tn{styEndStyle}. The defined style for a group is the first defined one, in order to change the default format you should use the following macro % -%\begin{function}{\setGroupStyle} -%\begin{syntax} -%|\setGroupStyle| \marg{group name} \marg{new default style} -%\end{syntax} +%Suppose you've created the following styled commands: +% +% \begin{verbatim} +% \newstyledcmd{\LenUnit}{SI}{metre} +% \newstyledcmd{\MasUnit}{SI}{kilo} +% +% \newstyledcmd{\LenUnit}{old}{yard} +% \newstyledcmd{\MasUnit}{old}{pound} +% \end{verbatim} +% +% \newstyledcmd{\LenUnit}{SI}{metre} +% \newstyledcmd{\MasUnit}{SI}{kilo} +% +% \newstyledcmd{\LenUnit}{old}{yard} +% \newstyledcmd{\MasUnit}{old}{pound} +% +% Commands \tn{LenUnit}, \tn{MasUnit} will expand as \LenUnit, \MasUnit\ respectively since |SI| is the default style. We've used \tn{newstyledcmd} but you could use also \tn{NewDocStyledCMD}, \tn{newstyledcmdExp} or any other command generated as in section \ref{advanced}. To add these two commands to group |Units| run +% \begin{verbatim} +% \AddCMDToGroup{Units}{\LenUnit, \MasUnit} +% \end{verbatim} +% \AddCMDToGroup{Units}{\LenUnit}\AddCMDToGroup{Units}{\MasUnit}\SetGroupStyle{Units}{old}If you want to set |old| as the default style for these commands just run +% \begin{verbatim} +% \SetGroupStyle{Units}{old} +% \end{verbatim} +% now \tn{LenUnit}, \tn{MasUnit} will expand as \LenUnit, \MasUnit\ respectively. +% +% Notice that if the specified group already exists then \tn{AddCMDToGroup} just appends the speficied commands to it. In particular this +% \begin{verbatim} +% \AddCMDToGroup{Units}{\LenUnit} +% \AddCMDToGroup{Units}{\MasUnit} +% \end{verbatim} +% is equivalent to write +% \begin{verbatim} +% \AddCMDToGroup{Units}{\LenUnit, \MasUnit} +% \end{verbatim} +% +%\section{Advanced usage} +%\label{advanced}This section is for advanced users and package mantainers that knows \LaTeX3, It's not needed to use \thpkg\ daily or creating documents. If \tn{newstyledcmd}, \tn{NewDocStyledCMD} and \tn{newstyledcmdExp} aren't suitable for you it's possible to create a custom styled command generator, but we first need to know a bit of the internal structure of \thpkg. +% +% What you see as a styled command it's instead a collection of different macros: +% \begin{itemize} +% \item multiple \emph{effective styled commands} (\emph{ES commands}), one for each style; +% \item a single \emph{dispatch command} that's called by the user and expands to the specified ES command. +% \end{itemize} +% +% \begin{function}{\stycmd_generate:NNN, \stycmd_generate:NN} +% \begin{syntax} +% \cs{stycmd_generate:NNN} \meta{generator name} \meta{ES commands generator} \meta{dispatch command generator} +% \cs{stycmd_generate:NN} \meta{generator name} \meta{ES commands generator} +% \end{syntax} +% Creates a generator of styled commands with name \meta{generator name}. Argument \meta{ES commands generator} is used to create ES commands and should accept a macro name as the first argument, but there aren't other restrictions on remaining arguments. Suitable ES commands generators are \tn{newcommand} and \tn{NewDocumentCommand}. +% \end{function} +% +% Argument \meta{dispatch command generator} should generate the dispatch command. Despite \meta{ES commands generator} this command must have only one parameter, a string representing the command to be created. Suitable values for this parameter are: +% +% \begin{function}{\stycmd_xparsecmd:N} +% \begin{syntax} +% \cs{stycmd_xparsecmd:N} \meta{command} +% \end{syntax} +% Creates the dispatch command with \tn{ProvideDocumentCommand} with optional style name parameter (used in \tn{newstyledcmd} and \tn{NewDocStyledCMD}). %\end{function} % -%Consider now the following example -% -% \styBeginGroup{saluti} -% \styBeginStyle{formal} -% \newGstyledcmd{\ciao}[1]{Good morning #1} -% \newGstyledcmd{\via}{Goodbye} -% \styEndStyle -% \styBeginStyle{informal} -% \newGstyledcmd{\ciao}[1]{Hi #1} -% \newGstyledcmd{\via}{Catch you later} -% \styEndStyle -% \styEndGroup -% -%\begin{verbatim} -% \styBeginGroup{saluti} -% \styBeginStyle{formal} -% \newGstyledcmd{\ciao}[1]{Good morning #1} -% \newGstyledcmd{\via}{Goodbye} -% \styEndStyle -% -% \styBeginStyle{informal} -% \newGstyledcmd{\ciao}[1]{Hi #1} -% \newGstyledcmd{\via}{Catch you later} -% \styEndStyle -% \styEndGroup -%\end{verbatim} -%We've defined the group \verb+saluti+ with two styles: \verb+formal+ and \verb+informal+. In that group are also defined the two commands \tn{ciao} and \tn{via} for both the styles. Since in \verb+saluti+ group the first defined style is \verb+formal+ it'll be also the default style for this group, so commands \verb+\ciao{Enrico}+ and \verb+\via+ will be expanded as \ciao{Enrico} and \via{}. -% -%If now we execute the command \setGroupStyle{saluti}{informal} \verb+\setGroupStyle{saluti}{informal}+ we change the default style to \verb+informal+ so the preceding commands this time will be expanded as \ciao{Enrico} and \via{}. -% -%You can also pass an optional argument for the style name you want to use, in particular \verb+\ciao[formal]{Enrico}+ will be always expanded as \ciao[formal]{Enrico}. -% -%\section{Generate more styled commands} -%Suppose now that you've created your own version of \tn{newcommand} or \tn{NewDocumentCommand} in order to generate some classes of commands. Suppose that your function name is \tn{mynewcommand} and it accepts, like \tn{newcommand}, the new macro as its first argument. Then you can create styled commands with your own macro by using this function -%\begin{function}{\stycmd_generate:NN, \stycmd_generate_renew:NN} -%\begin{syntax} -%|\stycmd_generate:NN| \meta{new generator name} \meta{generator name} -%\end{syntax} +%\begin{function}{\stycmd_expcmd:N} +% \begin{syntax} +% \cs{stycmd_expcmd:N} \meta{command} +% \end{syntax} +% Creates the dispatch command with \tn{providecommand} with mandatory style name parameter (used in \tn{newstyledcmdExp}). %\end{function} -%So for example executing -%\begin{verbatim} -% \stycmd_generate:NN\mynewstyledcommand\mynewcommand -%\end{verbatim} -%you'll create the new macro \tn{mynewstyledcommand} that accepts the command you want to define as first argument, the style you want to use as second argument and the remaining arguments are the same needed by \tn{mynewcommand}. % -%Notice that \tn{newstyledcmd} is defined internally as -%\begin{verbatim} -% \stycmd_generate:NN \newstyledcmd \newcommand -%\end{verbatim} -% -%Notice that \tn{mynewcommand} first argument has to be the macro you want to define, otherwise \cs{stycmd_generate:NN} will have undefined behaviour. The \cs{stycmd_generate_renew:NN} function should be used only for ''renew`` type commands that requires a preceding declaration, like \tn{renewcommand} and \tn{RenewDocumentCommand}. -% -%Actually there isn't any analogue proceeding for defining customized versions for \tn{newGstyledcmd} and \tn{NewGDocStyledCMD}. +% If you don't specify the dispatch command generator (by using the |NN| variant) \cs{stycmd_xparsecmd:N} is used implicitly. +% +% \begin{function}{\stycmd_generate_renew:NN} +% \begin{syntax} +% \cs{stycmd_generate_renew:NN} \meta{updater name} \meta{ES commands generator} +% \end{syntax} +% Creates command \tn{\meta{updater name}} that modifies styles of commands already generated, like \tn{renewcommmand} edits commands generated by \tn{newcommand}. +% +% For example if you have \tn{createA} that creates commands and \tn{editA} that edits commands generated by \tn{createA} then +% \begin{verbatim} +% \stycmd_generate:NN \createStyledA \createA +% \end{verbatim} +% creates styled commands by using \tn{createA} and +% \begin{verbatim} +% \stycmd_generate_renew:NN \editStyledA \editA +% \end{verbatim} +% modifies commands generated by \tn{createStyledA} (by invoking \tn{editA}). +% \end{function} % %\end{documentation} % @@ -238,167 +258,270 @@ %<@@=stycmd> % \end{macrocode} % -%\begin{variable}{\c__stycmd_defname_str} -%the default style +%\begin{variable}{\c_@@_cmdproxy_str} +%Proxy used to generate styled commands % \begin{macrocode} -\str_const:Nn \c_@@_defname_str{ default } + +\str_const:Nx \c_@@_cmdproxy_str { \object_address:nn + { stycmd }{ proxy } } + +\proxy_create:nnN { stycmd }{ proxy } \c_object_public_str +\proxy_push_member:Vnn \c_@@_cmdproxy_str { default }{ tl } + % \end{macrocode} %\end{variable} % -%\begin{variable}{\l__stycmd_cexp_str, \l__stycmd_fexp_str} -%Temporary variables to store expanded names. +%\begin{macro}{\@@_cmd:n} +% Entity name % \begin{macrocode} -\str_new:N \l_@@_cexp_str -\str_new:N \l_@@_fexp_str + +\cs_new:Nn \@@_cmd:n + { + \object_address:nn{ stycmd }{ entity - #1 } + } + % \end{macrocode} -%\end{variable} +%\end{macro} % -%\begin{macro}{\__stycmd_cmd:nn, \__stycmd_cmd:nV, \__stycmd_cmd:VV, \__stycmd_cmd:, \__stycmd_cmddefname:n} -%Name of a command bounded to some style. +%\begin{macro}{\@@_setdef_strip:Nn} +%Changes the default style % \begin{macrocode} -\cs_new:Npn \__stycmd_cmd:nn #1#2{ @@_command_#1_#2 } -\cs_generate_variant:Nn \@@_cmd:nn { nV } -\cs_generate_variant:Nn \@@_cmd:nn { VV } +\cs_new_protected:Nn \@@_setdef_aux:nN + { + \object_member_set:nnn + { + \@@_cmd:n{ #1 } + } + { default } + { #2 } + } +\cs_generate_variant:Nn \@@_setdef_aux:nN { nc } -\cs_new:Nn \@@_cmd: +\cs_new_protected:Nn \@@_setdef_style:nn { - \@@_cmd:VV\l_@@_cexp_str\l_@@_fexp_str + \@@_setdef_aux:nc{ #1 } + { + \object_macro_adr:nn + { + \@@_cmd:n{ #1 } + } + { + style - #2 + } + } } -\cs_new:Npn \@@_cmddefname:n #1 +\cs_generate_variant:Nn \@@_setdef_style:nn { ff } + +\cs_new_protected:Nn \@@_setdef_strip:Nn { - \@@_cmd:nV { #1 } \c_@@_defname_str + \@@_setdef_style:ff{ \cs_to_str:N #1 } + { \tl_trim_spaces:n{ #2 } } } + % \end{macrocode} %\end{macro} % -%\begin{macro}{\__stycmd_erroring:nn, \__stycmd_erroring:nV, \__stycmd_erroring:VV} -%Error messages for undefined styles. +%\begin{macro}{\@@_cmd_define_strip:NNn} +% Define a macro with the specified command % \begin{macrocode} -\msg_new:nnn { stycmd } { noformat } + +\cs_new_protected:Nn \@@_cmd_define_aux_aux:NN { - Style~#2~not~defined~for~command~#1 + #1 { #2 } } +\cs_generate_variant:Nn \@@_cmd_define_aux_aux:NN { Nc } -\cs_new_protected:Npn\@@_erroring:nn #1#2 +\cs_new_protected:Nn \@@_cmd_define_aux:Nnn { - \cs_if_free:cT { \@@_cmd:nn {#1} {#2} } - { \msg_error:nnnn { stycmd } { noformat } {#1} {#2} } + \@@_cmd_define_aux_aux:Nc #1 + { + \object_macro_adr:nn + { + \@@_cmd:n{ #2 } + } + { + style - #3 + } + } + } + +\cs_generate_variant:Nn \@@_cmd_define_aux:Nnn { Nff } + +\cs_new_protected:Nn \@@_cmd_define_strip:NNn + { + \@@_cmd_define_aux:Nff #1 + { \cs_to_str:N #2 }{ \tl_trim_spaces:n { #3 } } } -\cs_generate_variant:Nn \@@_erroring:nn { nV, VV } % \end{macrocode} %\end{macro} % -%\begin{macro}{\__stycmd_deferr:} -%Error message when try to create the \verb+default+ style +%\begin{macro}{\@@_cmd_usedef:N, \@@_cmd_usesty_strip:Nn} +%Uses the styled command % \begin{macrocode} -\msg_new:nnn { stycmd } { deferror } + +\cs_new:Nn \@@_cmd_usedef_aux:n { - Cannot~define~a~style~with~name~default + \object_member_use:nn + { + \@@_cmd:n{ #1 } + } + { + default + } } -\cs_new_protected:Nn\@@_deferr: +\cs_generate_variant:Nn \@@_cmd_usedef_aux:n { f } + +\cs_new:Nn \@@_cmd_usedef:N + { + \@@_cmd_usedef_aux:f{ \cs_to_str:N #1 } + } + + +\cs_new:Nn \@@_cmd_usesty_aux:nn + { + \object_macro_use:nn + { + \@@_cmd:n{ #1 } + } + { + style - #2 + } + } + +\cs_generate_variant:Nn \@@_cmd_usesty_aux:nn { ff } + +\cs_new:Nn \@@_cmd_usesty_strip:Nn { - \str_if_eq:NNT \l_@@_fexp_str \c_@@_defname_str - { \msg_error:nn { stycmd } { deferror } } + \@@_cmd_usesty_aux:ff{ \cs_to_str:N #1 } + { \tl_trim_spaces:n{ #2 } } } + % \end{macrocode} %\end{macro} % -%\begin{macro}{\__stycmd_macro_default:nn, \__stycmd_macro_default:VV} -%Sets the default style to use. +% \begin{macro}{\@@_entity_create_strip:Nnn} +% Creates a new entity if it doesn't exists and execute following code % \begin{macrocode} -\cs_new_protected:Npn \@@_macro_default:nn #1#2 + +\cs_new_protected:Nn \@@_entity_create_aux:nnn { - \exp_args:Nc \ProvideDocumentCommand { \@@_cmddefname:n { #1 } } - {} + \object_if_exist:nF { - \use:c { \@@_cmd:nn { #1 } { #2 } } + \@@_cmd:n{ #1 } } + { + \object_create:VnnNN \c_@@_cmdproxy_str + { stycmd }{ entity - #1 } + \c_object_global_str + \c_object_public_str + + \@@_setdef_style:nn{ #1 }{ #2 } + + #3 + } + } + +\cs_generate_variant:Nn \@@_entity_create_aux:nnn { ffn } + +\cs_new_protected:Nn \@@_entity_create_strip:Nnn + { + \@@_entity_create_aux:ffn + { \cs_to_str:N #1 } + { \tl_trim_spaces:n{ #2 } } + { #3 } } -\cs_generate_variant:Nn \@@_macro_default:nn { VV } % \end{macrocode} -%\end{macro} +% \end{macro} % -%\begin{macro}{\__stycmd_macro_overwrite:nn, \__stycmd_macro_overwrite:VV} -%Overwrite the default style, not the command associated to that style. +%\begin{macro}{\stycmd_xparsecmd:N} +% Defines the main macro with \cs{ProvideDocumentCommand}. % \begin{macrocode} -\cs_new_protected:Npn \@@_macro_overwrite:nn #1#2 - { - \@@_erroring:nn { #1 } { #2 } - \exp_args:Nc \RenewDocumentCommand { \@@_cmddefname:n { #1 } } - {} +\cs_new_protected:Nn \stycmd_xparsecmd:N + { + \ProvideDocumentCommand { #1 } { o } { - \use:c { \@@_cmd:nn { #1 } { #2 } } + \IfNoValueTF {##1} + { + \@@_cmd_usedef:N #1 + } + { + \@@_cmd_usesty_strip:Nn #1 { ##1 } + } } } -\cs_generate_variant:Nn \@@_macro_overwrite:nn { VV } % \end{macrocode} %\end{macro} % -%\begin{macro}{\__stycmd_macro_declaration:n, \__stycmd_macro_declaration:V} -%Declare the effective macro. It'll overwrite existing \tn{l__stycmd_fexp_str}. +%\begin{macro}{\stycmd_expcmd:N} +% Defines the main macro with \tn{providecommand} but the style argument is mandatory in order to make the command expandable. To use default style pass an empty argument as style. % \begin{macrocode} -\cs_new_protected:Npn \@@_macro_declaration:n #1 + +\cs_new_protected:Nn \stycmd_expcmd:N { - \exp_args:Nc \ProvideDocumentCommand { #1 } {o} + \providecommand { #1 } [1] { - \IfNoValueTF {##1} + \tl_if_empty:nTF {##1} { - \use:c { \@@_cmddefname:n { #1 } } + \@@_cmd_usedef:N #1 } { - \str_set:Nx \l_@@_fexp_str {##1} - \@@_erroring:nV { #1 } \l_@@_fexp_str - \use:c{ \@@_cmd:nV { #1 } \l_@@_fexp_str } + \@@_cmd_usesty_strip:Nn #1 { ##1 } } } } -\cs_generate_variant:Nn \__stycmd_macro_declaration:n { V } % \end{macrocode} %\end{macro} % -%\begin{macro}{\__stycmd_init_vars:Nn} -%Initializes system variables. First argument is the command name, second argument should be \verb+x+ expandable. +%\begin{macro}{\SetGlobalStyle} +%Change the default style for specified command % \begin{macrocode} -\cs_new_protected:Npn \@@_init_vars:Nn #1#2 + +\NewDocumentCommand{\SetGlobalStyle}{m m} { - \str_set:Nx \l_@@_cexp_str { \cs_to_str:N #1 } - \str_set:Nx \l_@@_fexp_str {#2} - \@@_deferr: + \@@_setdef_strip:Nn #1 { #2 } } + % \end{macrocode} %\end{macro} % -%\begin{macro}{\stycmd_generate:NN, \stycmd_generate_renew:NN} +%\begin{macro}{\stycmd_generate:NNN, \stycmd_generate:NN, \stycmd_generate_renew:NN} %Declare the styled version \verb+#1+ of the macro generator command \verb+#2+. the \verb+_renew+ variant requires a preceding declaration % \begin{macrocode} -\cs_new_protected:Npn \stycmd_generate:NN #1#2 + +\cs_new_protected:Nn \stycmd_generate:NNN { - \NewDocumentCommand #1 {m m} + \cs_new_protected:Npn #1 ##1 ##2 { - \@@_init_vars:Nn { ##1 } { ##2 } - \@@_macro_default:VV \l_@@_cexp_str \l_@@_fexp_str - \@@_macro_declaration:V \l_@@_cexp_str - \exp_args:Nc #2 { \@@_cmd: } + \@@_entity_create_strip:Nnn ##1 { ##2 } + { + #3 ##1 + } + \@@_cmd_define_strip:NNn #2 ##1 { ##2 } } } -\cs_new_protected:Npn \stycmd_generate_renew:NN #1#2 +\cs_new_protected:Nn \stycmd_generate:NN { - \NewDocumentCommand #1 {m m} + \stycmd_generate:NNN #1 #2 \stycmd_xparsecmd:N + } + + +\cs_new_protected:Nn \stycmd_generate_renew:NN + { + \cs_new_protected:Npn #1 ##1 ##2 { - \@@_init_vars:Nn { ##1 } { ##2 } - \@@_erroring:VV \l_@@_cexp_str \l_@@_fexp_str - \exp_args:Nc #2 { \@@_cmd: } + \@@_cmd_define_strip:NNn #2 ##1 { ##2 } } } + % \end{macrocode} %\end{macro} % @@ -420,149 +543,164 @@ % \end{macrocode} %\end{macro} % -%\begin{macro}{\setGlobalStyle} -%Change the default style. -% \begin{macrocode} -\NewDocumentCommand \setGlobalStyle{m m}{ - \@@_init_vars:Nn { #1 } { #2 } - - \@@_macro_overwrite:VV \l_@@_cexp_str \l_@@_fexp_str -} -% \end{macrocode} -%\end{macro} -% -%\begin{variable}{\l__stycmd_group_str, \l__stycmd_format_str} -%Variables that stores group and format names. -% \begin{macrocode} -\str_new:N \l_@@_group_str -\str_new:N \l_@@_format_str -% \end{macrocode} -%\end{variable} -% -%\begin{macro}{\__stycmd_gvar:n, \__stycmd_gvar:V, \__stycmd_gvar:} -%Group command list. +%\begin{macro}{\newstyledcmdExp, \renewstyledcmdExp, \providestyledcmdExp} +%Declare a new macro with the specified style name. % \begin{macrocode} -\cs_new:Npn \@@_gvar:n #1 { g_@@_glist_#1_seq } - -\cs_generate_variant:Nn \@@_gvar:n { V } - -\cs_new:Nn \@@_gvar: { \@@_gvar:V \l_@@_group_str } +\stycmd_generate:NNN \newstyledcmdExp \newcommand \stycmd_expcmd:N +\stycmd_generate_renew:NN \renewstyledcmdExp \renewcommand +\stycmd_generate:NNN \providestyledcmdExp \providecommand \stycmd_expcmd:N % \end{macrocode} %\end{macro} % -%\begin{macro}{\__stycmd_push_g:Nn, \__stycmd_push_g:NV} -%Pushes command name inside group command sequence. First argument is command, second is group name +%\begin{macro}{\AddCMDToGroup} +%Creates a group of commands % \begin{macrocode} -\cs_new_protected:Npn \@@_push_g:Nn #1#2 - { - \seq_gput_left:cn { \@@_gvar:n { #2 } } { #1 } - } -\cs_generate_variant:Nn \@@_push_g:Nn { NV } -% \end{macrocode} -%\end{macro} -% -%\begin{macro}{\styBeginGroup} -%Starts a group. -% \begin{macrocode} -\msg_new:nnn { stycmd } { gnotclosed } { Group~not~closed } +\str_new:N \g_@@_grproxy_str +\seq_new:N \g_@@_tmp_seq +\seq_new:N \g_@@_tmpb_seq -\NewDocumentCommand \styBeginGroup { m } - { - \str_if_empty:NF \l_@@_group_str - { - \msg_error:nn { stycmd } { gnotclosed } - } +\proxy_create_gset:NnnN \g_@@_grproxy_str { stycmd }{ groups } + \c_object_public_str + +\proxy_push_member:Vnn \g_@@_grproxy_str { commands }{ seq } - \str_set:Nx \l_@@_group_str {#1} +\cs_generate_variant:Nn \seq_gconcat:NNN { ccN } - \seq_if_exist:cF { \@@_gvar: } - { \seq_new:c { \@@_gvar: } } - } -% \end{macrocode} -%\end{macro} -% -%\begin{macro}{\styEndGroup} -%Closes a group. -% \begin{macrocode} -\NewDocumentCommand \styEndGroup {} +\cs_new_protected:Nn \@@_gconcat:nN { - \str_clear:N \l_@@_group_str + \seq_gconcat:ccN { #1 }{ #1 } #2 } -% \end{macrocode} -%\end{macro} -% -%\begin{macro}{\styBeginStyle} -%Starts a style subgroup. -% \begin{macrocode} -\msg_new:nnn { stycmd } { fnotclosed } { Format~not~closed } - -\NewDocumentCommand \styBeginStyle { m } + +\cs_new_protected:Nn \@@_addgroup:nn { - \str_if_empty:NF \l_@@_format_str + \object_if_exist:nF + { + \object_address:nn{ stycmd }{ group - #1 } + } { - \msg_error:nn { stycmd } { fnotclosed } + \object_create:VnnNN \g_@@_grproxy_str + { stycmd } + { group - #1 } + \c_object_global_str + \c_object_public_str } - \str_set:Nx \l_@@_format_str {#1} + + \seq_gset_from_clist:Nn \g_@@_tmp_seq { #2 } + \seq_gset_map_x:NNn \g_@@_tmpb_seq \g_@@_tmp_seq + { + \cs_to_str:N ##1 + } + + \@@_gconcat:nN + { + \object_member_adr:nnn + { + \object_address:nn + { stycmd } + { group - #1 } + } + { commands } + { seq } + } \g_@@_tmpb_seq } -% \end{macrocode} -%\end{macro} -% -%\begin{macro}{\styEndStyle} -%Closes a style subgroup. -% \begin{macrocode} -\NewDocumentCommand \styEndStyle {} + +\cs_generate_variant:Nn \@@_addgroup:nn { fn } + +\NewDocumentCommand{\AddCMDToGroup}{m m} { - \str_clear:N \l_@@_format_str + \@@_addgroup:fn { \tl_trim_spaces:n{ #1 } } { #2 } } + % \end{macrocode} %\end{macro} % -%\begin{macro}{\newGstyledcmd} -%Declare a command inside a styled group. +%\begin{macro}{\SetGroupStyle} +%Change the default style for each command in the group. % \begin{macrocode} -\NewDocumentCommand \newGstyledcmd { m o +m } +\NewDocumentCommand{\SetGroupStyle}{m m} { - \IfNoValueTF {#2} + \seq_map_inline:cn { - \newstyledcmd {#1} { \l_@@_format_str } {#3} + \object_member_adr:nnn + { + \object_address:nn + { stycmd } + { group - #1 } + } + { commands } + { seq } } { - \newstyledcmd {#1} { \l_@@_format_str } [#2] {#3} + \@@_setdef_style:nn{ ##1 }{ #2 } } - \@@_push_g:NV {#1} \l_@@_group_str } % \end{macrocode} %\end{macro} % -%\begin{macro}{\NewGDocStyledCMD} -%Equivalent of \tn{NewDocStyledCMD} for command defined in a group. +%Legacy commands % \begin{macrocode} -\NewDocumentCommand \NewGDocStyledCMD { m m +m } + +\msg_new:nnnn{ styledcmd }{ stydep }{ Old-fashioned~groups~for~styled~commands~are~deprecated } { - \NewDocStyledCMD {#1} { \l_@@_format_str } {#2} {#3} + From~version~2.0~of~styledcmd~you~should~use~new~group~commands~instea~of~old~ones,~see~official~documentation~on~CTAN. + } + +\str_new:N \g_@@_act_group_str +\str_new:N \g_@@_act_style_str - \@@_push_g:NV {#1} \l_@@_group_str +\NewDocumentCommand{\styBeginGroup}{ m } + { + \msg_warning:nn{ styledcmd }{ stydep } + \str_gset:Nn \g_@@_act_group_str{ #1 } } -% \end{macrocode} -%\end{macro} -% -%\begin{macro}{\setGroupStyle} -%Change the default style for a group. -% \begin{macrocode} -\NewDocumentCommand \setGroupStyle { m m } + +\NewDocumentCommand{\styEndGroup}{} + { + \msg_warning:nn{ styledcmd }{ stydep } + \str_gset:Nn \g_@@_act_group_str{} + } + +\NewDocumentCommand{\styBeginStyle}{ m } + { + \msg_warning:nn{ styledcmd }{ stydep } + \str_gset:Nn \g_@@_act_style_str{ #1 } + } + +\NewDocumentCommand{\styEndStyle}{} + { + \msg_warning:nn{ styledcmd }{ stydep } + \str_gset:Nn \g_@@_act_style_str{} + } + +\cs_generate_variant:Nn \@@_addgroup:nn { Vn } + +\NewDocumentCommand{\newGstyledcmd}{m o m} { - \str_set:Nx \l_@@_group_str {#1} - \str_set:Nx \l_@@_format_str {#2} - \seq_map_inline:cn { \@@_gvar: } + \msg_warning:nn{ styledcmd }{ stydep } + \@@_addgroup:Vn \g_@@_act_group_str { #1 } + \IfNoValueTF{ #2 } { - \setGlobalStyle {##1} { \l_@@_format_str } + \exp_args:NNV \newstyledcmd #1 \g_@@_act_style_str { #3 } + } + { + \exp_args:NNV \newstyledcmd #1 \g_@@_act_style_str [ #2 ] { #3 } } - \str_clear:N \l_@@_format_str - \str_clear:N \l_@@_group_str } + +\NewDocumentCommand{\NewGDocStyledCMD}{m m m} + { + \msg_warning:nn{ styledcmd }{ stydep } + \@@_addgroup:Vn \g_@@_act_group_str { #1 } + \exp_args:NNV \NewDocStyledCMD #1 \g_@@_act_style_str { #2 } { #3 } + } + + \NewDocumentCommand{\setGroupStyle}{m m} + { + \msg_warning:nn{ styledcmd }{ stydep } + \SetGroupStyle{ #1 }{ #2 } + } % \end{macrocode} -%\end{macro} % % \begin{macrocode} % diff --git a/macros/latex/contrib/styledcmd/styledcmd.ins b/macros/latex/contrib/styledcmd/styledcmd.ins index d314af58ae..1b48ace486 100644 --- a/macros/latex/contrib/styledcmd/styledcmd.ins +++ b/macros/latex/contrib/styledcmd/styledcmd.ins @@ -45,6 +45,7 @@ along with Styledcmd. If not, see . \endpreamble +\askforoverwritefalse \generate{\file{styledcmd.sty}{\from{styledcmd.dtx}{package}}} \obeyspaces diff --git a/macros/latex/contrib/styledcmd/styledcmd.pdf b/macros/latex/contrib/styledcmd/styledcmd.pdf index 34d9942d43..93082e4f08 100644 Binary files a/macros/latex/contrib/styledcmd/styledcmd.pdf and b/macros/latex/contrib/styledcmd/styledcmd.pdf differ -- cgit v1.2.3