diff options
Diffstat (limited to 'macros')
42 files changed, 1752 insertions, 148 deletions
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index e7d6087348..ee55f696dd 100644 --- a/macros/latex/contrib/easybook/easybook.dtx +++ b/macros/latex/contrib/easybook/easybook.dtx @@ -15,7 +15,7 @@ %<*class> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e} -\ProvidesExplClass{easybook}{2022/08/03}{1.69} +\ProvidesExplClass{easybook}{2022/08/12}{1.70} {Easily typesetting Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -303,7 +303,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2022/08/03}{1.69} +\ProvidesExplPackage{easybase}{2022/08/12}{1.70} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -2333,7 +2333,7 @@ } %</package> %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/08/03}{1.69} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/08/12}{1.70} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf Binary files differindex 3daa1a6648..c5fece6af0 100644 --- a/macros/latex/contrib/easybook/easybook.pdf +++ b/macros/latex/contrib/easybook/easybook.pdf diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex index ef0b16e0ba..e20dc7f0ab 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -21,8 +21,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK使用手册, - version = v1.69, - date = 2022/08/03, + version = v1.70, + date = 2022/08/12, authors = 瞿毅, info = 简便地排版中文学位论文或书籍, email = toquyi@163.com, @@ -132,11 +132,19 @@ \newcounter{ctexexam} \define@key{FV}{labelref}{\def\ctexexamlabelref{\label{#1}}} \let\ctexexamlabelref\empty +\fvset + { + formatcom = \xeCJKVerbAddon, + baselinestretch = 1.2, + gobble = 2, + fontsize = \small, + rulecolor = \color{Blue}, + framerule = 0.5pt, + frame = single, + framesep = 10pt + } \DefineVerbatimEnvironment{frameverb}{Verbatim} { - baselinestretch = 1.2,gobble = 2,fontsize = \small, - rulecolor = \color{Blue},framerule = 0.5pt, - frame = single,framesep = 10pt, listparameters = { \setlength{\topsep}{\bigskipamount} @@ -145,15 +153,12 @@ } \DefineVerbatimEnvironment{ctexexam}{Verbatim} { - baselinestretch = 1.2,gobble = 2,fontsize = \small, - rulecolor = \color{Blue},framerule = 0.5pt, - frame = single,framesep = 10pt, label = \rule{0pt}{12pt}\textnormal{\bfseries 例 \arabic{ctexexam}}, listparameters = { \setlength{\topsep}{\bigskipamount} - \refstepcounter{ctexexam}\ctexexamlabelref \appto\FV@EndList{\nointerlineskip} + \refstepcounter{ctexexam}\ctexexamlabelref } } \makeatother\ExplSyntaxOff diff --git a/macros/latex/contrib/hereapplies/COPYING b/macros/latex/contrib/hereapplies/COPYING new file mode 100644 index 0000000000..0ad25db4bd --- /dev/null +++ b/macros/latex/contrib/hereapplies/COPYING @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are 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. + + 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. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + 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 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 work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + 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 AGPL, see +<https://www.gnu.org/licenses/>. diff --git a/macros/latex/contrib/hereapplies/ChangeLog.md b/macros/latex/contrib/hereapplies/ChangeLog.md new file mode 100644 index 0000000000..0c8b9e934f --- /dev/null +++ b/macros/latex/contrib/hereapplies/ChangeLog.md @@ -0,0 +1,21 @@ +Change Log +========== + + +## 0.2.0 (2022-08-12) + +Changes: + +* A starred version of `\hereapplies` has been created +* A module for LyX has been added to the repository +* The package now prints `??` (instead of generating an error) when + `\whereapplies` is invoked but `\hereapplies` is never invoked +* Code review +* Documentation +* Examples + + +## 0.1.0 (2022-08-11) + +**Here Applies** has been published. + diff --git a/macros/latex/contrib/hereapplies/README.md b/macros/latex/contrib/hereapplies/README.md new file mode 100644 index 0000000000..4b688052d5 --- /dev/null +++ b/macros/latex/contrib/hereapplies/README.md @@ -0,0 +1,57 @@ +hereapplies.sty +=============== + +A LaTeX package for cross-linking applications of concepts + + +Example usage +------------- + +### LaTeX source + +``` tex +\documentclass{article} + +\usepackage{hereapplies} + +\begin{document} + +\title{Some title} +\author{Some author} + +\maketitle + +This is concept one. To see this concept applied, please +see \whereapplies{conceptone}. + +This is concept four. To see this concept applied, please +see \whereapplies{conceptfour}. + +\newpage + +\hereapplies{conceptone}This is page \thepage. As you can see, ``concept +one'' applies here.\newpage + +\hereapplies{conceptfour}This is page \thepage. As you can see, +``concept four'' applies here.\newpage + +\hereapplies{conceptone}This is page \thepage. As you can see, ``concept +one'' applies here.\newpage + +\hereapplies{conceptfour}This is page \thepage. As you can see, +``concept four'' applies here.\newpage + +\hereapplies[myref]{conceptone}This is page \thepage. As you can +see, ``concept one'' applies here. This point in the document is +labeled \texttt{appl:conceptone:myref}. + +\end{document} +``` + +### Result + +![Example of hereapplies LaTeX package][1] + + + [1]: example.png + diff --git a/macros/latex/contrib/hereapplies/example.png b/macros/latex/contrib/hereapplies/example.png Binary files differnew file mode 100644 index 0000000000..89e0172cd8 --- /dev/null +++ b/macros/latex/contrib/hereapplies/example.png diff --git a/macros/latex/contrib/hereapplies/example.tex b/macros/latex/contrib/hereapplies/example.tex new file mode 100644 index 0000000000..1635e73f30 --- /dev/null +++ b/macros/latex/contrib/hereapplies/example.tex @@ -0,0 +1,36 @@ +\documentclass{article} + +\usepackage{hereapplies} + +\begin{document} + +\title{Some title} +\author{Some author} + +\maketitle + +This is concept one. To see this concept applied, please +see \whereapplies{conceptone}. + +This is concept four. To see this concept applied, please +see \whereapplies{conceptfour}. + +\newpage + +\hereapplies{conceptone}This is page \thepage. As you can see, ``concept +one'' applies here.\newpage + +\hereapplies{conceptfour}This is page \thepage. As you can see, +``concept four'' applies here.\newpage + +\hereapplies{conceptone}This is page \thepage. As you can see, ``concept +one'' applies here.\newpage + +\hereapplies{conceptfour}This is page \thepage. As you can see, +``concept four'' applies here.\newpage + +\hereapplies[myref]{conceptone}This is page \thepage. As you can +see, ``concept one'' applies here. This point in the document is +labeled \texttt{appl:conceptone:myref}. + +\end{document} diff --git a/macros/latex/contrib/hereapplies/hereapplies.sty b/macros/latex/contrib/hereapplies/hereapplies.sty new file mode 100644 index 0000000000..29db09d163 --- /dev/null +++ b/macros/latex/contrib/hereapplies/hereapplies.sty @@ -0,0 +1,210 @@ +% -*- Mode: latex; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- + +% +% hereapplies.sty +% +% A LaTeX package for cross-linking applications of concepts +% +% https://github.com/madmurphy/hereapplies.sty +% +% Version 0.2.0 +% +% Copyright (c) 2022 madmurphy <madmurphy333@gmail.com> +% +% **Here Applies** is free software: you can redistribute it and/or modify it +% under the terms of the GNU Affero General Public License as published by the +% Free Software Foundation, either version 3 of the License, or (at your +% option) any later version. +% +% **Here Applies** 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 Affero General Public License +% for more details. +% +% You should have received a copy of the GNU Affero General Public License +% along with this program. If not, see <http://www.gnu.org/licenses/>. +% +% +% +% Example usage: +% +% \documentclass{article} +% +% \usepackage{hereapplies} +% +% \begin{document} +% +% \title{Some title} +% \author{Some author} +% +% \maketitle +% +% This is concept one. To see this concept applied, please +% see \whereapplies{conceptone}. +% +% This is concept four. To see this concept applied, please +% see \whereapplies{conceptfour}. +% +% \newpage +% +% \hereapplies{conceptone}This is page \thepage. As you can see, ``concept +% one'' applies here.\newpage +% +% \hereapplies{conceptfour}This is page \thepage. As you can see, +% ``concept four'' applies here.\newpage +% +% \hereapplies{conceptone}This is page \thepage. As you can see, ``concept +% one'' applies here.\newpage +% +% \hereapplies{conceptfour}This is page \thepage. As you can see, +% ``concept four'' applies here.\newpage +% +% \hereapplies[myref]{conceptone}This is page \thepage. As you can +% see, ``concept one'' applies here. This point in the document is +% labeled \texttt{appl:conceptone:myref}. +% +% \end{document} +% +% +\ProvidesPackage{hereapplies} +\RequirePackage{hyperref} +% +% +% +% PRIVATE ENVIRONMENT +% =================== +% +% +% Assign a unique number to each applicable concept +\newcounter{@ha@concept@counter} +% +% +% Macro `\@ha@newapplicable{concept_name}` +% ***************************************************************************** +% +% Initialize a new applicable concept +% +% Thie macro is for internal purposes only. When invoked it sets up the helper +% macros, counters and auxiliary files needed for keeping track of a concept. +% If the concept was already initialized this macro will be no op. +% +\newcommand{\@ha@newapplicable}[1]{% + % Was this concept already initialized? + \expandafter\ifx\csname @ha@concept@#1@cursor\endcsname\relax% + % The concept was never initialized + % Move the counter to the current id + \stepcounter{@ha@concept@counter}% + % Count the unnamed occurrences + \newcounter{@ha@concept@#1@unnamed@counter}% + % The content of this macro will be saved in the .haN file + \expandafter\def\csname @ha@concept@#1@output\endcsname{\textbf{??}}% + % The last page that applies + \expandafter\def\csname @ha@concept@#1@cursor\endcsname{-1}% + % Store the id of the current concept + \expandafter\edef\csname @ha@concept@#1@id\endcsname{\arabic{@ha@concept@counter}}% + % Initialize the .haN file + % The previous solution generated unwanted whitespaces: + %\@starttoc{ha\csname @ha@concept@#1@id\endcsname}% + % I am thankful to David Carlisle for the following line: + {\endlinechar=\m@ne\@starttoc{ha\csname @ha@concept@#1@id\endcsname}}% + % Store all the occurrences when the document reaches the end + \AtEndDocument{% + % Set the .haN file as output + \addtocontents{ha\csname @ha@concept@#1@id\endcsname}{% + % Check that there are occurrences + \expandafter\ifcsname @ha@concept@#1@cache\endcsname% + % There are occurrences - write "p./pp. ..." to the output + \gdef\expandafter\protect\csname @ha@concept@#1@output\endcsname{% + \csname @ha@concept@#1@preamble\endcsname\csname @ha@concept@#1@cache\endcsname% + }% + \else% + % There are no occurrences - write "??" to the output + \gdef\expandafter\protect\csname @ha@concept@#1@output\endcsname{% + \textbf{??}% + }% + \fi% + }% + }% + \fi% +} +% +% +% Macro: `\starred@hereapplies[occurrence_name]{concept_name}` +% ***************************************************************************** +% +% Equivalent to `\hereapplies*` +% +% Thie macro is for internal purposes - but nothing forbids invoking it +% directly. +% +\newcommand{\starred@hereapplies}[2][]{% + % Make sure that the concept has been initialized + \@ha@newapplicable{#2}% + \ifx&% + % The macro has been called with only one argument + % Assign a unique number to the unnamed occurrence + \stepcounter{@ha@concept@#2@unnamed@counter}% + % Call `\starred@hereapplies` again (recursion), but this time with 2 arguments + \edef\tmp{\noexpand\starred@hereapplies[__unnamed\arabic{@ha@concept@#2@unnamed@counter}__]{#2}}\tmp% + \else% + % The macro has been called with two arguments + % Assign a label to this occurrence + \label{appl:#2:#1}% + % If the cursor already points to the current page do nothing + \unless\ifnum\csname @ha@concept@#2@cursor\endcsname=\thepage% + % Make the cursor point to the current page + \expandafter\edef\csname @ha@concept@#2@cursor\endcsname{\thepage}% + % Is this the first occurrence? + \expandafter\ifcsname @ha@concept@#2@cache\endcsname% + % This is *not* the first occurrence + % Use "pp." for the preamble when there are multiple occurrences + \expandafter\def\csname @ha@concept@#2@preamble\endcsname{pp.~}% + % Populate the cache + \expandafter\g@addto@macro\csname @ha@concept@#2@cache\endcsname{, \pageref{appl:#2:#1}}% + \else% + % This is the first occurrence + % Use "p." for the preamble when there is only one occurrence + \expandafter\def\csname @ha@concept@#2@preamble\endcsname{p.~}% + % Initialize the cache + \expandafter\def\csname @ha@concept@#2@cache\endcsname{\pageref{appl:#2:#1}}% + \fi% + \fi% + \fi% +} +% +% +% +% PUBLIC ENVIRONMENT +% =================== +% +% +% Macro: `\hereapplies[occurrence_name]{concept_name}` +% ***************************************************************************** +% +% Notify the document that here a particular concept applies +% +% If the `occurrence_name` argument is passed, a new label will be created in +% the form `appl:[concept_name]:[occurrence_name]`. Without passing the +% `occurrence_name` argument, an opaque name will be assigned to the label. +% +% The starred version of this macro (`\hereapplies*`) will not invoke the +% `\phantomsection` directive before generating the label. +% +\newcommand{\hereapplies}{% + % Check if a star is present in the invocation of the command + \@ifstar{\starred@hereapplies}{\phantomsection\relax\starred@hereapplies}% +} +% +% +% Macro: `\whereapplies{concept_name}` +% ***************************************************************************** +% +% Print all the applications of a concept in the form "p./pp. ..." +% +\newcommand{\whereapplies}[1]{% + % Make sure that the applicable concept is initialized + \@ha@newapplicable{#1}% + % Print all the applications of the concept + \csname @ha@concept@#1@output\endcsname% +} + diff --git a/macros/latex/contrib/hereapplies/lyx-module/hereapplies.module b/macros/latex/contrib/hereapplies/lyx-module/hereapplies.module new file mode 100644 index 0000000000..b19419024c --- /dev/null +++ b/macros/latex/contrib/hereapplies/lyx-module/hereapplies.module @@ -0,0 +1,102 @@ +#\DeclareLyXModule[hereapplies.sty]{Here Applies} +#DescriptionBegin +#A module for cross-linking applications of concepts. +#See the hereapplies.sty LaTeX package for more information. +#DescriptionEnd +#Authors: madmurphy + +Format 66 + +AddToPreamble + \usepackage{hereapplies} +EndPreamble + +InsetLayout Flex:Here_Applies + LyXType custom + Decoration Classic + LabelString "Applies" + LatexType command + LatexName hereapplies + Requires hereapplies + ForcePlain 1 + MultiPar 0 + NoInsetLayout 1 + BgColor lightgray + Font + Color black + Size Small + EndFont + LabelFont + Color teal + Size Small + EndFont + Argument 1 + LabelString "Label" + MenuString "Occurrence label" + Tooltip "A string that will used to build a reference label in the form “appl:concept:label”" + Mandatory 0 + LabelFont + Color blue + EndFont + Font + Color red + EndFont + EndArgument +End + +InsetLayout Flex:Here_Applies* + LyXType custom + Decoration Classic + LabelString "Applies*" + LatexType command + LatexName hereapplies* + Requires hereapplies + ForcePlain 1 + MultiPar 0 + NoInsetLayout 1 + BgColor lightgray + Font + Color black + Size Small + EndFont + LabelFont + Color teal + Size Small + EndFont + Argument 1 + LabelString "Label" + MenuString "Occurrence label" + Tooltip "A string that will used to build a reference label in the form “appl:concept:label”" + Mandatory 0 + LabelFont + Color blue + EndFont + Font + Color red + EndFont + EndArgument +End + +InsetLayout Flex:Where_Applies + LyXType custom + Decoration Classic + LabelString "Applications of" + LatexType command + LatexName whereapplies + Requires hereapplies + ForcePlain 1 + MultiPar 0 + NoInsetLayout 1 + BgColor lightgray + Font + Family Typewriter + Color black + Size Small + EndFont + LabelFont + Family Serif + Color green + Size Small + EndFont +End + diff --git a/macros/latex/contrib/hereapplies/lyx-module/lyx-module-example.lyx b/macros/latex/contrib/hereapplies/lyx-module/lyx-module-example.lyx new file mode 100644 index 0000000000..2b12bf2e48 --- /dev/null +++ b/macros/latex/contrib/hereapplies/lyx-module/lyx-module-example.lyx @@ -0,0 +1,345 @@ +#LyX 2.3 created this file. For more info see http://www.lyx.org/ +\lyxformat 544 +\begin_document +\begin_header +\save_transient_properties true +\origin unavailable +\textclass article +\use_default_options false +\begin_modules +hereapplies +\end_modules +\maintain_unincluded_children false +\language english +\language_package none +\inputencoding ascii +\fontencoding default +\font_roman "default" "default" +\font_sans "default" "default" +\font_typewriter "default" "default" +\font_math "auto" "auto" +\font_default_family default +\use_non_tex_fonts false +\font_sc false +\font_osf false +\font_sf_scale 100 100 +\font_tt_scale 100 100 +\use_microtype false +\use_dash_ligatures true +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref true +\pdf_title "Some title" +\pdf_author "Some author" +\pdf_bookmarks false +\pdf_bookmarksnumbered false +\pdf_bookmarksopen false +\pdf_bookmarksopenlevel 1 +\pdf_breaklinks false +\pdf_pdfborder false +\pdf_colorlinks false +\pdf_backref section +\pdf_pdfusetitle false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 0 +\use_package cancel 0 +\use_package esint 1 +\use_package mathdots 0 +\use_package mathtools 0 +\use_package mhchem 0 +\use_package stackrel 0 +\use_package stmaryrd 0 +\use_package undertilde 0 +\cite_engine basic +\cite_engine_type default +\biblio_style plain +\use_bibtopic false +\use_indices false +\paperorientation portrait +\suppress_date false +\justification true +\use_refstyle 0 +\use_minted 0 +\index Index +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\is_math_indent 0 +\math_numbering_side default +\quotes_style english +\dynamic_quotes 0 +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Title +Some title +\end_layout + +\begin_layout Author +Some author +\end_layout + +\begin_layout Standard +This is concept one. + To see this concept applied, please see +\begin_inset Flex Where Applies +status open + +\begin_layout Plain Layout +conceptone +\end_layout + +\end_inset + +. +\end_layout + +\begin_layout Standard +This is concept four. + To see this concept applied, please see +\begin_inset Flex Where Applies +status open + +\begin_layout Plain Layout +conceptfour +\end_layout + +\end_inset + +. +\end_layout + +\begin_layout Standard +\begin_inset Newpage newpage +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Here Applies +status open + +\begin_layout Plain Layout +conceptone +\end_layout + +\end_inset + +This is page +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +thepage +\end_layout + +\end_inset + +. + As you can see, +\begin_inset Quotes eld +\end_inset + +concept one +\begin_inset Quotes erd +\end_inset + + applies here. +\begin_inset Newpage newpage +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Here Applies +status open + +\begin_layout Plain Layout +conceptfour +\end_layout + +\end_inset + +This is page +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +thepage +\end_layout + +\end_inset + +. + As you can see, +\begin_inset Quotes eld +\end_inset + +concept four +\begin_inset Quotes erd +\end_inset + + applies here. +\begin_inset Newpage newpage +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Here Applies +status open + +\begin_layout Plain Layout +conceptone +\end_layout + +\end_inset + +This is page +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +thepage +\end_layout + +\end_inset + +. + As you can see, +\begin_inset Quotes eld +\end_inset + +concept one +\begin_inset Quotes erd +\end_inset + + applies here. +\begin_inset Newpage newpage +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Here Applies +status open + +\begin_layout Plain Layout +conceptfour +\end_layout + +\end_inset + +This is page +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +thepage +\end_layout + +\end_inset + +. + As you can see, +\begin_inset Quotes eld +\end_inset + +concept four +\begin_inset Quotes erd +\end_inset + + applies here. +\begin_inset Newpage newpage +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset Flex Here Applies +status open + +\begin_layout Plain Layout +\begin_inset Argument 1 +status open + +\begin_layout Plain Layout +myref +\end_layout + +\end_inset + +conceptone +\end_layout + +\end_inset + +This is page +\begin_inset ERT +status collapsed + +\begin_layout Plain Layout + + +\backslash +thepage +\end_layout + +\end_inset + +. + As you can see, +\begin_inset Quotes eld +\end_inset + +concept one +\begin_inset Quotes erd +\end_inset + + applies here. + This point in the document is labeled +\family typewriter +appl:conceptone:myref +\family default +. +\end_layout + +\end_body +\end_document diff --git a/macros/latex/contrib/hereapplies/package.json b/macros/latex/contrib/hereapplies/package.json new file mode 100644 index 0000000000..0c3d6dd1eb --- /dev/null +++ b/macros/latex/contrib/hereapplies/package.json @@ -0,0 +1,29 @@ +{ + "name": "hereapplies.sty", + "version": "0.2.0", + "description": "A LaTeX package for cross-linking applications of concepts", + "homepage": "https://madmurphy.github.io/hereapplies.sty", + "author": "madmurphy", + "license": "AGPL-3.0-or-later", + "repository": { + "url": "https://github.com/madmurphy/hereapplies.sty.git" + }, + "src": [ + "hereapplies.sty" + ], + "bugs": { + "url": "https://github.com/madmurphy/hereapplies.sty/issues", + "email": "madmurphy333@gmail.com" + }, + "keywords": [ + "glossary", + "index", + "latex", + "latex-hyperref", + "latex-package", + "lyx", + "lyx-module", + "toc" + ] +} + diff --git a/macros/latex/contrib/media4svg/ChangeLog b/macros/latex/contrib/media4svg/ChangeLog index 5a25d497a9..8a3b552bbf 100644 --- a/macros/latex/contrib/media4svg/ChangeLog +++ b/macros/latex/contrib/media4svg/ChangeLog @@ -1,3 +1,8 @@ +2022-08-12 + * v0.9 + * improvement: script `media4svg.lua' for base64 encoding of files now + accepts a 2nd, optional argument for setting the chunk size (default: 72) + 2022-08-04 * v0.8 * fix: option processing acc. to new LaTeX format 22-06-01 diff --git a/macros/latex/contrib/media4svg/README.md b/macros/latex/contrib/media4svg/README.md index 5884f5a2ed..7612ec0ddf 100644 --- a/macros/latex/contrib/media4svg/README.md +++ b/macros/latex/contrib/media4svg/README.md @@ -1,6 +1,6 @@ # The `media4svg` LaTeX Package -Version 0.8, 2022/08/04 +Version 0.9, 2022/08/12 © 2020--today, Alexander Grahn diff --git a/macros/latex/contrib/media4svg/example/beamer-example-1.svg b/macros/latex/contrib/media4svg/example/beamer-example-1.svg index ce6ee99695..85af0c109a 100644 --- a/macros/latex/contrib/media4svg/example/beamer-example-1.svg +++ b/macros/latex/contrib/media4svg/example/beamer-example-1.svg @@ -9,13 +9,13 @@ function $(id) {return document.getElementById("msvg_"+id.toString().trim());}; </script> </defs> <style type='text/css'> -<![CDATA[@font-face{font-family:nf7;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABbgAAAI+AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCCwdDG5kEAK4K4rFj0pwZG+VFd+oPjevEw/P7+2/tc+99A+j+nwZyFhrISrZpSlIfp6lMZFJ9jfb/APxgPRyVahNaJQuVP01QXAosbOJc440iBcZzzcQKG1gRz2A3jPoiTpE31LdtUrU0fKDmWctHED2EgKfXX5yCl40Ot6/zkS2NQwrSnnQX+9y/48QrvSKRFLUAaAiACQvGzeOrb+n/mZVV67uLAGTI0FaAoTKBtnIlcrnga/iKBgUQFQIQCQkAEOrzVqXNiP8kUIDaqGA8pgBydJdAkvK8fbSPOkW9fFqdovbck4/TGuy9qLH7gtWffvJz+Ik9Me9YYf7xyRFLjx2m1t9zTuw67w2mHFsMU1ULTzYXQI8OrTpT68yb8t6Me/8unleev3/Zq+mFpsOp1kvk2+oXn3d8smXrc88Z70k5tvYNEG5yG7/dhFMLGAOaM9l3EVwKPYZerpH71PtSpXgmwlniVGAGFhzAr8SfBMUvB4K2r3fN0GDor5p1srdzea//j7OlWTVqSiDIqrNnViiAYweg58WuiiL9CgQKHSSQEAIjdQfUtECApIaGAmTamyZAoY79AlRkzspEXktSH5nJDNWSKTS3/raKitMmmW+h9ZaZbQ2/jXUZb6UV1vG3r7HQfKXeuuupNFhphQUG+KqvbgZSureeYW+eSQLDaxbOL3t371kOLlcsGBDLvt0GdjtIx5hmvjXWWjxQVOrVue06o/UytA2iM+9DWpjTBUKKFFnt2WvWrNx4MFl1RHGHAgAA) format('woff2');} -@font-face{font-family:nf3;src:url(data:application/x-font-woff2;base64,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) format('woff2');} -@font-face{font-family:nf8;src:url(data:application/x-font-woff2;base64,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) format('woff2');} -@font-face{font-family:nf6;src:url(data:application/x-font-woff2;base64,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) format('woff2');} -@font-face{font-family:nf0;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAATEAA0AAAAACMwAAARwAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwoIBBEICodQhhkLHAABNgIkAzIEIAWCCwc8GxMHIB6FcbPzoNLEd6YsOhz5z3+n/2ufQdM5mZJJhRT2pNIF4b8HkOj7E/fdz0SC8RAFNBrARGoFabCgJShICcqtyO9/AOmuf39q8N+zUC72KTaWRSwhK9Dag5ZxSVpa1O09b0Eq0itQr0w1rHWyHPNLzNv/37cZpKguAkAAPDv5cTUAfLJd4tV2UyppMSRgT3YOwLxtF31FFQMYqQFQilwMVB553QCiDG52/4dqzEk8ANJ8QufzCKLpXwUCeBD1BjixIZBFyZWvUp0OPfQy0OAuUO/GXXbJSUftst02G6yPqIJGgBhCAcDoEG0BI5KQMsqCGjqAJcUv4fT0fsaMAUBdDACoAMAN4Ae0AHQCAAARYMIAACPuaZFsGpGyJsuSsiKOdXbkQgo5kAUFk56sZNKaVOKSKmoNKyop1+9+fj0Wr0qYAvU+5aWiF9V5r0ib/FxRJD7vBUZVMMUFdYAun7eD86wUF7iAAkJpUFOYn577kmz3Cz6kCsl4bm3dq+IT4Lm6QQ2bwffJiacx/ZCmmNF1ZR/Ms7FubQyBplbrt70qvjAO02rE4WxCO20/JoejOe8VTVGibZrifIa7SZPTFLMYVzv5cRg/pSnPbvcEDY/nc1/SlFXrVp3ifB7UNkWZW0sK4zTlFZ935sAasKlrysuCRP+TtYzNDTlLdG09f57xpVv7meFm/U3TzYwZPZ3eVXlqkzM0iv1nRkY3rtYuu/BglsdJj1kXbi7swIxlK/puytzUb+nGmYi+5T891iMpMzvz53nyYPki+v6rF43uZ3Wyh+fhziWj65oyOiu1ZYZltd0VmRj5u29+0Nq7uyC/q7vlYY/7/TctHThg7dL+OG4o6dFWYq4IkQrLYmr88+OCKtk4p/rkMFNaVerAzIiAWm2Byc8uMqTTI/2FZRROve17aVq5Mbhp/Jz2jhlzOhvLI6T8otj6rPoWyi28J/5enBQcUhj9EOziOVq5p83H+MLO9uzEkKuRoZOz/DOTZpdfn12etOBtS0qszaT3MfyuyF0JYlZgzJnWuPaAkJgoY6i1t3dL8NT6yN6i5fTv9c7tCzLxJGjj0pb0kqLKa+afk2LMcX7PpXhboxn/f1zznMJexUmRtRPNP35RVTlsZqe5sKk1LeCkq/f149mp1W3ZAIAjhIj1qIWIb6OPyNJ7jxSYkQEBJCOflOmfA+ilQQCCt6faytqsU3/VceHza+WH8OoxuZaTAHQYACBg7/9jNOb/ALAPolfpqx+MANAGsBnN+b/OtKMju2CiN1P1HxLqNV/6ebzijxp1CKDKJwMABiAEyGQCAIBOTwQAGAs2CAAIvGgIAEi4BSAAIBNsgYAGSzBW4LKCVC6sxMmI02SyNajWQy8j9NdhKPztbh7IN8hAw2GMrOulB4NoJpEMksEM1FMrVrjEjo4WmY6G13SJpUN79TBEmyINyYaBPaUcG54YfiO3CtD0MNQwfebJGESN7cPjdC3KFIk5XDh7AYBRv/rt6z4OAgWLkShXoWJVagA=) format('woff2');} -@font-face{font-family:nf4;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAJMAA0AAAAABTgAAAH1AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkoIBBEICoE8gTMLDAABNgIkAxQEIAWCCwcsGz8EAC4OzPM3xRI6XlEfYJb6ScnFeHh+v9q578sO7jOIiGSSWIRthGjSCFGiNbHGNqGfqgCrdWRsrbH8N35Inwnf/7013mg4gW80lOnpl10dwBlHsJemvUDzaYkEGlrmrttrj9XCcuxDUnIKAR9efHkAXzvQ1/cjDYn7CtKN9Ba3cLv4alwkkiIDEACw9vCigxhncdbx/wjb01MQgAwZeguwUCbQW24oSrmQjLP4P/A9/99bAERJACIhAQCC8zL/nEPPtXQN8Z8ECtASJQZgOCDHaAkkKc/bROtoVbTJN7cqWraJlkXLjy3dWpFaanMlWuetMs7Vm1rV6iv136pvfXSzO9xl/tzrONwcVU8ufvd077Qp86Y09P8TG8DjMGbmk7rc3/GWxaeQZkl04QwXguDKaDQSbw4E/+70nmY2VFpl35dhDzVSLT1FRQJBeortaRWkmgAAFHFCDWIVKbGfsEeg0FYCCSEw12hAxWEBkjrtBcj0tVmAQit3BChlHslE3kLSlhgyM3WHQleXjpVKD613yBGXnLTPeb4KW7LYGaddbLfPO+KQqvFGGws5XeC0wybOE40ytWbjjQ3jeeOI2uePHKqOHz22Or16+vBETRNHTR11Cm6x2SHnXXAsUawaN7l1F6njRo+VRBq+gqSIBXs0dDYMAAAA) format('woff2');} -@font-face{font-family:nf5;src:url(data:application/x-font-woff2;base64,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) format('woff2');} +<![CDATA[@font-face{font-family:nf7;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABbwAAAI+AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCDgdDG5wEAC4O4o1nGFf6Sqd/EXwSD8/b9XXuq6oeQP1/NJBj0SnoSMpnGW06ipaK1P8D8INhG0xv3aA0QXEpsLCJm8VFYwrEuc6JY2NZtogz6ML9m3iKvKG+bZOqpeEDNc9aPoLoIQR89fT9GfjQssWzuhzZ8jiiIO1Lr3HA/TtOfNQtEklRDYC6ABizaNQCfvUt/3+mZZV67iEAGTK0FGCgTKClXBm5XPBr+BV1rgsgSgQgEhIAINTnrUhbEf+TQAGqo4TRmADI0VkCScrz1tE6ahS18kk1iurzT19yUp399xt7703tyacvO/jUvltwYg8LT+7/IctPXGRi7X13Ys/drTPhxAUGqcrFp/e6CHrqwIpz1c59U34z5c1/F+9K777/0K3hvYaDqdZN5Nua99+1/XLb9nfeMd6X5dj6b4Bwg5f4ywacWsAY0JzJsfvgQegy8GGV3E/dH5SKtyKcJU4FZmDBAfxS/JOg+OVA8PW6Gi1m1xn4V9Ua2bdz+aj/v8iWZ5WoKoEgq8yeaaEAjh2Anhe7Ior0KxAotJFAQggM1RlQ1SIBkirqCpBpY4oAhRqOCFCSuSETeTVJbWQmM1hTptDYlttKSi4YZ6HFNlphrnX8NtZntNVW2cDfvs5iC5V111lXZf2VrbJIH1/vprtO+lK6u65hdx5KAuPrFi8sd+/ctdy/vGpRn1h1696pb6ezdIpJFlpnvaVj8f2I/dtuNFo3S9s4OvshpLU5XyCkSJFVn7tu3erNZ5NVQxQ3KQAA) format('woff2');} +@font-face{font-family:nf3;src:url(data:application/x-font-woff2;base64,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) format('woff2');} +@font-face{font-family:nf8;src:url(data:application/x-font-woff2;base64,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) format('woff2');} +@font-face{font-family:nf6;src:url(data:application/x-font-woff2;base64,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) format('woff2');} +@font-face{font-family:nf0;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAATMAA0AAAAACNAAAAR4AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwoIBBEICodQhhkLHAABNgIkAzIEIAWCDgc8GxYHIxE2g1EaCvGPhUzuD9Y7RNPGYll+0RPJSO4H8fy36c+5u0sSNlSV1ISIO8SMpCICFeOZaE3s/Yko+S8NEAB/f2rw37NQLvYpNpZFLCEr0NqDlnFJWlrU7T1vQSrSK1CvTDWsdbIc80vM2//ftxmkqC4CBODS1rtPAHw2ZPC2tltUmTyAAWqz2gX4tl3yGeGiQGFogFLCxVDWmd0BhDNH6+WfSJ3ayhlI82mdb0gQrfsqEGAIOlOAfvRAw0I4WeRQRjWtuOliFnP8gno3tt8+W33kda942bOeSVCFWEAwRBSg0BG0NRgdA9ICFYCaQCAIK7/EJBi9X4haCohfCgAbAIOAUSDDQLoAAB1woABQ6Htax2IakeouQSXVTUys6yUDxCp9JEDGS7B0k8nuYhPTsOnOhq02sV7/xuXDUVwrVFZs871XrcG6zXdNnJ7LVqth+q6wWIIpU7MN0DV9r5pmVsrUTAEraKXZmlX56S1XxXZf4UM2LRlvqaq+VrwAl9UNNezCdHritmP6rHhdtHsz3suzsW7nGAKnrSL45WvFKyHznTXSZ2dCO/kdPJPR9F0TrzXaFm//HaabdPTzmsXoKs/5ML4o3ku3u0Ct5/KWq+J9/OnHt5mmD5vmtW6pEqsyxXvN9O1490mU2e69WpDuv7CWsS0TdoocWs+fV2nIU4FPfW4/WnPUcTR1fWe/W+VDnZ5Up0T9uz61g4NVD+85s3HI1iEb9xy9r5X1Dz867fm056c/9NwGImbkXPzYHZ+WkfaLzzLHspdpX1fcv2R6t63uoR+0Pbikuj61rcz5sP3hqo7SNBZ9ddp1pmlKR25Oe0fjWffpGc8/NGvmUw/N4BN7obu50FU6wcgrjqwcnRM9rkwt71eTMMmRXJ40Ky10TJXzXseoXmET2oakXAkKZ9vNafvWloSMr1+xuaV1/ea2upJQIyc/qia9plGy8k7pfxTEj5+QF3EW5TUznSVDe9yNyWtryYibcDBsoid9dFr8ppLDm0ri773ZmBjVY/XtSH5X2OuxevrYyB1N0S1jJkSGG0NNU4Y3jl9TH3m4HrTuh+D+LfemcWHccw81phTmlx1y/RIf6YoeddmI6Rniwn+3sWFzXldBfFjVKtdPX5aXzd/Q5sqrb0oes3Xg8MOfZCRVNGcQAOBDITTpowCd7yI+tBi3PVJTRgY0MIx80iL/HiAvjQACH0XdHtbcPem3QFP74lr5IYb5I9UhtRUIRAEgoLb6I6lT/gB1CEGvCpbphABIMajeNCh/baqFVvU6JroxJf/HynVG0s8zTI2mkmoEsJGDBQAFCAKk4QAAAulEAFAE0AMBQGM4NQgABiYPIABY0HgFDdGDUHQDl9VIYQBr0I8lp1mwzHmmwt21cEbrPP52Nw85s2ctgDGyrsttj3CE2RPAzOocDY+YHNfREWHpCF7UJZbO63LbIxxh9gT7rE5ph0dMjpt8L7cKnO5586dOlbGHD+/jiboW7ghjGhenLwBK/bbPX/fpM3Z8ZFxWXkF5JQ==) format('woff2');} +@font-face{font-family:nf4;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAJIAA0AAAAABTwAAAHzAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkoIBBEICoE8gTMLDAABNgIkAxQEIAWCDgcsG0IEAB6HsTP6iWsNu9CtleLh/9d8f587M+krc1KCUJFZVwHJsqowBO7T8iDJAck6SsCqp/z39Zm85RsNJ/CRD2X6+sdPZXHGEezStAs0n5ZIoKGl25yXhyCWtPIpoqdTCPjp9W/34Pd+fd/4fqThcVdBupY+4AZuF79rRCIpMgABAKsPLtiPhoVZl6+jbU0vQAAyZOgnwHyZQD+5ESjJhaRh4Vfge77+aAEQJQIQCQkAEFyU+ecceq6kK4ivJFCANihhMEYBclQlkKQ8bx/tom3RPt/YtmjTPtoUbX5u48ay1Eb7S9Eub5txrt7QtvKg5cEf5R82/1B9NdPB7nNnX62DX7Ty8YXfvNg9ZdKcSR8H/RfrwLNQm/68Ve7/5rNS8UuKsiSHQAYKSfCl+GQw3hwIvuty78mujtM/trTN/tyGPVRIlfQCLRII0gtsTSsgVQQAoIhjKhArSIn9hF0ChQ4SSAiB2aqAFgcFSFrpJEBmoM0CFNq6K0BJ5qlM5K0lHchJZqZepNDD5WMlJY+sdcAhFxy3x1m+Cluy0Cknne+3zzrkgLKmqjrUVCEnHTR+3tA01uQWN9X5JgtPnTzfPnvoQLlZrZenlk8eHK9Tozl28tiLcIuNDjjrnCO1Ulljfec5khvVujrK/BUkIRUc09jNSAA=) format('woff2');} +@font-face{font-family:nf5;src:url(data:application/x-font-woff2;base64,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) format('woff2');} text.f4 {font-family:nf3;font-size:8.966376px} text.f5 {font-family:nf0;font-size:7.471995px} text.f6 {font-family:nf4;font-size:8.966376px} @@ -61,7 +61,7 @@ text.f10 {font-family:nf8;font-size:10.909088px} </g> </g> </g> -<text class='f10' x='139.580744' y='18.135514'>AlexG<tspan x='115.346184' y='60.059399'>4th</tspan><tspan x='134.74254'>A</tspan><tspan x='142.618907'>ugust</tspan><tspan x='172.378897'>2022</tspan></text> +<text class='f10' x='139.580744' y='18.135514'>AlexG<tspan x='112.618924' y='60.059399'>12th</tspan><tspan x='137.469824'>A</tspan><tspan x='145.34619'>ugust</tspan><tspan x='175.10618'>2022</tspan></text> <rect x='-43.653545' y='87.452373' height='.3985' width='119.056331'/> <text class='f7' x='-43.653545' y='102.674282'>Na<tspan x='-32.391778'>vigate</tspan><tspan x='-4.990527'>with</tspan></text> <g stroke-miterlimit='10' transform='translate(31.052339,99.727614)scale(0.996264,-0.996264)'> @@ -145,10 +145,9 @@ text.f10 {font-family:nf8;font-size:10.909088px} </g> </g> <text class='f7' x='208.215097' y='102.674282'>.<tspan x='-43.653545' y='121.362198'>T</tspan><tspan x='-37.771604'>o</tspan><tspan x='-30.087414'>build</tspan><tspan x='-6.523772'>this</tspan><tspan x='11.453817'>presen</tspan><tspan x='36.864526'>tation</tspan><tspan x='64.014718'>from</tspan><tspan x='85.794051'>the</tspan><tspan x='101.673509'>source,</tspan><tspan x='132.473016'>run:</tspan></text> -<text class='f4' x='-43.653545' y='133.558467'>dvilualatex<tspan x='12.834631'>beamer-example</tspan><tspan x='-43.653545' y='144.517371'>dvilualatex</tspan><tspan x='12.834631'>beamer-example</tspan><tspan x='-43.653545' y='155.476275'>dvisvgm</tspan><tspan x='-5.994759'>--bbox=papersize</tspan><tspan x='74.030154'>--font-format=woff2</tspan><tspan x='168.177109'>--zoom=-1</tspan><tspan x='215.250589'>--page=-</tspan><tspan x='257.616722'>--output=%f-%0p.svg</tspan><tspan x='351.763677'>\</tspan><tspan x='281.153849' y='166.435179'>beamer-example</tspan></text> +<text class='f4' x='-43.653545' y='133.558467'>dvilualatex<tspan x='12.834631'>beamer-example</tspan><tspan x='-43.653545' y='144.517371'>dvilualatex</tspan><tspan x='12.834631'>beamer-example</tspan><tspan x='-43.653545' y='155.476275'>dvisvgm</tspan><tspan x='-5.994759'>--bbox=papersize</tspan><tspan x='74.030154'>--font-format=woff2</tspan><tspan x='168.177109'>--zoom=-1</tspan><tspan x='215.250589'>--page=-</tspan><tspan x='257.616722'>--linkmark=none</tspan><tspan x='332.934288'>\</tspan><tspan x='281.153849' y='166.435179'>beamer-example</tspan></text> <text class='f9' x='357.750568' y='-60.856353'><tspan fill='#bfbfbf'></tspan></text> <a xlink:href='beamer-example-2.svg' xlink:title='beamer-example-2.svg'> -<rect fill='none' stroke='#adade0' stroke-width='.5' x='369.14693' y='-70.149078' width='10.545452' height='10.403634'/> <text class='f9' x='369.64693' y='-60.856353'><tspan fill='#adade0'></tspan></text> </a> </g> diff --git a/macros/latex/contrib/media4svg/example/beamer-example-2.svg b/macros/latex/contrib/media4svg/example/beamer-example-2.svg index dd5135d555..e3d67c886e 100644 --- a/macros/latex/contrib/media4svg/example/beamer-example-2.svg +++ b/macros/latex/contrib/media4svg/example/beamer-example-2.svg @@ -9,11 +9,11 @@ function $(id) {return document.getElementById("msvg_"+id.toString().trim());}; </script> </defs> <style type='text/css'> -<![CDATA[@font-face{font-family:nf7;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABbgAAAI+AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCCwdDG5kEAK4K4rFj0pwZG+VFd+oPjevEw/P7+2/tc+99A+j+nwZyFhrISrZpSlIfp6lMZFJ9jfb/APxgPRyVahNaJQuVP01QXAosbOJc440iBcZzzcQKG1gRz2A3jPoiTpE31LdtUrU0fKDmWctHED2EgKfXX5yCl40Ot6/zkS2NQwrSnnQX+9y/48QrvSKRFLUAaAiACQvGzeOrb+n/mZVV67uLAGTI0FaAoTKBtnIlcrnga/iKBgUQFQIQCQkAEOrzVqXNiP8kUIDaqGA8pgBydJdAkvK8fbSPOkW9fFqdovbck4/TGuy9qLH7gtWffvJz+Ik9Me9YYf7xyRFLjx2m1t9zTuw67w2mHFsMU1ULTzYXQI8OrTpT68yb8t6Me/8unleev3/Zq+mFpsOp1kvk2+oXn3d8smXrc88Z70k5tvYNEG5yG7/dhFMLGAOaM9l3EVwKPYZerpH71PtSpXgmwlniVGAGFhzAr8SfBMUvB4K2r3fN0GDor5p1srdzea//j7OlWTVqSiDIqrNnViiAYweg58WuiiL9CgQKHSSQEAIjdQfUtECApIaGAmTamyZAoY79AlRkzspEXktSH5nJDNWSKTS3/raKitMmmW+h9ZaZbQ2/jXUZb6UV1vG3r7HQfKXeuuupNFhphQUG+KqvbgZSureeYW+eSQLDaxbOL3t371kOLlcsGBDLvt0GdjtIx5hmvjXWWjxQVOrVue06o/UytA2iM+9DWpjTBUKKFFnt2WvWrNx4MFl1RHGHAgAA) format('woff2');} -@font-face{font-family:nf1;src:url(data:application/x-font-woff2;base64,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) format('woff2');} -@font-face{font-family:nf2;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAP4AA0AAAAAB2AAAAOjAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAglIIBBEICoVQhHALDgABNgIkAxgEIAWCCwcuGwoGII7DdGsnY4jFcr7EEDQevt/vf2vvc9/9Ksl1+ndcsllJJHy6aIg0SqBRLZIYQvny03fam9azNTYVNqil5M5JYZz9J2P+L3e4aEyBD3zPN9iR3m6NAZJxIIH10sI1wSKOMdRewJTv7vOUfAiLGeZLlLu9EPBjz71+AP5Id2ik9SifonYQJJ/zHQTw0tTjDzClHJktSBv2vHjPIx3AXVVF9b+52BwEgm6RkiNDjfDZuwSGCFgDmjVL3FWg6vCQMUgw+r/vfysg06iJuEAiQf+AKpjKR2gw32s8awDE4SEkqEE7WvEfIAYAQIUVfKCSsqqmkTRKQoGIaHRU1wnB1tucXsyVO3RlF+YeGUWcKILnN3dwaKgPcS5h7hVgXyV41y+jSPbyvl2npjH+dP3gwTmCdxjqnmBut9wVzEUcs+uIcw5zw0dL+MhBjP5xJTk2wetTnNpJ8ICtFN0N7B6CpxrVN9aaVL3uxNTi4cOAD592cG1tCJVxVjF3HtjyC8C+onYFc1cRRzNqCq14oBbeD2wUFkcHs38swEdG+5aX+0GtMxt85R9ms5/nNnCW4EXtvI5ogyKDz8gz0Weoy1kCQ0ICL0QjGbPSGtZDyiZSLvoxFdH4eR0WnEqmoscG67x9M91ts8z58cI/5cyZBvdiSfnD+m5OEzLC6jIqYP65DUu2HDXWqbdWUJeXt59wsLlnHGsXFbjPIMIm0O0WzWRXyUeGE5ZsPe706rWCioFinq+xgSD+I6EyoD+mckDlyqRjXiDlqrTFmV/yTCubmZ8KWi3aKucOODbww7cqdXN56TfSYueWWWq0msd68Q7a73TUjxrO/RIe/nLq66wfN2lKM/21lL5OamM7695tcrpLNJV7i4EN/Lir5aoR2WCvoK6o6MrcbOGgQVUmHZo0jqCKUk33GgDgK4LV9R3CAv6xtgsJ/uRwfj7DovyooCHPC8VewNA7IwSPz+4pSZK0/ypClL9byS+hHX4tvnyDAJolCPLt/69iCwvg8E/xBQQAqOMx0ABxDiC+Q2lhQVj2QxiE2g0CIBEC2ygAmt2DQGrSDYFiRCRAQ5vXm2vFF+AXVYvUCQuKdUqgYVDFdrXaGwiVIUuFfClKwS/fZgGOK1KovLp9qSwZSCwUBpItUqFMLAzMmbIueBZGkQXeqkLLS7MySBbFIG3JwkyWb5qbWpueZlYBXJehVJkcPSUSc+4I3Ck7TIoBOgIweg6ARNH6A9DhScFiAQA=) format('woff2');} -@font-face{font-family:nf8;src:url(data:application/x-font-woff2;base64,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) format('woff2');} -@font-face{font-family:nf6;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARYAA0AAAAACEAAAAQDAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgmoIBBEICoZ0hVgLFgABNgIkAygEIAWCCwc6G6YGII7UVvGHNkkFEY9z/exLW0oCXjgtF8ytqJyop1/MJf87Coau+RyFD/43OpK1+IA+KGmRFO0NMpIRRAXOKoCGwwnaFvWSWtMFrgUIwMu3vXcGwPvBJ0aEwSKvyQnYQR1VdwNeyJP3yRQFhrNrgEEqgKU7ZmunAc/fopn/FzKoHiAMkCl0jaoLO1mYVkVsZ6MBCMCJwoGHGZaygtV/y/8A0GmMb/1/rQuc62xn5kRIkDhAcEQUoLCHYKTx/9jsgAN8wAlY58vpItVWQP6HAkAHwAXMBQkFqQYAbEAaCgCFjStKNrfZYiRcwiRCDAmFbf2lXAy7v81j2PXN0mPFceuV7HH1j4bvNeQSnb6d99Ir542ceqr39DljZ599txEo1lVi78F7JTykW6+w51VvH32ePXMf0K3L7rruNdlbffXzhvfZeWfCx3t1y3XDK7p123Ovifh7T5e9r81WzfC+fn+2R7/49btvn7z01XPnGWJdJtqiO6s9l+hcbnhzR/depVtX7LnSOq+WSTA7YXPGTi1QYgPFsyflFctz3d70h72V1xKIeZbrFF2Xva+LUKrFoqS5sl8BHUOhNH25sfJjx0ae5TzrM/Ox/sfSnjrWPSSte93mtyHOkbu+ecSnzd3sXrt0fK075qLxqS8XF8+6ekfea5h4/esYNHf2vtgJS6/d47vvt/fv3jc2unXfZVk1tcf4HrMh7NX76/0OnPb5nI780RDfk6MT+h65wfUcp61wGc7Cua2Z8a7z7Yt6S0PDgqcDuvrXeHo3HBid2L2/N7E6stQs3f9dnJngfiMgdl5oTb+DH89ojVhzWMdOe2ODzGOy3Te21gbnD4U/tYQB9yTc7Qq/JpQ/zj7GXLFBqt9Unds7buSpV8d3Hu4f2Hnkvl17+uhse0ebnRPnxVWdFFtx32PfDFpLvp1Gm/dwa7b4BGQGBW1cWztUl1f4UWqS69TAoFPDEqrzCzKHFlU3Za9vc7c1mDtylizOlNVwbmSsGdI5EQA3CuklN/nY+DbrRof9nRajKX4E1VA7P+5zyD8Wk18WQGBxfu2xY4ElvzoN7fNd2aQh/3+tnlYPAE4UAALqAfcZBtV7AOpphLSfLsuJBJBWUO8Rokyi5WYiJIhIPd9XRCiT+QigU4ENYBWoZKggjRTDySxmFD4ENWHQiMADYcfg2CVwoHEhGmLzRREAADRKmAvshLNxOQcOzqSLGRazkRVMsA5+QVcKdaxmFRuq1dexmBlMskgjA+QiBKuYJS+VQyoFBZtFRiAL3p1Fqq9bPGNmpWWYReaq2TwZzkktSD27UtlHZ9axnqXrCZpkLlvnGjeWmZbBOmTmrgAUKaUDMmHvQuppoIV2ukRps2NLAQA=) format('woff2');} +<![CDATA[@font-face{font-family:nf7;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABbwAAAI+AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCDgdDG5wEAC4O4o1nGFf6Sqd/EXwSD8/b9XXuq6oeQP1/NJBj0SnoSMpnGW06ipaK1P8D8INhG0xv3aA0QXEpsLCJm8VFYwrEuc6JY2NZtogz6ML9m3iKvKG+bZOqpeEDNc9aPoLoIQR89fT9GfjQssWzuhzZ8jiiIO1Lr3HA/TtOfNQtEklRDYC6ABizaNQCfvUt/3+mZZV67iEAGTK0FGCgTKClXBm5XPBr+BV1rgsgSgQgEhIAINTnrUhbEf+TQAGqo4TRmADI0VkCScrz1tE6ahS18kk1iurzT19yUp399xt7703tyacvO/jUvltwYg8LT+7/IctPXGRi7X13Ys/drTPhxAUGqcrFp/e6CHrqwIpz1c59U34z5c1/F+9K777/0K3hvYaDqdZN5Nua99+1/XLb9nfeMd6X5dj6b4Bwg5f4ywacWsAY0JzJsfvgQegy8GGV3E/dH5SKtyKcJU4FZmDBAfxS/JOg+OVA8PW6Gi1m1xn4V9Ua2bdz+aj/v8iWZ5WoKoEgq8yeaaEAjh2Anhe7Ior0KxAotJFAQggM1RlQ1SIBkirqCpBpY4oAhRqOCFCSuSETeTVJbWQmM1hTptDYlttKSi4YZ6HFNlphrnX8NtZntNVW2cDfvs5iC5V111lXZf2VrbJIH1/vprtO+lK6u65hdx5KAuPrFi8sd+/ctdy/vGpRn1h1696pb6ezdIpJFlpnvaVj8f2I/dtuNFo3S9s4OvshpLU5XyCkSJFVn7tu3erNZ5NVQxQ3KQAA) format('woff2');} +@font-face{font-family:nf1;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAqsAA0AAAAAFFgAAApXAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgxIIBBEICp1gl1oLRgABNgIkA0wEIAWCDgdmGyMQUZRQVhjAFwmmmwfShUc6EY51R9jxRMR+efyTTZnOUb3fvf/z20x9k+cid008WYUEvPVVkQruX3xx+Hk87f3BKZFiSgpncrtlUMfqYLlH8cBzuH5jLpyUFlhbIJKofUqn9w7ogA6s4dvui9veqKhGGsSBdRfGEsn8SwQ/wPL/GmBof/UX4XbX9hIdIhjj8PZm9r0VZk+cgxKd4NYgNH2wK/2QGGL6IbWvQ1xNhQqQ6stpKACghLcXvrFeYd9GRe44GoMYmkgLVKfgVQCyKcc/l88OBlDZE0AKop/ad7A3BYAs/YL/fUpcwQt+llPVphrl6/WeDk0hQTq6wrDa/cIYUNJ5NdJMK27nnvro94HOzK2XO3kTLbTV9e9nLi+cdsJxxxxx0H77QqQMoyAShMHMqmlBP1gdDm7WxcLCI/YFU/1/4V4ZBgD4YhU4wC3zAUJqIrEEACLbclwBEEeFaOKDvaAEP3LAJ8GryVMxaRum+rMzQ6vmSE5WUR7UDXWvDhLiTw5tf75wEB+FoSgkR3qUiggUiEwobHKJEKttH4cwFIsUc4MchaIE2UYmMiCBTNcyzEXhKAKpJ2bkfBYSObAMUSgZRQZjQUMPo1oymb8h4hqw61SG7mrbB+wwlR78lRMvwah37WR+YzfeRI96s5kQ7bWfCHMq54BR2asiwmi8QA8Gju0hwgrkqCfTg9xNhBOyzVHkITs9dukCpigKTm/pGIHMjI6rknjQHR0aqi413Qta3SYT9dvHSYQ7w4L8iDgEzBVDGheTmlsqhTFohPwKSiE2WIShQw4jo1WTg7G1IUt6CSuo4Etl6N2VFwwG0mrTrzKHtXdi2imMFxEaZgsMMN0hs+zaxuCZnoHyqEbL7YQkQK9x9JAOnM+JSEkxyZbISG4JtViczqBZL+MiBy04jBkPJV0i4gVyz3CYzNO48Ski3Mj33vVQCbsDghzVqVrhubkTJW1EHTSYTPBCAk9ykJn204ywMCcKLoXBuOUJ3tJCSEfw5Ekc5rVX1Dx0etFbqq7AyexDwNJhLyY9yO9UPCFEhIgQsx1DeOhlypA5B0tt+2OXXmGviHiD/K18DSOZM2hn5cGDs7jvuj5yEn9HH0ZYUVlNEtk4kiXHAbxJ0oaT9vTmX9SFSnZYFi4jSxXNZ8Y/QJDb99ww1p0xLVXmguOQJWUqsa+eGA4Eu2BhZGjjzjnYGPeqH7lbZJl1+LBcqPRIF9TEoSiZNPx1ViqkrOjIJ8cHx2PgtX1EXLDbEWs3tKG00FBJ6QxXE6rZsUvnVAfnEvqhJZXSgtPRaB21jxgFTxPORxZpteVg6GhpwiR7PbEP23NkaQgzOoOIqsNiGVEeG0eaCKoN3WI9sXS7K9hWsU2hoy04jtZhw9NMysOkDEOgXtWUDlXspCAcw4cW1qUmcnLhwRE7Iu94mYg89CSVByOsEYoR6q3WpHNEAQ7dXfHAbMeTH1Po7aZz4k5Abj+R8iRh692/f9gGwNr3HbNaG4zWffeKVFG3gRxuQeQOR+pF+MeLtxvsv1iMuAcjHuSMFOlC1XKeWGaRREz+33sxKMoaFd3YXQBXfBy5GUZzi8fQtJDmiqWUaP4HwK4Ow2/kNqTjvBmEKzekPhpXUdrl7qjbFzjxOy0GbqRFYPK/fmFLJf7Fpj7d2jZsUTewta+mfdMc8XE//5U8/u09dSSZ43Fk1nZucPfyXz4K0in6EAYPjhelV8WN0pRqUlpWOuubZlLCHeqVPM5If19hjkFNTYo4c1zejBmFhxrs5cUmc0VhNlEtYewpcUbFzRDm9Cv3NejZgQb/A7GrlE4Q/2+0udc++HHqewLR//pzTk00Pbeiy5nRttRx9Dr8/tdjLNy43tuuR3WOZ/8H/rvARB/CCCbz+3L2T1JS8qqoVFd5Vt2/rxS8gs06FlHbsd7pG9TNCc9GtVhdVoe++eGrFqb3qFTD4yKU4pkPK5zXtttcFD0MP0/gcCmXtOvYfDvY18ZwlIB+KDK86pcMIV2ciM+/WT3J22QSLZjBZW6N65zfvUpVuRbrSLRn6UhwlRXWTetQzUHvZOWBmSsQmij9bDy2j7l1gAKX5kRFM270q/lZHk+e4KI+L9GYFg7a0kw+PS3dq7U6RAUx7v6DvSZarvkwxP3XLqH/G/ZdeDupcO0/X5fj7DXA5+kysLygVmCM5LGuNmtxXp6LSij25tir3InG7FxtPlwI6XtzlKb66H2aiIXf471HT+npre83eOfmDRMMtLSlJdLxfsSBTYHNaE8OtsOfYzTFpj6+Xmxv4MtO+FGVSrandWVZIyoPbx3MVOJqj9vB78TfZ68I0WK+ETZ7A2+ubvY4Vf6ASN+h5S3tNaPjiT6ErU2b5upmtsnLrdW6UdLP5TmcfEYwDv9Lj9S9/GhDT97uBJlfZVldCwicvc6mvFK7Ie5k7o+pjZOcRWh5HTe1ohVMH5BCohPViwmuRnzc94xn1H0b3tR8PjiLvHeIwa+4ldEIFw/sMP8OQj75VV9fEJuR24QyNsG+NlKSOKsXJVD99VWyzmftLZmmAhWXa3jl/eiBk5OiIeloYnr1+1fGnFNtLq+60nPwSqPc6+s5wNr2XpOuubdxxzbcnlte1/6oXHjhGYsGltPlWFSfLwDNyO12PqDB2XuAz164L0GluvS0js41JhZ7c+DgWq8ojMX8M6WygB/5SPxsgo9/19Q2S/dY9N84U2CVw/vedV9ab1Zvrz2jPgXQu16Lk51DfGXksTg/BqMr9Lzb+Uy/kZeAzw9MpRu0U9Y2myoyt9LtB3ddvLOze28+9qj2dK46XwX8/sLfh7t4v/7zP6/ZbCZRcajzkl4sXxZLTNQjK2lmI7G7gfnOc1PLJOQYHlPOfxDSX4/iY4cUbsTZKWn66yAueifwPjqWJAYs7DSFqAeubgSu15ZNNy1qyv4oIXCiW1YDW+WUPgsJF5FJzqvuXdebgx4Nh8uFMeoPV1cWa1HWgo7sodnx8b3DolkM/+GNpabBPaMEqk/62ep9FoV6eFDQcoFmVN92Luz1BVzOaxIMCw5awScf4I56/aAqOD2jjr0oa/64x4X6zemop1esHyFG//tNby6GPg4d79AD2et0AIzzzaEaeFdwOkR71xkUqAIs75B3MBBw6tCf3QcJBMwfmjAbuXU8s+qrIQS+eNSX7v//WsHQgO0aMAggWsAPcMq5gt4SgRn+EVWkJoiBCtqR+XhblTkJM9noyNnEuQ8VSBa0GInkopRK+Txbltx6idGjPib10SWHEJmgSgiOhzfWQR3D45CS5tBUEorljlFTqIvRijSR6bhsqelC4fC+hAH6mEAZRDHBBHqyEHr8XAOaaaGbthrpDL7RtydAiw7a62pnnaW6NqNkYWBqWYoJ+CXNmd3MfLj0kvoQC5OwgA8jeazfuUUzpcVgUqYo2zc3z9Js0Sfpn6/aDGCYZjrrolVYCAfhq/CqQZFZU4VwGOgXPmIdedI+mhMo4FFoG2w8/OE9EBJRypApSx6HfAUKFSlWplyFSk616tRzcfNpCAA=) format('woff2');} +@font-face{font-family:nf2;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAQAAA0AAAAAB2QAAAOsAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAglIIBBEICoVQhHALDgABNgIkAxgEIAWCDgcuGw0GERWcZyF+HORkriYqr7zOpXIWVdasyppo/q3Hw/f35rn3vf920yp1kADuhFqhcDp5aZwJBiTisYwvYAD/T++Vb4LdvcmR/qqEpHVyhP8qMva17fcGSiDi7ewlhpJMmvg3nf7efVw0psAD/ucb7JOOMRqUjskZBxJYlxZuCyziGEPtAqbMre0E8SHq0Lm29YqC6ioE4K/nfh4AY3293n4c5WmUBjTIR2IQwDONYgwuWg4guwKsDVderIlYBeAe9pJ6orsFRAEw4LC0jHRtEz6xhKutAcUZwJAMAdzDZtgrimSwoETMFVMAWUQDiLZDAkjQPwBVMNVH6ND32ib2A4heBAKgAUwDk8A/QKwAgArsAAFQEYhKWSAVtBQlIoZWoOYwNF7J5WBefehqF+ZHShA3lxHiagcLC3MRdxnzV4G9xgg3rqA5bFNf11QVxqU3BgdrGWEYDnKYz1K/innEud1A3HnMzyqZ4ZGbnPPKtNVZRsjVquxkBGC152UBm80IenNzS3crvRtZTL+YVQR4+LHB1tZCtJNrwXwdsBr1wF7Vv4r5FsQZza1EZzzWn5UHLAYNJQUjKK3wyLSvqSkPwjre4Kv/MJ9+ISz/HCPM7byBTApkBc+NZ+bNiCtrqUIJxcvNca5RMfQu1LFXDrGav3sefnEQ0+bLHOeVFhyMjl0T7rvWncS2/3XWVB8O36akMWwVFlSuKjVQ1QX3slSsJBduZ37IW9NAQ8O/PMDnvt0Cv7mJfdazfRLDbjv2Xds/qSCshCODXr/R1LXW2hhrZ03jB4q6+ValugO6VysCNyY6hmqfCSY1z/Tyqf6laZpspnt+IPAwCX17Ddw1VN6qyJ9vctU32f8kXBRg9t7cYNSm9rfU/OUMjnk/OWqk4hJvqv2twsN+3jlt6haNJrr3GxIPk1hJbpat8WF/TQMtrVCX0x4Bho57lg5V2M123LrCodcaAD8InPw7pBS8c22X0HclnCSMhJIobej7EvS3YuidERBgdN4rcKmS/zcZQ764lPwSE/FbiUVmARhKEORn/01XXKF/UGIxAECLjRwgTiF+PYurPPPkGJorJkiEwC4BYOgBA2lgHgPFpgagM+XjdFN8M0SVgzSLCIoRC3RW/c9rmi+Z2erjrPeEX75tAnturt7L859WMxsRFFvMdrUgrGuEiyaeqCHB26rQ/uc62ySUHdvXhcpEE4/4Dc0h4NLs6WUPZbmx3Kd4rAy0YYowIcy3ABJn7RvQyYFEBw==) format('woff2');} +@font-face{font-family:nf8;src:url(data:application/x-font-woff2;base64,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) format('woff2');} +@font-face{font-family:nf6;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARMAA0AAAAACEQAAAP4AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgmoIBBEICoZ0hVgLFgABNgIkAygEIAWCDgc6G6kGAB6FcbNzEVFcRXxnClG3sngo9qO93S/nglg288xcJBOvYtaIlkT7DREi3bOLD9+mvp84tE4ypaViYjAR9cNpVfA/dM3nWOGD/41GshYf0AclLVIjAmQkI4gqm1UADYcTtD10g3WqV+RKCHh27N0K4MXsWcdD/4hnsQAVeUJ0GpyCnHjBKURg8KoA8lgFWGzXSFgp4MDvKLj/Xo7kBSprc6Og3PhWjKNciM1Km0C7Rql2QJkqtRp+x/8AXIr41v9bN1x79ZUUCIlC1BAMiQRJH0Gp8P+UFahpoBFo1+R0U7ILEP9L0Ax6MUj0EGsBUGKGBKnkbMrGpcQ01KEKg6CJPmyqSQKClmpK0mkp1UFSeXM82olRJjNfPUSTLRR9u1Nbd87IW7pUWD6tYPXq07Q24XcRaSqEnfCY4p9g8KmQgYwDg9MvUPy2U/uekaGQ3fdp4e6MlfBmiOKZA08o/ti9Z4RoCsvJ0LN5lWjh+XmXdGrz89PHxxc/XTuDJvw2Il52+xzdQuEmLbjlD+2i+B2DO61xNxmDSEWl0axkiTTrS9IHbZ/w6fuGHC4LQXvRgTk8s4SiyNBz4bLjsSx6WuYToFlLIj2hlF77sc2MVilWfeOuZV6zvzWXzSFxQyz3V0+Rd+rPFXk8G8M2VRU2saabCkt+VviUM2l57yKLnv82RTFh7rBZEU8V7/Ht+4TMgeGC/K7hbc6hYXOUc1pVT89HaIwu+z4t0SNfT7nYxDLjygHmHpbVMrTCazDOyYJZLzXc76ev0i3VSs5sTE9rHc0vGhhJswox8uP8Rv6ZmzHO01pmQ/qhmTJ8ZB3jDBonKNx3yEyHm+PCHowL0/XIUd/SV52xPM2o9+jjB+syh6vdIk5jWPuExIN48rSwbyIzq2/yXP9gRnG6ofwYRdE68+BFZoHnrv3J5iv/lkI8+XCNnXItp06dtqawnHB3r0921sxSbZ0rKssQD0+nHMOQaJeWeDY+kut1XTQ1KyNyrZEZp9c6FuAewcxlh+QSvHU+KJO+qcrEIqILFsNSYoBNRv5bhPxyIJgzdi+5QNv3a2OL+Pu+bNzu/7/zdl4AjRIEOeY+IzvfAfkUkezWHDUwgtgO5HN6yZkWhzExdEzRs/1ikJxhgWarSGAdcBRZxR7WLIxgODXorIPCJIfwSovzC6gVrqEQpRKpHQCFFQZBpd/xxWq1q9ijTIU2tYo0wz/oioENGtRrLVduVqEMZ44ZZgGzBMEx5dzjZ5tjukU5Nscsxxxen4UqN1eUcc72jpw3V1/uLgNOznaedmdYHPbTgWYtqtZFLYdevuA61+1k74j1MOaXASnxNyNGdl9so0ixEiSHSFxeUAU=) format('woff2');} text.f2 {font-family:nf1;font-size:10.909088px} text.f3 {font-family:nf2;font-size:10.909088px} text.f8 {font-family:nf6;font-size:14.346196px} @@ -2747,11 +2747,9 @@ AG1kaXJhcHBsAAAAAAAAAAAAAAAALWlsc3QAAAAlqXRvbwAAAB1kYXRhAAAAAQAAAABMYXZmNTcuNzEu </video> </foreignObject> <a xlink:href='beamer-example-1.svg' xlink:title='beamer-example-1.svg'> -<rect fill='none' stroke='#adade0' stroke-width='.5' x='357.250568' y='-70.149078' width='10.545452' height='10.403634'/> <text class='f9' x='357.750568' y='-60.856353'><tspan fill='#adade0'></tspan></text> </a> <a xlink:href='beamer-example-3.svg' xlink:title='beamer-example-3.svg'> -<rect fill='none' stroke='#adade0' stroke-width='.5' x='369.14693' y='-70.149078' width='10.545452' height='10.403634'/> <text class='f9' x='369.64693' y='-60.856353'><tspan fill='#adade0'></tspan></text> </a> </g> diff --git a/macros/latex/contrib/media4svg/example/beamer-example-3.svg b/macros/latex/contrib/media4svg/example/beamer-example-3.svg index 06496d9d97..e6f9ad5d94 100644 --- a/macros/latex/contrib/media4svg/example/beamer-example-3.svg +++ b/macros/latex/contrib/media4svg/example/beamer-example-3.svg @@ -9,10 +9,10 @@ function $(id) {return document.getElementById("msvg_"+id.toString().trim());}; </script> </defs> <style type='text/css'> -<![CDATA[@font-face{font-family:nf7;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABbgAAAI+AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCCwdDG5kEAK4K4rFj0pwZG+VFd+oPjevEw/P7+2/tc+99A+j+nwZyFhrISrZpSlIfp6lMZFJ9jfb/APxgPRyVahNaJQuVP01QXAosbOJc440iBcZzzcQKG1gRz2A3jPoiTpE31LdtUrU0fKDmWctHED2EgKfXX5yCl40Ot6/zkS2NQwrSnnQX+9y/48QrvSKRFLUAaAiACQvGzeOrb+n/mZVV67uLAGTI0FaAoTKBtnIlcrnga/iKBgUQFQIQCQkAEOrzVqXNiP8kUIDaqGA8pgBydJdAkvK8fbSPOkW9fFqdovbck4/TGuy9qLH7gtWffvJz+Ik9Me9YYf7xyRFLjx2m1t9zTuw67w2mHFsMU1ULTzYXQI8OrTpT68yb8t6Me/8unleev3/Zq+mFpsOp1kvk2+oXn3d8smXrc88Z70k5tvYNEG5yG7/dhFMLGAOaM9l3EVwKPYZerpH71PtSpXgmwlniVGAGFhzAr8SfBMUvB4K2r3fN0GDor5p1srdzea//j7OlWTVqSiDIqrNnViiAYweg58WuiiL9CgQKHSSQEAIjdQfUtECApIaGAmTamyZAoY79AlRkzspEXktSH5nJDNWSKTS3/raKitMmmW+h9ZaZbQ2/jXUZb6UV1vG3r7HQfKXeuuupNFhphQUG+KqvbgZSureeYW+eSQLDaxbOL3t371kOLlcsGBDLvt0GdjtIx5hmvjXWWjxQVOrVue06o/UytA2iM+9DWpjTBUKKFFnt2WvWrNx4MFl1RHGHAgAA) format('woff2');} -@font-face{font-family:nf1;src:url(data:application/x-font-woff2;base64,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) format('woff2');} -@font-face{font-family:nf8;src:url(data:application/x-font-woff2;base64,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) format('woff2');} -@font-face{font-family:nf6;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAUoAA0AAAAACVwAAATRAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgnIIBBEICokIhzYLGAABNgIkAywEIAWCCwc4G44HUZQvThDi50HmpqfZLZqIWla7RMm2Uso5lL/HP95nz/+m/RxI0vTSepoqKTU3KitusOvQdfW/fa48H5zs/btt4AMd8EATDTwMIwiwxAMpofj6HyA2cgmP//2p0UGxH4FnEYllEwRojQ5c0wrYi2hBS7AmTV9Am4uhLkBqAazD9AK8C9wIAAHw/NR3DQCfXWdzs6kYLWEE7lHnATqo0E9CKwK4VCNwyUPrryV9ATQa39Jk6KhTPLoleJ/wq8SHxojRBvV5Fy54WqN+BhlmhLHGD8TqG73bYqN11lppRSQwaAOIGioAHKWJIO+vwbACMAHsmAGwx4TDB9QkAI0KAAgAwArwA7oBvQAAYADE4oqWjnF8LLcYcuMSazxii0DuAK/6ao7kl5AIRkfDM2XByEaoTFth2XCBaccC5XXrDlkvlb5+Teor5gBB3wuDsocx7Bb0EGLaPuIFPWfvRihbI1beFfTLm6lDYYxXV6/2XC3oJ1+ePQpn0vaRsRn6XgDTXkB5qbeiVVa8rjBt17lDr0gt2v9Y0B96rwWqTLMcecG0U49eETnqq9c2h2m+8fXlJJltf33+dPfwy43eAmm7iJ86zyk7tqqS0l3dx9EeZW92P7l20egTSd3mc4lpL/xeMe3OhTUWRoNyIaR577VqFqiN9dkQk2yNZCX6hSYfUuOu6wUH0YcYlCtMI14gRuzFi2IInHL07MneCwygHUzGzr0roXi1dawjVag7Fn2nd/vKlYLu22X16v2nhYB15nVfpFttt2IfyM6CXag5M8vHf1lP+8q8LsZPLd2rXPu0pVesHDwkSrQkjbS520YmWcReI0b2YtvF2AJ58vqMwus/fLwdGvR4n+vzzauPjjQ5+WpLlcTAUYXOXT9EgReTZob00ljut338XNc2Y2aP7pNm7kosLum07xzr8fJymcPsVV951qd1d7NfHhTeeuOI5RFWDbUI5gyvmoQwy2ajf0uOu4drX6fGtpFyy9jZ3XvNmNUSURSQI+XM+jFUrLosOIV4uxe3mfCLGF9jGzmPifFqiIvUmSQerSlxTetivefucSH8vMV6wB3eor+a43Smpt8fDjVpJdl/uPYeFTjQ7p+qDJi3kZ/ZWZqaLC5tbFoqJnVK5yrr5KTqkd9Vj8C9lz2nzWtrnzb/0nSlFd2q2r3K3GtTaOGykPxLt77v0Ab+0BclUzKsaSldbcXDvRaKC89YUZs74hdLizVswhTNGpNYnYFflopXYxpIlHrVme179qMR3vWcT7qo1vUgUdixf+6ifln9zQ6j76XVi9L9rACAo0HceczOgB8SbzJ+KFE8p7UQTRi19oyJ/tck5QiSuy96dv7Qwzn7bxb4r3bYs9zmu97rFMCMg0HRcO/5TkfHA8DvSNi2kCECAKALcB+RJQnKcba4COh4Ur5lyzRuZYQbggdQzwAAOAAhQL5YAACY9UcdkB0Xswg8GxmMBAvnm/C24tFiD44TAOBl8wIjq3GrmZis1aifAcYZqpfR8LO9MFBqhOHGZjU/boB+JIlixZNkIhiuv9R6shjpCZ0oPpcIbwlj7UcP6CclxsZLmdLw/qm8lhyTHnMe2Q2Q9TPaGIPWyUsS5k7gat5LGJfAGj5GtwBwQlL49HZSijLlqtVr1KodAAAA) format('woff2');} +<![CDATA[@font-face{font-family:nf7;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABbwAAAI+AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCDgdDG5wEAC4O4o1nGFf6Sqd/EXwSD8/b9XXuq6oeQP1/NJBj0SnoSMpnGW06ipaK1P8D8INhG0xv3aA0QXEpsLCJm8VFYwrEuc6JY2NZtogz6ML9m3iKvKG+bZOqpeEDNc9aPoLoIQR89fT9GfjQssWzuhzZ8jiiIO1Lr3HA/TtOfNQtEklRDYC6ABizaNQCfvUt/3+mZZV67iEAGTK0FGCgTKClXBm5XPBr+BV1rgsgSgQgEhIAINTnrUhbEf+TQAGqo4TRmADI0VkCScrz1tE6ahS18kk1iurzT19yUp399xt7703tyacvO/jUvltwYg8LT+7/IctPXGRi7X13Ys/drTPhxAUGqcrFp/e6CHrqwIpz1c59U34z5c1/F+9K777/0K3hvYaDqdZN5Nua99+1/XLb9nfeMd6X5dj6b4Bwg5f4ywacWsAY0JzJsfvgQegy8GGV3E/dH5SKtyKcJU4FZmDBAfxS/JOg+OVA8PW6Gi1m1xn4V9Ua2bdz+aj/v8iWZ5WoKoEgq8yeaaEAjh2Anhe7Ior0KxAotJFAQggM1RlQ1SIBkirqCpBpY4oAhRqOCFCSuSETeTVJbWQmM1hTptDYlttKSi4YZ6HFNlphrnX8NtZntNVW2cDfvs5iC5V111lXZf2VrbJIH1/vprtO+lK6u65hdx5KAuPrFi8sd+/ctdy/vGpRn1h1696pb6ezdIpJFlpnvaVj8f2I/dtuNFo3S9s4OvshpLU5XyCkSJFVn7tu3erNZ5NVQxQ3KQAA) format('woff2');} +@font-face{font-family:nf1;src:url(data:application/x-font-woff2;base64,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) format('woff2');} +@font-face{font-family:nf8;src:url(data:application/x-font-woff2;base64,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) format('woff2');} +@font-face{font-family:nf6;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAUkAA0AAAAACWAAAATNAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgnIIBBEICokIhzYLGAABNgIkAywEIAWCDgc4G5EHII7TZbbjJoANngfa5vt3gHinjZjncBm4yGQVBVsfi+oogP+/PzU6KPYj8CwE2QQFytrYsblW7EW0oCVYk6YvoM3FUBcgtQDWYXoB3gVuBAjA5W33ZgDcT4jf7maLoskErKCMVnYDflCV++RoRaCkVQJbeGjVVqVaANXppbr+51NP2UZUt1D1YUIl3sEXRluoWggjDI+tTkva0pHO9KDX/yA2LZSQ+MYLzj3rzFNPIQSG2EBIRRRAQW6BV+WvwWIFbEAAdoBANMLhk5S+gPyPAoAOgBNIAOkLshUAsABZUYqG9hU+VrFYCkuYOCVKEkWXSIBX+GrBkiBpRLcGWzy6Vevs08wpjjl7NHNTSs+sWeuc+0pfvy6+a1oQun8lFu8KTWO57k8jmrlKVN1faOVcvAszTD2p+/fPl3peTVN906dHT9f9W6/u3EiomKvEWhP/SjikmVfwXvXXprbHG3NAM5ftWndNfCVWn9f9Z2NnwmOfZjo2XNHMbeeuiQT7p6+tD1N84/X9yR5t8fXd27vHr86N1cVcJurUBcW7ZKuquRr5VnG0wrsyt1rCuyj0ieJbFLdPM68kXNPME3tmODQZlE8jpneuq2ah1m++ITrZmni8ma+YnnW+bIf9xdbSXDS8BzRTVF000a5cKYmueDfu3Np7gdayRPOwdOVUvDF16s0Sn153LP6lsXWnTtX98fWnT1+9XU+aZZ/1zHWszrGsZzyhekBae/4CcSkmNQksX6S+9V6tRhXCm9fJW25qu/aZDEdyl8TIxC7JDqNp5y5N2XbpUczTb3a+4off3j2eNtX5VeGX50/f2MUWEm9O9LpTdi0e2uBOJlQjeUiapqaW+21371epM3hI40Z9hyxzlyw1JnBMj6ir+8sEDZv2PLpqnkYRgZNTpa99ZIPjHNM6OHR7vphKOdI55ltT1CoUGRXeIqR6nS6eWj2GNWo6eGitDCWSCrkKDX2X1qiwXw9JExtZso6Nj0b2SoldRmpGdl+aMNeYZGNjpVLheeo7T0VG7Um/2+FcE0mskcJXKGRHpZZfgyrlKVXwa3izrinbBPysIK1HbuRnDnUNyGlMrF5jopE8xrWrfBVPcsUur6tHcOpqk4Ej69QdOGrfIG9tdKu+RhXsTeelLT4pTdF9x97UM9u8bUGp/vmceXI1SCzZKWasMXaHk8qFO3901HKm693fdGZxV8zHx4nGwSzVxHA1rWIPbNJSOsdWVeLyGr4qjcXIuHrEuJYFWtmDuvlKVxyXN8EJwEYhW8FNARbeujfarHdKlKooLYRKWJX2rE3+aFLyAsnd62WL2tQ4tOBXu64+32HPivj/Wo1VtgF2FBiUjLLt/2vqqdkB1FiEsG1d2pMEIJVAuUhGxUUq2UyihJGkZsclr0iUgUQoViIQeACqYgFAAQQBipIVALDTCumAAgjTi6CSgjpgRWfCfBsqS1ARSyAKIQBApTAxYMVJn9Vs2JhDdVrSmp50oCnd4Gd7cShNZzrRI6v4ca1piQs3WcmOi/wIOtGK3PU5cJOFvAntJnveDe8JY+27tW7pcmfN7srv6tQqN6/lcGfJm+VUsht4aEk3utN2KXUaffqQC3onx8CQZVyGtwAKIdK/vp2UizKUpSJVqU5t6gIAAAA=) format('woff2');} text.f2 {font-family:nf1;font-size:10.909088px} text.f8 {font-family:nf6;font-size:14.346196px} text.f9 {font-family:nf7;font-size:10.909088px} @@ -40,11 +40,9 @@ text.f10 {font-family:nf8;font-size:10.909088px} </video> </foreignObject> <a xlink:href='beamer-example-2.svg' xlink:title='beamer-example-2.svg'> -<rect fill='none' stroke='#adade0' stroke-width='.5' x='357.250568' y='-70.149078' width='10.545452' height='10.403634'/> <text class='f9' x='357.750568' y='-60.856353'><tspan fill='#adade0'></tspan></text> </a> <a xlink:href='beamer-example-4.svg' xlink:title='beamer-example-4.svg'> -<rect fill='none' stroke='#adade0' stroke-width='.5' x='369.14693' y='-70.149078' width='10.545452' height='10.403634'/> <text class='f9' x='369.64693' y='-60.856353'><tspan fill='#adade0'></tspan></text> </a> </g> diff --git a/macros/latex/contrib/media4svg/example/beamer-example-4.svg b/macros/latex/contrib/media4svg/example/beamer-example-4.svg index c3f79aef3e..f9a884cbdc 100644 --- a/macros/latex/contrib/media4svg/example/beamer-example-4.svg +++ b/macros/latex/contrib/media4svg/example/beamer-example-4.svg @@ -9,13 +9,13 @@ function $(id) {return document.getElementById("msvg_"+id.toString().trim());}; </script> </defs> <style type='text/css'> -<![CDATA[@font-face{font-family:nf0;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAIkAA0AAAAABQwAAAHNAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoEcgSALCgABNgIkAxAEIAWCCwcqGx4EIB6FccNdQjRLGeKGfPzll3jof+zbnZm3qgmxph1PZLW2h0qk7TZEI78R4mb6hoJb4pBoX+D5537eX7wzG1a/X6kDTes0mWA25j/IynUXPwoTOIBfA2thWxBokWYUH5LvJgkFmkjk7c3t2Y7ZZM2koiSSCgEv/p/Bl/yTLcYrdSAeGyLv5HPcg63iCzuSNDQGIADgxEp/AXbr1PzgJvlyAwJQKGyigEM0gU1026BpArsH0Y0HbylADBOASCRgKN+hlKdsz1sQgyRoYBQNm2E7QMM+KsjWFmNiaKqdmzDG/62NT9baXTl5d3ViKlfvRU0d3P4a7fzexmhDet9lV71RlWrDL9YDwHrYf+g90vx11oeHPkaukjJQMET5OBxdsXGygmApbt+8nsv+j07Un6W2bWkg+9nBqARBdgZcqgRknwIAaHVACdQB1AEpBc0SFSRC4BgBGLVCAWnErBDLFgMcMuEBKVueKdHGpGkglkMKOGTZUzZs2FOnLK09HUzd8BVYD8ednTyq2pu1pSKHsBQlik5WWD09kfMOKzl4w2imt/Wy6IhVTIqnFWevF/VOOTmcs3Rzt3V2UmQTFu4axRaLPgKtRyF3TQsNMW8AAAA=) format('woff2');} -@font-face{font-family:nf4;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAWsAA0AAAAACrwAAAVYAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwoIBBEICosEiFoLKgABNgIkA1AEIAWCCwdKG4AIIB6FTdlbuJ3Jcn6TUe3wyH94N/1zI5UEmk7MsFEx6lScWOvQ+lxhYmx74gpT8z8jHv5q89923RZ4gIGcuoFFF9iFgSecYRFu/ksDDH+/PIzGSMwUK7IDqngXnVZ4YnfcdIC1jf6okmeWgDDmAeAW9QpNCq9BdwJAABwLXvwYAC61eqf7IjRForfBA/Nm1gHwm4vpz1oYgMFX6NXJhxafMusBWE2qWr8Zojz7bUXzsDNP142IBYASkdP81PYisUJYpXPKJvNoMM4EkxoBYTIpdUb9NLbFZpsE/Own3/jaV5FRijoA0YcCgKGDaGUpcvgOQmmEkQgnDA34ozBOpMhWaK0Nw+iV6RCjRgHaWoiBABPQB2AWsIDbvJsBAEwDuBngnH1ltMUZqRdJZPCNQdSBpNnpCDJSGwoljvpRO+B+iQQSqS2JvJHTGoZgJEHo+AD+POZdjDdtv/1/YZl2knz6KdEfFYjT90YHhWXH4VVPiP6YVUUSCW4ykoFEVSQDZ5xqIiK7TVziBcbACldhxLG+k04teJR8p0S/qq8NnuS0L/WXA4F+auAEvMfruKacADdOkZH1xYCi4haOAMeLETKsQ6y9H//c92fggYPkO3Rql4i6mgyc5MnaE6ev3WtGLhp5gRFgp4y23YzaTEXdKw0MEM08GprRJXznjp9QRV7gRIn1CcsUHUokMCLhlsAvX3yC1XlG1ocUq/Oxr50izath4ASAZhI45zoywJXisjTalrJN5Tivfyb0OttqYRmRSAIJEIjxin6916dhn97subN0pyng8Da2S0uZ7yhqfO11qChf8TkL8/wpnkwlQ5k2PUPOVDxRM0dckvT0H3+KWbblyPvvuVvczctSfs3ehqR9fSd6JafKt/o/I815+L+L6Hl2bv3PHReTGvOi932SMfXrHlY6zB10Z5dmu4GNhU1jX9d3+GTtoGHFmame/BRJw9iNNKTRN7Uovj7vRu4tuW1FXMoQe0leytT6EkkbkzG7ft4cDT/2yvV4cuWCIbwzc7gyyGAdPJ/5OC1xaLwroTnV0r/Y5Y+IDA9/ahro6tbxHVVkJTt+7cs7c2x6ckFVdrqzMdf0X4shc/dRe+OstzbOWeouLTJjU7C4f2q0lte0eGvD4hw13WGXXcvb/VEXH1Miy3p5SVyCvAO/nm2Zbc2t1qct9dR5l1br+RY+I8cuO9QaynCsfbklI900IMtmSMO3weJgMS4O+nJFpaOka0lDZVxeVsFW+Xm8Vbd3favP12TsvR7AFvSpiL8Erp6rm7+ipmrB8vrahQsqqxcs9LjCXXJ5QpKrosSlynEJilKCBxery5Y63bnxluI58uPVRQVjF9a7kHV0Tys4PSU9rrjaiaJ79jhKrarI3Vp8Ir+h0gmoy4ivbHb94duOt+fmzi11qFiqFeb0BQD8QzCv/w3l8MD2Twh/fo3AMgYIkkXyBng8hF42KPrKBCAIDDe9qJESX4SJ7K2DDVSbxpGL2Q8IwwCRYZMBwFReWWaD+e2UH9K2jEQvAOgAMEF53kFaWlCTghni1P4EmMpD0WWPvmljjIujfbzgqiwo2WRwqgy6pw3kUvPWiWiDAG0NxgEABkAIkMK0iyc3og4jVOQqj9WdxuOJVlwegvUNWNQKByMCDI+VqCOP197km4UI8QlcGjSZbBSPCfAzwUnAaawxJi0enqBJg55sTCzGGW95YzSyN+yGiZ0RbSxJG7wFDTs8oamhp81k6Rnfc0yjPRftw2KHnSefAjQNJpioRU6qJytvD+5WVKwmC2Q4Qb0AwBgH2wIIs/jY/gYaZIhoGZyyZCtSrISLTKUD) format('woff2');} -@font-face{font-family:nf7;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABbgAAAI+AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCCwdDG5kEAK4K4rFj0pwZG+VFd+oPjevEw/P7+2/tc+99A+j+nwZyFhrISrZpSlIfp6lMZFJ9jfb/APxgPRyVahNaJQuVP01QXAosbOJc440iBcZzzcQKG1gRz2A3jPoiTpE31LdtUrU0fKDmWctHED2EgKfXX5yCl40Ot6/zkS2NQwrSnnQX+9y/48QrvSKRFLUAaAiACQvGzeOrb+n/mZVV67uLAGTI0FaAoTKBtnIlcrnga/iKBgUQFQIQCQkAEOrzVqXNiP8kUIDaqGA8pgBydJdAkvK8fbSPOkW9fFqdovbck4/TGuy9qLH7gtWffvJz+Ik9Me9YYf7xyRFLjx2m1t9zTuw67w2mHFsMU1ULTzYXQI8OrTpT68yb8t6Me/8unleev3/Zq+mFpsOp1kvk2+oXn3d8smXrc88Z70k5tvYNEG5yG7/dhFMLGAOaM9l3EVwKPYZerpH71PtSpXgmwlniVGAGFhzAr8SfBMUvB4K2r3fN0GDor5p1srdzea//j7OlWTVqSiDIqrNnViiAYweg58WuiiL9CgQKHSSQEAIjdQfUtECApIaGAmTamyZAoY79AlRkzspEXktSH5nJDNWSKTS3/raKitMmmW+h9ZaZbQ2/jXUZb6UV1vG3r7HQfKXeuuupNFhphQUG+KqvbgZSureeYW+eSQLDaxbOL3t371kOLlcsGBDLvt0GdjtIx5hmvjXWWjxQVOrVue06o/UytA2iM+9DWpjTBUKKFFnt2WvWrNx4MFl1RHGHAgAA) format('woff2');} -@font-face{font-family:cmr10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAALIAA0AAAAABcwAAAJ0AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoJQgkMLCgABNgIkAxAEIAWCFwcqG80EAI7DdGsnlxMWZ4gK5UEkHvjs+u9WdY+/0e8DRGquEa6zPbmcwakHHp7L/duL4I6OsiiwbWM9z86jtBdHc4Bcz3sJZnEDNw3PxwQC8PT6O5blkYSBlp5r7w7HG/CEpqMRj3l7izIrppxbs72SSDchwEfXb+/Ad8G8TR0OydhwRY54Lr6DC+GlwvfSIBLlSgACAMzpTtyAjjrGbzVvmfi7HAGQIEErAYyQCGgllSGVCuhY/aevrX5LAEKeAAgREQD8/CjdQ2viFKFaFUEKiihjDRwHSNFLBMU07SQE0W+HSq52uogqyodvC2dvlc81eiO56On/WPFJ5fxncq5fs2cnW27IwJvVTUcbzq1efPXTs5+99tJzmPgTxcfljRRafPZj5Bk1i9K9H7JySdlr/eFxtfh2sfTuxPaRbXNmjO4wfPG+RUsW7x0+eNqBBSPHT+06c24/HywvFBQ/+tW//vx+kZ4+3d+prqo9qf+NtNS1smnGrFEbu751bSnmzJsLawcGmV0E3gh6j3izkPotO+RzX7NUElmAEzjHKsj58G9GwjsHBO59Pm/W8Ub8ipXkx+2wtKb6SorxdyiKIBB/L39GXRoLSVEAAKTJWDWQjCUZa4iA1BKKICIIGEMvQNEmAogK6gkgkVlGADkV1wWQl/OSREhLojrwTGIMzZicJo6fyyt7zDw2spmD7GAt+/BdWZBJ7GYXB+b37GMzG8n000sfmWEy69nJPvrKvAF6GjLS/fRR+/HWEujYt3lj1q9Xn2xYtn7nvr7gDug5pOd53MYiNrKP/Wx1p2X6upDciqJ9e/XhKr31k319+xB3OcFLETT5Ig==) format('woff2');} -@font-face{font-family:nf1;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARQAA0AAAAACDQAAAP7AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgloIBBEICocIhX8LFgABNgIkAxwEIAWCCwc2G60GURSxAviZYNOpLXgRCGVYBkM7mKdbJnVlqBv8A6/x8P9r5n1/INmZAitghRbZAR2/IHxdI7spADgAFpJRVdaRRWubhY9og3ahvGpDmon0ixkbWlezx5fYBCWISDBK/3/gnMcFPQqs/WQ3XfYzKNIPdIGLHKOpA/A2v8gB8A/xRr1u3YWAp/8P++FjNm1k2kypb2xXkDalO2iTDfGRGjCSooPgF9AnK3oKS0CnZ/pKrJ/ylQhAhgzDEVgjLjCcYBqoNCVJp6OL5//AHWf3Pv4fnztn1lAbURK0h4SkCHqwZhK5gv2LRrMD/dSY5AfifwlUYAgYBDEJYj2AHFPEQJJCDi/L8wlBEfyBGVVMDFldwi765utSQNXZqnp3D7k45UW0Tj15WbedEOqZaMI8S2/gz+v2ywfHorO1d29VZa2DVdVrY10nUO3bbqhVVQfsipY697YA1LhgXiLZc9Qufm296O11pb2+zZ8Nt/Sy/dzGK6evy8gaGkakmZWlUUTG7ZWWVzdyBdswA4NOmRVcZcxqpZhQkwONg0LRX31ss7cxF/Cmvrku0aqqvjrAF7HiDbKzseIrMwFCPIF+iRZ3BloKpoipbgJkxvlgJVzpzs+HoDHGJgKD0G6okcbGVmc7EGM+Rv4Zw7TRNN+aIw0z3o76gKKUmZkc2SpajplfDBNwE+eSKmeJm3MLK1AosZgGh5sLKNNyPWCCdVq8uzGc8F+KA8piTno6jvDLMPAkZQ468E9Lz8lzkRquIYePE/SCr9wsySvKQ5mSVlAzo01OQ56PbZb/mF2onHmdtaz79/uG11by5ha+IWDrrhxKXtPGlbrkZbWMnE+RBWfemDYkibS2ClpMFAeUzhx0I5DWFtVG9ITkpKPndAlSt3DVh/yICGOIwXygXSmFLLYVDhf5mrSFIRb3Fx4BLi2uPCcdhV6npIAioZ2bPS5VLHo9WrTi7MCfmO5dypbGSHKRqE3A+kHKLlENXnnChMgUAjAahEODS4D/I2LTwD4y1HSLTEyoHLhSqdOJ+svQmaZjOIWPGb3Iakr5m8uLIgCXwtRZ70bul9ZWFu9QY5aQRlAGFUgL8TL+eDh+mRBcPHZrwyQt9rtZZz93cYcm/kvSQTQlEKSDYRD9hAtp1+HJU19jUBirfttynoTpmLI8QmURASSEwDwSgKYeBJKGAQhkRmojUKhtEaCUOSETeYekH7g/M0vOXxjmdV2pdMAqKxsvRzN3+B1dO7DExdmTLb/bWGE0EgXjUf/Zmlo2iBzu1ChJDd6jNcy+b1ZMkxTmsXOPqouG6IhnWouAdVbuHnYDKjKqnou43mXUDkUMhEXn3QBpDy1VH6fOX6Kipq6lrQMA) format('woff2');} -@font-face{font-family:nf8;src:url(data:application/x-font-woff2;base64,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) format('woff2');} -@font-face{font-family:nf6;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAWoAA0AAAAACgQAAAVRAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwIIBBEICooQiCwLHAABNgIkAzQEIAWCCwc8GyAIQB6Hsduk02li+w5gyCqcVo9kO84qYQUrcuQQ2w4AHzs5YLbuWDoCHwD4ADHwBECEnvdfsRI3NZzIkiUFH5i3/wFmg87/5ZrTOqDoWy+CSRDQWMvutpW1zSIYY3AcBdYLaEwwzGNLQXYXy8vYCQABwOtz7zkB4H3f1aZkPNFTWgU9wC3lLgPQyAR6H5ZwAAc9D2RKAgB3fCoGuZNNH/L/OXr0HJ605ecTfxjGn+UlBenQjxL54Osu21F/Aw02ylgTTDL9Ci4Zc99uj9122WIzp43WRshUyAAQjCEOAAfDEjTwcHxVxfwHuMHoDjAIAOAB0src6QDof5UKPceEAkxAhwH6BVmZDkAKDnUwdOBSh14MnE4XRr6USl4URyYSyJ9sxO1ZXxhGWSToPXV2d0TsZ6WNeUDQDkHnOMgYDghaNDH1MJGgNbU5nCcPtjDGKxsFQWs95JIGEoNDJVK2H094xtQWOA5pR0hhWx63kQZaoH20Clp7+LargnbgyAmyO1qY+oyU05cv3z8QhIGHqevEnSivLd1+/XJn8RC1L3AbU1s6z3t8/cQW+rjVsHhShM490yh5ahvbsPW/4LrNzva0Xz5f0/Jp67YQgdT9pO+KifDtFW5v1CRbk7I79BpTH1xxioxakXCWrtRJaRc0IDhwHK7UTnZHUotqP66k3tZKjmHoucbUrj1xzCebJwP2wnFIRY/Q/FnqBlOJF4gRa2kph8A5XBfP9jU0lDptacdZOMSuPZRQRQAKtX0h3Z1bnc512cHEFqbuDwzUNh4h5bB6EI6ngtbUs10wbzZu/ky+13wvZcD+DQtGD+wkibZxJn/TOJsojR87bjz90X461H3R6V7+caHc/wtJ0XxC35X7pJSEfM+Z8GZzdmB2SX35iQhzYYlUW9ClwhIwOWqIX7zt33fNccUlhXEaLelXktHXmpNaZvk08rjMhrqCwnbbSmuL46M7RIWPv7qu++4PBmL9FHdmKA/5qdKSmGUfNCwvtNul3QHm0tC/LPF+Q6ImB1iaSwqbZiy6NmOePfqC39BpOmwYJQrGnOAGS6y4Qx/ercA/wHeQV+fmcfZukxb06T93frf4MnOBXDD/uxip7rrgFR3iX95swB+SbZk8SmWSbV60h7zMJrk6dHTBXQpXCrwuNAz+1aMhYpjbn3U0dHFLpd7yrHRpdecuqzusuVTbwW6rH/c12gePWvvNXtzcffaSa3McTRWfUvrUGftvjyldE1187d43PdRh3w5Cvy+4f3i3iDE0dmEvc13dBvSXxPTka2xrLBidxdJmhojzvXwm+aPizQnMyuhlKh8TvFxafiEQjXvsj2K3wNipM9XAZGt9Dn5cLd1M6UjSy3j3PoP/HuONrjNLWt3Qj6TELRvXjV7w8eRxcdEcxZRZvZZ0LdOdjvDx7WIaIJqSYhuSxx49FFpWCgBwEVLXKTcdvrW6DPp3auQ8Z2og4AV6U+OUgf7xQrplAkBAr/+PP/t65/9qFPjPjxrj/G56B3LnABjBAd2YEBN+Hj26GQC4gSBk+/GkkTADQA0AtxkJ+QoROY3InIYpPjBXhhwoU2YjLFX4Vd8KAfBEER16DAMgFEWxFArDiCHB2hx1g486wMPEDvQQsHyyATx2gQfp3MHBCyCAR75goEegyZsZYMAmdDbYUJON0t8E+PNfOVBprDEmVTWeYKjBZFYp0og7l4Ixhsik0iXLLkJWaRkrvLJMazxh6GDZmpIm58pjhmRqOD05O/mkthVgN9gEEw0fTFZm6bUftxZcls78GIQbHdcBcMgCnt8BL2NTrlK1DjrprJsmvQAAAAA=) format('woff2');} +<![CDATA[@font-face{font-family:nf0;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAIoAA0AAAAABRAAAAHTAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoEcgSALCgABNgIkAxAEIAWCDgcqGyEEAB6FcZsTUqEJRXjhdvZZE0H98N3evZdSi6uerqJRsbhYNC6R0PUfJMJE4yMMpTWF+8X/2ObDMnWuH9M0CWWJo01E2kqnxGlj/oOsXHf+KEzgWwB4DSyQpC1IizSjtEPSbpJQoIlE3ttEffQQpZQ2FNGTCAGPfm8B71ILf+OZcibuEcjr+RDchK3iHSWS1NUHIADg8mF/AtjSLOOdCzOyAAEoKFjEgHM4gUW8VVBVga1OdOPOcwwQ3QQgEgmYy3cokqes5TUQnSSooBcVS2ANQMUuFmStkzHQNVQPBoT+f8f9g+X4BnbwxtHAUB7djDJ0di3qbXzdaXBKrY+0WamWqFR1JismgJOwd+7VU/1RT7q7Xoe6JBVBgS6q4LujKSpOZhD8fnZ1roj+/96B8m2vbZvvyHY2QK8EQTY6hMUFsi0AALWckQfKGShneBhUU1iQCIFLCECvQwxIPUbFWKwIsMuAe6Rs8QAnap80DMTighh2mfZY69btvoGpuauNoRP8BVYD+/Z2Lr70ZG4qR0VkOa6cnRnmClWbnRuVbKuwf3V36Z7m05xKcs7N7WYcFbVtt2+6EXBg6uRsaW/XTyIyvDeCQjLGcWjfCuTJKaEi1g4A) format('woff2');} +@font-face{font-family:nf4;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAWwAA0AAAAACsAAAAVcAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwoIBBEICosEiFoLKgABNgIkA1AEIAWCDgdKG4MIIB6FTdlbuJ3Jcn6TUe3wyH/4TvtzB8VMptMuhKhw6hQepXXSes1koew+AVnKfyIe/mrz33bdFniAgZy6gUUX2IWBJ5xhEW7+SwMMfz8bRmMkZooV2YAq3qLTCie2cdMA1/RHFwV0ZgkIx3wAeIt6KTww6C7wSQAIgKOBCx8BwMVuXVfOQlNkegs8MG9mLQA/XKc/W2EABl+hUycfWnLKagBgM6lq83qoiuyzhczDTjzdViIWAPJETstbOwjHCmKTwSmHyqPROBNMagSFyaLUG/XT2GabbPS/n/zoa1/5MjJIUQcg+lAAMHQQrSxFDt9BMI0QEqGEoQl/FNJEDo9AG20Bo3emQ4waBWinIAYBzEAfgFlAAW71bgYAMAVwE8Bp+8Joi5OoN8lkMvHB1FEZJ6fDSKK2FEwc9af2yP0yCSRSOxJ5iTMKQ5BIEDo2gD+feRfpZuyL+k9YZpwgn+uk6I/+P961JyYgLDsGr35c9MeuLJZJcJNEJhJ1kUycNBUiIrtOXOYFxsQKd2HEsb4TTiNwhHwnRb/uWhM4IWlf2s/7/++v/38c3mM5bmjH0Y2TJLE+F9B02sJh4Fg0YoZdEGvvRz/1+wl54AD5Dp7cKaK+ZgMnZLJ2x7vW7DETFyVeYCqwc0bbbSJtpqH+lY4GcGYZDUNShG/1nuO6yAucKLO+9S5tG0okMCLjlv9//vxjLM6TWB9RrN4nvnaSDO8WBo4DaWaBc67DPVwrLkunrT7bXI7J+mfCVW9fJSwjEkkgAQIxXtHv6v1JyCc3eu0o22H+3+Ftap+eOt9R3PTK69BRseJzF+b7Uz1ZWqY2bXqmmqV5omeOuCi7Mn74MXbZ5sPvvetudbcsS/0lZyuS9w2d6aWapt4c8JQM56F/L6DX2bnlX3d8bFrs8z73SMXUr3t42XB3wJ1TluMGNhQ1j33V0PHjNYOHl2SleQpSZQNjN/LQJt/U4oSG/Ot5N9V2lfGpQ6NK81OnNpTKxpjM2Q3z5hj4oXeex5OnFg7lnVmR2mCTbch85qP0pGEJSmJLmnVAieIPCw8NfWIepHTv9LYusnIUfunHO3PtrpTC6pwMZ1Oe+d9WU9auI1FNs97cMGepu6zYgo2BkgFpMUZ+8+ItjYtz9QxHlKosb/97fUJsqaq6KkrjE9Xt+OVM62xbXo1r2lJPvXdpjavAymfmRqkOvZYyHWtebM7MMA/MtpvS8U2gJFCCC4O/WFHlKO1W2lgVn59duEV9lmBzRXV7s+9XJPVZDmAz+VTCXwJXztbPX1FbvWB5Q93CBVU1CxZ6lFBFrUhMVipLFV2NT9S0Uty/UFO+1OnOS7CWzFEfrSouHLuwQUH20T2t8NSUjPiSGieK7znjKK26Mm9LyfGCxionoC/DvrRHuR685Xhrbt7cMoeOpUZRbj8AwN8Ey/qfYA737X8H8eeWCCxjwCBZJG/Ax4PoRUHRVyYAwYJV/26olZOeh4jszYMNVNvGkQvZBwjBAJNhlQHBVFFZZ4P57ZRf0q6MRG8A6AAwQUXeRnpaUZvCCeLk/kSYywMxZbd+aQvG2dG+nlMqK0pXGbQqgx5pC7XUNieiLRL8RENwAIABEAKkMu/iyU2owwgWvshj9VTG44neuh2E9R1Y1AoFIwyAx3LoxON1MO1hQYJ8BkWjZpON4jEBfiY4CTiNNcak2cMTNGvUi52ZFZwJijdGk6hBG7vh4iZEO2vSDu9Bww5PaG7sZTdbeyX0GtMUFZo2+/C44afKpwBDowkmaq3KKMYs3oMbFhWb2YpqnGBfAGAMg+0AhJl97QCDDDZUjExO2XIUK1FKodK5AA==) format('woff2');} +@font-face{font-family:nf7;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABbwAAAI+AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCDgdDG5wEAC4O4o1nGFf6Sqd/EXwSD8/b9XXuq6oeQP1/NJBj0SnoSMpnGW06ipaK1P8D8INhG0xv3aA0QXEpsLCJm8VFYwrEuc6JY2NZtogz6ML9m3iKvKG+bZOqpeEDNc9aPoLoIQR89fT9GfjQssWzuhzZ8jiiIO1Lr3HA/TtOfNQtEklRDYC6ABizaNQCfvUt/3+mZZV67iEAGTK0FGCgTKClXBm5XPBr+BV1rgsgSgQgEhIAINTnrUhbEf+TQAGqo4TRmADI0VkCScrz1tE6ahS18kk1iurzT19yUp399xt7703tyacvO/jUvltwYg8LT+7/IctPXGRi7X13Ys/drTPhxAUGqcrFp/e6CHrqwIpz1c59U34z5c1/F+9K777/0K3hvYaDqdZN5Nua99+1/XLb9nfeMd6X5dj6b4Bwg5f4ywacWsAY0JzJsfvgQegy8GGV3E/dH5SKtyKcJU4FZmDBAfxS/JOg+OVA8PW6Gi1m1xn4V9Ua2bdz+aj/v8iWZ5WoKoEgq8yeaaEAjh2Anhe7Ior0KxAotJFAQggM1RlQ1SIBkirqCpBpY4oAhRqOCFCSuSETeTVJbWQmM1hTptDYlttKSi4YZ6HFNlphrnX8NtZntNVW2cDfvs5iC5V111lXZf2VrbJIH1/vprtO+lK6u65hdx5KAuPrFi8sd+/ctdy/vGpRn1h1696pb6ezdIpJFlpnvaVj8f2I/dtuNFo3S9s4OvshpLU5XyCkSJFVn7tu3erNZ5NVQxQ3KQAA) format('woff2');} +@font-face{font-family:cmr10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAALAAA0AAAAABdAAAAJpAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoJQgkMLCgABNgIkAxAEIAWCGgcqG9AEUZQMxhCAH4exe6SEWInRYKa+bLTBgvP//EU8fL8f7dz73v8rKnE3FEWzScLbTmc2UfHEdKZbpzSqRrzRVuCh3+bbPEQxNH5NHH2liBhSV4PPs788sSmDVUC6BCUo/qtIQiTi3P5eP9S11dWlG7hpeD4mEICn18/VouJIwkBLz7V3h+MNeELT0YjHvL1FmRVTzq3ZXkmkmxDw6fd1CN86M/86HOVUvNKQT/IjnoWXiu9MJKnpAhAAcOHhYA3WhPnvpHUr/4kgAAUFswpgS0lgVtkiVFVg7eSZvvbkqwIQLQGIRAKAnx+le+hSPoI4eUpQQSe6cRsOACo2FEFnresxFL290dNkiYgwVeCqA2i9j2uQrkiGX7xXwK2n+ZBz/GZ7yOmuDOxVU3PxxmJzuD9+vNsuMfENcO1OUChSvxt5Bm2MHf8uglFQ7sADVOcrBvtuitWyXqeGqYgUwtFIXiGxl4Iqg43n8vEhX9MWWvGjD/9/P2FMnQmIphjxvKCLwPLUSadbneC9tJdigEvIURKbXeQU8CFsbr06qr/2Q9t8ZqmSLMAFblgFuY3DjMQ7FxC076fXZwNb/zt7yo/tsHTp5Lt05j/olCDIf+XPGJZToHQKAEAtp7ignEI5JVJAdUMdJEJgjwTo9FABpA6DCqBYMlYAjR6vBWg13iqidkn98ExxWoNpjHuea3V745KNndzZQoLvyoJw3s1VNr8nsbPhsCTNEXOsXCSMzG9YQjTSllYtXlsCHclu41ipndhZ7ScGXGNFJI7kNrhmI5E6eNQcxovExShqpMZbeu7tJ0ZDbnSCUxGafCcAAAA=) format('woff2');} +@font-face{font-family:nf1;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARIAA0AAAAACDgAAAP0AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgloIBBEICocIhX8LFgABNgIkAxwEIAWCDgc2G7AGUZQwSgjAzwTbGcqIYlUNGh1gWMQ3nI3gYX//zTkXCzm977RkEhySkIVQhBK3Km7aKAzlZTOtV8KvAl6AklJHOq8DHf8NCHAW+uevqRd0a8D2I5vp+2+RQZE+oAlMZBhNHYCz7xMZAO4xnMdVQ+ur7kLAuz0f58EnwbCX6+bIHnFdRV7It7h02hCftIcLqerCbBCgkyW75u3AdifyF926XKBGAAoUGC7ACoXAcKWJ6KqzlLY74LAT/0GrDjnWx/978+bOjtqImoAeEmln9CAvJEpV+hedOncBnxqTLYj//yXoCvqjL9FErAaUaJEgG3eJLyvLCcEJc3hH12hEcFfCVz3Kx9JWEa4YwQ3PYmybcgciK09i+BHwOrARSuy31jeA2/gR7OhSWIzMmYPDuSILcLhhAI93QQPEESG0aOBIUOqco8DgTbUdI7KbQeziY+TOsOvKSHpa9624JWzkNtjk37CniaTAGJHZsztC+IiugvPXZ65QjKSlmdqv0gHpbJXiyNq5MA9+zoHjY7f2bZoHbN5/frdz9er964FLuOG0OXNww6tmgeb4iPgyFLGDWxeWyL5GwsyKO7QKr+xZsADCHGMhECM21kxjbinDoHSB14JnkjMZZ0zXywVyEhZ7MDwgJyeEdc0zRG728QZ6+jxm5GzfXL09jBOhyO5Ecy2RQt0Hb3BDSHp3nID+5TzgLtGKRRr0JYKeFKkRgf9CsdbwYhKNCyETOr6QI2VJo9MA9qUqpJ+xPSQu1KQ6Z36srgPa+WYtN1oPNKPrDvncvOYutPVuiEdofFE1qEODEzIqTwkGzxq9ixijwuKwBBnnAbdSI8pAOtGZSNDkrhWJtVUdsXnVqbCFRh2ggwvtJcs4wfgCgo59PTAvHaf/RaIQhcRQrYiTssvfEk4tqSkl8gY9b/Q7Vz570EoXfQ8oFmT4X6JpMoUPcnc744yh1JHeCQo41kEQECnkP0a8wOUHhS+6JEvuVcH9q5JMAn8lZsGk9BI+lvElOD6gNTdUz3TwOLROfdKp9MX2uK7ek0KRIOIKrgKFeB1/Jj5+ORCcHTVx4eZePl87dys+38Ud2v3/r5Q30FmCIG/Mg1iXRMi7Dm2ZPYwhOB6/bZHJuptktIWGCHQ1VwkSITBTC6CzXQKkTnoLUBhljQCVbq4LUCs8Uoiyi9QT2lCYbrChMtCZ62q1W5bZabeTDtjqGH9H1858hx1yIi0/ZredRuvQos1ok8FwyC7tAKIOzSZq5miDZAffpIXj7GO7d47uaGkbPXn0oV3tXaW9o3li85OtRayy0zHH7Y2FftC/x0tee7ulRxwH+27IO2lv19+nzp9vsaWWWWmV1Q==) format('woff2');} +@font-face{font-family:nf8;src:url(data:application/x-font-woff2;base64,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) format('woff2');} +@font-face{font-family:nf6;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAWoAA0AAAAACggAAAVSAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwIIBBEICooQiCwLHAABNgIkAzQEIAWCDgc8GyMIQI7UTvmHAUTwPOCmvR+gkrRO9RoKNR0wUaWduMPmYSadiHSidpUzkf4HmA06/b37zWU9oOhZF8EkCGisZWNS39pmEYwxeFIUWBfYWGCYx9YwdlmbawEC8Pq590oA3k967bwbLPJUVmEBZalyGfCDIfI+TlFAwWKCwBMg3HFIs0HqbKab7P/XoodyjidtWUzOklSPMsskDJjp91krEZgw05H+DGQwoxjLBCYx/X9Rnznmvt0eu+2yxWYlNlqbEPgkAARZRAEUpCsIMaH9qgr3DwgkKBhUNIAQQD2HMh2Q/6VAWmj9RMAGchjkFw7AHC1AoSpkRkm1fCrFbE6SSCmUMMkSm2gSLW5gCK3OTpIaollCzR51QurPvgo1BM1/CLP3oKpyQPOni2ocFtH8RRXekpMHy1TV5Nuoaf7yQ6X6QFHxGiK+7cdznqlGGd5D/iPiU7c8biMAZbU2Ua75K5O3XdX8B46cEI+3TDWeie/05cv3D8Qx0Kca66w765IrApXXL3fmSTD6Eq5QjbLOUY+vn9giH7fqsJ4k9nPPeFRC/RvbUPc/67rbo+6pvHy+ou7T8m0Jmhj7xdKViTDvJYbwunJaX3y7E6+pxoMrJVZVWmEqyq4ExVep+cE2cByuVCkeb16Z4TnuK7ztb3SMob5rqtG1J9r5pNbJmL14DzHXEZk/M91QDTFpoopaVtYUTfGWXjzbV/tQ6bSuh7N4rV17+BJ9Wo1s/76E7iVbS0rWhaNZy1Rjf2ysf+MR8R02DuJ9qvmLelZqjs1Bmz+z3yu+VzBg/4YFowd20q3ucbZo2zi3VR8/dtx4+KP9dKj7otO9orMSlf+XUOCPSHzX3qegUcL3io03i2vG1mzUtumJFEf9Rnrrel2aOWMmpw2Jynb/+64jq2Gj+ll+WdKvUbW+rlqFTZyfph63q0NL45J2uxu3bpid3iEtefzVdd13fzCQ9VOC1YCmCT81d+bW8AwaViex26XdMY7GiX85s6OGpE2OcRY3ql80Y9G1GfM86Reihk4zs2GUVQuqFd/OmWndYUnuVi86JnJQWOficZ5ukxb06T93frfsJo569nrzv8vQ21zXwtITopsWB/CH7l5mH2Wounteeoh9mVsv7dCxlGA92Vcv7EK7wb+GtEsZFvhnGxm6uKX8cPusqvrqzl1Wd1h2qXUHj7vtuK/rduBReb/Zi4u7z15ybY63qPApX582Qf23ZzRek97w2r1vehjDvh1Evznx/ZO7pYyRsQt7mVnabUB/3VrVfY1t7euNrqFWmZlgnR8WMSmaZjNrxdao1svWdEz8cn35hVja1x/7o7VbbObUmUZsvqttLX5crd8s6Cj6y+zgPoP/HhNO18Qa+up2/UTP3bJx3egFH08el5WuSEYTV9iSrk3Mp1MiIrvYBlhteZnt8scePZTYpDEApUJh3VOBZr51lQZY3qngmBR5A6qJapE39gfIP5omtyyAQJbNd61veN1fgzTT50eNQVH/V1UGKueAIBToRl5HXv8y9FA2AygDEcJmQmUkDgBpB8pmcuQrUuQ0qXIam0TgUOzYTcoms0ny3CjFcjAECKUBZgAUQBCgIQUAQBBDkObRQCKogiaSKYYWNFYND8DEXkyIORiFMADQRH3ioYVYpi0XQABb6cxghjKZUfRnAvz5rxCaM5YxTCpVn8BQBmPHRQFVgKE2hGMYQnW0Exf51EyBiypBF7y0jFSfMHSw3VVQxV7bPmZIdZ52uvJr5p/X1gMPg5nARIYPSdkXZd8t3F3QO7uzMBQDXVcACsEa+inwLG6a0pyWdKATnelGEb0AAAA=) format('woff2');} text.f0 {font-family:nf0;font-size:7.970112px} text.f1 {font-family:cmr10;font-size:10.909088px} text.f2 {font-family:nf1;font-size:10.909088px} @@ -648,7 +648,6 @@ text.f10 {font-family:nf8;font-size:10.909088px} </g> </g> <a xlink:href='beamer-example-3.svg' xlink:title='beamer-example-3.svg'> -<rect fill='none' stroke='#adade0' stroke-width='.5' x='357.250568' y='-70.149078' width='10.545452' height='10.403634'/> <text class='f9' x='357.750568' y='-60.856353'><tspan fill='#adade0'></tspan></text> </a> <text class='f9' x='369.64693' y='-60.856353'><tspan fill='#bfbfbf'></tspan></text> diff --git a/macros/latex/contrib/media4svg/example/beamer-example.tex b/macros/latex/contrib/media4svg/example/beamer-example.tex index 5597c404d4..d356dfcf53 100644 --- a/macros/latex/contrib/media4svg/example/beamer-example.tex +++ b/macros/latex/contrib/media4svg/example/beamer-example.tex @@ -7,14 +7,12 @@ \usepackage{menukeys,siunitx,calc} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% PageDown, PageUp key event handling; navigation symbols <--, --> +% PageDown, PageUp key event handling; navigation symbols <--, -->, % mouse cursor autohide on idle %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usepackage[totpages]{zref} \usepackage{fontawesome5} \setbeamertemplate{navigation symbols}{} -\def\navBtnSize{9pt} -\def\navBtnLnWd{1.6pt} \AtBeginShipout{% \AtBeginShipoutAddToBox{% \special{dvisvgm:raw @@ -29,18 +27,18 @@ svgRoot.style.cursor='initial';% if(e.target!=svgRoot){% e.target.style.cursor='inherit';% - }% + }% try{clearTimeout(cursorTimer);}catch(err){};% cursorTimer=setTimeout(function(){e.target.style.cursor='none';},3000);% });% document.addEventListener('keydown',function(e){% if(e.key=='PageDown'||e.key=='ArrowDown'||e.key=='ArrowRight'){% \ifnum\thepage<\ztotpages - document.location.replace('\jobname-\the\numexpr\thepage+1\relax.svg');% + document.location.replace('\jobname-\zeroPad{\ztotpages}{\the\numexpr\thepage+1\relax}.svg');% \fi% }else if(e.key=='PageUp'||e.key=='ArrowUp'||e.key=='ArrowLeft'){% \ifnum\thepage>1 - document.location.replace('\jobname-\the\numexpr\thepage-1\relax.svg');% + document.location.replace('\jobname-\zeroPad{\ztotpages}{\the\numexpr\thepage-1\relax}.svg');% \fi% }% });% @@ -53,12 +51,12 @@ \raisebox{-\dimexpr\height+0.5ex\relax}[0pt][0pt]{\makebox[\paperwidth][r]{% \normalsize\color{structure!40!}% \ifnum\thepage>1% - \href{\jobname-\the\numexpr\thepage-1\relax.svg}{\faArrowLeft}% + \href{\jobname-\zeroPad{\ztotpages}{\the\numexpr\thepage-1\relax}.svg}{\faArrowLeft}% \else% \textcolor{lightgray}{\faArrowLeft}% \fi\hspace{0.5ex}% \ifnum\thepage<\ztotpages% - \href{\jobname-\the\numexpr\thepage+1\relax.svg}{\faArrowRight}% + \href{\jobname-\zeroPad{\ztotpages}{\the\numexpr\thepage+1\relax}.svg}{\faArrowRight}% \else% \textcolor{lightgray}{\faArrowRight}% \fi% @@ -66,6 +64,27 @@ }}% }% }% +% helper macro \zeroPad : zero-pads integer according to template, +% e. g. 123 --> 00123 if template is `99999` +% #1: arbitrary integer number as template specifying the +% width, e. g. `987654' for a width of 6 digits +% #2: the number to be formatted +\def\zeroPad#1#2{\zeroPadI{\zeroTemplate{0}{#1}}{#2}} +%low level macros used by \zeroPad +\def\zeroPadI#1#2{% #1: string of zeros specifying width, #2 number + \ifnum1#2<1#1 + \zeroPadI{#1}{0#2}% + \else% + #2% + \fi% +}% +\def\zeroTemplate#1#2{% create template (string of zeros) from given num + \ifnum10#1>1#2 + #1% + \else% + \zeroTemplate{0#1}{#2}% + \fi% +}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \title{Presentation example with embedded video} @@ -84,7 +103,7 @@ To build this presentation from the source, run:\vspace{-2ex} \begin{verbatim} dvilualatex beamer-example dvilualatex beamer-example -dvisvgm --bbox=papersize --font-format=woff2 --zoom=-1 --page=- --output=%f-%0p.svg \ +dvisvgm --bbox=papersize --font-format=woff2 --zoom=-1 --page=- --linkmark=none \ beamer-example \end{verbatim} \end{frame} diff --git a/macros/latex/contrib/media4svg/media4svg.lua b/macros/latex/contrib/media4svg/media4svg.lua index ae291a368e..6abc26d339 100755 --- a/macros/latex/contrib/media4svg/media4svg.lua +++ b/macros/latex/contrib/media4svg/media4svg.lua @@ -1,9 +1,9 @@ #!/usr/bin/env texlua -------------------------------------------------------------------------------- +-- ============================================================================ -- -- media4svg.lua -- --- base64 encoding utility, version 2020/04/09 +-- base64 encoding utility, version 2022/08/12 -- -- (C) 2020-today, Alexander Grahn, using code by Alex Kloss -- @@ -11,22 +11,26 @@ -- -- 1. as a commandline utility: -- --- texlua media4svg.lua <file> +-- texlua media4svg.lua <file> [<chunksize>] -- -- 2. as a library from within LuaTeX input: -- -- \directlua{require('media4svg')} -- \directlua{media4svg.base64("<file>",<chunksize>,"<end-of-line string>")} -- --- <file> string; file name --- <chunksize> integer, multiple of 3; size of binary data (bytes) --- to be converted at a time --- <end-of-line string> a string to be appended at the end of every output --- line +-- The output is placed into LuaTeX's input stream. -- --- The output is placed into LuaTeX's input stream. +-- ---------------------------------------------------------------------------- -- -------------------------------------------------------------------------------- +-- <file> string; file name +-- <chunksize> integer, multiple of 3; size of binary data (bytes) +-- to be converted at a time +-- <end-of-line string> a string to be appended at the end of every converted +-- chunk; usually a newline should be passed here, or +-- something equivalent, such as "{?nl}" when using the +-- output in a `dvisvgm:raw' \special +-- +-- ============================================================================ -- This work may be distributed and/or modified under the -- conditions of the LaTeX Project Public License. @@ -91,8 +95,12 @@ if (string.find(arg[0],'media4svg%.lua$') and arg[1] ~= nil) then end local filehandle = io.open(foundfile,'rb') if not filehandle then os.exit(1) end + local chunksize=72 + if arg[2] ~= nil then + chunksize= tonumber(arg[2]) + end while true do - local data = filehandle:read(72) + local data = filehandle:read(chunksize) if not data then break end print(base64(data)) end diff --git a/macros/latex/contrib/media4svg/media4svg.sty b/macros/latex/contrib/media4svg/media4svg.sty index 4a3396f10a..fec450169b 100644 --- a/macros/latex/contrib/media4svg/media4svg.sty +++ b/macros/latex/contrib/media4svg/media4svg.sty @@ -23,8 +23,8 @@ % % The Current Maintainer of this work is A. Grahn. -\def\g@msvg@date@tl{2022/08/04} -\def\g@msvg@version@tl{0.8} +\def\g@msvg@date@tl{2022/08/12} +\def\g@msvg@version@tl{0.9} \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage{media4svg}{\g@msvg@date@tl}{\g@msvg@version@tl} @@ -190,8 +190,8 @@ } % base64-encode (non-Lua way) the media file \sys_if_engine_luatex:F{ - \msvg_convert_file_to_blob:nN{ - \l_msvg_full_name_tl}\g_msvg_media_blob_tl + \msvg_convert_file_to_blob:nnnN{ + \l_msvg_full_name_tl}{72}{{?nl}}\g_msvg_media_blob_tl } } \special{dvisvgm:raw {?nl} @@ -729,7 +729,8 @@ % (very slow!) \cs_set_eq:NN\ior_msvg_shell_open:Nn\ior_shell_open:Nn \cs_generate_variant:Nn\ior_msvg_shell_open:Nn{Nx} -\cs_new_protected_nopar:Nn\msvg_convert_file_to_blob:nN{% #1 filename, #2 tlvar +\cs_new_protected_nopar:Nn\msvg_convert_file_to_blob:nnnN{ + % #1 filename, #2 chunk size, #3 endline marker, #4 tlvar \sys_if_shell_unrestricted:F{ \msg_error:nnx{media4svg}{unrestricted~shell~required}{#1} } @@ -741,11 +742,11 @@ } \ior_close:N\g_tmpa_ior % encode - \ior_msvg_shell_open:Nx\g_tmpa_ior{texlua~\l_tmpa_tl\space #1} + \ior_msvg_shell_open:Nx\g_tmpa_ior{texlua~\l_tmpa_tl\space #1\space #2} \message{<#1} - \tl_gclear_new:N#2 + \tl_gclear_new:N#4 \ior_str_map_inline:Nn\g_tmpa_ior{ - \tl_gput_right:Nn#2{##1{?nl}}\message{.}}\message{>} + \tl_gput_right:Nn#4{##1#3}\message{.}}\message{>} \ior_close:N\g_tmpa_ior } diff --git a/macros/latex/contrib/schulmathematik/README b/macros/latex/contrib/schulmathematik/README index 1cc641870a..12614cf2c1 100644 --- a/macros/latex/contrib/schulmathematik/README +++ b/macros/latex/contrib/schulmathematik/README @@ -2,8 +2,8 @@ The schulmathematik bundle provides LaTeX commands and document classes for German-speaking teachers of mathematics and physics. Package author: K. Wehr -Version: 1.2 -Date: 18 December 2021 +Version: 1.3 +Date: 12 August 2022 The schulmathematik bundle is subject to the LaTeX Project Public License, version 1.3 or later. diff --git a/macros/latex/contrib/schulmathematik/schulma-ab.cls b/macros/latex/contrib/schulmathematik/schulma-ab.cls index cde79ed6d9..61a6cb7597 100644 --- a/macros/latex/contrib/schulmathematik/schulma-ab.cls +++ b/macros/latex/contrib/schulmathematik/schulma-ab.cls @@ -1,8 +1,8 @@ % schulmathematik bundle: document class schulma-ab -% Version 1.2 -% 18. Dezember 2021 +% Version 1.3 +% 12. August 2022 \NeedsTeXFormat{LaTeX2e} -\ProvidesExplClass{schulma-ab}{2021-12-18}{1.2}{Dokumentenklasse fuer Arbeitsblaetter} +\ProvidesExplClass{schulma-ab}{2022-08-12}{1.3}{Dokumentenklasse fuer Arbeitsblaetter} \tl_new:N \g_schulma_ab_kurs_tl \tl_new:N \g_schulma_ab_thema_tl @@ -127,7 +127,8 @@ label=\schulmaalph*), after-skip=4.5pt plus2pt minus1pt} -\settasks{before-skip=4.5pt plus2pt minus1pt} +\settasks{before-skip=9pt plus4pt minus2pt, + after-item-skip=9pt plus4pt minus2pt} \addtokomafont{pagefoot}{\upshape} \cfoot{\pagemark/\pageref{LastPage}} diff --git a/macros/latex/contrib/schulmathematik/schulma-gutachten.cls b/macros/latex/contrib/schulmathematik/schulma-gutachten.cls index 3c38d75b9c..996f85bb4b 100644 --- a/macros/latex/contrib/schulmathematik/schulma-gutachten.cls +++ b/macros/latex/contrib/schulmathematik/schulma-gutachten.cls @@ -1,8 +1,8 @@ % schulmathematik bundle: document class schulma-gutachten -% Version 1.2 -% 18. Dezember 2021 +% Version 1.3 +% 12. August 2022 \NeedsTeXFormat{LaTeX2e} -\ProvidesExplClass{schulma-gutachten}{2021-12-18}{1.2}{Dokumentenklasse fuer Gutachten ueber schriftliche Abiturklausuren} +\ProvidesExplClass{schulma-gutachten}{2022-08-12}{1.3}{Dokumentenklasse fuer Gutachten ueber schriftliche Abiturklausuren} \bool_new:N \g_schulma_gutachten_bell_bool \bool_new:N \g_schulma_gutachten_oesterreich_bool diff --git a/macros/latex/contrib/schulmathematik/schulma-klausur.cls b/macros/latex/contrib/schulmathematik/schulma-klausur.cls index 9f74a2057b..96e6e023e4 100644 --- a/macros/latex/contrib/schulmathematik/schulma-klausur.cls +++ b/macros/latex/contrib/schulmathematik/schulma-klausur.cls @@ -1,8 +1,8 @@ % schulmathematik bundle: document class schulma-klausur -% Version 1.2 -% 18. Dezember 2021 +% Version 1.3 +% 12. August 2022 \NeedsTeXFormat{LaTeX2e} -\ProvidesExplClass{schulma-klausur}{2021-12-18}{1.2}{Dokumentenklasse fuer Klausuren} +\ProvidesExplClass{schulma-klausur}{2022-08-12}{1.3}{Dokumentenklasse fuer Klausuren} \RequirePackage {etoolbox} @@ -29,6 +29,8 @@ \bool_new:N \l_schulma_klausur_loesung_bool \int_new:N \g_schulma_klausur_anzahl_hilfen_int +\int_new:N \g_schulma_klausur_gesamtzeitbedarf_int +\int_new:N \g_schulma_klausur_gesamtpunktzahl_int \clist_new:N \l_schulma_klausur_notenliste_clist @@ -51,6 +53,31 @@ \frac {f(x)-f(x\sb{0})} {x-x\sb{0}} \] } +\msg_new:nnn {schulma-klausur} {Aufgabennachricht} + { + Aufgabe~ \arabic {Aufgabe} :~ + \str_if_eq:nnTF {#1} {-NoValue-} {[ohne~Titel]} {#1} + \str_if_eq:nnF {#2} {-NoValue-} {,~#2~min} + \str_if_eq:nnF {#3} {-NoValue-} {,~#3~Punkte} + } + +\msg_new:nnn {schulma-klausur} {Aufgabensumme} + { + insgesamt~ \arabic {Aufgabe} ~Aufgaben + \int_compare:nNnT { \g_schulma_klausur_gesamtzeitbedarf_int } > {0} + { + ,~ + \int_to_arabic:n { \g_schulma_klausur_gesamtzeitbedarf_int } + \c_space_tl min + } + \int_compare:nNnT { \g_schulma_klausur_gesamtpunktzahl_int } > {0} + { + ,~ + \int_to_arabic:n { \g_schulma_klausur_gesamtpunktzahl_int } + \c_space_tl Punkte + } + } + \tl_set:Nn \l_schulma_klausur_aufgabentitel_tl {Aufgabe} \bool_gset_true:N \g_schulma_klausur_gruppe_a_bool @@ -174,7 +201,7 @@ \resetcounteronoverlays {Aufgabe} - \NewDocumentCommand \Aufgabe {s o d()} + \NewDocumentCommand \Aufgabe {s o o d()} { \stepcounter {Aufgabe} \frametitle @@ -325,10 +352,13 @@ } }{}{} % pretocmd hat vier Argumente - \NewDocumentCommand \Aufgabe {s o d()} + \AtEndDocument { \msg_note:nn {schulma-klausur} {Aufgabensumme} } + + \NewDocumentCommand \Aufgabe {s o o d()} { \item \stepcounter {Aufgabe} + \msg_note:nnnnn {schulma-klausur} {Aufgabennachricht} {#2} {#3} {#4} \group_begin: \sffamily \bfseries \l_schulma_klausur_aufgabentitel_tl @@ -336,11 +366,16 @@ \arabic {Aufgabe} \IfValueT {#3} { + \int_gadd:Nn \g_schulma_klausur_gesamtzeitbedarf_int {#3} + } + \IfValueT {#4} + { \mdseries \rmfamily \slshape \c_space_tl - (#3~Punkte) + (#4~Punkte) + \int_gadd:Nn \g_schulma_klausur_gesamtpunktzahl_int {#4} } \IfBooleanF {#1} {.} \group_end: @@ -377,7 +412,8 @@ label=\schulmaalph*), after-skip=4.5pt plus2pt minus1pt} -\settasks{before-skip=4.5pt plus2pt minus1pt} +\settasks{before-skip=9pt plus4pt minus2pt, + after-item-skip=9pt plus4pt minus2pt} } \RequirePackage {adjustbox} diff --git a/macros/latex/contrib/schulmathematik/schulma-komp.cls b/macros/latex/contrib/schulmathematik/schulma-komp.cls index ff1a7362df..2a811c79a9 100644 --- a/macros/latex/contrib/schulmathematik/schulma-komp.cls +++ b/macros/latex/contrib/schulmathematik/schulma-komp.cls @@ -1,8 +1,8 @@ % schulmathematik bundle: document class schulma-komp -% Version 1.2 -% 18. Dezember 2021 +% Version 1.3 +% 12. August 2022 \NeedsTeXFormat{LaTeX2e} -\ProvidesExplClass{schulma-komp}{2021-12-18}{1.2}{Dokumentenklasse fuer Kompetenzlisten} +\ProvidesExplClass{schulma-komp}{2022-08-12}{1.3}{Dokumentenklasse fuer Kompetenzlisten} \ProcessOptions \relax diff --git a/macros/latex/contrib/schulmathematik/schulma-mdlprf.cls b/macros/latex/contrib/schulmathematik/schulma-mdlprf.cls index a446fbd38a..3633352413 100644 --- a/macros/latex/contrib/schulmathematik/schulma-mdlprf.cls +++ b/macros/latex/contrib/schulmathematik/schulma-mdlprf.cls @@ -1,8 +1,8 @@ % schulmathematik bundle: document class schulma-mdlprf -% Version 1.2 -% 18. Dezember 2021 +% Version 1.3 +% 12. August 2022 \NeedsTeXFormat{LaTeX2e} -\ProvidesExplClass{schulma-mdlprf}{2021-12-18}{1.2}{Dokumentenklasse fuer muendliche Abiturpruefungen} +\ProvidesExplClass{schulma-mdlprf}{2022-08-12}{1.3}{Dokumentenklasse fuer muendliche Abiturpruefungen} \bool_new:N \g_schulma_mdlprf_oesterreich_bool \bool_new:N \g_schulma_mdlprf_pruefer_weiblich_bool diff --git a/macros/latex/contrib/schulmathematik/schulma-physik.sty b/macros/latex/contrib/schulmathematik/schulma-physik.sty index 3ce073aa2a..b3996d6cc2 100644 --- a/macros/latex/contrib/schulmathematik/schulma-physik.sty +++ b/macros/latex/contrib/schulmathematik/schulma-physik.sty @@ -1,11 +1,13 @@ % schulmathematik bundle: package schulma-physik -% Version 1.2 -% 18. Dezember 2021 -\ProvidesExplPackage{schulma-physik}{2021-12-18}{1.2}{Befehle für die Schulphysik} +% Version 1.3 +% 12. August 2022 +\ProvidesExplPackage{schulma-physik}{2022-08-12}{1.3}{Befehle für die Schulphysik} -\RequirePackage [locale=DE] {siunitx} +\RequirePackage {siunitx} \RequirePackage {tikz} +\sisetup { locale = DE , uncertainty-mode = separate } + \NewDocumentCommand \Massstab {m m m m} { \ensuremath @@ -74,7 +76,7 @@ \NewDocumentCommand \Planck { } { - \qty {6,63e-34} { \J . \s } + \qty {6,63e-34} { \J \s } } \NewDocumentCommand \EFK { } @@ -91,8 +93,11 @@ { \ensuremath { - 4 \, \pi \cdot - \qty [ print-unity-mantissa = false ] { e-7 } { \V \s \per \A \per \m } + 4 \, + \cs_if_exist_use:N \symup + \pi + \cdot + \qty [ print-unity-mantissa = false ] {e-7} { \V \s \per \A \per \m } } } } diff --git a/macros/latex/contrib/schulmathematik/schulma-praes.cls b/macros/latex/contrib/schulmathematik/schulma-praes.cls index 9d47606aee..eeac2ce3c9 100644 --- a/macros/latex/contrib/schulmathematik/schulma-praes.cls +++ b/macros/latex/contrib/schulmathematik/schulma-praes.cls @@ -1,8 +1,8 @@ % schulmathematik bundle: document class schulma-praes -% Version 1.2 -% 18. Dezember 2021 +% Version 1.3 +% 12. August 2022 \NeedsTeXFormat{LaTeX2e} -\ProvidesExplClass{schulma-praes}{2021-12-18}{1.2}{Dokumentenklasse fuer Bildschirmpraesentationen} +\ProvidesExplClass{schulma-praes}{2022-08-12}{1.3}{Dokumentenklasse fuer Bildschirmpraesentationen} \bool_new:N \g_schulma_praes_seitenzahlen_bool \bool_new:N \g_schulma_praes_druck_bool diff --git a/macros/latex/contrib/schulmathematik/schulma.sty b/macros/latex/contrib/schulmathematik/schulma.sty index 139894f4b8..6d25a7e445 100644 --- a/macros/latex/contrib/schulmathematik/schulma.sty +++ b/macros/latex/contrib/schulmathematik/schulma.sty @@ -1,7 +1,7 @@ % schulmathematik bundle: package schulma -% Version 1.2 -% 18. Dezember 2021 -\ProvidesExplPackage{schulma}{2021-12-18}{1.2}{Befehle für die Schulmathematik} +% Version 1.3 +% 12. August 2022 +\ProvidesExplPackage{schulma}{2022-08-12}{1.3}{Befehle für die Schulmathematik} \RequirePackage [intlimits] {mathtools} \RequirePackage {autoaligne} diff --git a/macros/latex/contrib/schulmathematik/schulmathematik.pdf b/macros/latex/contrib/schulmathematik/schulmathematik.pdf Binary files differindex d99796c55a..949258def0 100644 --- a/macros/latex/contrib/schulmathematik/schulmathematik.pdf +++ b/macros/latex/contrib/schulmathematik/schulmathematik.pdf diff --git a/macros/latex/contrib/schulmathematik/schulmathematik.tex b/macros/latex/contrib/schulmathematik/schulmathematik.tex index f643c7d999..73211a02db 100644 --- a/macros/latex/contrib/schulmathematik/schulmathematik.tex +++ b/macros/latex/contrib/schulmathematik/schulmathematik.tex @@ -1,6 +1,6 @@ % Manual of the schulmathematik bundle -% Version 1.2 -% 18. Dezember 2021 +% Version 1.3 +% 12. August 2022 \documentclass{scrartcl} \usepackage[babelshorthands]{polyglossia} \usepackage{longtable} @@ -9,6 +9,7 @@ \usepackage{chemmacros} \usepackage{tasks} \usepackage{beamerarticle} +\usepackage{unicode-math} \makeatletter \let\example\@undefined @@ -177,8 +178,6 @@ \ExplSyntaxOff -\chemsetup{modules=isotopes} - \definecolor{drot}{rgb}{0.7,0,0} \definecolor{braun}{rgb}{0.5,0.1,0.1} \definecolor{dorange}{rgb}{0.9,0.35,0} @@ -199,6 +198,11 @@ ehr } +\NewDocumentCommand \AutorEMailDomain { } + { + abgol + } + \NewDocumentCommand \Paket {m} { \textcolor {dgruen} { \textsf {#1} } @@ -355,7 +359,7 @@ Schulmathematik \medskip \large -Version 1.2 +Version 1.3 \medskip \normalsize @@ -366,10 +370,13 @@ Version 1.2 \textit{Paketautor} \smallskip -\AutorVorname\ \AutorNachname +\AutorVorname\ \AutorNachname\\ +\normalsize +\texttt{\AutorNachname*@\AutorEMailDomain.de} \bigskip -\textit{Fragen und Fehlermeldungen} +\large +\textit{Fehlermeldungen} \smallskip \normalsize @@ -501,13 +508,14 @@ Das Paket \Paket{schulma-physik} wird von den Dokumentenklassen \Klasse{schulma- \subsubsection*{Geladene Pakete und Bibliotheken} \begin{Liste} -\Paketbeschreibung{siunitx}[mit der Option \Option{locale=DE}]\label{siunitx}% -Das Paket erlaubt eine typographisch korrekte Darstellung physikalischer Größen und Einheiten. Die Option \Option{locale=DE} stellt sicher, dass ein Dezimalkomma anstelle eines Dezimalpunkts und in der wissenschaftlichen Schreibweise ein Multiplikationspunkt anstelle eines Kreuzes verwendet wird. +\Paketbeschreibung{siunitx}[mit den Optionen \Option{locale=DE} und \Option{uncertainty-mode=separate}]\label{siunitx}% +Das Paket erlaubt eine typographisch korrekte Darstellung physikalischer Größen und Einheiten. Die Option \Option{locale=DE} stellt sicher, dass ein Dezimalkomma anstelle eines Dezimalpunkts und in der wissenschaftlichen Schreibweise ein Multiplikationspunkt anstelle eines Kreuzes verwendet wird. Die Option \Option{uncertainty-mode=separate} sorgt für eine Ausgabe von Messungenauigkeiten in Plus-Minus-Schreibweise. Details zur Syntax und weitere Einstellungsmöglichkeiten sind der \Paket{siunitx}-Anleitung zu entnehmen. \begin{sidebyside} - \qty{37,5}{N}\\ - \qty{7,25e6}{\m\per\s} + \qty{37,5}{\N}\\ + \qty{7,25e6}{\m\per\s}\\ + \qty{6,34(53)e-34}{\J\s} \end{sidebyside} \Paketbeschreibung{tikz} Mit Hilfe dieses Pakets kann eine Vielfalt graphischer Darstellungen angefertigt werden. @@ -515,6 +523,7 @@ Mit Hilfe dieses Pakets kann eine Vielfalt graphischer Darstellungen angefertigt Diese TikZ-Bibliothek ermöglicht die Darstellung von Schaltbildern. \end{Liste} +\newpage \subsubsection*{Befehle} \begin{Liste} \Befehlsbeschreibung{Messschieber}[\marg{Messwert}] @@ -632,11 +641,10 @@ Messgerät & \Schaltbeispiel{messgeraet} & \texttt{messgeraet}\textsuperscript{\ \end{example} \subsubsection*{Nuklide} -Zur Darstellung von Nukliden empfiehlt es sich, dass Paket \Paket{chemmacros} mit dem Modul \Paket{isotopes} zu laden. +Zur Darstellung von Nukliden empfiehlt es sich, das Paket \Paket{chemmacros} zu laden. Da die Nuklidschreibweise eher selten benötigt wird, wird dieses Paket nicht automatisch geladen. \begin{example}[code-only] \usepackage{chemmacros} - \chemsetup{modules=isotopes} \end{example} \begin{sidebyside} \isotope{Ra} @@ -682,8 +690,9 @@ Dieses Paket erlaubt es, die vertikale Ausrichtung von Abbildungen zu beeinfluss Ermöglicht die Anzeige von Päckchenaufgaben. Die folgenden Voreinstellungen werden vorgenommen: \begin{itemize} -\item \verb:before-skip=4.5pt plus2pt minus1pt: +\item \verb:before-skip=9pt plus4pt minus2pt: \item \verb:after-skip=4.5pt plus2pt minus1pt: +\item \verb:after-item-skip=9pt plus4pt minus2pt: \item \verb:label-align=right: \item \verb:item-indent=2.2em: \item \verb:label-offset=0.5em: @@ -944,10 +953,12 @@ Legt das Datum der Besprechung der Musterlösung fest, das bei Verwendung der Kl \end{Liste} \subsubsection*{Befehle und Umgebungen im Dokumentenkörper} \begin{Liste} -\Befehlsbeschreibung{Aufgabe}[\sarg\oarg{Thema}\darg{Punktzahl}] +\Befehlsbeschreibung{Aufgabe}[\sarg\oarg{Thema}\oarg{Bearbeitungszeit}\darg{Punktzahl}] Mit diesem Befehl wird eine neue Aufgabe der Klausur eröffnet. Er sollte der erste Befehl nach \verb:\begin{document}: sein. Die Sternvariante setzt keinen Punkt nach der Aufgabennummer. -Das erste optionale Argument (in eckigen Klammern) gibt das Thema der Aufgabe an und erscheint nur in der Musterlösung. Das zweite optionale Argument (in runden Klammern) gibt die in der Aufgabe erreichbare Punktzahl an; diese erscheint nur in der Klausur. +Das erste optionale Argument (in eckigen Klammern) gibt das Thema der Aufgabe an und erscheint nur auf dem Terminal und in der Musterlösung. Das zweite optionale Argument (in eckigen Klammern) gibt die avisierte Bearbeitungszeit an und erscheint nur auf dem Terminal. Das dritte optionale Argument (in runden Klammern) gibt die in der Aufgabe erreichbare Punktzahl an; diese erscheint nur auf dem Terminal und in der Klausur. + +Am Ende der Klausur werden die Anzahl der Aufgaben, die Summe der Bearbeitungszeiten und die Summe der erreichbaren Punkte auf das Terminal geschrieben. Für den Satz von Unteraufgaben empfiehlt sich die Umgebung \Umgebung{Teilaufgaben}. \Umgebungsbeschreibung{Teilaufgaben} @@ -1133,7 +1144,7 @@ Der Klausurtitel und der Klausurteiltitel werden jetzt auch in der Musterlösung \item \textbf{\Klasse{schulma-gutachten}:} Korrektur der Fehlermeldung bei fehlendem \Befehl{Ort}-Befehl; Fehlerbehebung bei der KOMA-Option \Option{DIV} \item \textbf{\Klasse{schulma-mdlprf}:} Fehlerbehebung bei der KOMA-Option \Option{DIV} \end{itemize} -\item[1.2] \today +\item[1.2] 18. Dezember 2021 \begin{itemize} \item \textbf{\Paket{schulma}:} Unterdrückung der wissenschaftlichen Zahlschreibweise bei der Skalenbeschriftung von \Paket{pgfplots}-Graphen durch die Option \texttt{ticklabel style=""\{/pgf/number format/fixed\}}; Korrektur der (bisher unwirksamen) \Paket{pgfplots}-Option \verb:scaled ticks=false: @@ -1149,6 +1160,12 @@ Bei Verwendung der Klassenoption \Option{A5quer} wird jetzt auch tatsächlich da Für die Musterlösung wird bei Verwendung der Umgebung \Umgebung{Teilaufgaben} innerhalb der Umgebung \Umgebung{Lsg} nur noch die Aufgabenmarke in Aufgabenfarbe angezeigt, der folgende Text dagegen in Lösungsfarbe. \item \textbf{\Klasse{schulma-gutachten}:} Anpassung an die Version 3 des \Paket{siunitx}-Pakets \end{itemize} +\item[1.3] \today +\begin{itemize} +\item \textbf{\Paket{schulma-physik}:} globale Einstellung der \Paket{siunitx}-Option \Option{uncertainty-mode=""separate}; Verwendung eines aufrechten $\symup{\pi}$ in der Ausgabe des Befehls \Befehl{MFK}, wenn das Paket \Paket{unicode-math} geladen ist; Aktualisierung des Hinweises zur Nuklidschreibweise mit dem Paket \Paket{chemmacros} +\item \textbf{\Klasse{schulma-ab}:} Anpassung der vertikalen Abstände innerhalb der \verb:tasks:"=Umgebung an die Umgebung \Umgebung{Teilaufgaben} +\item \textbf{\Klasse{schulma-klausur}:} Anpassung der vertikalen Abstände innerhalb der \verb:tasks:-Umgebung an die Umgebung \Umgebung{Teilaufgaben}; neues optionales Argument des Befehls \Befehl{Aufgabe} für die Bearbeitungszeit; Ausgabe von Informationen zu den Aufgaben auf dem Terminal +\end{itemize} \end{description} \end{document} diff --git a/macros/xetex/latex/exam-zh/CHANGELOG.md b/macros/xetex/latex/exam-zh/CHANGELOG.md index ba0c53e0c4..f52160370d 100644 --- a/macros/xetex/latex/exam-zh/CHANGELOG.md +++ b/macros/xetex/latex/exam-zh/CHANGELOG.md @@ -5,6 +5,17 @@ 格式参照 [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)， 并且此项目遵守 [Semantic Versioning](https://semver.org/spec/v2.0.0.html)。 +## [0.1.17] - 2022-08-12 + +### Added + +- 增加 `question` 的 `hang` 键值控制“悬挂效果” + +### Fixed + +- 修复同一行的 `\fillin` 造成的 `\linegoal` 冲突问题 + + ## [0.1.16] - 2022-08-11 ### Fixed diff --git a/macros/xetex/latex/exam-zh/doc/body/usage.tex b/macros/xetex/latex/exam-zh/doc/body/usage.tex index c797579d3c..95bc41224a 100644 --- a/macros/xetex/latex/exam-zh/doc/body/usage.tex +++ b/macros/xetex/latex/exam-zh/doc/body/usage.tex @@ -1633,6 +1633,28 @@ \examsetup{ fillin/show-answer = false, question/combine-fillin = false, + question/index = 1, +} + +\begin{function}[added = 2022-08-12]{question/hang} + \begin{ccnusyntax}[emph={[1]hang}] + combine-fillin = (*\TTF*) + \end{ccnusyntax} + \env{question} 环境是否是“悬挂效果”。 +\end{function} + +\begin{latexexample}{\opt{question/hang} 的效果} + \begin{question} + 劳仑衣普桑，认至将指点效则机，最你更枝。想极整月正进好志次回总般，段然取向使张规军证回，世市总李率英茄持伴。用阶千样响领交出，器程办管据家元写 + \end{question} + + \begin{question}[hang = false] + 劳仑衣普桑，认至将指点效则机，最你更枝。想极整月正进好志次回总般，段然取向使张规军证回，世市总李率英茄持伴。用阶千样响领交出，器程办管据家元写 + \end{question} +\end{latexexample} + +\examsetup{ + question/index = 1, } diff --git a/macros/xetex/latex/exam-zh/doc/exam-zh-doc-setup.tex b/macros/xetex/latex/exam-zh/doc/exam-zh-doc-setup.tex index 072135fcc0..987f7b8889 100644 --- a/macros/xetex/latex/exam-zh/doc/exam-zh-doc-setup.tex +++ b/macros/xetex/latex/exam-zh/doc/exam-zh-doc-setup.tex @@ -1,5 +1,6 @@ \usepackage{xeCJKfntef, xpinyin} \usepackage{graphicx} +\usepackage{zhlipsum} \usepackage{tabularray} \usepackage{../exam-zh-choices} \usepackage{../exam-zh-question} @@ -31,7 +32,7 @@ \title{\textcolor{MaterialIndigo800}{% \textbf{exam-zh: 高考试卷 \LaTeX \xpinyin[font=\sffamily,format=\color{MaterialIndigo800}]{模}{mu2}板}}} \author{李泽平，夏康玮，郭李军} -\date{2022/08/11\quad v0.1.16% +\date{2022/08/12\quad v0.1.17% \thanks{% \url{https://gitee.com/zepinglee/exam-zh} } diff --git a/macros/xetex/latex/exam-zh/doc/exam-zh-doc.pdf b/macros/xetex/latex/exam-zh/doc/exam-zh-doc.pdf Binary files differindex 64f66098ca..d748b9e7ec 100644 --- a/macros/xetex/latex/exam-zh/doc/exam-zh-doc.pdf +++ b/macros/xetex/latex/exam-zh/doc/exam-zh-doc.pdf diff --git a/macros/xetex/latex/exam-zh/tex/exam-zh-chinese-english.sty b/macros/xetex/latex/exam-zh/tex/exam-zh-chinese-english.sty index b6ff798846..3d95350b1e 100644 --- a/macros/xetex/latex/exam-zh/tex/exam-zh-chinese-english.sty +++ b/macros/xetex/latex/exam-zh/tex/exam-zh-chinese-english.sty @@ -8,7 +8,7 @@ \RequirePackage{expl3} -\ProvidesExplPackage {exam-zh-chinese-english} {2022-08-11} {v0.1.16} +\ProvidesExplPackage {exam-zh-chinese-english} {2022-08-12} {v0.1.17} {exam-zh chinese and english module} \PassOptionsToPackage { tcolorbox } { most } diff --git a/macros/xetex/latex/exam-zh/tex/exam-zh-choices.sty b/macros/xetex/latex/exam-zh/tex/exam-zh-choices.sty index 09b434e5e1..3a7d9f7d2c 100644 --- a/macros/xetex/latex/exam-zh/tex/exam-zh-choices.sty +++ b/macros/xetex/latex/exam-zh/tex/exam-zh-choices.sty @@ -9,7 +9,7 @@ \RequirePackage{expl3} \RequirePackage{xparse} -\ProvidesExplPackage {exam-zh-choices} {2022-08-11} {v0.1.16} +\ProvidesExplPackage {exam-zh-choices} {2022-08-12} {v0.1.17} {exam-zh choices module} \dim_new:N \l__examzh_choices_column_sep_dim diff --git a/macros/xetex/latex/exam-zh/tex/exam-zh-font.sty b/macros/xetex/latex/exam-zh/tex/exam-zh-font.sty index 0a8348b094..d342229cc1 100644 --- a/macros/xetex/latex/exam-zh/tex/exam-zh-font.sty +++ b/macros/xetex/latex/exam-zh/tex/exam-zh-font.sty @@ -9,7 +9,7 @@ \RequirePackage{expl3} \RequirePackage{xparse} -\ProvidesExplPackage {exam-zh-font} {2022-08-11} {v0.1.16} +\ProvidesExplPackage {exam-zh-font} {2022-08-12} {v0.1.17} {exam-zh font module} \RequirePackage { unicode-math } diff --git a/macros/xetex/latex/exam-zh/tex/exam-zh-question.sty b/macros/xetex/latex/exam-zh/tex/exam-zh-question.sty index 6e612c19aa..d1a07de8ad 100644 --- a/macros/xetex/latex/exam-zh/tex/exam-zh-question.sty +++ b/macros/xetex/latex/exam-zh/tex/exam-zh-question.sty @@ -9,7 +9,7 @@ \RequirePackage{expl3} \RequirePackage{xparse} -\ProvidesExplPackage {exam-zh-question} {2022-08-11} {v0.1.16} +\ProvidesExplPackage {exam-zh-question} {2022-08-12} {v0.1.17} {exam-zh question module} @@ -120,7 +120,8 @@ combine-fillin-args .tl_set:N = \l__examzh_question_combine_fillin_args_tl, label-align .choices:nn = { left, center, right } - { \tl_set_eq:NN \l__examzh_question_label_align_tl \l_keys_choice_tl } + { \tl_set_eq:NN \l__examzh_question_label_align_tl \l_keys_choice_tl }, + hang .bool_set:N = \l__examzh_question_hang_bool, } \keys_set:nn { exam-zh / question } @@ -134,7 +135,8 @@ bottom-sep = .25em plus .25em minus .1em , label = \arabic*., combine-fillin = false, - label-align = right + label-align = right, + hang = true } @@ -221,10 +223,10 @@ { % 用 group 是为了防止 combine-fillin 的 type 影响了环境里面的 fillin 的type \group_begin: - \dim_gset:Nn \topsep { 0pt } - \dim_gset:Nn \partopsep { 0pt } - \dim_gset:Nn \itemsep { 0pt } - \dim_gset:Nn \parsep { 0pt } + \dim_gset:Nn \topsep { 0pt } + \dim_gset:Nn \partopsep { 0pt } + \dim_gset:Nn \itemsep { 0pt } + \dim_gset:Nn \parsep { 0pt } % \group_begin: % 上面 \fillin 里面的设置是局部的，这样的问题是 question 的可选参数改 type 的时候不会影响 \l__examzh_fillin_type_str 的值 % 所以要把 \l__examzh_question_combine_fillin_args_tl 里关于 type 的选取出来 @@ -237,8 +239,20 @@ \bool_if:NTF \l__examzh_question_combine_fillin_bool { % 如果 combine 的话就和 question 一样的缩进 - \dim_gset:Nn \leftmargin { 6em } - \dim_gset:Nn \itemindent { 0pt } + \bool_if:NTF \l__examzh_question_hang_bool + { \dim_gset:Nn \itemindent { 0em } } + { \dim_gset:Nn \itemindent { 2em } } + \bool_if:NTF \l__examzh_question_combine_fillin_bool + { + \bool_if:NTF \l__examzh_question_hang_bool + { \dim_gset:Nn \leftmargin { 6em } } + { \dim_gset:Nn \leftmargin { 4em } } + } + { + \bool_if:NTF \l__examzh_question_hang_bool + { \dim_gset:Nn \leftmargin { 2em } } + { \dim_gset:Nn \leftmargin { 0em } } + } } { \dim_gset:Nn \leftmargin { 0pt } @@ -247,16 +261,20 @@ } { % 选择和填空题是悬挂效果 + \bool_if:NTF \l__examzh_question_hang_bool + { \dim_gset:Nn \itemindent { 0em } } + { \dim_gset:Nn \itemindent { 2em } } \bool_if:NTF \l__examzh_question_combine_fillin_bool - % { - % \str_case:VnF \l__examzh_question_label_align_tl - % { - % { left } { \dim_set:Nn \leftmargin { 8em } } - % } + { + \bool_if:NTF \l__examzh_question_hang_bool { \dim_gset:Nn \leftmargin { 6em } } - % } - { \dim_gset:Nn \leftmargin { 2em } } - \dim_set:Nn \itemindent { 0pt } + { \dim_gset:Nn \leftmargin { 4em } } + } + { + \bool_if:NTF \l__examzh_question_hang_bool + { \dim_gset:Nn \leftmargin { 2em } } + { \dim_gset:Nn \leftmargin { 0em } } + } } \dim_gset_eq:NN \listparindent \itemindent \group_end: @@ -1157,7 +1175,7 @@ { \dim_set_eq:NN \l_tmpb_dim \linegoal % 比较 \l__examzh_fillin_F_width_dim 和 linegoal - \dim_compare:nNnTF { \l__examzh_fillin_F_width_dim } > { \linegoal } + \dim_compare:nNnTF { \l__examzh_fillin_F_width_dim } > { \l_tmpb_dim } { % 超过 linegoal 就排一段 linegoal，然后 \l__examzh_fillin_F_width_dim 减去 linegoal 长度 % \dim_set:NV \l_tmpa_dim \linegoal diff --git a/macros/xetex/latex/exam-zh/tex/exam-zh-symbols.sty b/macros/xetex/latex/exam-zh/tex/exam-zh-symbols.sty index 0940b545db..c5c2d35245 100644 --- a/macros/xetex/latex/exam-zh/tex/exam-zh-symbols.sty +++ b/macros/xetex/latex/exam-zh/tex/exam-zh-symbols.sty @@ -8,7 +8,7 @@ \RequirePackage{expl3} -\ProvidesExplPackage {exam-zh-symbols} {2022-08-11} {v0.1.16} +\ProvidesExplPackage {exam-zh-symbols} {2022-08-12} {v0.1.17} {exam-zh symbols module} \RequirePackage { tikz } diff --git a/macros/xetex/latex/exam-zh/tex/exam-zh.cls b/macros/xetex/latex/exam-zh/tex/exam-zh.cls index 90d70c8095..3449ff42de 100644 --- a/macros/xetex/latex/exam-zh/tex/exam-zh.cls +++ b/macros/xetex/latex/exam-zh/tex/exam-zh.cls @@ -6,7 +6,7 @@ \NeedsTeXFormat{LaTeX2e}[2017/04/15] \RequirePackage{expl3} -\ProvidesExplClass {exam-zh} {2022-08-11} {v0.1.16} {LaTeX template for Chinese exam} +\ProvidesExplClass {exam-zh} {2022-08-12} {v0.1.17} {LaTeX template for Chinese exam} % 检查 LaTeX2e kernel 版本 \msg_new:nnn { exam-zh } { latex-too-old } |
