diff options
| author | Norbert Preining <norbert@preining.info> | 2021-04-06 03:01:02 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2021-04-06 03:01:02 +0000 |
| commit | e4d1c68b2517d031bb9adc055fe19d1051c81042 (patch) | |
| tree | e3aa97c83e9f8e8d58e22894ac757e6fd9247a25 /macros/latex/contrib | |
| parent | f0b3901f183621b9000493d3ec263c69ac868156 (diff) | |
CTAN sync 202104060301
Diffstat (limited to 'macros/latex/contrib')
111 files changed, 1714 insertions, 218 deletions
diff --git a/macros/latex/contrib/babel-contrib/romanian/README.md b/macros/latex/contrib/babel-contrib/romanian/README.md new file mode 100644 index 0000000000..099bfff6f9 --- /dev/null +++ b/macros/latex/contrib/babel-contrib/romanian/README.md @@ -0,0 +1,15 @@ +Romanian 1.2m +-------------- + +This is the babel style for Romanian. + +**This package is NOT being actively maintained, but bugs might +got fixed if you report them. If you want to take over maintenance +of this language style, please contact me at +http://www.texnia.com/contact.html .** + +Changes 1.2m +------------ +* Fixed name for index + + diff --git a/macros/latex/contrib/babel-contrib/romanian/romanian.dtx b/macros/latex/contrib/babel-contrib/romanian/romanian.dtx index 8895057030..e5fca08840 100644 --- a/macros/latex/contrib/babel-contrib/romanian/romanian.dtx +++ b/macros/latex/contrib/babel-contrib/romanian/romanian.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% Copyright 1989-2005 Johannes L. Braams and any individual authors +% Copyright 1989-2021 Johannes L. Braams and any individual authors % listed elsewhere in this file. All rights reserved. % % This file is part of the Babel system. @@ -16,7 +16,7 @@ % % This work has the LPPL maintenance status "maintained". % -% The Current Maintainer of this work is Johannes Braams. +% The Current Maintainer of this work is Javier Bezos. % % The list of all files belonging to the Babel system is % given in the file `manifest.bbl. See also `legal.bbl' for additional @@ -36,20 +36,17 @@ %<code>\ProvidesLanguage{romanian} %\fi %\ProvidesFile{romanian.dtx} - [2005/03/31 v1.2l Romanian support from the babel system] + [2021/04/04 v1.2m Romanian support from the babel system] %\iffalse %% File `romanian.dtx' %% Babel package for LaTeX version 2e -%% Copyright (C) 1989 - 2005 +%% Copyright (C) 1989 - 2021 %% by Johannes Braams, TeXniek % %% Romanian Language Definition File -%% Copyright (C) 1989 - 2005 +%% Copyright (C) 1989 - 2021 %% by Johannes Braams, TeXniek % -%% Please report errors to: J.L. Braams -%% babel at braams.cistron.nl -% % This file is part of the babel system, it provides the source % code for the Romanian language definition file. A contribution % was made by Umstatter Horst (hhu at cernvm.cern.ch) and Robert @@ -149,7 +146,7 @@ \def\contentsname{Cuprins}% \def\listfigurename{List\u{a} de figuri}% \def\listtablename{List\u{a} de tabele}% - \def\indexname{Glosar}% + \def\indexname{Index}% \def\figurename{Figura}% % sau Plan\c{s}a \def\tablename{Tabela}% \def\partname{Partea}% diff --git a/macros/latex/contrib/babel-contrib/romanian/romanian.ins b/macros/latex/contrib/babel-contrib/romanian/romanian.ins index 749b4561ea..2b8a095997 100644 --- a/macros/latex/contrib/babel-contrib/romanian/romanian.ins +++ b/macros/latex/contrib/babel-contrib/romanian/romanian.ins @@ -3,7 +3,7 @@ %% driver files from the doc files in this package when run through %% LaTeX or TeX. %% -%% Copyright 1989-2005 Johannes L. Braams and any individual authors +%% Copyright 1989-2021 Johannes L. Braams and any individual authors %% listed elsewhere in this file. All rights reserved. %% %% This file is part of the Babel system. @@ -19,7 +19,7 @@ %% %% This work has the LPPL maintenance status "maintained". %% -%% The Current Maintainer of this work is Johannes Braams. +%% The Current Maintainer of this work is Javier Bezos. %% %% The list of all files belonging to the LaTeX base distribution is %% given in the file `manifest.bbl. See also `legal.bbl' for additional @@ -53,7 +53,7 @@ \declarepreamble\mainpreamble This is a generated file. -Copyright 1989-2005 Johannes L. Braams and any individual authors +Copyright 1989-2021 Johannes L. Braams and any individual authors listed elsewhere in this file. All rights reserved. This file was generated from file(s) of the Babel system. @@ -69,7 +69,7 @@ version 2003/12/01 or later. This work has the LPPL maintenance status "maintained". -The Current Maintainer of this work is Johannes Braams. +The Current Maintainer of this work is Javier Bezos. This file may only be distributed together with a copy of the Babel system. You may however distribute the Babel system without @@ -87,7 +87,7 @@ extension .ins) which are part of the distribution. \declarepreamble\fdpreamble This is a generated file. -Copyright 1989-2005 Johannes L. Braams and any individual authors +Copyright 1989-2021 Johannes L. Braams and any individual authors listed elsewhere in this file. All rights reserved. This file was generated from file(s) of the Babel system. @@ -103,7 +103,7 @@ version 2003/12/01 or later. This work has the LPPL maintenance status "maintained". -The Current Maintainer of this work is Johannes Braams. +The Current Maintainer of this work is Javier Bezos. This file may only be distributed together with a copy of the Babel system. You may however distribute the Babel system without diff --git a/macros/latex/contrib/babel-contrib/romanian/romanian.pdf b/macros/latex/contrib/babel-contrib/romanian/romanian.pdf Binary files differindex 799d91042e..5ce088cbe2 100644 --- a/macros/latex/contrib/babel-contrib/romanian/romanian.pdf +++ b/macros/latex/contrib/babel-contrib/romanian/romanian.pdf diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/LICENSE b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/LICENSE new file mode 100644 index 0000000000..a737dcfed5 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/LICENSE @@ -0,0 +1,675 @@ + + 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. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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: + + <program> Copyright (C) <year> <name of author> + 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/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/README.md b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/README.md new file mode 100644 index 0000000000..4091861f6c --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/README.md @@ -0,0 +1,11 @@ +# temabeamerlalic +Tema do LALIC para o beamer + +GNU GENERAL PUBLIC LICENSE +Version 3 (or later) + +By Jander Moreira (moreira.jander@gmail.com) + + +Inclua: + \usetheme{lalic} diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamercolorthemelalic.sty b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamercolorthemelalic.sty new file mode 100644 index 0000000000..8d958ce812 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamercolorthemelalic.sty @@ -0,0 +1,52 @@ +% +% Tema para beamer: LALIC +% +% Por Jander Moreira, 2018-2021 +% +% +% Color theme + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Definições de cores +% +\RequirePackage{xcolor} + +% Cores dos gráficos +\definecolor{lalicbackground}{rgb}{1, 1, 1} % branco +%\definecolor{lalicbackground}{rgb}{0.8, 0.8, 0.9} +\definecolor{lalictitlebackground}{rgb}{0.1, 0.1, 0.5} % azul escuro +\definecolor{lalicline}{rgb}{0.1, 0.1, 0.4} % azul muito escuro + +% Cores das fontes +\definecolor{lalicfonttitle}{rgb}{1, 1, 1} % branco +\definecolor{lalicfontsubtitle}{rgb}{1, 1, 1} % branco +\definecolor{lalicfontauthor}{rgb}{0, 0, 0} % preto +\definecolor{lalicfontdate}{rgb}{0, 0, 0} % preto +\definecolor{lalicfonttext}{rgb}{0, 0, 0} % preto + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Ajustes de cores nos elementos +% + +\mode<presentation> + +\setbeamercolor*{background canvas}{bg = white} +\setbeamercolor*{normal text}{fg = black} +\setbeamercolor*{title page header}{fg = white} +\setbeamercolor*{subtitle page header}{fg = white} +\setbeamercolor*{author}{fg = black} +\setbeamercolor*{date}{fg = lalicfontdate} +\setbeamercolor*{note page}{bg=white, fg=black} +\setbeamercolor*{title text}{fg = white} + + +\setbeamertemplate{blocks}[rounded][shadow=false] +\setbeamercolor{block title}{fg = white, bg = blue!50!black} +\setbeamercolor{block body}{fg = black, bg = blue!30!black!10} +\setbeamercolor{block title example}{fg = white, bg = blue!50!green} +\setbeamercolor{block body example}{fg=black,bg=blue!30!green!10} +\setbeamercolor{block title alerted}{fg = white, bg = blue!20!red} +\setbeamercolor{block body alerted}{fg=black,bg=blue!30!red!10} + + +\mode<all>
\ No newline at end of file diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerfontthemelalic.sty b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerfontthemelalic.sty new file mode 100644 index 0000000000..0a092fb003 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerfontthemelalic.sty @@ -0,0 +1,9 @@ +% +% Tema para beamer: LALIC +% +% Por Jander Moreira, 2018-2021 +% +% +% Font theme + +% Sem alterações de fontes
\ No newline at end of file diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerinnerthemelalic.sty b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerinnerthemelalic.sty new file mode 100644 index 0000000000..e0562cc0c8 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerinnerthemelalic.sty @@ -0,0 +1,96 @@ +% +% Tema para beamer: LALIC +% +% Por Jander Moreira, 2018-2021 +% +% +% Inner theme (definição do espaço de conteúdo) + +\mode<presentation> + +\RequirePackage{tikz} +\usetikzlibrary{positioning, calc, shapes.misc} + +\setbeamercolor{title box}{fg = black} + +\setbeamertemplate{background}{ + \begin{tikzpicture}[ + moldura/.style = { + draw = lalicline, + very thick, + rounded corners, + }, + ] + \useasboundingbox[fill = lalicbackground] (0, 0) rectangle(\the\paperwidth, \the\paperheight); + \coordinate (superior esquerdo) at (0, \the\paperheight); + \coordinate (superior direito) at (\the\paperwidth, \the\paperheight); + \coordinate (inferior esquerdo) at (0, 0); + \coordinate (inferior direito) at (\the\paperwidth, 0); + + % Moldura + \draw [moldura] + ($(inferior esquerdo) + (0.2cm, 0.2cm)$) + rectangle + ($(superior direito) - (0.2cm, 0.2cm)$); + \end{tikzpicture} +} + +\defbeamertemplate*{title page}{lalic}[1][]{ + \vskip0.8cm% + \begin{beamercolorbox}[wd=\paperwidth, ht = 1.5cm]{frametitle} + \begin{tikzpicture}[ + faixa do titulo/.style = { + fill = lalictitlebackground, + rounded rectangle, + rounded rectangle west arc = 20, + rounded rectangle west arc = none, + minimum height = 1.8cm, + minimum width = 0.95\paperwidth, + align = left, + }, + fonte titulo/.style = { + text = lalicfonttitle, + anchor = west, + inner sep = 3pt, + %font = \Large\bfseries, + }, + fonte subtitulo/.style = { + text = lalicfonttitle, + anchor = west, + text depth = 0.25ex, + inner sep = 3pt, + font = \small, + }, + ] + \node (barra) [faixa do titulo, align = left] at (0, 0) {}; + \node[fonte titulo] at ($(barra.north west) + (0.2cm, -0.55cm)$)% + {\Huge\bfseries LALIC}; + \draw[line width = 2.2pt, draw = lalicbackground, + line cap = round]% + ($(barra.west) - (0, 0.26cm)$) -- + ++(\textwidth, 0); + \node[fonte subtitulo] at ($(barra.south west) + (0.3cm, 0.3cm)$)% + {Laboratório de Linguística e Inteligência Computacional}; + \end{tikzpicture} + \end{beamercolorbox} + + \begin{beamercolorbox}[ht = 2.5cm, center]{title box} + \LARGE\inserttitle + \end{beamercolorbox} + + \vspace{0.5cm} + \begin{beamercolorbox}[ht = 2.5cm, center]{title box} + {\Large\insertauthor}\\ + \small\texttt{\lalicemail} + + \vspace{0.3cm} + \textit{\insertdate} + \end{beamercolorbox} + +% \includegraphics[height=1.8cm]{logo_ufscar}% +% \hfill% +% \includegraphics[height=1.2cm]{logo_nilc}% +} + + +\mode<all> diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerouterthemelalic.sty b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerouterthemelalic.sty new file mode 100644 index 0000000000..e30eb54f01 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerouterthemelalic.sty @@ -0,0 +1,91 @@ +% +% Tema para beamer: LALIC +% +% Por Jander Moreira, 2018-2021 +% +% +% Outer theme (definição do espaço fora do conteúdo: cabeçalhos, rodapés) + +\mode<presentation> + +\RequirePackage{tikz} +\usetikzlibrary{positioning, calc, shapes.misc, math} + +\defbeamertemplate*{frametitle}{lalic}[1][] +{ + \begin{beamercolorbox}[wd=\paperwidth, ht=2cm]{frametitle} + \begin{tikzpicture}[ + overlay, remember picture, + faixa do titulo/.style = { + fill = lalictitlebackground, + rounded rectangle, + rounded rectangle west arc = 20, + rounded rectangle west arc = none, + minimum height = 2.5em, + minimum width = 0.995\paperwidth, + anchor = south west, + }, + fonte titulo/.style = { + text = lalicfonttitle, + anchor = west, + text depth = 0.25ex, + font = \Large\bfseries, + }, + fonte subtitulo/.style = { + text = lalicfonttitle, + anchor = west, + text depth = 0.25ex, + font = \normalsize, + }, + ] +% \useasboundingbox(0, 0) rectangle (\the\paperwidth, \the\paperheight); + + \node (barra) [faixa do titulo] at (0, 0) {};% + + \ifx\insertframesubtitle\@empty{% + \draw[line width = 3pt, line cap = round, + draw = lalicbackground]% + ($(barra.south west) + (0, 0.5em)$) -- + ++(\textwidth, 0); + \node[fonte titulo] at ($(barra.west) + (0, 0.1em)$) {\insertframetitle}; + } + \else{% + \draw[line width = 2.5pt, line cap = round, + draw = lalicbackground]% + ($(barra.west) - (0, 0.15em)$) -- + ++(\textwidth, 0); + \node[fonte titulo]% + at ($(barra.north west) - (0, 0.7em)$) {\insertframetitle}; + \node[fonte subtitulo]% + at ($(barra.south west) + (0, 0.5em)$) % + {\raisebox{0.25ex}{$\rhd$}% + \hspace{0.5em}\insertframesubtitle}; + } + \fi + \end{tikzpicture} + \end{beamercolorbox} +} + +\newlength{\progressbar} +\setlength{\progressbar}{1.1\linewidth} +\setbeamertemplate{footline}{% + \begin{beamercolorbox}[center]{} + \ifnum\thepage>1\relax% + \begin{tikzpicture}%[overlay, remember picture] + \pgfmathparse{\insertframenumber/\inserttotalframenumber} + \coordinate (progresso) + at (\pgfmathresult * \progressbar, 0); + \draw[thick] (0, 0) -- (progresso); + \draw[dotted] (progresso) --(\progressbar, 0); + \node[fill = white, rounded corners, draw, anchor = east] + at (progresso) {\insertframenumber}; + \end{tikzpicture} + \vskip3pt + \insertnavigation{0.98\linewidth} + \fi + \vskip01cm + \end{beamercolorbox} +} + + +\mode<all> diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerthemelalic-exemplo.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerthemelalic-exemplo.pdf Binary files differnew file mode 100644 index 0000000000..67af80698a --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerthemelalic-exemplo.pdf diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerthemelalic-exemplo.tex b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerthemelalic-exemplo.tex new file mode 100644 index 0000000000..6fd5172729 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerthemelalic-exemplo.tex @@ -0,0 +1,196 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Documento exemplo para uso do tema do LALIC no Beamer +% Jander, 2018 +% +\documentclass[ + brazilian, % idioma + 12pt, % pode ser 10pt, 11pt, 12pt... +% aspectratio = 169, % 16x9 = widescreen +]{beamer} +\usepackage[utf8]{inputenc} +\usepackage{babel} +\usepackage[T1]{fontenc} +\usepackage{amsmath} +\usepackage{amsfonts} +\usepackage{amssymb} + +% Tema: LALIC +\usetheme{lalic} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Agenda no inicio de cada seção (remova comentário de uma das opções) +% +%\agendaautomatica % agenda em uma coluna +%\agendaautomatica[4] % agenda em duas colunas, quebrando na seção indicada + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Opção para geração de eslaides com notas +% O programa pympress consegue mostrar os eslaides no projetor e as notas na tela +% +%\usepackage{pgfpages} +%\setbeameroption{show notes on second screen=right} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Documentação +\title{Sobre o tema do LALIC} +\author{Jander Moreira} +\email{jander@ufscar.br} % LALIC; use \email{} para omitir +\dataapresentacao{5}{4}{2021} % LALIC; argumentos: dia, mês e ano (numéricos) +\date{\today} % \date{} sumprime a data + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Conteúdo +% +\begin{document} +\begin{frame} + \titlepage +\end{frame} + +% Opcionalmente, comente este frame caso use \agendaautomatica +\begin{frame}{Agenda} + \tableofcontents +\end{frame} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Seções, subseções... +% > texto normal: nome usado na \tableofcontents +% > texto curto (opcional): nome usado na navegação +% +% \section[texto curto]{texto normal} cria uma seção +% \subsection[texto curto]{texto normal} cria uma subseção + +\section{Introdução e motivação} +\begin{frame}{Introdução} + Este tema foi feito para uso em apresentações do LALIC. + + \vspace{2em} + Para uso, inclua no preâmbulo: + + \centering\texttt{\textbackslash usetheme\{lalic\}} +\end{frame} + +\begin{frame} + Eslaide sem o título +\end{frame} + +\begin{frame}{Introdução} + Eslaide somente com o título principal. +\end{frame} + + +\begin{frame}{Introdução}{Motivação} + Eslaide com título e subtítulo +\end{frame} + + +\section[Recursos]{Recursos de apresentação} + +\subsection{Listas} + +\begin{frame}{Listas}{Listas sem numeração} + Lista sem numeração + + \begin{itemize} + \item Um one eins + \item Dois two zwei + \item Três three drei + \begin{itemize} + \item Três ponto um + \item Três ponto dois + \end{itemize} + \item Quatro four vier + \end{itemize} +\end{frame} + +\begin{frame}{Listas}{Listas com numeração} + Lista com numeração + + \begin{enumerate} + \item Um one eins + \item Dois two zwei + \item Três three drei + \begin{enumerate} + \item Três ponto um + \item Três ponto dois + \end{enumerate} + \item Quatro four vier + \end{enumerate} +\end{frame} + +\subsection{Duas colunas} + +\begin{frame}{Duas colunas} + \begin{columns}[t] + \begin{column}{0.4\linewidth} + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. + \end{column} + \begin{column}{0.6\linewidth} + Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. + \end{column} + \end{columns} +\end{frame} + +\subsection{Blocos} + +\begin{frame}{Blocos} + \begin{block}{Bloco} + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + \end{block} + + \begin{definition} + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + \end{definition} + +\end{frame} + +\begin{frame}{Mais blocos} + \begin{alertblock}{Bloco de alerta} + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + \end{alertblock} + + \begin{exampleblock}{Bloco de exemplo} + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + \end{exampleblock} +\end{frame} + +\begin{frame}{Blocos padrões da matemática} + \begin{theorem} + $ a^2 = b^2 + c^2 $ + \end{theorem} + + \begin{corollary} + $\Delta = b^2 - 4ac$ + \end{corollary} + + \begin{proof} + $\dfrac{\pi}{4} = 1 - \dfrac{1}{3} + \dfrac{1}{5} - \dfrac{1}{7} -\ldots$ + \end{proof} +\end{frame} + +\subsection{Figuras} + +\begin{frame}{Figuras} + \begin{columns} + \begin{column}{0.5\linewidth} + \includegraphics[width=\linewidth]{example-image-a} + \end{column} + \begin{column}{0.5\linewidth} + \includegraphics[width=\linewidth]{example-image-b} + \end{column} + \end{columns} +\end{frame} + +\section{Conclusões} +\begin{frame}{Questões?} + \centering + \textit{That's all folks!} +\end{frame} + + +\end{document} diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerthemelalic.sty b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerthemelalic.sty new file mode 100644 index 0000000000..0970eb6b05 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemelalic/beamerthemelalic.sty @@ -0,0 +1,69 @@ +% +% Tema para beamer: LALIC +% +% Por Jander Moreira, 2018-2021 +% +% Versão 1.0 + +\mode<presentation> + +%%%%%%%%%%%%%%%%%%%%%%%%%% +% Configurações +%%%%%%%%%%%%%%%%%%%%%%%%%% +\usecolortheme{lalic} +\usefonttheme{lalic} +\useinnertheme{lalic} +\useoutertheme{lalic} + +%%%%%%%%%%%%%%%%%%%%%%%%%% +% Aspectos visuais +%%%%%%%%%%%%%%%%%%%%%%%%%% + +\setbeamertemplate{navigation symbols}{} % sem navegação +\makeatletter +\protect\beamer@compresstrue +\makeatother +%%%%%%%%%%%%%%%%%%%%%%%%%% +% Aspectos configuráveis +%%%%%%%%%%%%%%%%%%%%%%%%%% + +% Comando para e-mail +\def\lalicemail{use \textbackslash email\{\} para definir e-mail} % email +\newcommand{\email}[1]{\def\lalicemail{#1}} + +% Comando para data da apresentação +\newcommand{\dataapresentacao}[3]{ + \day=#1\relax% + \month=#2\relax% + \year=#3\relax% +} + +% Geração tabela de conteúdo +\RequirePackage{calculator} +\newcommand{\agendaautomatica}[1][]{ + \AtBeginSection[]{ + \def\temp{#1} + \ifx\temp\empty{% + \begin{frame} + \tableofcontents[currentsection, hideallsubsections] + \end{frame} + } + \else{ + \ADD{#1}{1}{\segundacoluna} + \begin{frame} + \begin{columns}[t] + \begin{column}{0.5\linewidth} + \tableofcontents[currentsection, hideallsubsections, + sections={1-#1}] + \end{column} + \begin{column}{0.5\linewidth} + \tableofcontents[currentsection, hideallsubsections, + sections={\segundacoluna-}] + \end{column} + \end{columns} + \end{frame} + } + \fi + } +} +%\mode<all> diff --git a/macros/latex/contrib/changes/changes.drv b/macros/latex/contrib/changes/changes.drv index 22ee08eb90..213bf8ba41 100644 --- a/macros/latex/contrib/changes/changes.drv +++ b/macros/latex/contrib/changes/changes.drv @@ -259,11 +259,11 @@ % document title \ifENGLISH \title{The \docpackage{changes}-package} - \subtitle{Manual change markup --- version 4.0.1} + \subtitle{Manual change markup --- version 4.0.2} \fi \ifGERMAN \title{Das \docpackage{changes}-Paket} - \subtitle{Manuelle Änderungsmarkierung -- Version 4.0.1} + \subtitle{Manuelle Änderungsmarkierung -- Version 4.0.2} \fi \author{Ekkart Kleinod} diff --git a/macros/latex/contrib/changes/changes.dtx b/macros/latex/contrib/changes/changes.dtx index c5f18a6d61..5e29a4c990 100644 --- a/macros/latex/contrib/changes/changes.dtx +++ b/macros/latex/contrib/changes/changes.dtx @@ -64,6 +64,7 @@ % \changes{v3.2.2}{2020/06/16}{Merge changes script (pyMergeChanges): Correctly handle multiple different macros in the same line} % \changes{v4.0.0}{2021/01/28}{new: convenience macros, setlocextension, option commandnameprefix, defaultcolor; removed: xifthen, remark} % \changes{v4.0.1}{2021/02/14}{bugfix: Command do undefined} +% \changes{v4.0.2}{2021/04/05}{bugfix: documentation with ifthenelse references} % \GetFileInfo{changes.dtx} % \RecordChanges % @@ -104,8 +105,8 @@ % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{changes} -[2021/02/14 v4.0.1 changes package] -\typeout{*** changes package 2021/02/14 v4.0.1 ***} +[2021/04/05 v4.0.2 changes package] +\typeout{*** changes package 2021/04/05 v4.0.2 ***} % \end{macrocode} % % Package \docpackage{xkeyval} provides options with key-value-pairs. @@ -601,7 +602,6 @@ % \begin{macro}{\IfIsAuthorEmptyAtPosition} % % Check if author is anonymous or position does not equal needed position, therefore the author text is empty. -% This is a new test that can be tested using \doccommand{ifthenelse}. % % This test could be removed if the test for empty \doccommand{Changes@output@author} would work. % todo % diff --git a/macros/latex/contrib/changes/changes.english.pdf b/macros/latex/contrib/changes/changes.english.pdf Binary files differindex 67f536d250..fc27c4b72b 100644 --- a/macros/latex/contrib/changes/changes.english.pdf +++ b/macros/latex/contrib/changes/changes.english.pdf diff --git a/macros/latex/contrib/changes/changes.english.withcode.pdf b/macros/latex/contrib/changes/changes.english.withcode.pdf Binary files differindex d5436b7cb7..8380fb3ef7 100644 --- a/macros/latex/contrib/changes/changes.english.withcode.pdf +++ b/macros/latex/contrib/changes/changes.english.withcode.pdf diff --git a/macros/latex/contrib/changes/changes.ngerman.pdf b/macros/latex/contrib/changes/changes.ngerman.pdf Binary files differindex 4b74cae5ff..b2ef68e5ba 100644 --- a/macros/latex/contrib/changes/changes.ngerman.pdf +++ b/macros/latex/contrib/changes/changes.ngerman.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.bf.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.bf.pdf Binary files differindex 59fd765bcd..94aa175a4e 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.bf.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.bf.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.colored.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.colored.pdf Binary files differindex 7d89a89191..c9e7997130 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.colored.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.colored.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dashuline.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dashuline.pdf Binary files differindex 4ba20384f4..3e82123e0c 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dashuline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dashuline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dotuline.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dotuline.pdf Binary files differindex a5da33b1fc..73ab86ac99 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dotuline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.dotuline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.em.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.em.pdf Binary files differindex 7055252fc1..c056f7a5d3 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.em.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.em.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.it.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.it.pdf Binary files differindex 0366c4148a..86065fdcc0 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.it.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.it.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.sl.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.sl.pdf Binary files differindex 843b987275..ecaeee44bf 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.sl.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.sl.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uline.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uline.pdf Binary files differindex 4bd5a65671..df3f69fb09 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uuline.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uuline.pdf Binary files differindex 65264a07c5..4a001be71c 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uuline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uuline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uwave.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uwave.pdf Binary files differindex 83b3dea28d..f11f74a050 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uwave.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.uwave.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.wrong.pdf Binary files differindex a26765e5ba..6c88140c94 100644 --- a/macros/latex/contrib/changes/examples/changes.example.addedmarkup.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.addedmarkup.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.brackets.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.brackets.pdf Binary files differindex 145c9b7ae8..bf2a1444c2 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkup.brackets.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkup.brackets.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.footnote.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.footnote.pdf Binary files differindex 021a0c9bf9..a6af792a8c 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkup.footnote.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkup.footnote.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.none.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.none.pdf Binary files differindex ab2701b401..36562b523f 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkup.none.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkup.none.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.subscript.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.subscript.pdf Binary files differindex b5e30f56e0..a928c7c0d6 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkup.subscript.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkup.subscript.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.superscript.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.superscript.pdf Binary files differindex 2a317f3a86..412587188f 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkup.superscript.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkup.superscript.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkup.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkup.wrong.pdf Binary files differindex 2a628264a8..528c03cd38 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkup.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkup.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.left.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.left.pdf Binary files differindex 3999cdea41..fbf6c35d9d 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.left.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.left.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.right.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.right.pdf Binary files differindex d961a0a7bc..9b72b87338 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.right.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.right.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.wrong.pdf Binary files differindex 21cb49bcb9..bf11a6ad51 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkupposition.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.id.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.id.pdf Binary files differindex 356565b075..0e56ee8c8c 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.id.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.id.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.name.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.name.pdf Binary files differindex 87972be92b..59f174bbd3 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.name.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.name.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.wrong.pdf Binary files differindex 0866f51648..7cb35c63b9 100644 --- a/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.authormarkuptext.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.always.pdf b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.always.pdf Binary files differindex d755b5456c..1d9515058a 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.always.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.always.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.ifneeded.pdf b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.ifneeded.pdf Binary files differindex e61db0af10..f48df177c4 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.ifneeded.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.ifneeded.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.none.pdf b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.none.pdf Binary files differindex 806577a4d0..6f821fe804 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.none.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.none.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.wrong.pdf Binary files differindex 735174f20e..fc498affa1 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commandnameprefix.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf Binary files differindex abd67f56de..657c88f26f 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.footnote.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.margin.pdf b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.margin.pdf Binary files differindex a4c554af82..edbe772faf 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.margin.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.margin.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.todo.pdf b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.todo.pdf Binary files differindex 5acd6508bb..2af4f6ba9f 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.todo.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.todo.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.uwave.pdf b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.uwave.pdf Binary files differindex e0726bb9ca..836f693fc1 100644 --- a/macros/latex/contrib/changes/examples/changes.example.commentmarkup.uwave.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.commentmarkup.uwave.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.defaultcolor.pdf b/macros/latex/contrib/changes/examples/changes.example.defaultcolor.pdf Binary files differindex 813c772526..68494b767c 100644 --- a/macros/latex/contrib/changes/examples/changes.example.defaultcolor.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.defaultcolor.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.bf.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.bf.pdf Binary files differindex c43fc262f3..90892b2723 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.bf.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.bf.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.colored.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.colored.pdf Binary files differindex a9ef5e00fd..bb6fd6c754 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.colored.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.colored.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dashuline.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dashuline.pdf Binary files differindex 3c8edbd235..b3a42225fe 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dashuline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dashuline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dotuline.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dotuline.pdf Binary files differindex bc3f5fc4ec..cfa622e157 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dotuline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.dotuline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.em.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.em.pdf Binary files differindex 5a6c53611d..51b5591abb 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.em.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.em.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.it.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.it.pdf Binary files differindex 190cbbacb4..87f59d8d76 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.it.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.it.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sl.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sl.pdf Binary files differindex 2bf0d7ca6c..5d1d61d35e 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sl.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sl.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sout.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sout.pdf Binary files differindex 0299ff820f..08119810c7 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sout.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.sout.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uline.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uline.pdf Binary files differindex 13c6375a63..28e5cec57f 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uuline.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uuline.pdf Binary files differindex 521bf01c5a..8f358941f5 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uuline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uuline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uwave.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uwave.pdf Binary files differindex 1cfd047296..77fd6f3088 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uwave.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.uwave.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.wrong.pdf Binary files differindex d3006ae9df..9a7c4f778f 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.xout.pdf b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.xout.pdf Binary files differindex b0e38926b1..40ca92b0fe 100644 --- a/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.xout.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.deletedmarkup.xout.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.draft.pdf b/macros/latex/contrib/changes/examples/changes.example.draft.pdf Binary files differindex 33a85b5163..7931c405c1 100644 --- a/macros/latex/contrib/changes/examples/changes.example.draft.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.draft.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.final.pdf b/macros/latex/contrib/changes/examples/changes.example.final.pdf Binary files differindex d2e51f4758..8494c403a2 100644 --- a/macros/latex/contrib/changes/examples/changes.example.final.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.final.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.background.pdf b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.background.pdf Binary files differindex 4ec36b6db3..fc36efc655 100644 --- a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.background.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.background.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uuline.pdf b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uuline.pdf Binary files differindex ee5aa24439..4cdd1ec1f9 100644 --- a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uuline.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uuline.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uwave.pdf b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uwave.pdf Binary files differindex f58c169c70..4bb4758900 100644 --- a/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uwave.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.highlightmarkup.uwave.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf Binary files differindex 951102c378..f2d71336f2 100644 --- a/macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.listofchanges.all.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.compactsummary.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.compactsummary.pdf Binary files differindex 97052ec888..8f0d996862 100644 --- a/macros/latex/contrib/changes/examples/changes.example.listofchanges.compactsummary.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.listofchanges.compactsummary.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.list.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.list.pdf Binary files differindex 12e5c6de44..7a3a422497 100644 --- a/macros/latex/contrib/changes/examples/changes.example.listofchanges.list.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.listofchanges.list.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf Binary files differindex 86c1116896..c7e1862c2b 100644 --- a/macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.listofchanges.show.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.summary.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.summary.pdf Binary files differindex e15f9a483b..956498b3d9 100644 --- a/macros/latex/contrib/changes/examples/changes.example.listofchanges.summary.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.listofchanges.summary.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.title.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.title.pdf Binary files differindex 5ce6aadf4f..4b6050942a 100644 --- a/macros/latex/contrib/changes/examples/changes.example.listofchanges.title.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.listofchanges.title.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.listofchanges.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.listofchanges.wrong.pdf Binary files differindex 2ed12780fc..4de909cf86 100644 --- a/macros/latex/contrib/changes/examples/changes.example.listofchanges.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.listofchanges.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.bfit.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.bfit.pdf Binary files differindex 78b423faa4..67742c8a20 100644 --- a/macros/latex/contrib/changes/examples/changes.example.markup.bfit.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.markup.bfit.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.default.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.default.pdf Binary files differindex 5e99c83246..cb50ff4ab4 100644 --- a/macros/latex/contrib/changes/examples/changes.example.markup.default.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.markup.default.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.nocolor.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.nocolor.pdf Binary files differindex f0a34fb51d..c3de83963f 100644 --- a/macros/latex/contrib/changes/examples/changes.example.markup.nocolor.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.markup.nocolor.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.underlined.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.underlined.pdf Binary files differindex f665ef373c..4f97f7cddd 100644 --- a/macros/latex/contrib/changes/examples/changes.example.markup.underlined.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.markup.underlined.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.markup.wrong.pdf b/macros/latex/contrib/changes/examples/changes.example.markup.wrong.pdf Binary files differindex 3b633aff75..e69a1290ef 100644 --- a/macros/latex/contrib/changes/examples/changes.example.markup.wrong.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.markup.wrong.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.packageoptions.todonotes.pdf b/macros/latex/contrib/changes/examples/changes.example.packageoptions.todonotes.pdf Binary files differindex 6d691a11d9..6c2ef16461 100644 --- a/macros/latex/contrib/changes/examples/changes.example.packageoptions.todonotes.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.packageoptions.todonotes.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.packageoptions.truncate.pdf b/macros/latex/contrib/changes/examples/changes.example.packageoptions.truncate.pdf Binary files differindex 3920da6869..2bf38fe630 100644 --- a/macros/latex/contrib/changes/examples/changes.example.packageoptions.truncate.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.packageoptions.truncate.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.packageoptions.ulem.pdf b/macros/latex/contrib/changes/examples/changes.example.packageoptions.ulem.pdf Binary files differindex 1b84fe2a55..679ead2652 100644 --- a/macros/latex/contrib/changes/examples/changes.example.packageoptions.ulem.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.packageoptions.ulem.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.packageoptions.xcolor.pdf b/macros/latex/contrib/changes/examples/changes.example.packageoptions.xcolor.pdf Binary files differindex 9f4d1bf423..1f6a2e5dbf 100644 --- a/macros/latex/contrib/changes/examples/changes.example.packageoptions.xcolor.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.packageoptions.xcolor.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.screenshot.pdf b/macros/latex/contrib/changes/examples/changes.example.screenshot.pdf Binary files differindex 4d129b343b..fb0af2d126 100644 --- a/macros/latex/contrib/changes/examples/changes.example.screenshot.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.screenshot.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setaddedmarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.setaddedmarkup.pdf Binary files differindex 2841fbb46f..ef53f15213 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setaddedmarkup.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setaddedmarkup.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setauthormarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.setauthormarkup.pdf Binary files differindex 799c083dd1..56a33ac167 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setauthormarkup.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setauthormarkup.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf b/macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf Binary files differindex ff1477f4c9..f0bde0ea56 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setauthormarkupposition.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setauthormarkuptext.pdf b/macros/latex/contrib/changes/examples/changes.example.setauthormarkuptext.pdf Binary files differindex 7cb88c4de8..1036e247e9 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setauthormarkuptext.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setauthormarkuptext.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setcommentmarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.setcommentmarkup.pdf Binary files differindex e438a0b854..cd02212a25 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setcommentmarkup.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setcommentmarkup.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setdeletedmarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.setdeletedmarkup.pdf Binary files differindex b8a9c23a1b..fb44f1e006 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setdeletedmarkup.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setdeletedmarkup.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.sethighlightmarkup.pdf b/macros/latex/contrib/changes/examples/changes.example.sethighlightmarkup.pdf Binary files differindex dfa43422f4..383dc0687a 100644 --- a/macros/latex/contrib/changes/examples/changes.example.sethighlightmarkup.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.sethighlightmarkup.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setsocextension.pdf b/macros/latex/contrib/changes/examples/changes.example.setsocextension.pdf Binary files differindex a711422617..b0bf4be302 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setsocextension.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setsocextension.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setsummarytowidth.pdf b/macros/latex/contrib/changes/examples/changes.example.setsummarytowidth.pdf Binary files differindex 98339e937f..d62a7cf3a3 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setsummarytowidth.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setsummarytowidth.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.setsummarywidth.pdf b/macros/latex/contrib/changes/examples/changes.example.setsummarywidth.pdf Binary files differindex b2e249ebad..d436e19eba 100644 --- a/macros/latex/contrib/changes/examples/changes.example.setsummarywidth.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.setsummarywidth.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.settruncatewidth.pdf b/macros/latex/contrib/changes/examples/changes.example.settruncatewidth.pdf Binary files differindex bccbfe8d42..7b07af4115 100644 --- a/macros/latex/contrib/changes/examples/changes.example.settruncatewidth.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.settruncatewidth.pdf diff --git a/macros/latex/contrib/changes/examples/changes.example.simple.pdf b/macros/latex/contrib/changes/examples/changes.example.simple.pdf Binary files differindex b0ef62ead4..c88b4ae87e 100644 --- a/macros/latex/contrib/changes/examples/changes.example.simple.pdf +++ b/macros/latex/contrib/changes/examples/changes.example.simple.pdf diff --git a/macros/latex/contrib/changes/userdoc/changes.de.tex b/macros/latex/contrib/changes/userdoc/changes.de.tex index 80f3005654..830aa591c2 100644 --- a/macros/latex/contrib/changes/userdoc/changes.de.tex +++ b/macros/latex/contrib/changes/userdoc/changes.de.tex @@ -699,6 +699,25 @@ Das Paket definiert einen anonymen Autor vor, der ohne ID genutzt werden kann. \localtableofcontents +\subsubsection{Werte für die Anpassung in den Makros} + +Wenn Sie die Ausgabe anpassen wollen, können sie beliebige \hologo{LaTeX}-Befehle sowie spezielle Werte oder Makros des \docpackage{changes}-Pakets benutzen. +Einige Werte sind makrospezifisch, diese sind in den Makros beschrieben. + +Die folgenden Werte und Makros können Sie in jedem Kommando benutzen: + +\begin{itemize} + \item beliebige \hologo{LaTeX}-Befehle + \item Autorenfarbe wird in der Farbe "`authorcolor"' bereitgestellt + \item boolscher Test auf farbigen Text mit "`\doccommand{IfIsColored}"' +\end{itemize} + +Ich stelle nicht den vollen Zugriff auf alle Parameter des Markups zur Verfügung, um die Makros einfach zu halten. +So ist \zB die Autoren-ID nur für \doccommand{setcommentmarkup} zugreifbar. + +Die Ausgabe ersetzten Texts ist ein Kombination von zugefügtem und gelöschten Text. + + \chnewcmd{setaddedmarkup} \chinline{setaddedmarkup} @@ -709,12 +728,13 @@ Ohne andere Definition gilt, dass der Text farbig oder je nach Option \docoption Werte für die Definition: \begin{itemize} - \item beliebige \hologo{LaTeX}-Befehle - \item neuer Text wird mit "`\#1"' genutzt + \item neuer Text wird mit "`\#1"' gesetzt \end{itemize} \chexample{setaddedmarkup} +Die Ausgabe ersetzten Texts ist ein Kombination von zugefügtem und gelöschten Text, daher beeinflusst deren Layoutänderung auch das Layout ersetzen Texts. + \chnewcmd{setdeletedmarkup} @@ -726,8 +746,7 @@ Ohne andere Definition gilt, dass der Text durchgestrichen wird oder je nach Opt Werte für die Definition: \begin{itemize} - \item beliebige \hologo{LaTeX}-Befehle - \item gelöschter Text wird mit "`\#1"' genutzt + \item gelöschter Text wird mit "`\#1"' gesetzt \end{itemize} Die Ausgabe ersetzten Texts ist ein Kombination von zugefügtem und gelöschten Text, daher beeinflusst deren Layoutänderung auch das Layout ersetzen Texts. @@ -745,10 +764,7 @@ Ohne andere Definition gilt, dass die Hervorhebung über die Hintergrundfarbe er Werte für die Definition: \begin{itemize} - \item beliebige \hologo{LaTeX}-Befehle - \item hervorgehobener Text wird mit "`\#1"' genutzt - \item \docpackage{ifthenelse} boolscher Test auf farbigen Text mit ``\doccommand{isColored}'' - \item Autorenfarbe wird mit ``authorcolor'' genutzt + \item hervorgehobener Text wird mit "`\#1"' gesetzt \end{itemize} \chexample{sethighlightmarkup} @@ -764,14 +780,11 @@ Ohne andere Definition gilt, dass Kommentare im Rand oder je nach Option \docopt Werte für die Definition: \begin{itemize} - \item beliebige \hologo{LaTeX}-Befehle - \item Kommentar wird mit "`\#1"' genutzt - \item Autor-ID wird mit ``\#2'' genutzt - \item Autor-Ausgabe (ID oder Name) wird mit ``\#3'' genutzt - \item \docpackage{ifthenelse} boolscher Test auf anonymen Autor Text mit ``\doccommand{isAnonymous}'' - \item \docpackage{ifthenelse} boolscher Test auf farbigen Text mit ``\doccommand{isColored}'' - \item Autorenfarbe wird mit ``authorcolor'' genutzt - \item Kommentaranzahl wird mit ``authorcommentcount'' genutzt + \item Kommentar wird mit "`\#1"' gesetzt + \item Autor-ID steht in "`\#2"' bereit + \item Autor-Ausgabe (ID oder Name) wird mit "`\#3"' gesetzt + \item Kommentaranzahl steht in "`authorcommentcount"' bereit + \item boolscher Test auf anonymen Autor mit "`\doccommand{IfIsAnonymous}"' \end{itemize} \chexample{setcommentmarkup} @@ -787,8 +800,7 @@ Ohne andere Definition gilt, dass der Autor hochgestellt erscheint. Werte für die Definition: \begin{itemize} - \item beliebige \hologo{LaTeX}-Befehle - \item Autor-Ausgabe (ID oder Name) wird mit ``\#1'' genutzt + \item Autor-Ausgabe (ID oder Name) wird mit "`\#1"' gesetzt \end{itemize} \chexample{setauthormarkup} diff --git a/macros/latex/contrib/changes/userdoc/changes.en.tex b/macros/latex/contrib/changes/userdoc/changes.en.tex index 751f4aa391..a9853fbef1 100644 --- a/macros/latex/contrib/changes/userdoc/changes.en.tex +++ b/macros/latex/contrib/changes/userdoc/changes.en.tex @@ -202,7 +202,7 @@ You cannot markup: \item tables \item headings \item some commands - \item several paragraphs (sometimes) + \item multiple paragraphs (sometimes) \end{itemize} You can try putting such text in an extra file and include in with \texttt{input}. @@ -699,6 +699,25 @@ The package predefines one anonymous author without id. \localtableofcontents +\subsubsection{Values for markup command definitions} + +If you want to adapt the markup output, you can use any \hologo{LaTeX}-commands and special values resp.\ macros of the \docpackage{changes} package. +Some values or macros are specific for each command, they are described in the corresponding sections. + +The following values and macros can be used in each command: + +\begin{itemize} + \item any \hologo{LaTeX}-commands + \item author's color can be used with color ``authorcolor'' + \item boolean test if colored change output is needed ``\doccommand{IfIsColored}'' +\end{itemize} + +I do not provide full access to all elements of the markup for every command in order to keep the macros simple. +For example, the author's id is only available for \doccommand{setcommentmarkup}. + +The output of replaced text is a combination of added and deleted text. + + \chnewcmd{setaddedmarkup} \chinline{setaddedmarkup} @@ -709,7 +728,6 @@ The default markup is colored text, or the markup set with the option \docoption Values for definition: \begin{itemize} - \item any \hologo{LaTeX}-commands \item added text can be used with ``\#1'' \end{itemize} @@ -728,7 +746,6 @@ The default markup is striked-out, or the markup set with the option \docoption{ Values for definition: \begin{itemize} - \item any \hologo{LaTeX}-commands \item deleted text can be used with ``\#1'' \end{itemize} @@ -747,10 +764,7 @@ The default markup is via a background color, or the markup set with the option Values for definition: \begin{itemize} - \item any \hologo{LaTeX}-commands \item highlighted text can be used with ``\#1'' - \item \docpackage{ifthenelse} boolean test for colored text ``\doccommand{isColored}'' - \item author's color can be used with color ``authorcolor'' \end{itemize} \chexample{sethighlightmarkup} @@ -766,14 +780,11 @@ The default markup is a margin note, or the markup set with the option \docoptio Values for definition: \begin{itemize} - \item any \hologo{LaTeX}-commands \item comment can be used with ``\#1'' \item author's id can be used with ``\#2'' \item author output (id or name) can be used with ``\#3'' - \item \docpackage{ifthenelse} boolean test for anonymous author ``\doccommand{isAnonymous}'' - \item \docpackage{ifthenelse} boolean test for colored text ``\doccommand{isColored}'' - \item author's color can be used with color ``authorcolor'' \item comment count of the autor can be used with counter ``authorcommentcount'' + \item boolean test if author is anonymous ``\doccommand{IfIsAnonymous}'' \end{itemize} \chexample{setcommentmarkup} @@ -789,7 +800,6 @@ The default markup is a superscripted author's text. Values for definition: \begin{itemize} - \item any \hologo{LaTeX}-commands \item author output (id or name) can be used with ``\#1'' \end{itemize} @@ -982,14 +992,14 @@ Kudos to Charly Arenz for this tip. \subsection{Footnotes and margin notes} -There is a problem of typesetting footnotes or margin notes in special environments, such as tables or tabbings. -Avoid such markup when using these environments. +There is a problem of typesetting footnotes or margin notes in special environments, such as tables or the \emph{tabbing} environment. +Avoid this type of markup when using these environments. \subsection{The \docpackage{ulem} package} I am using the \docpackage{ulem} package for striking out text as default. -This leads to problems with some commands or environments, e.g. +This causes problems with some commands and environments, e.g. \begin{itemize} \item in math mode @@ -997,7 +1007,7 @@ This leads to problems with some commands or environments, e.g. \item when using the \doccommand{citet} or \doccommand{citep} command \end{itemize} -In that case there are only a few good solutions, the best way is to avoid using the \docpackage{ulem} package by defining your own deletion markup. +In that case there are few good options, the best is to define the markup for deletions yourself and avoid the ulem package. See \begin{itemize} @@ -1008,13 +1018,12 @@ See \subsection{Command already defined} -Some package define the markup commands as well, especially \doccommand{comment} and \doccommand{highlight} are not exclusively used by \docpackage{changes}. - -If needed, \docpackage{changes} can prefix it's markup commands in order to avoid name clashes. -This is set with the option \docoption{commandnameprefix}, see \autoref{sec:ui:options:commandnameprefix} for the documentation. +Some packages use the same names for their commands as the \docpackage{changes} package, in particular \doccommand{comment} and \doccommand{highlight} are not originally named commands. -In order for this to work, the \docpackage{changes} package has to be used after the other package defining the command. +In this case, \docpackage{changes} may prefix its commands to avoid naming collisions. +This is controlled by the \docoption{commandnameprefix} option, see \autoref{sec:ui:options:commandnameprefix} for the documentation. +In order for this to work, the \docpackage{changes} package has to be loaded after the other packages or \docoption{commandnameprefix=always} must be selected. %^^A -- Authors ------------------------------------------------------------- diff --git a/macros/latex/contrib/changes/userdoc/setcommentmarkup_ex.tex b/macros/latex/contrib/changes/userdoc/setcommentmarkup_ex.tex index 121e2d9dc8..1cc3bcc640 100644 --- a/macros/latex/contrib/changes/userdoc/setcommentmarkup_ex.tex +++ b/macros/latex/contrib/changes/userdoc/setcommentmarkup_ex.tex @@ -1,4 +1,4 @@ \setcommentmarkup{-- #1 --} -\setcommentmarkup{\ifthenelse{\isColored}{\color{authorcolor}}{}#1} -\setcommentmarkup{\ifthenelse{\isAnonymous{#2}}{}{\textbf{#3: }}#1} +\setcommentmarkup{{\IfIsColored{\color{authorcolor}}{}#1}} +\setcommentmarkup{\IfIsAnonymous{#2}{}{\textbf{#3: }}#1} \setcommentmarkup{[\arabic{authorcommentcount}] #1} diff --git a/macros/latex/contrib/changes/userdoc/sethighlightmarkup_ex.tex b/macros/latex/contrib/changes/userdoc/sethighlightmarkup_ex.tex index e731735ce2..c3bc59f638 100644 --- a/macros/latex/contrib/changes/userdoc/sethighlightmarkup_ex.tex +++ b/macros/latex/contrib/changes/userdoc/sethighlightmarkup_ex.tex @@ -1,2 +1,2 @@ \sethighlightmarkup{\emph{#1}} -\sethighlightmarkup{\ifthenelse{\isColored}{\color{authorcolor}}{}\#\#: #1} +\sethighlightmarkup{{\IfIsColored{\color{authorcolor}}{}||: #1}} diff --git a/macros/latex/contrib/changes/userdoc/setsummarytowidth_ex.tex b/macros/latex/contrib/changes/userdoc/setsummarytowidth_ex.tex index ad5a04fe3e..4cb9bda39e 100644 --- a/macros/latex/contrib/changes/userdoc/setsummarytowidth_ex.tex +++ b/macros/latex/contrib/changes/userdoc/setsummarytowidth_ex.tex @@ -1,2 +1,2 @@ \setsummarytowidth{Highlighted \qquad} -\setsummarytowidth{The longest text you can imagine for the summary.} +\setsummarytowidth{The longest text imaginable for the summary.} diff --git a/macros/latex/contrib/dimnum/README b/macros/latex/contrib/dimnum/README deleted file mode 100644 index 426c859331..0000000000 --- a/macros/latex/contrib/dimnum/README +++ /dev/null @@ -1,22 +0,0 @@ -NAME - dimnum -- Provides commands for Dimensionless numbers - -VERSION - Version: v1.0.0 - -COPYRIGHT - Copyright (c) 2021 Miguel R. Clemente <miguel.clemente@dem.uc.pt> - - This file may be distributed and/or modified under the conditions of - the LaTeX Project Public License, either version 1.3 of this license - or (at your option) any later version. The latest version of this - license is in: - - http://www.latex-project.org/lppl.txt - - and version 1.3 or later is part of all distributions of LaTeX version - 2005/12/01 or later. - - This work has the LPPL maintenance status `maintained'. - - The Current Maintainer of this work is Miguel R. Clemente.
\ No newline at end of file diff --git a/macros/latex/contrib/dimnum/README.md b/macros/latex/contrib/dimnum/README.md new file mode 100644 index 0000000000..39d77b0377 --- /dev/null +++ b/macros/latex/contrib/dimnum/README.md @@ -0,0 +1,22 @@ +# dimnum +LaTeX package that implements commands for Dimensionless Numbers + +Current version: v1.0.1 + +Minor fixes and 42 new additions, see full changelog for more details. + +Copyright (c) 2021 Miguel R. Clemente <miguel.clemente@dem.uc.pt> + +This file may be distributed and/or modified under the conditions of +the LaTeX Project Public License, either version 1.3 of this license +or (at your option) any later version. The latest version of this +license is in: + +http://www.latex-project.org/lppl.txt + +and version 1.3 or later is part of all distributions of LaTeX version +2005/12/01 or later. + +This work has the LPPL maintenance status `maintained'. + +The Current Maintainer of this work is Miguel R. Clemente.
\ No newline at end of file diff --git a/macros/latex/contrib/dimnum/changelog b/macros/latex/contrib/dimnum/changelog new file mode 100644 index 0000000000..192247e396 --- /dev/null +++ b/macros/latex/contrib/dimnum/changelog @@ -0,0 +1,140 @@ +# Changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), +and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [1.0.1] - 2021-04-05 +### Added +- Abbe number +- Activity coefficient +- Albedo +- Arrhenius number +- Atomic weight +- Basic reproduction number +- Blondeau number +- Chilton-Colburn Momentum J-factor +- Chilton-Colburn Heat J-factor +- Chilton-Colburn Mass J-factor +- Coefficient of Determination +- Coefficient of Kinetic Friction +- Coefficient of Static Friction +- Coefficient of Variation +- Cohesion number +- Courant-Friedrich-Levy number +- Damping ratio +- Darcy friction factor +- Excess Temperature coefficient +- Fanning friction factor +- Fine-structure constant +- Föppl-von Kármán number +- Fresnel number +- Havnes parameter +- Helmholtz number +- Lift Coefficient +- Lockhart-Martinelli parameter +- Lundquist number +- Markstein number +- Peel number +- Pierce parameter +- Poisson’s ratio +- Power factor +- Power number +- Pressure Coefficient +- Refractive index +- Rolling resistance coefficient +- Shield’s parameter +- Van ’t Hoff factor +- Wallis parameter +- Womersley number +- Zel’dovich number + +### Changed +- Brownell-Katz number command from \Bk to \BK +- Capillary number command from \Cap to \Ca +- Coefficient of Frication command from \Cf to \CoF +- Keulegan-Carpenter number command from \Kc to \KC + +### Fixed +- Fixed command incompatibility between Capillary number and math set intersection symbol +- Table in documentation was missing some available Dimensionless Numbers + +## [1.0.0] - 2021-04-01 +### Added +- dimnum command to add new Dimensionless numbers +- Archimedes number +- Atwood number +- Bagnold number +- Bejan number +- Bingham number +- Biot number +- Blake number +- Bodenstein number +- Bond number +- Brinkman number +- Brownell-Katz number +- Capillary number +- Cauchy number +- Chandrasekhar number +- Coefficient of Frication +- Condensation number +- Dahmköhler number +- Darcy number +- Dean number +- Deborah number +- Drag Coefficient +- Dukhin number +- Eckert number +- Ekman number +- Elasticity number +- Elenbass number +- Eötvös number +- Ericksen number +- Euler number +- Fourier number +- Froude number +- Galilei number +- Görtier number +- Graetz number +- Grashof number +- Hatta number +- Hagen number +- Hodgson number +- Iribarren number +- Jakob number +- Karlovitz number +- Keulegan-Carpenter number +- Knudsen number +- Kutateladze number +- Laplace number +- Lewis number +- Mach number +- Marangoni number +- Morton number +- Nusselt number +- Ohnesorge number +- Péclet number +- pH +- Prandtl number +- Rayleigh number +- Reynolds number +- Richardson number +- Roshko number +- Rossby number +- Rouse number +- Schmidt number +- Sherwood number +- Sommerfield number +- Stanton number +- Stefan number +- Stokes number +- Strouhal number +- Stuart number +- Svelteness +- Taylor number +- Ursell number +- Vadasz number +- Wagner number +- Weaver flame speed number +- Weber number +- Weissenberg number
\ No newline at end of file diff --git a/macros/latex/contrib/dimnum/dimnum.dtx b/macros/latex/contrib/dimnum/dimnum.dtx index 2020b088c7..7dfaefcc37 100644 --- a/macros/latex/contrib/dimnum/dimnum.dtx +++ b/macros/latex/contrib/dimnum/dimnum.dtx @@ -26,12 +26,12 @@ %<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01] %<package>\ProvidesPackage{dimnum} %<*package> - [2021/04/01 v1.0.0 Provides commands for Dimensionless numbers] + [2021/04/05 v1.0.1 Provides commands for Dimensionless numbers] %</package> % %<*driver> \documentclass{ltxdoc} -\usepackage{dimnum}[2021/04/01] +\usepackage{dimnum}[2021/04/05] \usepackage{multirow} \usepackage{tabu} \usepackage{longtable} @@ -49,7 +49,7 @@ %</driver> % \fi % -% \CheckSum{122} +% \CheckSum{221} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -69,6 +69,7 @@ % % % \changes{v1.0.0}{2021/04/01}{Public release} +% \changes{v1.0.1}{2021/04/05}{Minor fixes, 42 new additions} % % \DoNotIndex{\newcommand,\newenvironment} % @@ -78,6 +79,8 @@ % \author{Miguel R. Clemente \\ \url{miguel.clemente@dem.uc.pt}} % \date{\fileversion~from \filedate} % +% \extrarowsep=4mm +% % \maketitle % % Note: \Pr[l] is redefined from the \verb!amsmath! package. @@ -114,100 +117,142 @@ % You can add your own Dimensionless Numbers to your projects. Requests and suggestions to increment Table~\ref{Tab:DimNum} are accepted and encouraged. % -%\begin{longtabu*} to \textwidth {>{\small}X[2,m] >{\small}X[m,c] >{\small}X[m,c] >{\small}X[2,m,c]} +%\begin{longtabu*} to \textwidth {>{\small}X[2,m] >{\small}X[m,c] >{\small}X[m,c]} % \centering \\ % \captionsetup{justification=centering} \\ % \caption{List of Dimensionless Numbers Available} \\ % \label{Tab:DimNum} \\ % \toprule \toprule -% \rowfont[]{\bf}Long Name & Symbol & Command & Application Fields\\ \midrule +% \rowfont[]{\bf}Long Name & Symbol & Command\\ \midrule % \endfirsthead -% \multicolumn{4}{c}% +% \multicolumn{3}{c}% % {{\footnotesize{\tablename\ \thetable{} -- continued from the previous page}}} \\ % \toprule -% \rowfont[]{\bf}Long Name & Symbol & Command & Application Fields\\ \midrule +% \rowfont[]{\bf}Long Name & Symbol & Command\\ \midrule % \endhead -% \midrule \multicolumn{4}{r}{{\footnotesize{Continues on the next page}}} \\ +% \midrule \multicolumn{3}{r}{{\footnotesize{Continues on the next page}}} \\ % \endfoot % \bottomrule % \endlastfoot -% \Ar[l] & \Ar & \verb!\Ar! & Fluid Mechanics \\ -% \At[l] & \At & \verb!\At! & Fluid Mechanics \\ -% \Ba[l] & \Ba & \verb!\Ba! & Geology, Fluid Mechanics \\ -% \Be[l] & \Be & \verb!\Be! & Fluid Mechanics, Thermodynamics \\ -% \Bm[l] & \Bm & \verb!\Bm! & Fluid Mechanics, Rheology \\ -% \Bi[l] & \Bi & \verb!\Bi! & Heat Transfer, Mass Transfer \\ -% \Bl[l] & \Bl & \verb!\Bl! & Geology, Fluid Mechanics, Porous Media \\ -% \Bs[l] & \Bs & \verb!\Bs! & Chemistry \\ -% \Bo[l] & \Bo & \verb!\Bo! & Geology, Fluid Mechanics, Porous Media \\ -% \Br[l] & \Br & \verb!\Br! & Fluid Mechanics, Heat Transfer \\ -% \Bk[l] & \Bk & \verb!\Bk! & Fluid Mechanics \\ -% \Cap[l] & \Cap & \verb!\Cap! & Fluid Mechanics, Porous Media \\ -% \Cau[l] & \Cau & \verb!\Cau! & \\ -% \Ch[l] & \Ch & \verb!\Ch! & Magnetohydrodynamics \\ -% \Cf[l] & \Cf & \verb!\Cf! & \\ -% \Co[l] & \Co & \verb!\Co! & \\ -% \Dah[l] & \Dah & \verb!\Dah! & Chemistry \\ -% \Dar[l] & \Dar & \verb!\Dar! & Porous Media \\ -% \De[l] & \De & \verb!\De! & Fluid Mechanics \\ -% \Deb[l] & \Deb & \verb!\Deb! & Rheology \\ -% \Cd[l] & \Cd & \verb!\Cd! & \\ -% \Du[l] & \Du & \verb!\Du! & Colloid Science \\ -% \Ec[l] & \Ec & \verb!\Ec! & Heat Transfer \\ -% \Ek[l] & \Ek & \verb!\Ek! & Geophysics \\ -% \Ela[l] & \Ela & \verb!\Ela! & \\ -% \El[l] & \El & \verb!\El! & \\ -% \Eo[l] & \Eo & \verb!\Eo! & Fluid Mechanics \\ -% \Er[l] & \Er & \verb!\Er! & Fluid Dynamics \\ -% \Eu[l] & \Eu & \verb!\Eu! & Hydrodynamics \\ -% \Fo[l] & \Fo & \verb!\Fo! & Heat Transfer, Mass Transfer \\ -% \Fr[l] & \Fr & \verb!\Fr! & Fluid Mechanics \\ -% \Ga[l] & \Ga & \verb!\Ga! & Fluid Mechanics \\ -% \Go[l] & \Go & \verb!\Go! & Fluid Dynamics \\ -% \Gz[l] & \Gz & \verb!\Gz! & Fluid Mechanics, Heat Transfer \\ -% \Gr[l] & \Gr & \verb!\Gr! & Heat Transfer \\ -% \Ha[l] & \Ha & \verb!\Ha! & Chemistry \\ -% \Hg[l] & \Hg & \verb!\Hg! & Heat Transfer \\ -% \Ho[l] & \Ho & \verb!\Ho! & \\ -% \Ir[l] & \Ir & \verb!\Ir! & Wave Mechanics \\ -% \Ja[l] & \Ja & \verb!\Ja! & Chemistry \\ -% \Ka[l] & \Ka & \verb!\Ka! & Combustion \\ -% \Kc[l] & \Kc & \verb!\Kc! & Fluid Dynamics \\ -% \Kn[l] & \Kn & \verb!\Kn! & Gas Dynamics \\ -% \Ku[l] & \Ku & \verb!\Ku! & Fluid Mechanics \\ -% \La[l] & \La & \verb!\La! & Fluid Dynamics \\ -% \Le[l] & \Le & \verb!\Le! & Heat Transfer, Mass Transfer \\ -% \Ma[l] & \Ma & \verb!\Ma! & Gas Dynamics \\ -% \Mg[l] & \Mg & \verb!\Mg! & Fluid Mechanics \\ -% \Mo[l] & \Mo & \verb!\Mo! & Fluid Dynamics \\ -% \Nus[l] & \Nus & \verb!\Nus! & Heat Transfer \\ -% \Oh[l] & \Oh & \verb!\Oh! & Fluid Dynamics \\ -% \Pe[l] & \Pe & \verb!\Pe! & Heat Transfer \\ -% \pH[l] & \pH & \verb!\pH! & Chemistry \\ -% \Pr[l] & \Pr & \verb!\Pr! & Heat Transfer \\ -% \Ra[l] & \Ra & \verb!\Ra! & Heat Transfer \\ -% \Rey[l] & \Rey & \verb!\Rey! & Fluid Mechanics \\ -% \Ri[l] & \Ri & \verb!\Ri! & Fluid Dynamics \\ -% \Ro[l] & \Ro & \verb!\Ro! & Fluid Dynamics \\ -% \Ros[l] & \Ros & \verb!\Ros! & Geophysics \\ -% \Rou[l] & \Rou & \verb!\Rou! & Sediment Transport \\ -% \Sc[l] & \Sc & \verb!\Sc! & Mass Transfer \\ -% \Sh[l] & \Sh & \verb!\Sh! & Mass Transfer \\ -% \So[l] & \So & \verb!\So! & Hydrodynamic Lubrication \\ -% \St[l] & \St & \verb!\St! & Fluid Dynamics, Mass Transfer \\ -% \Ste[l] & \Ste & \verb!\Ste! & Thermodynamics \\ -% \Stk[l] & \Stk & \verb!\Stk! & Particles Suspensions \\ -% \Sr[l] & \Sr & \verb!\Sr! & Fluid Dynamics \\ -% \Stu[l] & \Stu & \verb!\Stu! & Magnetohydrodynamics \\ -% \Sv[l] & \Sv & \verb!\Sv! & Design \\ -% \Ta[l] & \Ta & \verb!\Ta! & Fluid Dynamics \\ -% \Ur[l] & \Ur & \verb!\Ur! & Wave Mechanics \\ -% \Va[l] & \Va & \verb!\Va! & Porous Media \\ -% \Wa[l] & \Wa & \verb!\Wa! & Electrochemistry \\ -% \Wea[l] & \Wea & \verb!\Wea! & Combustion \\ -% \We[l] & \We & \verb!\We! & Multiphase Flow \\ -% \Wei[l] & \Wei & \verb!\Wei! & Viscoelastic Flows \\ -% \bottomrule +% \Ab[l] & \Ab & \verb!\Ab! \\ +% \AC[l] & \AC & \verb!\AC! \\ +% \Al[l] & \Al & \verb!\Al! \\ +% \Ar[l] & \Ar & \verb!\Ar! \\ +% \Arr[l] & \Arr & \verb!\Arr! \\ +% \AW[l] & \AW & \verb!\AW! \\ +% \At[l] & \At & \verb!\At! \\ +% \Ba[l] & \Ba & \verb!\Ba! \\ +% \Rz[l] & \Rz & \verb!\Rz! \\ +% \Be[l] & \Be & \verb!\Be! \\ +% \Bm[l] & \Bm & \verb!\Bm! \\ +% \Bi[l] & \Bi & \verb!\Bi! \\ +% \Bl[l] & \Bl & \verb!\Bl! \\ +% \Blo[l] & \Blo & \verb!\Blo! \\ +% \Bs[l] & \Bs & \verb!\Bs! \\ +% \Bo[l] & \Bo & \verb!\Bo! \\ +% \Br[l] & \Br & \verb!\Br! \\ +% \BK[l] & \BK & \verb!\BK! \\ +% \Ca[l] & \Ca & \verb!\Ca! \\ +% \Cau[l] & \Cau & \verb!\Cau! \\ +% \Ch[l] & \Ch & \verb!\Ch! \\ +% \Jh[l] & \Jh & \verb!\Jh! \\ +% \Jd[l] & \Jd & \verb!\Jd! \\ +% \Jm[l] & \Jm & \verb!\Jm! \\ +% \CoD[l] & \CoD & \verb!\CoD! \\ +% \CoF[l] & \CoF & \verb!\CoF! \\ +% \CoK[l] & \CoK & \verb!\CoK! \\ +% \CoS[l] & \CoS & \verb!\CoS! \\ +% \CoV[l] & \CoV & \verb!\CoV! \\ +% \Coh[l] & \Coh & \verb!\Coh! \\ +% \Co[l] & \Co & \verb!\Co! \\ +% \CFL[l] & \CFL & \verb!\CFL! \\ +% \Dah[l] & \Dah & \verb!\Dah! \\ +% \Dr[l] & \Dr & \verb!\Dr! \\ +% \fD[l] & \fD & \verb!\fD! \\ +% \Dar[l] & \Dar & \verb!\Dar! \\ +% \De[l] & \De & \verb!\De! \\ +% \Deb[l] & \Deb & \verb!\Deb! \\ +% \Cd[l] & \Cd & \verb!\Cd! \\ +% \Du[l] & \Du & \verb!\Du! \\ +% \Ec[l] & \Ec & \verb!\Ec! \\ +% \Ek[l] & \Ek & \verb!\Ek! \\ +% \Ela[l] & \Ela & \verb!\Ela! \\ +% \El[l] & \El & \verb!\El! \\ +% \Eo[l] & \Eo & \verb!\Eo! \\ +% \Er[l] & \Er & \verb!\Er! \\ +% \Eu[l] & \Eu & \verb!\Eu! \\ +% \ExT[l] & \ExT & \verb!\ExT! \\ +% \fF[l] & \fF & \verb!\fF! \\ +% \Fs[l] & \Fs & \verb!\Fs! \\ +% \FvK[l] & \FvK & \verb!\FvK! \\ +% \Fo[l] & \Fo & \verb!\Fo! \\ +% \Fre[l] & \Fre & \verb!\Fre! \\ +% \Fr[l] & \Fr & \verb!\Fr! \\ +% \Go[l] & \Go & \verb!\Go! \\ +% \Ga[l] & \Ga & \verb!\Ga! \\ +% \Gz[l] & \Gz & \verb!\Gz! \\ +% \Gr[l] & \Gr & \verb!\Gr! \\ +% \Hg[l] & \Hg & \verb!\Hg! \\ +% \Ha[l] & \Ha & \verb!\Ha! \\ +% \Hav[l] & \Hav & \verb!\Hav! \\ +% \He[l] & \He & \verb!\He! \\ +% \Ho[l] & \Ho & \verb!\Ho! \\ +% \Ir[l] & \Ir & \verb!\Ir! \\ +% \Ja[l] & \Ja & \verb!\Ja! \\ +% \Ka[l] & \Ka & \verb!\Ka! \\ +% \KC[l] & \KC & \verb!\KC! \\ +% \Kn[l] & \Kn & \verb!\Kn! \\ +% \Ku[l] & \Ku & \verb!\Ku! \\ +% \La[l] & \La & \verb!\La! \\ +% \Le[l] & \Le & \verb!\Le! \\ +% \Cl[l] & \Cl & \verb!\Cl! \\ +% \LM[l] & \LM & \verb!\LM! \\ +% \Lu[l] & \Lu & \verb!\Lu! \\ +% \Ma[l] & \Ma & \verb!\Ma! \\ +% \Mg[l] & \Mg & \verb!\Mg! \\ +% \Mar[l] & \Mar & \verb!\Mar! \\ +% \Mo[l] & \Mo & \verb!\Mo! \\ +% \Nus[l] & \Nus & \verb!\Nus! \\ +% \Oh[l] & \Oh & \verb!\Oh! \\ +% \Pe[l] & \Pe & \verb!\Pe! \\ +% \Peel[l] & \Peel & \verb!\Peel! \\ +% \pH[l] & \pH & \verb!\pH! \\ +% \Pie[l] & \Pie & \verb!\Pie! \\ +% \Poi[l] & \Poi & \verb!\Poi! \\ +% \Pf[l] & \Pf & \verb!\Pf! \\ +% \Pn[l] & \Pn & \verb!\Pn! \\ +% \Pr[l] & \Pr & \verb!\Pr! \\ +% \Cp[l] & \Cp & \verb!\Cp! \\ +% \Ra[l] & \Ra & \verb!\Ra! \\ +% \Rfi[l] & \Rfi & \verb!\Rfi! \\ +% \Rey[l] & \Rey & \verb!\Rey! \\ +% \Ri[l] & \Ri & \verb!\Ri! \\ +% \Crr[l] & \Crr & \verb!\Crr! \\ +% \Ro[l] & \Ro & \verb!\Ro! \\ +% \Ros[l] & \Ros & \verb!\Ros! \\ +% \Rou[l] & \Rou & \verb!\Rou! \\ +% \Sc[l] & \Sc & \verb!\Sc! \\ +% \Sh[l] & \Sh & \verb!\Sh! \\ +% \Shi[l] & \Shi & \verb!\Shi! \\ +% \So[l] & \So & \verb!\So! \\ +% \St[l] & \St & \verb!\St! \\ +% \Ste[l] & \Ste & \verb!\Ste! \\ +% \Stk[l] & \Stk & \verb!\Stk! \\ +% \Sr[l] & \Sr & \verb!\Sr! \\ +% \Stu[l] & \Stu & \verb!\Stu! \\ +% \Sv[l] & \Sv & \verb!\Sv! \\ +% \Ta[l] & \Ta & \verb!\Ta! \\ +% \Ur[l] & \Ur & \verb!\Ur! \\ +% \Va[l] & \Va & \verb!\Va! \\ +% \vtH[l] & \vtH & \verb!\vtH! \\ +% \Wa[l] & \Wa & \verb!\Wa! \\ +% \Wal[l] & \Wal & \verb!\Wal! \\ +% \Wea[l] & \Wea & \verb!\Wea! \\ +% \We[l] & \We & \verb!\We! \\ +% \Wei[l] & \Wei & \verb!\Wei! \\ +% \Wo[l] & \Wo & \verb!\Wo! \\ +% \Zd[l] & \Zd & \verb!\Zd! \\ +% \bottomrule % \end{longtabu*} % % @@ -222,7 +267,7 @@ % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{dimnum} -[2021/04/01 v1.0.0 Provides commands for Dimensionless numbers] +[2021/04/05 v1.0.1 Provides commands for Dimensionless numbers] \RequirePackage{amsmath} \RequirePackage{xifthen} \let\Pr\relax @@ -259,11 +304,11 @@ \newdimnum{Bs}{Bs}{Bodenstein}{number} \newdimnum{Bo}{Bo}{Bond}{number} \newdimnum{Br}{Br}{Brinkman}{number} -\newdimnum{Bk}{\ensuremath{N_{BK}}}{Brownell-Katz}{number} -\newdimnum{Cap}{Ca}{Capillary}{number} +\newdimnum{BK}{\ensuremath{N_{BK}}}{Brownell-Katz}{number} +\newdimnum{Ca}{Ca}{Capillary}{number} \newdimnum{Cau}{C}{Cauchy}{number} \newdimnum{Ch}{Q}{Chandrasekhar}{number} -\newdimnum{Cf}{\ensuremath{C_f}}{Coefficient of Frication}{} +\newdimnum{CoF}{\ensuremath{C_f}}{Coefficient of Frication}{} \newdimnum{Co}{Co}{Condensation}{number} \newdimnum{Dah}{Da}{Dahmköhler}{number} \newdimnum{Dar}{Da}{Darcy}{number} @@ -290,7 +335,7 @@ \newdimnum{Ir}{Ir}{Iribarren}{number} \newdimnum{Ja}{Ja}{Jakob}{number} \newdimnum{Ka}{Ka}{Karlovitz}{number} -\newdimnum{Kc}{\ensuremath{K_C}}{Keulegan-Carpenter}{number} +\newdimnum{KC}{\ensuremath{K_C}}{Keulegan-Carpenter}{number} \newdimnum{Kn}{Kn}{Knudsen}{number} \newdimnum{Ku}{Ku}{Kutateladze}{number} \newdimnum{La}{La}{Laplace}{number} @@ -326,6 +371,48 @@ \newdimnum{Wea}{Wea}{Weaver flame speed}{number} \newdimnum{We}{We}{Weber}{number} \newdimnum{Wei}{Wi}{Weissenberg}{number} +\newdimnum{Ab}{\ensuremath{V}}{Abbe}{number} +\newdimnum{AC}{\ensuremath{\gamma}}{Activity}{coefficient} +\newdimnum{Al}{\ensuremath{\alpha}}{Albedo}{} +\newdimnum{Arr}{\ensuremath{\alpha}}{Arrhenius}{number} +\newdimnum{AW}{\ensuremath{M}}{Atomic}{weight} +\newdimnum{Rz}{\ensuremath{R_0}}{Basic reproduction}{number} +\newdimnum{Blo}{\ensuremath{B_k}}{Blondeau}{number} +\newdimnum{Jm}{\ensuremath{J_M}}{Chilton-Colburn Momentum J-factor}{} +\newdimnum{Jh}{\ensuremath{J_H}}{Chilton-Colburn Heat J-factor}{} +\newdimnum{Jd}{\ensuremath{J_D}}{Chilton-Colburn Mass J-factor}{} +\newdimnum{CoD}{\ensuremath{R^2}}{Coefficient of Determination}{} +\newdimnum{CoK}{\ensuremath{\mu_k}}{Coefficient of Kinetic Friction}{} +\newdimnum{CoS}{\ensuremath{\mu_s}}{Coefficient of Static Friction}{} +\newdimnum{CoV}{\ensuremath{\frac{\sigma}{\mu}}}{Coefficient of Variation}{} +\newdimnum{Coh}{\ensuremath{{Coh}}}{Cohesion}{number} +\newdimnum{CFL}{\ensuremath{C}}{Courant-Friedrich-Levy}{number} +\newdimnum{Dr}{\ensuremath{\zeta}}{Damping}{ratio} +\newdimnum{fD}{\ensuremath{f_D}}{Darcy friction}{factor} +\newdimnum{ExT}{\ensuremath{\Theta_r}}{Excess Temperature}{coefficient} +\newdimnum{fF}{\ensuremath{f}}{Fanning friction}{factor} +\newdimnum{Fs}{\ensuremath{\alpha}}{Fine-structure constant}{} +\newdimnum{FvK}{\ensuremath{\gamma}}{Föppl-von Kármán}{number} +\newdimnum{Fre}{F}{Fresnel}{number} +\newdimnum{Hav}{\ensuremath{P_H}}{Havnes}{parameter} +\newdimnum{He}{He}{Helmholtz}{number} +\newdimnum{Cl}{\ensuremath{C_L}}{Lift Coefficient}{} +\newdimnum{LM}{\ensuremath{\chi}}{Lockhart-Martinelli}{parameter} +\newdimnum{Lu}{S}{Lundquist}{number} +\newdimnum{Mar}{\ensuremath{\mathcal{M}}}{Markstein}{number} +\newdimnum{Peel}{\ensuremath{N_P}}{Peel}{number} +\newdimnum{Pie}{\ensuremath{C}}{Pierce}{parameter} +\newdimnum{Poi}{\ensuremath{\nu}}{Poisson's}{ratio} +\newdimnum{Pf}{\ensuremath{{pf}}}{Power}{factor} +\newdimnum{Pn}{\ensuremath{N_p}}{Power}{number} +\newdimnum{Cp}{\ensuremath{C_P}}{Pressure Coefficient}{} +\newdimnum{Rfi}{\ensuremath{n}}{Refractive index}{} +\newdimnum{Crr}{\ensuremath{C_{rr}}}{Rolling resistance}{coefficient} +\newdimnum{Shi}{\ensuremath{\tau_*}}{Shield's}{parameter} +\newdimnum{vtH}{\ensuremath{i}}{Van 't Hoff}{factor} +\newdimnum{Wal}{\ensuremath{j^*}}{Wallis}{parameter} +\newdimnum{Wo}{\ensuremath{\alpha}}{Womersley}{number} +\newdimnum{Zd}{\ensuremath{\beta}}{Zel'dovich}{number} \endinput % \end{macrocode} % diff --git a/macros/latex/contrib/dimnum/dimnum.pdf b/macros/latex/contrib/dimnum/dimnum.pdf Binary files differindex 24473874ec..54bad01fb7 100644 --- a/macros/latex/contrib/dimnum/dimnum.pdf +++ b/macros/latex/contrib/dimnum/dimnum.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.pdf b/macros/latex/contrib/easybook/doc/easybook-demo.pdf Binary files differindex 7aa01420f7..5a2fb630ee 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.pdf +++ b/macros/latex/contrib/easybook/doc/easybook-demo.pdf diff --git a/macros/latex/contrib/easybook/doc/easybook-demo.tex b/macros/latex/contrib/easybook/doc/easybook-demo.tex index cb06db92dc..63dc917aab 100644 --- a/macros/latex/contrib/easybook/doc/easybook-demo.tex +++ b/macros/latex/contrib/easybook/doc/easybook-demo.tex @@ -23,7 +23,7 @@ { hyperlink = various, linkcolor = skyblue, - linktopage = false + linktoc = all }, spread = { @@ -99,7 +99,7 @@ \url{https://latexstudio.net} \\ \url{https://gitee.com/texl3/easybook}\thanks{Gitee为项目的主要发布地址。} } -\date{2021/04/04\hskip\ccwd\relax v1.24d} +\date{2021/04/05\hskip\ccwd\relax v1.24e} \frontmatter[roman] \maketitle diff --git a/macros/latex/contrib/easybook/doc/easybook.pdf b/macros/latex/contrib/easybook/doc/easybook.pdf Binary files differindex d14bb989a7..e5042a675f 100644 --- a/macros/latex/contrib/easybook/doc/easybook.pdf +++ b/macros/latex/contrib/easybook/doc/easybook.pdf diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 338c72d9b4..80c214a527 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -55,7 +55,7 @@ The latest version of this license is in % % \title{\sffamily easybook书籍文档类} % \author{瞿毅} -% \date{2021/04/04\hskip\ccwd\relax v1.24d\thanks{\url{https://gitee.com/texl3/easybook}}} +% \date{2021/04/05\hskip\ccwd\relax v1.24e\thanks{\url{https://gitee.com/texl3/easybook}}} % \maketitle % \begin{abstract} % \cls{easybook} 是基于 \cls{ctexbook} 书籍文档类创建以极简为风格的模板，可以看作对 \cls{ctexbook} 的进一步包装。虽然\CTeX 文档类提供了较好的中文支持，但想实现个性化功能一般需要在其基础上载入更多宏包来定制。\cls{easybook} 考虑了一些细节并载入一些常用宏包实现一般的排版需求，它适用于排版中英文书籍或笔记，甚至可稍加调整成为学位论文模板。 @@ -78,11 +78,7 @@ The latest version of this license is in % xelatex -shell-escape easybook-demo % xelatex -shell-escape easybook-demo % \end{frameverb} -% -% 需注意，正确\textbf{编译索引}需要增加 \opt{-shell-escape} 命令行选项。若不需要索引和参考文献，可以在正文中注释掉命令。若出现以下警告，再编译一次即可。 -% \begin{frameverb} -% LaTeX Warning: Label(s) may have changed. Rerun to get cross-references right. -% \end{frameverb} +% 需注意，正确\textbf{编译索引}需要增加 \opt{-shell-escape} 命令行选项。 % % \subsection{字体设置} % \label{subsec:font settings} @@ -172,7 +168,7 @@ The latest version of this license is in % \end{syntax} % \opt{multoc} 与 \opt{style/multoc} 选项具有相同的效果，但是具有优先性且可单独设置不同目录是否双栏排版。已经预置了中英文的目录标题，可以使用 \opt{title} 选项更改目录标题的名称。\opt{book} 选项使目录标题按照 \opt{chapter} 级别输出，\opt{article} 选项使目录标题按照 \opt{article} 级别输出，默认为 \opt{chapter} 级别。 % \changes{v1.23}{2021/03/15}{为几个目录增加键值列表的选项，可设置标题输出级别以及是否加入主目录。} -% \changes{v1.24d}{2021/04/04}{目录命令的可选参数增加标题键值。} +% \changes{v1.24e}{2021/04/04}{目录命令的可选参数增加标题键值。} % \end{function} % % \section{接口选项} @@ -251,14 +247,16 @@ The latest version of this license is in % % \subsection{超链接} % \label{subsec:hyperlinks} -% \begin{function}[EXP,added = 2021-01-05,updated = 2021-01-08]{hyperlink,linkcolor,linktopage} +% \begin{function}[EXP,added = 2021-01-05,updated = 2021-04-05]{hyperlink,linkcolor,linktoc} % \begin{syntax} % hyperlink = <(edge)|various|none> % linkcolor = <(fresh)|cutepink|skyblue|crimson> -% linktopage = <true|(false)> +% linktoc = <none|section|page|(all)> % \end{syntax} -% \ding{229} 以上选项路径为 \opt{link/...} +% \ding{229} 以上选项路径为 \opt{link/...} \\ +% \opt{link} 将超链接选项（包括以上选项）交给 \pkg{hyperref} 处理，除了一些关于 pdf 书签的选项可能会失效，其它由键值选项命令 \tn{hypersetup} 支持的多数选项可用。 % \changes{v1.10}{2021/01/08}{修复了 \opt{linktopage} 选项关闭时目录中标题编号无超链接的问题。} +% \changes{v1.24e}{2021/04/05}{增加 \pkg{hyperref} 超链接选项完整的支持。} % \end{function} % % \begin{optdesc} @@ -271,7 +269,7 @@ The latest version of this license is in % 超链接颜色用到这三个颜色，可以使用 \tn{definecolor} 命令进行更改。 % \changes{v1.10}{2021/01/08}{可以自定义超链接颜色。} % \end{function} -% \item[linktopage] 将目录中的超链接置于页码上，默认是置于标题上。 +% \item[linktoc] 将目录中的超链接取消、置于标题上、置于页码上或置于标题和页码上。 % \end{optdesc} % % \subsection{行距} @@ -410,9 +408,9 @@ The latest version of this license is in % \end{optdesc} % % \subsubsection{新的定理样式} -% 定理由 \pkg{thmtools} 设置，预置定理的样式为 \opt{easythm}，上述定理样式选项将对这个定理样式生效。如果使用这个样式而只是增加新的定理名称，可以这样 +% 定理由 \pkg{thmtools} 设置，预置定理的样式为 \opt{easy-thm-sty}，上述定理样式选项将对这个定理样式生效。如果使用这个样式而只是增加新的定理名称，可以这样 % \begin{ctexexam} -% \newtheorem[style = easythm,name = 定理名]{定理环境名} +% \newtheorem[style = easy-thm-sty,name = 定理名]{定理环境名} % \end{ctexexam} % 若要给定理环境增加边框，可以如下进行设置 % \begin{ctexexam} @@ -507,13 +505,26 @@ The latest version of this license is in % \changes{v1.21}{2021/01/13}{增加配置目录样式的选项。} % \end{function} % -% \begin{function}[EXP,added = 2021-01-13,updated = 2021-01-15]{lists/lolskip,lists/belowoffset,tocset/belowoffset} +% \begin{function}[EXP,added = 2021-01-13,updated = 2021-04-05]{lists/lolskip,lists/labelname-fig,lists/labelname-tab,lists/labelname-lst,lists/belowoffset,tocset/belowoffset} % \begin{syntax} % lolskip = <(0.8pc)> +% labelname-fig = <图片目录标签> +% labelname-tab = <表格目录标签> +% labelname-lst = <代码目录标签> % belowoffset = <(0pc)> % belowoffset = <(-1pc)> % \end{syntax} -% \opt{lolskip} 是代码目录中章之间的代码标题的距离，与\CTeX 的表格目录和图片目录中章之间的标题距离选项 \opt{lotskip} 和 \opt{lofskip} 类似，它们的值均默认0.8 pc，在 \opt{article} 模式中此选项失效。\opt{belowoffset} 选项为主目录标题 \tn{contentsname} 后的间距补偿，一般为负值，用于抵消 \opt{format} 中设置的垂直间距。\opt{lists} 中的 \opt{belowoffset} 与之意义类似，但是一般为正值，可以在 \opt{article} 模式中使用。建议 \opt{lists/lolskip(0.8pc) + lists/format/addvspace(0.2pc) + lists/belowoffset(0pc) = belowoffset(-1pc)}。 +% \opt{lolskip} 是代码目录中章之间的代码标题的距离，与\CTeX 的表格目录和图片目录中章之间的标题距离选项 \opt{lotskip} 和 \opt{lofskip} 类似，它们的值均默认0.8 pc，在 \opt{article} 模式中此选项失效。目录标签整体使用 \opt{labelname} 设置，也可使用小节 \ref{subsec:page margins} 的 \opt{list-labelsep} 选项只设置编号与标题的间距。在图表标签的参数中，\#1与\#2分别代表编号和标题，代码标签的编号和标题则是 \tn{thelstlisting} 和 \tn{lst@@caption}，标签中还可包含标签名称，默认标签名称与图、表和代码环境的标题名称一致。下面举个设置标签的例子 +% \begin{ctexexam} +% \tocset +% { +% lists/labelname-fig = 图#1\hspace{\ccwd}#2 +% lists/labelname-lst = 代码\thelstlisting\hspace{\ccwd}\lst@@caption +% } +% \end{ctexexam} +% +% \opt{belowoffset} 选项为主目录标题 \tn{contentsname} 后的间距补偿，一般为负值，用于抵消 \opt{format} 中设置的垂直间距。\opt{lists} 中的 \opt{belowoffset} 与之意义类似，但是一般为正值，可以在 \opt{article} 模式中使用。建议 \opt{lists/lolskip(0.8pc) + lists/format/addvspace(0.2pc) + lists/belowoffset(0pc) = belowoffset(-1pc)}。 +% \changes{v1.24e}{2021/04/05}{可以设置图、表和代码目录的标签。} % \end{function} % % \begin{function}[added = 2021-01-13,updated = 2021-01-15]{\tocrule} @@ -790,11 +801,12 @@ The latest version of this license is in %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2021/04/04}{1.24d}{beta} +\ProvidesExplClass{easybook}{2021/04/05}{1.24e}{beta} \cs_generate_variant:Nn \keys_define:nn {nx} \cs_generate_variant:Nn \int_to_arabic:n {v} \cs_generate_variant:Nn \dim_add:Nn {NV} +\cs_generate_variant:Nn \__put_hyperref:n {x} \cs_new_protected:Npn \__ctex_define:nn #1 {\keys_define:nn {ctex/#1}} \cs_new_protected:Npn \__put_ctexbook:n #1 @@ -869,6 +881,7 @@ The latest version of this license is in {hang,stable}{footmisc}, {normalem}{ulem}, {protrusion = false}{microtype}, + {list = off}{bicaption}, {shortlabels,inline}{enumitem}, {many}{tcolorbox}, {xindy}{imakeidx}, @@ -1242,12 +1255,25 @@ The latest version of this license is in } \__ctex_define:nn {tocset} { - lists/lolskip .skip_set:N = \l__toc_lolskip_skip, - lists/lolskip .initial:n = 0.8pc, - lists/belowoffset .dim_set:N = \l__toc_listsoffset_dim, - lists/belowoffset .initial:n = 0pc, - belowoffset .dim_set:N = \l__toc_offset_dim, - belowoffset .initial:n = -1pc + lists/lolskip .skip_set:N = \l__toc_lolskip_skip, + lists/lolskip .initial:n = 0.8pc, + lists/belowoffset .dim_set:N = \l__toc_listsoffset_dim, + lists/belowoffset .initial:n = 0pc, + lists/labelname-fig .cs_set:Np = \labelname@lof#1#2, + lists/labelname-fig .initial:n = + {\figurename\space#1\hspace{\list@labelsep}#2}, + lists/labelname-tab .cs_set:Np = \labelname@lot#1#2, + lists/labelname-tab .initial:n = + {\tablename\space#1\hspace{\list@labelsep}#2}, + lists/labelname-lst .tl_set:N = \labelname@lol, + lists/labelname-lst .initial:n = + { + \lstlistingname\space + \thelstlisting\hspace{\list@labelsep} + \lst@@caption + }, + belowoffset .dim_set:N = \l__toc_offset_dim, + belowoffset .initial:n = -1pc } \ctex_set:nn {tocset} { @@ -1295,17 +1321,22 @@ The latest version of this license is in {table}{lists}, {lstlisting}{lists} }{\__titlecontents_set:nn #1} -\ctex_patch_cmd:Nnn \caption@@@addcontentsline - {\addcontentsline{#1}{#2}{\protect\numberline{#3}{#4}}} - {\addcontentsline{#1}{#2}{#3\hspace{\list@labelsep}#4}} +\prop_new:N \l_label_name_prop +\prop_set_from_keyval:Nn \l_label_name_prop + { + figure = \labelname@lof, + table = \labelname@lot + } +\cs_gset:Npn \caption@@@addcontentsline#1#2#3#4 + { + \addcontentsline{#1}{#2} + {\prop_item:Nn \l_label_name_prop{#2}{#3}{#4}} + } \ctex_patch_cmd:Nnn \lst@MakeCaption { \addcontentsline{lol}{lstlisting} {\protect\numberline{\thelstlisting}\lst@@caption} - }{ - \addcontentsline{lol}{lstlisting} - {\thelstlisting\hspace{\list@labelsep}\lst@@caption} - } + }{\addcontentsline{lol}{lstlisting}{\labelname@lol}} \__appto_cmd:Nn \@chapter { \skip_if_eq:nnF {\l__toc_lolskip_skip}{\c_zero_skip} @@ -1729,25 +1760,25 @@ The latest version of this license is in postheadspace = \l__thm_spacepost_tl, within = \l__thm_numberwith_tl, headformat = \NAME\space\NUMBER\NOTE - ]{easythm} + ]{easy-thm-sty} \clist_map_inline:nn { example,definition,theorem, proposition,lemma,corollary }{ \declaretheorem[ - style = easythm, + style = easy-thm-sty, name = \use:c {c__name_#1_tl} ]{#1} } \cs_gset_eq:NN \proof\relax \declaretheorem[ - style = easythm, + style = easy-thm-sty, name = \c__name_remark_tl, numbered = no ]{remark} \declaretheorem[ - style = easythm, + style = easy-thm-sty, name = \proofname, numbered = no, qed = \qedsymbol @@ -1993,9 +2024,7 @@ The latest version of this license is in \tl_if_eq:VnT \l__bib_style_tl{authoryear} {\bibliographystyle{gbt7714-author-year}} \cs_set_eq:NN \cite\citep - }{ - \exp_args:NV \bibliographystyle\l__bib_otherstyle_tl - } + }{\exp_args:NV \bibliographystyle\l__bib_otherstyle_tl} \tl_if_empty:NF \l__bib_citestyle_tl {\exp_args:NV \setcitestyle\l__bib_citestyle_tl} \skip_set:Nn \bibsep{0ex} @@ -2200,11 +2229,19 @@ The latest version of this license is in linkcolor .default:n = fresh, linkcolor .initial:n = fresh, - linktopage .choice:, - linktopage/true .code:n = \__put_hyperref:n {linktocpage}, - linktopage/false .code:n = {}, - linktopage .default:n = true, - linktopage .initial:n = false + linktoc .choice:, + linktoc/unknown .code:n = \__put_hyperref:n {linktoc = \exp_not:n {#1}}, + linktoc .default:n = all, + linktoc .initial:n = all, + unknown .code:n = + { + \__put_hyperref:x + { + \exp_not:N \l_keys_key_str + \exp_not:N \tl_if_empty:NF + \exp_not:N \l_keys_value_tl{ = \exp_not:n {#1}} + } + } } \keys_define:nx {ctex/style} { @@ -2226,7 +2263,7 @@ The latest version of this license is in \RequirePackage{hyperref,cleveref} \urlstyle{same} \__allow_urlbreak: - \ctex_hypersetup:n {pdfstartview = FitH,bookmarksnumbered} + \ctex_hypersetup:n {pdfstartview = FitH} \exp_args:NV \hypersetup\l__hyperref_clist \bool_if:NTF \l__lang_chinese_bool { |