openSUSE Commits

Download

commit@lists.opensuse.org

June 2017

1 participants
2052 discussions

commit perl-Gravatar-URL for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '17

26 Jun '17

Hello community, here is the log from the commit of package perl-Gravatar-URL for openSUSE:Factory checked in at 2017-06-26 15:51:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Gravatar-URL (Old) and /work/SRC/openSUSE:Factory/.perl-Gravatar-URL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Gravatar-URL" Mon Jun 26 15:51:59 2017 rev:13 rq:433927 version:1.07 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Gravatar-URL/perl-Gravatar-URL.changes 2012-05-31 17:08:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Gravatar-URL.new/perl-Gravatar-URL.changes 2017-06-26 15:52:00.309844969 +0200 @@ -1,0 +2,22 @@ +Sat Oct 8 16:03:41 UTC 2016 - coolo(a)suse.com + +- updated to 1.07 + see /usr/share/doc/packages/perl-Gravatar-URL/Changes + + 1.07 Wed Aug 10 17:47:19 PDT 2016 + Bug Fixes + * Require an updated version of Net::DNS to avoid + "resolver->dnssec(1) without Net::DNS::SEC installed" + (Schwern) [github #4] + + Test Fixes + * Fix our fake random number generator to avoid cross platform issues. + [rt.cpan.org 71064] [github #7] (Lisa Hare) + + Distribution + * Kwalitee fixups (BooK) (Lisa Hare) + * Added a LICENSE file (Lisa Hare) + * Now using Travis CI for Unix testing (Schwern) + * Now using AppVeyor for Windows testing (Schwern) + +------------------------------------------------------------------- Old: ---- Gravatar-URL-1.06.tar.gz New: ---- Gravatar-URL-1.07.tar.gz cpanspec.yml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Gravatar-URL.spec ++++++ --- /var/tmp/diff_new_pack.gFY06J/_old 2017-06-26 15:52:01.205718642 +0200 +++ /var/tmp/diff_new_pack.gFY06J/_new 2017-06-26 15:52:01.209718078 +0200 @@ -1,7 +1,7 @@ # # spec file for package perl-Gravatar-URL # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,28 +17,28 @@ Name: perl-Gravatar-URL -Version: 1.06 +Version: 1.07 Release: 0 %define cpan_name Gravatar-URL Summary: Make URLs for Gravatars from an email address License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Gravatar-URL/ -Source: http://www.cpan.org/authors/id/M/MS/MSCHWERN/%{cpan_name}-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/M/MS/MSCHWERN/%{cpan_name}-%{version}.tar.gz +Source1: cpanspec.yml BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: perl BuildRequires: perl-macros BuildRequires: perl(Digest::SHA) -BuildRequires: perl(Module::Build) -BuildRequires: perl(Net::DNS::Resolver) +BuildRequires: perl(Module::Build) >= 0.420000 +BuildRequires: perl(Net::DNS) >= 1.01 +BuildRequires: perl(Test::MockRandom) >= 1.01 BuildRequires: perl(Test::Warn) >= 0.11 BuildRequires: perl(URI::Escape) BuildRequires: perl(parent) -#BuildRequires: perl(Gravatar::URL) -#BuildRequires: perl(Unicornify::URL) Requires: perl(Digest::SHA) -Requires: perl(Net::DNS::Resolver) +Requires: perl(Net::DNS) >= 1.01 Requires: perl(URI::Escape) Requires: perl(parent) %{perl_requires} @@ -47,16 +47,15 @@ A Gravatar is a Globally Recognized Avatar for a given email address. This allows you to have a global picture associated with your email address. You can look up the Gravatar for any email address by constructing a URL to get -the image from the gravatar.com manpage. This module does that. +the image from gravatar.com. This module does that. -Examples of use include the author faces on the http://search.cpan.org -manpage. +Examples of use include the author faces on http://search.cpan.org. -See the http://gravatar.com manpage for more info. +See http://gravatar.com for more info. %prep %setup -q -n %{cpan_name}-%{version} -find . -type f -print0 | xargs -0 chmod 644 +find . -type f ! -name \*.pl -print0 | xargs -0 chmod 644 %build %{__perl} Build.PL installdirs=vendor @@ -71,6 +70,6 @@ %files -f %{name}.files %defattr(-,root,root,755) -%doc Changes +%doc Changes LICENSE README %changelog ++++++ Gravatar-URL-1.06.tar.gz -> Gravatar-URL-1.07.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gravatar-URL-1.06/.travis.yml new/Gravatar-URL-1.07/.travis.yml --- old/Gravatar-URL-1.06/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/Gravatar-URL-1.07/.travis.yml 2016-08-11 02:48:57.000000000 +0200 @@ -0,0 +1,10 @@ +language: perl +perl: + - "5.22" + - "5.20" + - "5.18" + - "5.16" + - "5.14" + - "5.12" + - "5.10" + - "5.8" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gravatar-URL-1.06/Build.PL new/Gravatar-URL-1.07/Build.PL --- old/Gravatar-URL-1.06/Build.PL 2012-03-27 14:00:52.000000000 +0200 +++ new/Gravatar-URL-1.07/Build.PL 2016-08-11 02:48:57.000000000 +0200 @@ -27,10 +27,11 @@ build_requires => { 'Test::More' => 0.40, 'Test::Warn' => 0.11, + 'Test::MockRandom' => 1.01, }, requires => { - 'Net::DNS::Resolver' => 0, + 'Net::DNS' => 1.01, 'URI::Escape' => 0, 'Digest::MD5' => 0, 'Digest::SHA' => 0, @@ -38,6 +39,10 @@ perl => '5.6.0', 'parent' => 0, }, + dist_version_from => 'lib/Gravatar/URL.pm', + create_readme => 1, + create_license => 1, + dist_author => 'Michael G. Schwern <schwern(a)pobox.com>' ); $builder->create_build_script(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gravatar-URL-1.06/Changes new/Gravatar-URL-1.07/Changes --- old/Gravatar-URL-1.06/Changes 2012-03-27 14:00:52.000000000 +0200 +++ new/Gravatar-URL-1.07/Changes 2016-08-11 02:48:57.000000000 +0200 @@ -1,3 +1,19 @@ +1.07 Wed Aug 10 17:47:19 PDT 2016 + Bug Fixes + * Require an updated version of Net::DNS to avoid + "resolver->dnssec(1) without Net::DNS::SEC installed" + (Schwern) [github #4] + + Test Fixes + * Fix our fake random number generator to avoid cross platform issues. + [rt.cpan.org 71064] [github #7] (Lisa Hare) + + Distribution + * Kwalitee fixups (BooK) (Lisa Hare) + * Added a LICENSE file (Lisa Hare) + * Now using Travis CI for Unix testing (Schwern) + * Now using AppVeyor for Windows testing (Schwern) + 1.06 Tue Mar 27 12:55:30 BST 2012 Bug fixes * Fixed some undef warnings during sanitization. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gravatar-URL-1.06/LICENSE new/Gravatar-URL-1.07/LICENSE --- old/Gravatar-URL-1.06/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/Gravatar-URL-1.07/LICENSE 2016-08-11 02:48:57.000000000 +0200 @@ -0,0 +1,379 @@ +This software is copyright (c) 2016 by Michael G. Schwern <schwern(a)pobox.com>. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + +Terms of the Perl programming language system itself + +a) the GNU General Public License as published by the Free + Software Foundation; either version 1, or (at your option) any + later version, or +b) the "Artistic License" + +--- The GNU General Public License, Version 1, February 1989 --- + +This software is Copyright (c) 2016 by Michael G. Schwern <schwern(a)pobox.com>. + +This is free software, licensed under: + + The GNU General Public License, Version 1, February 1989 + + GNU GENERAL PUBLIC LICENSE + Version 1, February 1989 + + Copyright (C) 1989 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The license agreements of most software companies try to keep users +at the mercy of those companies. By contrast, our General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. The +General Public License applies to the Free Software Foundation's +software and to any other program whose authors commit to using it. +You can use it for your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Specifically, the General Public License is designed to make +sure that you have the freedom to give away or sell copies of free +software, that you receive source code or can get it if you want it, +that you can change the software or use pieces of it in new free +programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of a such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must tell them their rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any program or other work which +contains a notice placed by the copyright holder saying it may be +distributed under the terms of this General Public License. The +"Program", below, refers to any such program or work, and a "work based +on the Program" means either the Program or any work containing the +Program or a portion of it, either verbatim or with modifications. Each +licensee is addressed as "you". + + 1. You may copy and distribute 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 and +disclaimer of warranty; keep intact all the notices that refer to this +General Public License and to the absence of any warranty; and give any +other recipients of the Program a copy of this General Public License +along with the Program. You may charge a fee for the physical act of +transferring a copy. + + 2. You may modify your copy or copies of the Program or any portion of +it, and copy and distribute such modifications under the terms of Paragraph +1 above, provided that you also do the following: + + a) cause the modified files to carry prominent notices stating that + you changed the files and the date of any change; and + + b) cause the whole of any work that you distribute or publish, that + in whole or in part contains the Program or any part thereof, either + with or without modifications, to be licensed at no charge to all + third parties under the terms of this General Public License (except + that you may choose to grant warranty protection to some or all + third parties, at your option). + + c) If the modified program normally reads commands interactively when + run, you must cause it, when started running for such interactive use + in the simplest and most usual way, to print or display an + announcement including an appropriate copyright notice and a notice + that there is no warranty (or else, saying that you provide a + warranty) and that users may redistribute the program under these + conditions, and telling the user how to view a copy of this General + Public License. + + d) You may charge a fee for the physical act of transferring a + copy, and you may at your option offer warranty protection in + exchange for a fee. + +Mere aggregation of another independent work with the Program (or its +derivative) on a volume of a storage or distribution medium does not bring +the other work under the scope of these terms. + + 3. You may copy and distribute the Program (or a portion or derivative of +it, under Paragraph 2) in object code or executable form under the terms of +Paragraphs 1 and 2 above provided that you also do one of the following: + + a) accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of + Paragraphs 1 and 2 above; or, + + b) accompany it with a written offer, valid for at least three + years, to give any third party free (except for a nominal charge + for the cost of distribution) a complete machine-readable copy of the + corresponding source code, to be distributed under the terms of + Paragraphs 1 and 2 above; or, + + c) accompany it with the information you received as to where the + corresponding source code may be obtained. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form alone.) + +Source code for a work means the preferred form of the work for making +modifications to it. For an executable file, complete source code means +all the source code for all modules it contains; but, as a special +exception, it need not include source code for modules which are standard +libraries that accompany the operating system on which the executable +file runs, or for standard header files or definitions files that +accompany that operating system. + + 4. You may not copy, modify, sublicense, distribute or transfer the +Program except as expressly provided under this General Public License. +Any attempt otherwise to copy, modify, sublicense, distribute or transfer +the Program is void, and will automatically terminate your rights to use +the Program under this License. However, parties who have received +copies, or rights to use copies, from you under this General Public +License will not have their licenses terminated so long as such parties +remain in full compliance. + + 5. By copying, distributing or modifying the Program (or any work based +on the Program) you indicate your acceptance of this license to do so, +and all its terms and conditions. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these +terms and conditions. You may not impose any further restrictions on the +recipients' exercise of the rights granted herein. + + 7. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of the license which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +the license, you may choose any version ever published by the Free Software +Foundation. + + 8. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + END OF TERMS AND CONDITIONS + + Appendix: 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 humanity, 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 convey +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) 19yy <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 1, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19xx name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the +appropriate parts of the General Public License. Of course, the +commands you use may be called something other than `show w' and `show +c'; they could even be mouse-clicks or menu items--whatever suits your +program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + program `Gnomovision' (a program to direct compilers to make passes + at assemblers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +That's all there is to it! + + +--- The Artistic License 1.0 --- + +This software is Copyright (c) 2016 by Michael G. Schwern <schwern(a)pobox.com>. + +This is free software, licensed under: + + The Artistic License 1.0 + +The Artistic License + +Preamble + +The intent of this document is to state the conditions under which a Package +may be copied, such that the Copyright Holder maintains some semblance of +artistic control over the development of the package, while giving the users of +the package the right to use and distribute the Package in a more-or-less +customary fashion, plus the right to make reasonable modifications. + +Definitions: + + - "Package" refers to the collection of files distributed by the Copyright + Holder, and derivatives of that collection of files created through + textual modification. + - "Standard Version" refers to such a Package if it has not been modified, + or has been modified in accordance with the wishes of the Copyright + Holder. + - "Copyright Holder" is whoever is named in the copyright or copyrights for + the package. + - "You" is you, if you're thinking about copying or distributing this Package. + - "Reasonable copying fee" is whatever you can justify on the basis of media + cost, duplication charges, time of people involved, and so on. (You will + not be required to justify it to the Copyright Holder, but only to the + computing community at large as a market that must bear the fee.) + - "Freely Available" means that no fee is charged for the item itself, though + there may be fees involved in handling the item. It also means that + recipients of the item may redistribute it under the same conditions they + received it. + +1. You may make and give away verbatim copies of the source form of the +Standard Version of this Package without restriction, provided that you +duplicate all of the original copyright notices and associated disclaimers. + +2. You may apply bug fixes, portability fixes and other modifications derived +from the Public Domain or from the Copyright Holder. A Package modified in such +a way shall still be considered the Standard Version. + +3. You may otherwise modify your copy of this Package in any way, provided that +you insert a prominent notice in each changed file stating how and when you +changed that file, and provided that you do at least ONE of the following: + + a) place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet or an + equivalent medium, or placing the modifications on a major archive site + such as ftp.uu.net, or by allowing the Copyright Holder to include your + modifications in the Standard Version of the Package. + + b) use the modified Package only within your corporation or organization. + + c) rename any non-standard executables so the names do not conflict with + standard executables, which must also be provided, and provide a separate + manual page for each non-standard executable that clearly documents how it + differs from the Standard Version. + + d) make other distribution arrangements with the Copyright Holder. + +4. You may distribute the programs of this Package in object code or executable +form, provided that you do at least ONE of the following: + + a) distribute a Standard Version of the executables and library files, + together with instructions (in the manual page or equivalent) on where to + get the Standard Version. + + b) accompany the distribution with the machine-readable source of the Package + with your modifications. + + c) accompany any non-standard executables with their corresponding Standard + Version executables, giving the non-standard executables non-standard + names, and clearly documenting the differences in manual pages (or + equivalent), together with instructions on where to get the Standard + Version. + + d) make other distribution arrangements with the Copyright Holder. + +5. You may charge a reasonable copying fee for any distribution of this +Package. You may charge any fee you choose for support of this Package. You +may not charge a fee for this Package itself. However, you may distribute this +Package in aggregate with other (possibly commercial) programs as part of a +larger (possibly commercial) software distribution provided that you do not +advertise this Package as a product of your own. + +6. The scripts and library files supplied as input to or produced as output +from the programs of this Package do not automatically fall under the copyright +of this Package, but belong to whomever generated them, and may be sold +commercially, and may be aggregated with this Package. + +7. C or perl subroutines supplied by you and linked into this Package shall not +be considered part of this Package. + +8. The name of the Copyright Holder may not be used to endorse or promote +products derived from this software without specific prior written permission. + +9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + +The End + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gravatar-URL-1.06/MANIFEST new/Gravatar-URL-1.07/MANIFEST --- old/Gravatar-URL-1.06/MANIFEST 2012-03-27 14:00:52.000000000 +0200 +++ new/Gravatar-URL-1.07/MANIFEST 2016-08-11 02:48:57.000000000 +0200 @@ -1,3 +1,4 @@ +.travis.yml Build.PL Changes lib/Gravatar/URL.pm @@ -7,10 +8,11 @@ MANIFEST.SKIP META.json META.yml +README t/deprecated.t t/error.t t/id.t t/libravatar.t t/unicornify.t t/url.t -SIGNATURE Added here by Module::Build +LICENSE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gravatar-URL-1.06/META.json new/Gravatar-URL-1.07/META.json --- old/Gravatar-URL-1.06/META.json 2012-03-27 14:00:52.000000000 +0200 +++ new/Gravatar-URL-1.07/META.json 2016-08-11 02:48:57.000000000 +0200 @@ -1,10 +1,10 @@ { "abstract" : "Make URLs for Gravatars from an email address", "author" : [ - "unknown" + "Michael G. Schwern <schwern(a)pobox.com>" ], "dynamic_config" : 1, - "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112621", + "generated_by" : "Module::Build version 0.4218", "keywords" : [ "Gravatar" ], @@ -19,23 +19,24 @@ "prereqs" : { "build" : { "requires" : { + "Test::MockRandom" : "1.01", "Test::More" : "0.4", "Test::Warn" : "0.11" } }, "configure" : { "requires" : { - "Module::Build" : "0.2808" + "Module::Build" : "0.42" } }, "runtime" : { "requires" : { - "Carp" : 0, - "Digest::MD5" : 0, - "Digest::SHA" : 0, - "Net::DNS::Resolver" : 0, - "URI::Escape" : 0, - "parent" : 0, + "Carp" : "0", + "Digest::MD5" : "0", + "Digest::SHA" : "0", + "Net::DNS" : "1.01", + "URI::Escape" : "0", + "parent" : "0", "perl" : "v5.6.0" } } @@ -43,15 +44,15 @@ "provides" : { "Gravatar::URL" : { "file" : "lib/Gravatar/URL.pm", - "version" : "1.06" + "version" : "1.07" }, "Libravatar::URL" : { "file" : "lib/Libravatar/URL.pm", - "version" : "1.06" + "version" : "1.07" }, "Unicornify::URL" : { "file" : "lib/Unicornify/URL.pm", - "version" : "1.06" + "version" : "1.07" } }, "release_status" : "stable", @@ -66,5 +67,6 @@ "url" : "http://github.com/schwern/gravatar-url/tree/master" } }, - "version" : "1.06" + "version" : "1.07", + "x_serialization_backend" : "JSON::PP version 2.27400" } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gravatar-URL-1.06/META.yml new/Gravatar-URL-1.07/META.yml --- old/Gravatar-URL-1.06/META.yml 2012-03-27 14:00:52.000000000 +0200 +++ new/Gravatar-URL-1.07/META.yml 2016-08-11 02:48:57.000000000 +0200 @@ -1,41 +1,43 @@ --- abstract: 'Make URLs for Gravatars from an email address' author: - - unknown + - 'Michael G. Schwern <schwern(a)pobox.com>' build_requires: - Test::More: 0.4 - Test::Warn: 0.11 + Test::MockRandom: '1.01' + Test::More: '0.4' + Test::Warn: '0.11' configure_requires: - Module::Build: 0.2808 + Module::Build: '0.42' dynamic_config: 1 -generated_by: 'Module::Build version 0.38, CPAN::Meta::Converter version 2.112621' +generated_by: 'Module::Build version 0.4218, CPAN::Meta::Converter version 2.150005' keywords: - Gravatar license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: 1.4 + version: '1.4' name: Gravatar-URL provides: Gravatar::URL: file: lib/Gravatar/URL.pm - version: 1.06 + version: '1.07' Libravatar::URL: file: lib/Libravatar/URL.pm - version: 1.06 + version: '1.07' Unicornify::URL: file: lib/Unicornify/URL.pm - version: 1.06 + version: '1.07' requires: - Carp: 0 - Digest::MD5: 0 - Digest::SHA: 0 - Net::DNS::Resolver: 0 - URI::Escape: 0 - parent: 0 + Carp: '0' + Digest::MD5: '0' + Digest::SHA: '0' + Net::DNS: '1.01' + URI::Escape: '0' + parent: '0' perl: v5.6.0 resources: bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Gravatar-URL license: http://dev.perl.org/licenses/ repository: http://github.com/schwern/gravatar-url/tree/master -version: 1.06 +version: '1.07' +x_serialization_backend: 'CPAN::Meta::YAML version 0.012' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gravatar-URL-1.06/README new/Gravatar-URL-1.07/README --- old/Gravatar-URL-1.06/README 1970-01-01 01:00:00.000000000 +0100 +++ new/Gravatar-URL-1.07/README 2016-08-11 02:48:57.000000000 +0200 @@ -0,0 +1,142 @@ +NAME + + Gravatar::URL - Make URLs for Gravatars from an email address + +SYNOPSIS + + use Gravatar::URL; + + my $gravatar_id = gravatar_id($email); + + my $gravatar_url = gravatar_url(email => $email); + +DESCRIPTION + + A Gravatar is a Globally Recognized Avatar for a given email address. + This allows you to have a global picture associated with your email + address. You can look up the Gravatar for any email address by + constructing a URL to get the image from gravatar.com. This module does + that. + + Examples of use include the author faces on http://search.cpan.org. + + See http://gravatar.com for more info. + +Functions + + gravatar_url + + # By email + my $url = gravatar_url( email => $email, %options ); + + # By gravatar ID + my $url = gravatar_url( id => $id, %options ); + + Constructs a URL to fetch the gravatar for a given $email or $id. + + $id is a gravatar ID. See "gravatar_id" for more information. + + %options are optional and are... + + rating + + A user can rate how offensive the content of their gravatar is, like a + movie. The ratings are g, pg, r and x. If you specify a rating it is + the highest rating that will be given. + + rating => "r" # includes g, pg and r + + size + + Specifies the desired width and height of the gravatar (gravatars are + square). + + Valid values are from 1 to 512 inclusive. Any size other than 80 may + cause the original gravatar image to be downsampled using bicubic + resampling before output. + + size => 40, # 40 x 40 image + + default + + The url to use if the user has no gravatar or has none that fits your + rating requirements. + + default => "https://secure.wikimedia.org/wikipedia/en/wiki/File:Mad30.jpg" + + Relative URLs will be relative to the base (ie. gravatar.com), not your + web site. + + Gravatar defines special values that you may use as a default to + produce dynamic default images. These are "identicon", "monsterid", + "wavatar" and "retro". "404" will cause the URL to return an HTTP 404 + "Not Found" error instead whereas "mm" will display the same "mystery + man" image for all missing people. See + http://en.gravatar.com/site/implement/url for more info. + + If omitted, Gravatar will serve up their default image, the blue G. + + border + + DEPRECATED! This key has been removed from the Gravatar protocol. It + will be removed from future versions of Gravatar::URL. + + Gravatars can be requested to have a 1 pixel colored border. If you'd + like that, pass in the color to border as a 3 or 6 digit hex string. + + border => "000000", # a black border, like my soul + border => "000", # black, but in 3 digits + + base + + This is the URL of the location of the Gravatar server you wish to grab + Gravatars from. Defaults to http://www.gravatar.com/avatar/" for HTTP + and https://secure.gravatar.com/avatar/ for HTTPS. + + short_keys + + If true, use short key names when constructing the URL. "s" instead of + "size", "r" instead of "ratings" and so on. + + short_keys defaults to true. + + https + + If true, serve avatars over HTTPS instead of HTTP. + + You should select this option if your site is served over HTTPS to + avoid browser warnings about the presence of insecure content. + + https defaults to false. + + gravatar_id + + my $id = gravatar_id($email); + + Converts an $email address into its Gravatar $id. + +THANKS + + Thanks to gravatar.com for coming up with the whole idea and Ashley + Pond V from whose Template::Plugin::Gravatar I took most of the + original code. + +LICENSE + + Copyright 2007 - 2009, Michael G Schwern <schwern(a)pobox.com>. Copyright + 2011, Francois Marier <fmarier(a)gmail.com>. + + This program is free software; you can redistribute it and/or modify it + under the same terms as Perl itself. + + See http://dev.perl.org/licenses/artistic.html + +SEE ALSO + + Template::Plugin::Gravatar - a Gravatar plugin for Template Toolkit + + http://www.gravatar.com - The Gravatar web site + + http://en.gravatar.com/site/implement/url - The Gravatar URL + implementor's guide + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gravatar-URL-1.06/SIGNATURE new/Gravatar-URL-1.07/SIGNATURE --- old/Gravatar-URL-1.06/SIGNATURE 2012-03-27 14:00:52.000000000 +0200 +++ new/Gravatar-URL-1.07/SIGNATURE 1970-01-01 01:00:00.000000000 +0100 @@ -1,38 +0,0 @@ -This file contains message digests of all files listed in MANIFEST, -signed via the Module::Signature module, version 0.68. - -To verify the content in this distribution, first make sure you have -Module::Signature installed, then type: - - % cpansign -v - -It will check each file's integrity, as well as the signature's -validity. If "==> Signature verified OK! <==" is not displayed, -the distribution may already have been compromised, and you should -not run its Makefile.PL or Build.PL. - ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -SHA1 7167d0e20bd720b44dd6537748b258de132d4931 Build.PL -SHA1 bd75123c13e28ada7281b6c9cce9ded20f06b56b Changes -SHA1 60a6b73a12bd5d7cb88bc589aadbd9590421e0b2 MANIFEST -SHA1 8ca6e2e38708e91e4bd249dc854520a142c3cafe MANIFEST.SKIP -SHA1 42bff277d510bd5f2759b318afa6773048382f2a META.json -SHA1 95859b05f633a09e377d0f1f3631a3173ea1dece META.yml -SHA1 9656b7f3e34510e84f9e10d9d640459dea9e88cc lib/Gravatar/URL.pm -SHA1 e1317787c350c56d78f1fed629b7496067a4e9ac lib/Libravatar/URL.pm -SHA1 42e2aaca70e7c05e79a474783bb4fbf036bf4c17 lib/Unicornify/URL.pm -SHA1 02f21c26f52380259046ea05ae9d560b8a5c5072 t/deprecated.t -SHA1 8d1cd74b2e6625fdd68062ed6fb9935eded6cdd4 t/error.t -SHA1 3b4f3259bb95a336b73ecd2c06bf96dd30637a0a t/id.t -SHA1 c1f9d8c33601bda1bc92ca23c1904e62efb36ed2 t/libravatar.t -SHA1 7bdb7b0b2b440eaade3bb2a968c4919c7c2d4666 t/unicornify.t -SHA1 1b8f6257f03be54ba3e0d39973b3ff0113785afa t/url.t ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (Darwin) - -iEYEARECAAYFAk9xq/QACgkQWMohlhD1Qye04gCgsiVO+Tqr87Iwc9lbT/cl2JJS -WMMAn2Tj4Xl5AMEJp+O35/u+bkq4Zq1u -=CXG6 ------END PGP SIGNATURE----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gravatar-URL-1.06/lib/Gravatar/URL.pm new/Gravatar-URL-1.07/lib/Gravatar/URL.pm --- old/Gravatar-URL-1.06/lib/Gravatar/URL.pm 2012-03-27 14:00:52.000000000 +0200 +++ new/Gravatar-URL-1.07/lib/Gravatar/URL.pm 2016-08-11 02:48:57.000000000 +0200 @@ -7,7 +7,7 @@ use Digest::MD5 qw(md5_hex); use Carp; -our $VERSION = '1.06'; +our $VERSION = '1.07'; use parent 'Exporter'; our @EXPORT = qw( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gravatar-URL-1.06/lib/Libravatar/URL.pm new/Gravatar-URL-1.07/lib/Libravatar/URL.pm --- old/Gravatar-URL-1.06/lib/Libravatar/URL.pm 2012-03-27 14:00:52.000000000 +0200 +++ new/Gravatar-URL-1.07/lib/Libravatar/URL.pm 2016-08-11 02:48:57.000000000 +0200 @@ -7,7 +7,7 @@ use Digest::SHA qw(sha256_hex); use Carp; -our $VERSION = '1.06'; +our $VERSION = '1.07'; use parent 'Exporter'; our @EXPORT = qw( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gravatar-URL-1.06/lib/Unicornify/URL.pm new/Gravatar-URL-1.07/lib/Unicornify/URL.pm --- old/Gravatar-URL-1.06/lib/Unicornify/URL.pm 2012-03-27 14:00:52.000000000 +0200 +++ new/Gravatar-URL-1.07/lib/Unicornify/URL.pm 2016-08-11 02:48:57.000000000 +0200 @@ -3,7 +3,7 @@ use strict; use warnings; -our $VERSION = '1.06'; +our $VERSION = '1.07'; use Gravatar::URL qw(gravatar_url); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Gravatar-URL-1.06/t/libravatar.t new/Gravatar-URL-1.07/t/libravatar.t --- old/Gravatar-URL-1.06/t/libravatar.t 2012-03-27 14:00:52.000000000 +0200 +++ new/Gravatar-URL-1.07/t/libravatar.t 2016-08-11 02:48:57.000000000 +0200 @@ -1,6 +1,7 @@ #!/usr/bin/perl -w use Test::More; +use Test::MockRandom 'Libravatar::URL'; BEGIN { use_ok 'Net::DNS'; use_ok 'Libravatar::URL'; } @@ -222,7 +223,7 @@ ], ); - srand(42); # to make these tests predictable + srand(0.74,0,0.1,0.42); # to make these tests predictable for my $test (@srv_tests) { my ($srv_strings, $pair) = @$test; @@ -234,6 +235,7 @@ } my @result = Libravatar::URL::srv_hostname(@srv_records); + is_deeply \@result, $pair; } ++++++ cpanspec.yml ++++++ --- #description_paragraphs: 3 #description: |- # override description from CPAN #summary: override summary from CPAN #no_testing: broken upstream #sources: # - source1 # - source2 #patches: # foo.patch: -p1 # bar.patch: #preamble: |- # BuildRequires: gcc-c++ #post_prep: |- # hunspell=`pkg-config --libs hunspell | sed -e 's,-l,,; s, *,,g'` # sed -i -e "s,hunspell-X,$hunspell," t/00-prereq.t Makefile.PL #post_build: |- # rm unused.files #post_install: |- # sed on %{name}.files #license: SUSE-NonFree #skip_noarch: 1 #custom_build: |- #./Build build flags=%{?_smp_mflags} --myflag #custom_test: |- #startserver && make test #ignore_requires: Bizarre::Module

1 0

commit osinfo-db for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '17

26 Jun '17

Hello community, here is the log from the commit of package osinfo-db for openSUSE:Factory checked in at 2017-06-26 15:51:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osinfo-db (Old) and /work/SRC/openSUSE:Factory/.osinfo-db.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osinfo-db" Mon Jun 26 15:51:40 2017 rev:5 rq:505957 version:20170423 Changes: -------- --- /work/SRC/openSUSE:Factory/osinfo-db/osinfo-db.changes 2017-04-12 17:12:08.985800413 +0200 +++ /work/SRC/openSUSE:Factory/.osinfo-db.new/osinfo-db.changes 2017-06-26 15:51:44.164121656 +0200 @@ -1,0 +2,6 @@ +Tue Jun 13 15:07:32 MDT 2017 - carnold(a)suse.com + +- fate#322156 - Update database to version 20170423 + osinfo-db-20170423.tar.xz + +------------------------------------------------------------------- Old: ---- osinfo-db-20170326.tar.xz New: ---- osinfo-db-20170423.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osinfo-db.spec ++++++ --- /var/tmp/diff_new_pack.gLvuIl/_old 2017-06-26 15:51:45.035998714 +0200 +++ /var/tmp/diff_new_pack.gLvuIl/_new 2017-06-26 15:51:45.039998150 +0200 @@ -17,7 +17,7 @@ Name: osinfo-db -Version: 20170326 +Version: 20170423 Release: 0 Summary: Osinfo database files License: LGPL-2.1+ and GPL-2.0+ ++++++ osinfo-db-20170326.tar.xz -> osinfo-db-20170423.tar.xz ++++++ ++++ 1615 lines of diff (skipped)

1 0

commit python-tornado for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '17

26 Jun '17

Hello community, here is the log from the commit of package python-tornado for openSUSE:Factory checked in at 2017-06-26 15:51:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-tornado (Old) and /work/SRC/openSUSE:Factory/.python-tornado.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-tornado" Mon Jun 26 15:51:35 2017 rev:38 rq:505956 version:4.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-tornado/python-tornado.changes 2017-04-28 10:36:31.721211138 +0200 +++ /work/SRC/openSUSE:Factory/.python-tornado.new/python-tornado.changes 2017-06-26 15:51:37.213101808 +0200 @@ -1,0 +2,17 @@ +Fri Jun 23 17:41:45 UTC 2017 - jmatejek(a)suse.com + +- in %pre, remove egg-info file if installed, because it's being + replaced by a directory (bsc#1035604) + +------------------------------------------------------------------- +Tue Jun 13 14:57:15 UTC 2017 - jmatejek(a)suse.com + +- replace the complicated condition for requiring backports.ssl_match_hostname + with unconditional requirement for Python >= 2.7.9 + +------------------------------------------------------------------- +Wed May 31 19:25:46 UTC 2017 - dmueller(a)suse.com + +- require python-backports.ssl_hostname only on python 2.x + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-tornado.spec ++++++ --- /var/tmp/diff_new_pack.1BynZr/_old 2017-06-26 15:51:37.857011011 +0200 +++ /var/tmp/diff_new_pack.1BynZr/_new 2017-06-26 15:51:37.857011011 +0200 @@ -20,63 +20,38 @@ Name: python-tornado Version: 4.4.3 Release: 0 -Url: http://www.tornadoweb.org Summary: Open source version of scalable, non-blocking web server that power FriendFeed License: Apache-2.0 Group: Development/Languages/Python +Url: http://www.tornadoweb.org Source: https://files.pythonhosted.org/packages/source/t/tornado/tornado-%{version}… Patch0: tornado-configtest.patch Patch1: tornado-async-deprecations.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_module devel} BuildRequires: %{python_module pycurl} BuildRequires: %{python_module setuptools} BuildRequires: %{python_module simplejson} -# SECTION test requirements -BuildRequires: %{python_module backports_abc} -BuildRequires: python-singledispatch -# /SECTION BuildRequires: fdupes BuildRequires: python-futures BuildRequires: python-rpm-macros - -# Tornado requires python-certifi when the ssl module -# does not provide the 'create_default_context' function. -# The ssl module is part of the python package. -# Starting from python 2.7.9 the ssl module satisfies -# tornado's requirement, making the python-certifi package -# optional. -# Python 2.7.9 is availalbe on SLE12 Updates channel and is going -# to be available also on openSUSE leap. -%if 0%{?sles_version} >= 12 || 0%{?suse_version} > 1320 Requires: python >= 2.7.9 -%else -BuildRequires: %{python_module certifi} -BuildRequires: python-backports.ssl_match_hostname -Requires: python-backports.ssl_match_hostname -Requires: python-certifi -%endif - +Requires: python-simplejson +Recommends: python-Twisted +Recommends: python-pycares +Recommends: python-pycurl +Recommends: python-service_identity +BuildRoot: %{_tmppath}/%{name}-%{version}-build +# SECTION test requirements +BuildRequires: %{python_module backports_abc} +BuildRequires: python-singledispatch +# /SECTION %if %python_version_nodots < 35 Requires: python-backports_abc %endif - -# Python 2 specific backports %ifpython2 Requires: python-singledispatch Recommends: python-futures %endif -# end python 2 specific - -Requires: python-simplejson - -Recommends: python-pycares -Recommends: python-pycurl -Recommends: python-Twisted -Recommends: python-service_identity - -BuildRequires: fdupes - %python_subpackages %description @@ -102,6 +77,12 @@ %patch0 -p1 %patch1 -p1 +%pre +# remove egg-info _file_, being replaced by an egg-info directory +if [ -f %{python_sitearch}/tornado-%{version}-py%{python_version}.egg-info ]; then + rm %{python_sitearch}/tornado-%{version}-py%{python_version}.egg-info +fi + %build %python_build

1 0

commit python-M2Crypto for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '17

26 Jun '17

Hello community, here is the log from the commit of package python-M2Crypto for openSUSE:Factory checked in at 2017-06-26 15:51:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-M2Crypto (Old) and /work/SRC/openSUSE:Factory/.python-M2Crypto.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-M2Crypto" Mon Jun 26 15:51:29 2017 rev:21 rq:505953 version:0.26.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-M2Crypto/python-M2Crypto.changes 2017-05-09 17:58:44.366287896 +0200 +++ /work/SRC/openSUSE:Factory/.python-M2Crypto.new/python-M2Crypto.changes 2017-06-26 15:51:31.365926308 +0200 @@ -1,0 +2,5 @@ +Mon Jun 19 21:47:35 UTC 2017 - sebix+novell.com(a)sebix.at + +- only require python3-typing if necessary + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-M2Crypto.spec ++++++ --- /var/tmp/diff_new_pack.7BPdox/_old 2017-06-26 15:51:32.001836640 +0200 +++ /var/tmp/diff_new_pack.7BPdox/_new 2017-06-26 15:51:32.001836640 +0200 @@ -32,7 +32,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module typing} BuildRequires: fdupes BuildRequires: openssl BuildRequires: openssl-devel @@ -43,7 +42,15 @@ %else BuildRequires: swig %endif +%if 0%{?suse_version} <= 1320 +BuildRequires: %{python_module typing} Requires: python-typing +%else +BuildRequires: python2-typing +%endif +%ifpython2 && 0%{?suse_version} > 1320 +Requires: python2-typing +%endif %ifpython2 Provides: %{oldpython}-m2crypto = %{version} Obsoletes: %{oldpython}-m2crypto < %{version}

1 0

commit opensm for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '17

26 Jun '17

Hello community, here is the log from the commit of package opensm for openSUSE:Factory checked in at 2017-06-26 15:51:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opensm (Old) and /work/SRC/openSUSE:Factory/.opensm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "opensm" Mon Jun 26 15:51:15 2017 rev:8 rq:505931 version:3.3.20 Changes: -------- --- /work/SRC/openSUSE:Factory/opensm/opensm.changes 2017-06-12 15:36:36.097073162 +0200 +++ /work/SRC/openSUSE:Factory/.opensm.new/opensm.changes 2017-06-26 15:51:16.687996013 +0200 @@ -1,0 +2,13 @@ +Fri Jun 23 12:23:04 UTC 2017 - nmoreychaisemartin(a)suse.com + +- Have new libs packages obsolete the old opensm-libs3 + +------------------------------------------------------------------- +Mon Jun 19 18:53:39 UTC 2017 - jengelh(a)inai.de + +- Implement shared library packaging guideline +- Rectify opensm-type_punning.patch: + a union does not fix type punning problems (let alone + misalignmened pointers), one must use memcpy. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opensm.spec ++++++ --- /var/tmp/diff_new_pack.F7fQer/_old 2017-06-26 15:51:17.459887170 +0200 +++ /var/tmp/diff_new_pack.F7fQer/_new 2017-06-26 15:51:17.463886606 +0200 @@ -43,34 +43,50 @@ Requires: logrotate %{?systemd_requires} -%define so_major 3 -%define opensm_libname libs%{so_major} - %description OpenSM provides an implementation for an InfiniBand Subnet Manager and Administration. Such a software entity is required to run for in order to initialize the InfiniBand hardware (at least one per each InfiniBand subnet). -%package %{opensm_libname} -Summary: Opensm runtime libraries +%package -n libopensm5 +Summary: Opensm runtime library +Group: System/Libraries +Obsoletes: opensm-libs3 + +%description -n libopensm5 +This package contains one of the opensm runtime libraries. + +%package -n libosmcomp3 +Summary: Opensm runtime library +Group: System/Libraries +Obsoletes: opensm-libs3 + +%description -n libosmcomp3 +This package contains one of the opensm runtime libraries. + +%package -n libosmvendor4 +Summary: Opensm runtime library Group: System/Libraries +Obsoletes: opensm-libs3 -%description %{opensm_libname} -This package contains the opensm runtime libraries. +%description -n libosmvendor4 +This package contains one of the opensm runtime libraries. %package devel Summary: Development files for OpenSM Group: Development/Libraries/C and C++ -Requires: %{name}-%{opensm_libname} = %{version} Requires: libibumad-devel +Requires: libopensm5 = %{version} +Requires: libosmcomp3 = %{version} +Requires: libosmvendor4 = %{version} %description devel Symlinks for the dynamic libraries and header files for OpenSM. %prep %setup -q -%patch1 +%patch1 -p1 %patch2 cp %{S:1} %{S:2} %{S:3} . @@ -111,15 +127,18 @@ %{fillup_only} %service_add_post opensm.service -%post %{opensm_libname} -p /sbin/ldconfig - %preun %service_del_preun opensm.service %postun %service_del_postun opensm.service -%postun %{opensm_libname} -p /sbin/ldconfig +%post -n libopensm5 -p /sbin/ldconfig +%postun -n libopensm5 -p /sbin/ldconfig +%post -n libosmcomp3 -p /sbin/ldconfig +%postun -n libosmcomp3 -p /sbin/ldconfig +%post -n libosmvendor4 -p /sbin/ldconfig +%postun -n libosmvendor4 -p /sbin/ldconfig %files %defattr(-, root, root) @@ -135,11 +154,17 @@ %_mandir/man8/osmtest.8.gz /var/adm/fillup-templates/sysconfig.%name -%files %{opensm_libname} +%files -n libopensm5 %defattr(-, root, root) -%_libdir/libopensm.so.* -%_libdir/libosmcomp.so.* -%_libdir/libosmvendor.so.* +%_libdir/libopensm.so.5* + +%files -n libosmcomp3 +%defattr(-,root,root) +%_libdir/libosmcomp.so.3* + +%files -n libosmvendor4 +%defattr(-,root,root) +%_libdir/libosmvendor.so.4* %files devel %defattr(-,root,root) ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.F7fQer/_old 2017-06-26 15:51:17.495882095 +0200 +++ /var/tmp/diff_new_pack.F7fQer/_new 2017-06-26 15:51:17.499881530 +0200 @@ -1,4 +1,8 @@ -opensm-libs3 - obsoletes "opensm-<targettype> < <version>" - provides "opensm-<targettype> = <version>" +libopensm5 +libosmcomp3 +libosmvendor4 opensm-devel + requires -opensm-<targettype> + requires "libopensm5-<targettype> = <version>" + requires "libosmcomp3-<targettype> = <version>" + requires "libosmvendor4-<targettype> = <version>" ++++++ opensm-type_punning.patch ++++++ --- /var/tmp/diff_new_pack.F7fQer/_old 2017-06-26 15:51:17.531877019 +0200 +++ /var/tmp/diff_new_pack.F7fQer/_new 2017-06-26 15:51:17.531877019 +0200 @@ -1,15 +1,19 @@ -diff --git opensm/osm_prtn_config.c opensm/osm_prtn_config.c -index b08da02d..3da8b867 100644 ---- opensm/osm_prtn_config.c -+++ opensm/osm_prtn_config.c -@@ -120,16 +120,18 @@ static inline boolean_t mgid_is_broadcast(const ib_gid_t *mgid) +--- + opensm/osm_prtn_config.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +Index: opensm-3.3.20/opensm/osm_prtn_config.c +=================================================================== +--- opensm-3.3.20.orig/opensm/osm_prtn_config.c ++++ opensm-3.3.20/opensm/osm_prtn_config.c +@@ -120,14 +120,16 @@ static inline boolean_t mgid_is_broadcas static inline boolean_t mgid_is_ip(const ib_gid_t *mgid) { - ib_net16_t ipsig = *(ib_net16_t *)&mgid->raw[2]; -- return (ipsig == cl_hton16(0x401b) || ipsig == cl_hton16(0x601b)); -+ union{uint8_t *ibg; ib_net16_t *ibn; }pun = { &mgid->raw[2]}; -+ return (*pun.ibn == cl_hton16(0x401b) || *pun.ibn == cl_hton16(0x601b)); ++ ib_net16_t ipsig; ++ memcpy(&ipsig, &mgid->raw[2], sizeof(ipsig)); + return (ipsig == cl_hton16(0x401b) || ipsig == cl_hton16(0x601b)); } static inline boolean_t ip_mgroup_pkey_ok(struct part_conf *conf, @@ -17,10 +21,7 @@ { - ib_net16_t mpkey = *(ib_net16_t *)&group->mgid.raw[4]; + ib_net16_t mpkey; -+ union{uint8_t *uip; ib_net16_t *ibn} pun = { &group->mgid.raw[4]}; ++ memcpy(&mpkey, &group->mgid.raw[4], sizeof(mpkey)); char gid_str[INET6_ADDRSTRLEN]; -+ mpkey = *pun.ibn; if (mgid_is_broadcast(&group->mgid) - /* user requested "wild card" of pkey */ - || mpkey == 0x0000

1 0

commit mutter for openSUSE:Factory
by root＠hilbert.suse.de 26 Jun '17

26 Jun '17

Hello community, here is the log from the commit of package mutter for openSUSE:Factory checked in at 2017-06-26 15:51:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mutter (Old) and /work/SRC/openSUSE:Factory/.mutter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mutter" Mon Jun 26 15:51:06 2017 rev:108 rq:505902 version:3.24.3 Changes: -------- --- /work/SRC/openSUSE:Factory/mutter/mutter.changes 2017-06-17 10:18:15.487795095 +0200 +++ /work/SRC/openSUSE:Factory/.mutter.new/mutter.changes 2017-06-26 15:51:07.877238397 +0200 @@ -1,0 +2,22 @@ +Fri Jun 23 13:18:37 UTC 2017 - zaitor(a)opensuse.org + +- Update to version 3.24.3: + + Fix handling of tiled monitors (bgo#781723). + + Fix swapped red and blue channels in CoglTexture data + (bgo#779234). + + Fix glitches when opening a window maximized (bgo#781353, + bgo#782183). + + Implement support for disable-while-typing option (bgo#764852). + + Consider subsurfaces when grabbing (bgo#781811). + + Fix handling of left-handed mode on pen/eraser devices + (bgo#782027). + + Fix output cycling in non-display-attached tablets + (bgo#782032). + + Fix wacom cursor offset on wayland (bgo#784009). + + Handle EXIF orientation of backgrounds (bgo#783125). + + Misc. bug fixes: bgo#782156, bgo#780407, bgo#757661, + bgo#783113, bgo#781703. +- Drop mutter-monitor-fixes.patch and mutter-wayland-fixes.patch, + fixed upstream. + +------------------------------------------------------------------- Old: ---- mutter-3.24.2.tar.xz mutter-monitor-fixes.patch mutter-wayland-fixes.patch New: ---- mutter-3.24.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mutter.spec ++++++ --- /var/tmp/diff_new_pack.5MmWKG/_old 2017-06-26 15:51:08.741116584 +0200 +++ /var/tmp/diff_new_pack.5MmWKG/_new 2017-06-26 15:51:08.745116020 +0200 @@ -23,7 +23,7 @@ %endif Name: mutter -Version: 3.24.2 +Version: 3.24.3 Release: 0 Summary: Window and compositing manager based on Clutter License: GPL-2.0+ @@ -38,10 +38,6 @@ Patch3: mutter-bsc984738-grab-display.patch # PATCH-FIX-UPSTREAM mutter-fix-startup.patch bgo#768531 zaitor(a)opensuse.org -- Fix slow startup notification on wayland Patch6: mutter-fix-startup.patch -# PATCH-FIX-UPSTREAM mutter-monitor-fixes.patch zaitor(a)opensuse.org -- Various monitor fixes from upstream stable git -Patch7: mutter-monitor-fixes.patch -# PATCH-FIX-UPSTREAM mutter-wayland-fixes.patch zaitor(a)opensuse.org -- Various wayland fixes from upstream stable git -Patch8: mutter-wayland-fixes.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel >= 0.9.5 BuildRequires: libSM-devel @@ -147,8 +143,6 @@ %patch3 -p1 %endif %patch6 -p1 -%patch7 -p1 -%patch8 -p1 %build %configure \ ++++++ mutter-3.24.2.tar.xz -> mutter-3.24.3.tar.xz ++++++ ++++ 2358 lines of diff (skipped)

1 0

commit python-psycopg2 for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package python-psycopg2 for openSUSE:Factory checked in at 2017-06-25 19:24:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-psycopg2 (Old) and /work/SRC/openSUSE:Factory/.python-psycopg2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-psycopg2" Sun Jun 25 19:24:18 2017 rev:21 rq:505946 version:2.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-psycopg2/python-psycopg2.changes 2016-03-16 10:34:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-psycopg2.new/python-psycopg2.changes 2017-06-25 19:32:57.320536947 +0200 @@ -1,0 +2,67 @@ +Fri Jun 23 16:26:18 UTC 2017 - jmatejek(a)suse.com + +- convert to singlespec +- update to 2.7.1 + * Added sql module to generate SQL dynamically (ticket #308). + * Added Replication protocol support (ticket #322). Main authors are + Oleksandr Shulgin and Craig Ringer, who deserve a huge thank you. + * Added parse_dsn() and make_dsn() functions (tickets #321, #363). connect() + now can take both dsn and keyword arguments, merging them together. + * Added __libpq_version__ and libpq_version() to inspect the version of the + libpq library the module was compiled/loaded with (tickets #35, #323). + * The attributes notices and notifies can be customized replacing them with + any object exposing an append() method (ticket #326). + * Adapt network types to ipaddress objects when available. When not enabled, + convert arrays of network types to lists by default. The old Inet adapter is + deprecated (tickets #317, #343, #387). + * Added quote_ident() function (ticket #359). + * Added get_dsn_parameters() connection method (ticket #364). + * callproc() now accepts a dictionary of parameters (ticket #381). + * Give precedence to __conform__() over superclasses to choose an object + adapter (ticket #456). + * Using Python C API decoding functions and codecs caching for faster + unicode encoding/decoding (ticket #473). + * executemany() slowness addressed by execute_batch() and execute_values() + (ticket #491). + * Added async_ as an alias for async to support Python 3.7 where async will + become a keyword (ticket #495). + * Unless in autocommit, do not use default_transaction_* settings to control + the session characteristics as it may create problems with external + connection pools such as pgbouncer; use BEGIN options instead (ticket #503). + * isolation_level is now writable and entirely separated from autocommit; + added readonly, deferrable writable attributes. + * dropped support for python 2.5 and postgres client library < 9.1 + * many bugs fixed + +- drop doc subpackage, html docs available from http://pythonhosted.org/psycopg2/ + +------------------------------------------------------------------- +Wed Jun 21 13:44:46 UTC 2017 - bwiedemann(a)suse.com + +- Do not include unneccessary undeterministic environment.pickle in package to fix build-compare + +------------------------------------------------------------------- +Mon Nov 14 14:06:11 UTC 2016 - dmueller(a)suse.com + +- update to 2.6.2: + * Fixed inconsistent state in externally closed connections (tickets #263, #311, #443). + * Report the server response status on errors (such as ticket #281). + * Raise NotSupportedError on unhandled server response status (ticket #352). + * Allow overriding string adapter encoding with no connection (ticket #331). + * The wait_select callback allows interrupting a long-running query in an interactive shell using Ctrl-C (ticket #333). + * Fixed PersistentConnectionPool on Python 3 (ticket #348). + * Fixed segfault on repr() of an uninitialized connection (ticket #361). + * Allow adapting bytes using QuotedString on Python 3 (ticket #365). + * Added support for setuptools/wheel (ticket #370). + * Fix build on Windows with Python 3.5, VS 2015 (ticket #380). + * Fixed errorcodes.lookup initialization thread-safety (ticket #382). + * Fixed read() exception propagation in copy_from (ticket #412). + * Fixed possible NULL TZ decref (ticket #424). + * errorcodes map updated to PostgreSQL 9.5. + * Lists consisting of only None are escaped correctly (ticket #285). + * Fixed deadlock in multithread programs using OpenSSL (ticket #290). + * Correctly unlock the connection after error in flush (ticket #294). + * Fixed MinTimeLoggingCursor.callproc() (ticket #309). + * Added support for MSVC 2015 compiler (ticket #350). + +------------------------------------------------------------------- Old: ---- psycopg2-2.6.tar.gz New: ---- psycopg2-2.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-psycopg2.spec ++++++ --- /var/tmp/diff_new_pack.prICxy/_old 2017-06-25 19:32:57.924451626 +0200 +++ /var/tmp/diff_new_pack.prICxy/_new 2017-06-25 19:32:57.928451061 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-psycopg2 # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,22 @@ # +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-psycopg2 -Version: 2.6 +Version: 2.7.1 Release: 0 Summary: Python-PostgreSQL Database Adapter License: LGPL-3.0+ and (LGPL-3.0+ or ZPL-2.0) and SUSE-GPL-2.0-with-openssl-exception Group: Development/Languages/Python Url: http://initd.org/psycopg/ -Source: http://pypi.python.org/packages/source/p/psycopg2/psycopg2-%{version}.tar.gz +Source: https://files.pythonhosted.org/packages/source/p/psycopg2/psycopg2-%{versio… +BuildRequires: %{python_module devel} BuildRequires: fdupes -BuildRequires: postgresql-devel -BuildRequires: python-Sphinx -BuildRequires: python-devel +BuildRequires: postgresql-devel >= 9.1 +BuildRequires: python-rpm-macros Suggests: postgresql-server BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} && 0%{?suse_version} <= 1110 -%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%endif +%python_subpackages %description psycopg2 is a PostgreSQL database adapter for the Python programming @@ -45,39 +44,23 @@ UPDATEs. psycopg2 also provide full asycronous operations and support for coroutine libraries. -%package doc -Summary: Documentation for psycopg python PostgreSQL database adapter -Group: Documentation/HTML -Requires: %{name} = %{version} - -%description doc -Documentation and example files for the psycopg python PostgreSQL database adapter. - %prep %setup -q -n psycopg2-%{version} -# use the year from source gzip header instead of current one to make reproducible rpms -year=$(perl -e 'sysread(STDIN, $h, 8); print (1900+(gmtime(unpack("l",substr($h,4))))[5])' < %{S:0}) -sed -i "s/^year =.*/year=$year/" doc/src/conf.py %build -CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build -rm -rf doc/build # Remove junk -sphinx-build doc/src doc/build/html +export CFLAGS="%{optflags} -fno-strict-aliasing" +%python_build %install -python setup.py install --prefix=%{_prefix} --root=%{buildroot} -rm -rf %{buildroot}%{python_sitearch}/psycopg2/tests # Don't package testsuite +%python_install +%python_expand rm -rf %{buildroot}%{$python_sitearch}/psycopg2/tests # Don't package testsuite %fdupes -s %{buildroot}/%{_mandir} # Create symlinks for man pages %fdupes %{buildroot} # Create hardlinks for the rest -%files +%files %{python_files} %defattr(-,root,root,-) %doc AUTHORS LICENSE NEWS README.rst %{python_sitearch}/psycopg2/ -%{python_sitearch}/psycopg2-%{version}-py%{py_ver}.egg-info - -%files doc -%defattr(-,root,root) -%doc doc/build/html examples/ +%{python_sitearch}/psycopg2-%{version}-py%{python_version}.egg-info %changelog ++++++ psycopg2-2.6.tar.gz -> psycopg2-2.7.1.tar.gz ++++++ ++++ 17268 lines of diff (skipped)

1 0

commit texlive-specs-r for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-r for openSUSE:Factory checked in at 2017-06-25 19:23:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-r (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-r.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-r" Sun Jun 25 19:23:32 2017 rev:25 rq:505892 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-r/texlive-specs-r.changes 2017-06-08 14:55:56.582807580 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-r.new/texlive-specs-r.changes 2017-06-25 19:32:37.475340678 +0200 @@ -1,0 +2,64 @@ +Fri Jun 23 13:21:21 UTC 2017 - werner(a)suse.de + +- Yet an other move for texlive-pas-cours that is move + doc/latex/pas-cours/macro-calculs.tex to tex/latex/pas-cours/ + +------------------------------------------------------------------- +Thu Jun 22 12:50:00 UTC 2017 - werner(a)suse.de + +- Avoid to depend on optional milog.cfg +- texlive-milog does replace mathgl-tex + +------------------------------------------------------------------- +Wed Jun 21 10:20:17 UTC 2017 - werner(a)suse.de + +- Do not require own provided perl modules for latexindent + +------------------------------------------------------------------- +Tue Jun 20 06:39:06 UTC 2017 - werner(a)suse.de + +- Change left over texlive-pdftex-def for texlive-latex-bin + +------------------------------------------------------------------- +Mon Jun 19 13:31:54 UTC 2017 - werner(a)suse.de + +- Fix texlive-pdftex-def dependency as now texlive-graphics-def does + provide pdftex.def +- Fix texlive-rotating dependency as now texlive-graphics does + provide rotating.sty + +------------------------------------------------------------------- +Fri Jun 16 12:14:49 UTC 2017 - werner(a)suse.de + +- Notive: Some patches have been moved + * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c + * context_fourier-map.dif from texlive-specs-e to texlive-specs-f + * dvips_config.dif from texlive-specs-g to texlive-specs-h + * jadetex_ini.dif from texlive-specs-l to texlive-specs-m + * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w + * texdraw_info.dif from texlive-specs-v to texlive-specs-w + this entry exists only to silent the auto factory bot + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 +- Remove patch fontspec_emph.dif as now upstream +- Update patches + * kpathsea_cnf.dif + * latex2man_tmphandling.dif + * latexdiff_perl.dif + * latexpand_perl.dif + * luaotfload_varfonts.dif + * luatex_cnf.dif + * musixtex_various.dif + * tetex_scripts.dif + * tex4ht_env.dif + * texconfig_scripts.dif + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- pdftex-def.tar.xz placeins-plain.tar.xz plain-doc.doc.tar.xz plain.tar.xz plainpkg.doc.tar.xz plainpkg.tar.xz plantslabels.doc.tar.xz plantslabels.tar.xz plari.doc.tar.xz plari.tar.xz plates.doc.tar.xz plates.tar.xz platex.doc.tar.xz platex.tar.xz play.doc.tar.xz play.tar.xz playfair.doc.tar.xz playfair.tar.xz plipsum.doc.tar.xz plipsum.tar.xz plnfss.doc.tar.xz plnfss.tar.xz plstmary.doc.tar.xz plstmary.tar.xz plweb.doc.tar.xz plweb.tar.xz pmgraph.doc.tar.xz pmgraph.tar.xz pmx.doc.tar.xz pmx.tar.xz pmxchords.doc.tar.xz pmxchords.tar.xz pnas2009.tar.xz poemscol.doc.tar.xz poemscol.tar.xz poetrytex.doc.tar.xz poetrytex.tar.xz polski.doc.tar.xz polski.tar.xz poltawski.doc.tar.xz poltawski.tar.xz polyglossia.doc.tar.xz polyglossia.tar.xz polynom.doc.tar.xz polynom.tar.xz polynomial.doc.tar.xz polynomial.tar.xz polytable.doc.tar.xz polytable.tar.xz postcards.doc.tar.xz postcards.tar.xz poster-mac.doc.tar.xz poster-mac.tar.xz powerdot-FUBerlin.doc.tar.xz powerdot-FUBerlin.tar.xz powerdot.doc.tar.xz powerdot.tar.xz ppr-prv.doc.tar.xz ppr-prv.tar.xz pracjourn.doc.tar.xz pracjourn.tar.xz preprint.doc.tar.xz preprint.tar.xz prerex.doc.tar.xz prerex.tar.xz present.doc.tar.xz present.tar.xz presentations-en.doc.tar.xz presentations.doc.tar.xz pressrelease.doc.tar.xz pressrelease.tar.xz prettyref.doc.tar.xz prettyref.tar.xz preview.doc.tar.xz preview.tar.xz prftree.doc.tar.xz prftree.tar.xz printlen.doc.tar.xz printlen.tar.xz proba.doc.tar.xz proba.tar.xz probsoln.doc.tar.xz probsoln.tar.xz procIAGssymp.doc.tar.xz procIAGssymp.tar.xz prodint.doc.tar.xz prodint.tar.xz productbox.doc.tar.xz productbox.tar.xz program.doc.tar.xz program.tar.xz progress.doc.tar.xz progress.tar.xz progressbar.doc.tar.xz progressbar.tar.xz proofread.doc.tar.xz proofread.tar.xz prooftrees.doc.tar.xz prooftrees.tar.xz properties.doc.tar.xz properties.tar.xz proposal.doc.tar.xz proposal.tar.xz prosper.doc.tar.xz prosper.tar.xz protex.doc.tar.xz protex.tar.xz protocol.doc.tar.xz protocol.tar.xz przechlewski-book.doc.tar.xz przechlewski-book.tar.xz ps2pk.doc.tar.xz psbao.doc.tar.xz psbao.tar.xz pseudocode.doc.tar.xz pseudocode.tar.xz New: ---- oubraces.doc.tar.xz oubraces.tar.xz outline.doc.tar.xz outline.tar.xz outliner.doc.tar.xz outliner.tar.xz outlines.doc.tar.xz outlines.tar.xz overlays.doc.tar.xz overlays.tar.xz overlock.doc.tar.xz overlock.tar.xz overpic.doc.tar.xz overpic.tar.xz pacioli.doc.tar.xz pacioli.tar.xz padauk.doc.tar.xz padauk.tar.xz pagecolor.doc.tar.xz pagecolor.tar.xz pagecont.doc.tar.xz pagecont.tar.xz pagenote.doc.tar.xz pagenote.tar.xz pagerange.doc.tar.xz pagerange.tar.xz pageslts.doc.tar.xz pageslts.tar.xz palatino.tar.xz paper.doc.tar.xz paper.tar.xz papercdcase.doc.tar.xz papercdcase.tar.xz papermas.doc.tar.xz papermas.tar.xz papertex.doc.tar.xz papertex.tar.xz paracol.doc.tar.xz paracol.tar.xz parades.doc.tar.xz parades.tar.xz paralist.doc.tar.xz paralist.tar.xz parallel.doc.tar.xz parallel.tar.xz paratype.doc.tar.xz paratype.tar.xz paresse.doc.tar.xz paresse.tar.xz parnotes.doc.tar.xz parnotes.tar.xz parrun.doc.tar.xz parrun.tar.xz parselines.doc.tar.xz parselines.tar.xz parskip.doc.tar.xz parskip.tar.xz pas-cours.doc.tar.xz pas-cours.tar.xz pas-crosswords.doc.tar.xz pas-crosswords.tar.xz pas-cv.doc.tar.xz pas-cv.tar.xz pas-tableur.doc.tar.xz pas-tableur.tar.xz passivetex.tar.xz patch.source.tar.xz patchcmd.doc.tar.xz patchcmd.tar.xz patgen.doc.tar.xz patgen2-tutorial.doc.tar.xz path.doc.tar.xz path.tar.xz pauldoc.doc.tar.xz pauldoc.tar.xz pawpict.doc.tar.xz pawpict.tar.xz pax.doc.tar.xz pax.tar.xz pb-diagram.doc.tar.xz pb-diagram.tar.xz pbibtex-base.doc.tar.xz pbibtex-base.tar.xz pbox.doc.tar.xz pbox.tar.xz pbsheet.doc.tar.xz pbsheet.tar.xz pdf-trans.doc.tar.xz pdf-trans.tar.xz pdf14.doc.tar.xz pdf14.tar.xz pdfbook2.doc.tar.xz pdfbook2.tar.xz pdfcomment.doc.tar.xz pdfcomment.tar.xz pdfcprot.doc.tar.xz pdfcprot.tar.xz pdfcrop.doc.tar.xz pdfcrop.tar.xz pdfjam.doc.tar.xz pdfjam.tar.xz pdflatexpicscale.doc.tar.xz pdflatexpicscale.tar.xz pdfmarginpar.doc.tar.xz pdfmarginpar.tar.xz pdfpagediff.doc.tar.xz pdfpagediff.tar.xz pdfpages.doc.tar.xz pdfpages.tar.xz pdfscreen.doc.tar.xz pdfscreen.tar.xz phffullpagefigure.doc.tar.xz phffullpagefigure.tar.xz phfnote.doc.tar.xz phfnote.tar.xz phfparen.doc.tar.xz phfparen.tar.xz phfqit.doc.tar.xz phfqit.tar.xz phfquotetext.doc.tar.xz phfquotetext.tar.xz phfsvnwatermark.doc.tar.xz phfsvnwatermark.tar.xz phfthm.doc.tar.xz phfthm.tar.xz phonenumbers.doc.tar.xz phonenumbers.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-r.spec ++++++ ++++ 28114 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-r/texlive-specs-r.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-r.new/texlive-specs-r.spec ++++++ prosper.doc.tar.xz -> paper.doc.tar.xz ++++++ ++++ 4319 lines of diff (skipped) ++++++ prosper.tar.xz -> paper.tar.xz ++++++ ++++ 20163 lines of diff (skipped) ++++++ properties.doc.tar.xz -> papercdcase.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/papercdcase/example.tex new/doc/latex/papercdcase/example.tex --- old/doc/latex/papercdcase/example.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/papercdcase/example.tex 2016-11-25 19:29:46.000000000 +0100 @@ -0,0 +1,22 @@ +\documentclass{article} + +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage{papercdcase} +\usepackage[a4paper, margin=0pt]{geometry} +\usepackage{mdwlist} + +\pagestyle{empty} +\setlength{\parindent}{0pt} + +\begin{document} + +\setcdlatchmatter{\textsf{\textbf{\LARGE Slackware Linux 10.2}\\ +CD 1/2}} +\setcdspinematter{\textsf{\Large Slackware 10.2 CD1/2}} +\setcdbackmatter{\textsf{\textbf{\LARGE Slackware Linux 10.2}\\ +CD 1/2}} + +\centering\papercdcase* + +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/papercdcase/interactive.tex new/doc/latex/papercdcase/interactive.tex --- old/doc/latex/papercdcase/interactive.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/papercdcase/interactive.tex 2016-11-25 19:29:46.000000000 +0100 @@ -0,0 +1,117 @@ +\documentclass{article} + +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage{papercdcase} +\usepackage[margin=0pt]{geometry} +\usepackage{mdwlist} + +\pagestyle{empty} +\setlength{\parindent}{0pt} + +\def\maxilatchtext#1{\setcdlatchmatter{\textsf{\textbf{\Large #1}}}} +\def\maxispinetext#1{\setcdspinematter{\textsf{\textbf{\large #1}}}} +\def\maxibacktext#1#2{\setcdbackmatter{\textsf{\textbf{\Large #1}\small #2}}} + +\def\latchtext#1{\setcdlatchmatter{\textsf{\textbf{\LARGE #1}}}} +\def\spinetext#1{\setcdspinematter{\textsf{\textbf{\Large #1}}}} +\def\backtext#1#2{\setcdbackmatter{\textsf{\textbf{\LARGE #1}#2}}} + +\def\empty{} +\def\yes{yes} + +\toksdef\ta=0% +\toksdef\tb=2% +\long\def\rightappenditem#1\to#2{\ta={#1}\tb=\expandafter{#2}\edef#2{\the\tb\the\ta}} +\long\def\erightappenditem#1\to#2{\tb=\expandafter{#2}\xdef#2{\the\tb\noexpand{#1}}} + +\def\msg{****************************************************************************} + +\begin{document} + +\typeout{} +\typeout{\msg} +\typeout{* Please enter "yes" if you'd like to create a case for a maxi (80mm) CD,} +\typeout{* just hit enter if not!} +\typein[\cdmaxi]{\msg} + +\typeout{} +\typeout{\msg} +\typeout{* Please enter the artist, if any!} +\typein[\cdartist]{\msg} + +\typeout{} +\typeout{\msg} +\typeout{* Please enter the CD title, if any!} +\typein[\cdtitle]{\msg} + +\newif\iftrackgiven +\def\tracks{} +\typeout{} +\typeout{\msg} +\typeout{* Please enter the tracks (to finish, just enter a blank line)!} +\loop +\def\nexttrack{} +\typein[\nexttrack]{\msg} +\ifx\nexttrack\empty% +\trackgivenfalse% +\else% +\rightappenditem\item\to\tracks% +\erightappenditem\nexttrack\to\tracks% +\trackgiventrue% +\fi% +\iftrackgiven% +\def\msg{}% +\repeat + +\ifx\cdmaxi\yes% +\ifx\cdtitle\empty% +\maxilatchtext{\cdartist}% +\maxispinetexi{\cdartist}% +\ifx\tracks\empty% +\maxibacktext{\cdartist}{}% +\else% +\maxibacktext{\cdartist}{\begin{enumerate*}\tracks\end{enumerate*}}% +\fi\else\ifx\cdartist\empty% +\maxilatchtext{\cdtitle}% +\maxispinetext{\cdtitle}% +\ifx\tracks\empty% +\maxibacktext{\cdtitle}{}% +\else% +\maxibacktexi{\cdtitle}{\begin{enumerate*}\tracks\end{enumerate*}}% +\fi\else% +\maxilatchtext{\cdartist\\[0.25\baselineskip]\cdtitle}% +\maxispinetext{\cdartist/\cdtitle}% +\ifx\tracks\empty% +\maxibacktext{\cdartist\\[0.25\baselineskip]\cdtitle}{}% +\else% +\maxibacktext{\cdartist\\[0.25\baselineskip]\cdtitle}{\begin{enumerate*}\tracks\end{enumerate*}}% +\fi\fi\fi +\centering\papercdcase[80] +\else +\ifx\cdtitle\empty% +\latchtext{\cdartist}% +\spinetexi{\cdartist}% +\ifx\tracks\empty% +\backtext{\cdartist}{}% +\else% +\backtext{\cdartist}{\begin{enumerate*}\tracks\end{enumerate*}}% +\fi\else\ifx\cdartist\empty% +\latchtext{\cdtitle}% +\spinetext{\cdtitle}% +\ifx\tracks\empty% +\backtext{\cdtitle}{}% +\else% +\backtexi{\cdtitle}{\begin{enumerate*}\tracks\end{enumerate*}}% +\fi\else% +\latchtext{\cdartist\\[0.4\baselineskip]\cdtitle}% +\spinetext{\cdartist/\cdtitle}% +\ifx\tracks\empty% +\backtext{\cdartist\\[0.4\baselineskip]\cdtitle}{}% +\else% +\backtext{\cdartist\\[0.4\baselineskip]\cdtitle}{\begin{enumerate*}\tracks\end{enumerate*}}% +\fi\fi\fi +\centering\papercdcase +\fi + +\end{document} Binary files old/doc/latex/papercdcase/papercdcase.pdf and new/doc/latex/papercdcase/papercdcase.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/properties/readme.de new/doc/latex/properties/readme.de --- old/doc/latex/properties/readme.de 2009-07-19 20:20:09.000000000 +0200 +++ new/doc/latex/properties/readme.de 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -% $Id: readme.de 7 2009-06-30 11:07:26Z michael $ -% -% Paket fuer Properties -% -% Properties-Datei laden: -% \loadDefaultProperties lädt Datei \jobname.properties und -% falls vorhanden \jobname.local.properties -% dabei werden die vorher definierten Werte überschrieben. -% \loadOtherProperties{xxx} lädt Datei xxx.properties und -% falls vorhanden xxx.local.properties -% dabei werden die vorher definierten Werte überschrieben. -% -% Werte ermitteln: -% \getDefaultProperty{key} ermittelt den Wert für key. -% \getOtherProperty{xxx}{key} ermittelt den Wert für key und verwendet -% dabei xxx.properties. -% -% Werte setzen: -% \setDefaultProperty{key}{value} setzt für key den Wert value. -% \setOtherProperty{xxx}{key}{value} setzt für key den Wert value und verwendet -% dabei xxx.properties. -% -% (c) Michael Niedermair (m.g.n(a)gmx.de) -% Lizenz: LaTeX Project Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/properties/testprop.tex new/doc/latex/properties/testprop.tex --- old/doc/latex/properties/testprop.tex 2009-07-19 20:20:09.000000000 +0200 +++ new/doc/latex/properties/testprop.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -% UTF8 -% -% $Id: testprop.tex 7 2009-06-30 11:07:26Z michael $ -% -\listfiles -\documentclass[ngerman,a4paper]{scrartcl} - -\usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} - -\usepackage{babel,libertine,sverb,ifthen} - -\usepackage{properties} - -\begin{verbwrite}{testprop.properties} -cropmark=true -autor=Michael Niedermair -test=Dies ist ein Test! -\end{verbwrite} -\begin{verbwrite}{testprop.local.properties} -cropmark=newlocal -\end{verbwrite} -\begin{verbwrite}{xxx.properties} -name=Michael Niedermair -\end{verbwrite} -\setlength{\parindent}{0pt} - -\begin{document} - -\section{Paket properties.sty} - -\minisec{Properties \jobname.properties} - -\loadDefaultProperties - - -crop\quad=\quad\getDefaultProperty{cropmark} - -nodef\quad=\quad\getDefaultProperty{notdef} - -autor\quad=\quad\getDefaultProperty{autor} - -test\quad=\quad\getDefaultProperty{test} - -Test auf crop = newlocal: \quad\ifthenelse{\equal{\getDefaultProperty{cropmark}}{newlocal}}{JA}{NEIN}\\ -Test auf crop = local: \quad\ifthenelse{\equal{\getDefaultProperty{cropmark}}{local}}{JA}{NEIN} - -\minisec{Properties xxx.properties} - -\loadOtherProperties{xxx} - -name\quad=\quad\getOtherProperty{xxx}{name} - -\setOtherProperty{xxx}{name}{Michael G. Niedermair} - -Wert setzen: - -new: name\quad=\quad\getOtherProperty{xxx}{name} - -\end{document} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/papercdcase.doc.tlpobj new/tlpkg/tlpobj/papercdcase.doc.tlpobj --- old/tlpkg/tlpobj/papercdcase.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/papercdcase.doc.tlpobj 2017-04-14 17:53:12.000000000 +0200 @@ -0,0 +1,9 @@ +name papercdcase.doc +category Package +revision 15878 +shortdesc doc files of papercdcase +relocated 1 +docfiles size=39 + RELOC/doc/latex/papercdcase/example.tex + RELOC/doc/latex/papercdcase/interactive.tex + RELOC/doc/latex/papercdcase/papercdcase.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/properties.doc.tlpobj new/tlpkg/tlpobj/properties.doc.tlpobj --- old/tlpkg/tlpobj/properties.doc.tlpobj 2016-04-14 19:36:20.000000000 +0200 +++ new/tlpkg/tlpobj/properties.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -name properties.doc -category Package -revision 15878 -shortdesc doc files of properties -relocated 1 -docfiles size=2 - RELOC/doc/latex/properties/readme.de - RELOC/doc/latex/properties/testprop.tex ++++++ properties.doc.tar.xz -> papercdcase.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/properties/readme.de new/doc/latex/properties/readme.de --- old/doc/latex/properties/readme.de 2009-07-19 20:20:09.000000000 +0200 +++ new/doc/latex/properties/readme.de 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -% $Id: readme.de 7 2009-06-30 11:07:26Z michael $ -% -% Paket fuer Properties -% -% Properties-Datei laden: -% \loadDefaultProperties lädt Datei \jobname.properties und -% falls vorhanden \jobname.local.properties -% dabei werden die vorher definierten Werte überschrieben. -% \loadOtherProperties{xxx} lädt Datei xxx.properties und -% falls vorhanden xxx.local.properties -% dabei werden die vorher definierten Werte überschrieben. -% -% Werte ermitteln: -% \getDefaultProperty{key} ermittelt den Wert für key. -% \getOtherProperty{xxx}{key} ermittelt den Wert für key und verwendet -% dabei xxx.properties. -% -% Werte setzen: -% \setDefaultProperty{key}{value} setzt für key den Wert value. -% \setOtherProperty{xxx}{key}{value} setzt für key den Wert value und verwendet -% dabei xxx.properties. -% -% (c) Michael Niedermair (m.g.n(a)gmx.de) -% Lizenz: LaTeX Project Public License diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/properties/testprop.tex new/doc/latex/properties/testprop.tex --- old/doc/latex/properties/testprop.tex 2009-07-19 20:20:09.000000000 +0200 +++ new/doc/latex/properties/testprop.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -% UTF8 -% -% $Id: testprop.tex 7 2009-06-30 11:07:26Z michael $ -% -\listfiles -\documentclass[ngerman,a4paper]{scrartcl} - -\usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} - -\usepackage{babel,libertine,sverb,ifthen} - -\usepackage{properties} - -\begin{verbwrite}{testprop.properties} -cropmark=true -autor=Michael Niedermair -test=Dies ist ein Test! -\end{verbwrite} -\begin{verbwrite}{testprop.local.properties} -cropmark=newlocal -\end{verbwrite} -\begin{verbwrite}{xxx.properties} -name=Michael Niedermair -\end{verbwrite} -\setlength{\parindent}{0pt} - -\begin{document} - -\section{Paket properties.sty} - -\minisec{Properties \jobname.properties} - -\loadDefaultProperties - - -crop\quad=\quad\getDefaultProperty{cropmark} - -nodef\quad=\quad\getDefaultProperty{notdef} - -autor\quad=\quad\getDefaultProperty{autor} - -test\quad=\quad\getDefaultProperty{test} - -Test auf crop = newlocal: \quad\ifthenelse{\equal{\getDefaultProperty{cropmark}}{newlocal}}{JA}{NEIN}\\ -Test auf crop = local: \quad\ifthenelse{\equal{\getDefaultProperty{cropmark}}{local}}{JA}{NEIN} - -\minisec{Properties xxx.properties} - -\loadOtherProperties{xxx} - -name\quad=\quad\getOtherProperty{xxx}{name} - -\setOtherProperty{xxx}{name}{Michael G. Niedermair} - -Wert setzen: - -new: name\quad=\quad\getOtherProperty{xxx}{name} - -\end{document} - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/papercdcase/papercdcase.sty new/tex/latex/papercdcase/papercdcase.sty --- old/tex/latex/papercdcase/papercdcase.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/papercdcase/papercdcase.sty 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,449 @@ +%% +%% This is file `papercdcase.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% papercdcase.dtx +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from papercdcase.sty. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file papercdcase.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +%%^^A $Id: papercdcase.dtx 11 2006-08-07 11:54:04Z tdussa $ +\def\SVNMisc$#1: #2 #3${#2} +\def\SVNDate$#1: #2-#3-#4 #5${#2/#3/#4} +\def\filename{papercdcase.dtx} +\xdef\fileversion{\SVNMisc$Revision: 11 $} +\xdef\filedate{\SVNDate$Date: 2006-08-07 13:54:04 +0200 (Mon, 07 Aug 2006) $} +\let\docversion=\fileversion +\let\docdate=\filedate +\typeout{% +%% Purpose: + Package: papercdcase \filedate\space\fileversion\space + for typesetting paper CD cases. +}% +%% +%% Documentation: +%% The documentation can be generated from the original file +%% papercdcase.dtx with the doc style/package. LaTeX the file +%% papercdcase.dtx to get the full documentation in dvi format. +%% +%% +%% Author: Tobias Dussa +%% Im Schlossfeld 4 +%% 77855 Achern +%% Mail: tdussa(a)sdhs.de +%% +%% Copyright (C) 2006 Tobias Dussa +%% +%% papercdcase.dtx is distributed in hopes that it will be useful, +%% but WITHOUT ANY WARRANTY. No author or distributor accepts +%% responsibility to anyone for the consequences of using it or for +%% whether it serves any particular purpose or works at all, unless +%% he says so in writing. +%% +%% Everyone is granted permission to copy, modify and redistribute +%% papercdcase.dtx, provided this copyright notice is preserved and +%% any modifications are indicated. +%% +%% +%% This style is still under development and may be replaced with a +%% new version which provides an enhanced functionality. +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren $ Right paren $ +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%% +\ProvidesPackage{papercdcase}[\filedate v.\fileversion{} Paper CD Case Style (TD)] +\NeedsTeXFormat{LaTeX2e} + +\RequirePackage{graphicx} +\RequirePackage{calc} + +\makeatletter + +\newcommand{\@PCDC@Latch@Matter}{} +\newcommand{\@PCDC@Pouch@Matter}{} +\newcommand{\@PCDC@Back@Matter}{} +\newcommand{\@PCDC@Spine@Matter}{} + +\newcommand{\setcdlatchmatter}[1]{\renewcommand{\@PCDC@Latch@Matter}{#1}} +\newcommand{\setcdpouchmatter}[1]{\renewcommand{\@PCDC@Pouch@Matter}{#1}} +\newcommand{\setcdbackmatter}[1]{\renewcommand{\@PCDC@Back@Matter}{#1}} +\newcommand{\setcdspinematter}[1]{\renewcommand{\@PCDC@Spine@Matter}{#1}} + +\DeclareRobustCommand{\papercdcase}{% +\@ifstar% +{\setcounter{@PCDC@Design@Height}{297}\setcounter{@PCDC@Pouch@Height}{75}\@PCDC@Typeset@Scheme}% +{\setcounter{@PCDC@Design@Height}{279}\setcounter{@PCDC@Pouch@Height}{64}\@PCDC@Typeset@Scheme}} + +%% Control counters. +%% Overall height of the folding scheme. +\newcounter{@PCDC@Design@Height} +%% Height of the CD pouch. +\newcounter{@PCDC@Pouch@Height} +%% Height (and width) of the folded paper CD case. +\newcounter{@PCDC@Back@Height} +%% Height of the CD case spine. +\newcounter{@PCDC@Spine@Height} +%% Margin between the text boxes and the edge of the CD case. +\newcounter{@PCDC@Text@Margin} +%% Length of regular fold marks. +\newcounter{@PCDC@Fold@Length} +%% Length of short fold marks. +\newcounter{@PCDC@Fold@Short@Length} +%% Space between fold marks and their labels. +\newcounter{@PCDC@Label@Sep} + +\setcounter{@PCDC@Design@Height}{279} +\setcounter{@PCDC@Pouch@Height}{64} +\setcounter{@PCDC@Back@Height}{125} +\setcounter{@PCDC@Spine@Height}{8} +\setcounter{@PCDC@Text@Margin}{5} +\setcounter{@PCDC@Fold@Length}{25} +\setcounter{@PCDC@Fold@Short@Length}{20} +\setcounter{@PCDC@Label@Sep}{1} + +%% Common counters. +\newcounter{@PCDC@Design@width} +\newcounter{@PCDC@Top@Lft@Fold} +\newcounter{@PCDC@Top@Rgt@Fold} +\newcounter{@PCDC@Bot@Lft@Fold} +\newcounter{@PCDC@Bot@Rgt@Fold} +\newcounter{@PCDC@Lwr@Top@Fold} +\newcounter{@PCDC@Upr@Top@Fold} +\newcounter{@PCDC@Bot@Fold} +\newcounter{@PCDC@Text@width} +\newcounter{@PCDC@Fold@Dash@Number} + +%% Counters with the actual coordinates of the folding marks. +\newcounter{@PCDC@Fold@A@Lft@X} +\newcounter{@PCDC@Fold@A@Lft@Y} +\newcounter{@PCDC@Fold@A@Rgt@X} +\newcounter{@PCDC@Fold@A@Rgt@Y} +\newcounter{@PCDC@Fold@B@Lft@X} +\newcounter{@PCDC@Fold@B@Lft@Y} +\newcounter{@PCDC@Fold@B@Rgt@X} +\newcounter{@PCDC@Fold@B@Rgt@Y} +\newcounter{@PCDC@Fold@C@Top@X} +\newcounter{@PCDC@Fold@C@Top@Y} +\newcounter{@PCDC@Fold@C@Bot@X} +\newcounter{@PCDC@Fold@C@Bot@Y} +\newcounter{@PCDC@Fold@D@Top@X} +\newcounter{@PCDC@Fold@D@Top@Y} +\newcounter{@PCDC@Fold@D@Bot@X} +\newcounter{@PCDC@Fold@D@Bot@Y} +\newcounter{@PCDC@Fold@E@Lft@X} +\newcounter{@PCDC@Fold@E@Lft@Y} +\newcounter{@PCDC@Fold@E@Rgt@X} +\newcounter{@PCDC@Fold@E@Rgt@Y} +\newcounter{@PCDC@Fold@F@Lft@X} +\newcounter{@PCDC@Fold@F@Lft@Y} +\newcounter{@PCDC@Fold@F@Rgt@X} +\newcounter{@PCDC@Fold@F@Rgt@Y} +\newcounter{@PCDC@Fold@G@Lft@X} +\newcounter{@PCDC@Fold@G@Lft@Y} +\newcounter{@PCDC@Fold@G@Rgt@X} +\newcounter{@PCDC@Fold@G@Rgt@Y} +\newcounter{@PCDC@Fold@H@X} +\newcounter{@PCDC@Fold@H@Y} +\newcounter{@PCDC@Fold@I@X} +\newcounter{@PCDC@Fold@I@Y} +\newcounter{@PCDC@Fold@J@X} +\newcounter{@PCDC@Fold@J@Y} +\newcounter{@PCDC@Fold@K@X} +\newcounter{@PCDC@Fold@K@Y} +\newcounter{@PCDC@Fold@L@X} +\newcounter{@PCDC@Fold@L@Y} +\newcounter{@PCDC@Fold@M@X} +\newcounter{@PCDC@Fold@M@Y} + +%% Counters with the actual coordinates of the text boxes. +\newcounter{@PCDC@Fold@A@Lft@Label@X} +\newcounter{@PCDC@Fold@A@Lft@Label@Y} +\newcounter{@PCDC@Fold@A@Rgt@Label@X} +\newcounter{@PCDC@Fold@A@Rgt@Label@Y} +\newcounter{@PCDC@Fold@B@Lft@Label@X} +\newcounter{@PCDC@Fold@B@Lft@Label@Y} +\newcounter{@PCDC@Fold@B@Rgt@Label@X} +\newcounter{@PCDC@Fold@B@Rgt@Label@Y} +\newcounter{@PCDC@Fold@C@Top@Label@X} +\newcounter{@PCDC@Fold@C@Top@Label@Y} +\newcounter{@PCDC@Fold@C@Bot@Label@X} +\newcounter{@PCDC@Fold@C@Bot@Label@Y} +\newcounter{@PCDC@Fold@D@Top@Label@X} +\newcounter{@PCDC@Fold@D@Top@Label@Y} +\newcounter{@PCDC@Fold@D@Bot@Label@X} +\newcounter{@PCDC@Fold@D@Bot@Label@Y} +\newcounter{@PCDC@Fold@E@Lft@Label@X} +\newcounter{@PCDC@Fold@E@Lft@Label@Y} +\newcounter{@PCDC@Fold@E@Rgt@Label@X} +\newcounter{@PCDC@Fold@E@Rgt@Label@Y} +\newcounter{@PCDC@Fold@F@Lft@Label@X} +\newcounter{@PCDC@Fold@F@Lft@Label@Y} +\newcounter{@PCDC@Fold@F@Rgt@Label@X} +\newcounter{@PCDC@Fold@F@Rgt@Label@Y} +\newcounter{@PCDC@Fold@G@Lft@Label@X} +\newcounter{@PCDC@Fold@G@Lft@Label@Y} +\newcounter{@PCDC@Fold@G@Rgt@Label@X} +\newcounter{@PCDC@Fold@G@Rgt@Label@Y} +\newcounter{@PCDC@Fold@H@Label@X} +\newcounter{@PCDC@Fold@H@Label@Y} +\newcounter{@PCDC@Fold@I@Label@X} +\newcounter{@PCDC@Fold@I@Label@Y} +\newcounter{@PCDC@Fold@J@Label@X} +\newcounter{@PCDC@Fold@J@Label@Y} +\newcounter{@PCDC@Fold@K@Label@X} +\newcounter{@PCDC@Fold@K@Label@Y} +\newcounter{@PCDC@Fold@L@Label@X} +\newcounter{@PCDC@Fold@L@Label@Y} +\newcounter{@PCDC@Fold@M@Label@X} +\newcounter{@PCDC@Fold@M@Label@Y} + +%% Counters with the actual coordinates of the text boxes. +\newcounter{@PCDC@Pouch@Matter@X} +\newcounter{@PCDC@Pouch@Matter@Y} +\newcounter{@PCDC@Back@Matter@X} +\newcounter{@PCDC@Back@Matter@Y} +\newcounter{@PCDC@Spine@Matter@X} +\newcounter{@PCDC@Spine@Matter@Y} +\newcounter{@PCDC@Latch@Matter@X} +\newcounter{@PCDC@Latch@Matter@Y} + +%% The actual output function. +\newcommand{\@PCDC@Typeset@Scheme}[1][120]{% +%% Scale the output. +\setlength{\unitlength}{1mm} +\multiply\unitlength by #1 +\divide\unitlength by 120 +%% +%% Compute the actual coordinates. +%% Common coordinates. +\setcounter{@PCDC@Design@width}{\value{@PCDC@Back@Height}+2*\value{@PCDC@Fold@Length}} +\setcounter{@PCDC@Top@Lft@Fold}{\value{@PCDC@Fold@Length}+1} +\setcounter{@PCDC@Top@Rgt@Fold}{\value{@PCDC@Fold@Length}+\value{@PCDC@Back@Height}} +\setcounter{@PCDC@Bot@Lft@Fold}{\value{@PCDC@Fold@Length}+1} +\setcounter{@PCDC@Bot@Rgt@Fold}{\value{@PCDC@Fold@Length}+\value{@PCDC@Back@Height}} +\setcounter{@PCDC@Lwr@Top@Fold}{2*\value{@PCDC@Pouch@Height}+2*\value{@PCDC@Back@Height}-\value{@PCDC@Design@Height}} +\setcounter{@PCDC@Upr@Top@Fold}{\value{@PCDC@Lwr@Top@Fold}+2*\value{@PCDC@Spine@Height}} +\setcounter{@PCDC@Bot@Fold}{2*\value{@PCDC@Pouch@Height}} +\setcounter{@PCDC@Text@width}{\value{@PCDC@Back@Height}-2*\value{@PCDC@Text@Margin}} +\setcounter{@PCDC@Fold@Dash@Number}{\value{@PCDC@Fold@Length}/2} +%% +%% Fold mark coordinates. +\setcounter{@PCDC@Fold@A@Lft@X}{\value{@PCDC@Top@Lft@Fold}} +\setcounter{@PCDC@Fold@A@Lft@Y}{\value{@PCDC@Design@Height}} +\setcounter{@PCDC@Fold@A@Rgt@X}{\value{@PCDC@Top@Rgt@Fold}} +\setcounter{@PCDC@Fold@A@Rgt@Y}{\value{@PCDC@Design@Height}} +\setcounter{@PCDC@Fold@B@Lft@X}{\value{@PCDC@Bot@Lft@Fold}} +\setcounter{@PCDC@Fold@B@Lft@Y}{0} +\setcounter{@PCDC@Fold@B@Rgt@X}{\value{@PCDC@Bot@Rgt@Fold}} +\setcounter{@PCDC@Fold@B@Rgt@Y}{0} +\setcounter{@PCDC@Fold@C@Top@X}{\value{@PCDC@Top@Rgt@Fold}} +\setcounter{@PCDC@Fold@C@Top@Y}{\value{@PCDC@Design@Height}} +\setcounter{@PCDC@Fold@C@Bot@X}{\value{@PCDC@Bot@Rgt@Fold}} +\setcounter{@PCDC@Fold@C@Bot@Y}{0} +\setcounter{@PCDC@Fold@D@Top@X}{\value{@PCDC@Top@Lft@Fold}} +\setcounter{@PCDC@Fold@D@Top@Y}{\value{@PCDC@Design@Height}} +\setcounter{@PCDC@Fold@D@Bot@X}{\value{@PCDC@Bot@Lft@Fold}} +\setcounter{@PCDC@Fold@D@Bot@Y}{0} +\setcounter{@PCDC@Fold@E@Lft@X}{\value{@PCDC@Bot@Lft@Fold}} +\setcounter{@PCDC@Fold@E@Lft@Y}{\value{@PCDC@Bot@Fold}} +\setcounter{@PCDC@Fold@E@Rgt@X}{\value{@PCDC@Bot@Rgt@Fold}} +\setcounter{@PCDC@Fold@E@Rgt@Y}{\value{@PCDC@Bot@Fold}} +\setcounter{@PCDC@Fold@F@Lft@X}{\value{@PCDC@Bot@Lft@Fold}} +\setcounter{@PCDC@Fold@F@Lft@Y}{\value{@PCDC@Lwr@Top@Fold}} +\setcounter{@PCDC@Fold@F@Rgt@X}{\value{@PCDC@Bot@Rgt@Fold}} +\setcounter{@PCDC@Fold@F@Rgt@Y}{\value{@PCDC@Lwr@Top@Fold}} +\setcounter{@PCDC@Fold@G@Lft@X}{\value{@PCDC@Bot@Lft@Fold}} +\setcounter{@PCDC@Fold@G@Lft@Y}{\value{@PCDC@Upr@Top@Fold}} +\setcounter{@PCDC@Fold@G@Rgt@X}{\value{@PCDC@Bot@Rgt@Fold}} +\setcounter{@PCDC@Fold@G@Rgt@Y}{\value{@PCDC@Upr@Top@Fold}} +\setcounter{@PCDC@Fold@H@X}{\value{@PCDC@Bot@Rgt@Fold}} +\setcounter{@PCDC@Fold@H@Y}{\value{@PCDC@Pouch@Height}} +\setcounter{@PCDC@Fold@I@X}{\value{@PCDC@Bot@Rgt@Fold}} +\setcounter{@PCDC@Fold@I@Y}{\value{@PCDC@Pouch@Height}} +\setcounter{@PCDC@Fold@J@X}{\value{@PCDC@Bot@Lft@Fold}} +\setcounter{@PCDC@Fold@J@Y}{\value{@PCDC@Pouch@Height}} +\setcounter{@PCDC@Fold@K@X}{\value{@PCDC@Bot@Lft@Fold}} +\setcounter{@PCDC@Fold@K@Y}{\value{@PCDC@Pouch@Height}} +\setcounter{@PCDC@Fold@L@X}{\value{@PCDC@Top@Rgt@Fold}} +\setcounter{@PCDC@Fold@L@Y}{\value{@PCDC@Design@Height}-\value{@PCDC@Fold@Short@Length}} +\setcounter{@PCDC@Fold@M@X}{\value{@PCDC@Top@Lft@Fold}} +\setcounter{@PCDC@Fold@M@Y}{\value{@PCDC@Design@Height}-\value{@PCDC@Fold@Short@Length}} +%% +%% Fold mark label coordinates. +\setcounter{@PCDC@Fold@A@Lft@Label@X}{\value{@PCDC@Fold@A@Lft@X}-\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@A@Lft@Label@Y}{\value{@PCDC@Fold@A@Lft@Y}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@A@Rgt@Label@X}{\value{@PCDC@Fold@A@Rgt@X}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@A@Rgt@Label@Y}{\value{@PCDC@Fold@A@Rgt@Y}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@B@Lft@Label@X}{\value{@PCDC@Fold@B@Lft@X}-\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@B@Lft@Label@Y}{\value{@PCDC@Fold@B@Lft@Y}-\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@B@Rgt@Label@X}{\value{@PCDC@Fold@B@Rgt@X}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@B@Rgt@Label@Y}{\value{@PCDC@Fold@B@Rgt@Y}-\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@C@Top@Label@X}{\value{@PCDC@Fold@C@Top@X}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@C@Top@Label@Y}{\value{@PCDC@Fold@C@Top@Y}-\value{@PCDC@Fold@Length}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@C@Bot@Label@X}{\value{@PCDC@Fold@C@Bot@X}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@C@Bot@Label@Y}{\value{@PCDC@Fold@C@Bot@Y}+\value{@PCDC@Fold@Length}-\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@D@Top@Label@X}{\value{@PCDC@Fold@D@Top@X}-\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@D@Top@Label@Y}{\value{@PCDC@Fold@D@Top@Y}-\value{@PCDC@Fold@Length}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@D@Bot@Label@X}{\value{@PCDC@Fold@D@Bot@X}-\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@D@Bot@Label@Y}{\value{@PCDC@Fold@D@Bot@Y}+\value{@PCDC@Fold@Length}-\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@E@Lft@Label@X}{\value{@PCDC@Fold@E@Lft@X}-\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@E@Lft@Label@Y}{\value{@PCDC@Fold@E@Lft@Y}-\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@E@Rgt@Label@X}{\value{@PCDC@Fold@E@Rgt@X}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@E@Rgt@Label@Y}{\value{@PCDC@Fold@E@Rgt@Y}-\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@F@Lft@Label@X}{\value{@PCDC@Fold@F@Lft@X}-\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@F@Lft@Label@Y}{\value{@PCDC@Fold@F@Lft@Y}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@F@Rgt@Label@X}{\value{@PCDC@Fold@F@Rgt@X}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@F@Rgt@Label@Y}{\value{@PCDC@Fold@F@Rgt@Y}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@G@Lft@Label@X}{\value{@PCDC@Fold@G@Lft@X}-\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@G@Lft@Label@Y}{\value{@PCDC@Fold@G@Lft@Y}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@G@Rgt@Label@X}{\value{@PCDC@Fold@G@Rgt@X}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@G@Rgt@Label@Y}{\value{@PCDC@Fold@G@Rgt@Y}+\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@H@Label@X}{\value{@PCDC@Fold@H@X}+5*\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@H@Label@Y}{\value{@PCDC@Fold@H@Y}+4*\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@I@Label@X}{\value{@PCDC@Fold@I@X}+5*\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@I@Label@Y}{\value{@PCDC@Fold@I@Y}-6*\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@J@Label@X}{\value{@PCDC@Fold@J@X}-5*\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@J@Label@Y}{\value{@PCDC@Fold@J@Y}+4*\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@K@Label@X}{\value{@PCDC@Fold@K@X}-5*\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@K@Label@Y}{\value{@PCDC@Fold@K@Y}-6*\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@L@Label@X}{\value{@PCDC@Fold@L@X}+5*\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@L@Label@Y}{\value{@PCDC@Fold@L@Y}+4*\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@M@Label@X}{\value{@PCDC@Fold@M@X}-5*\value{@PCDC@Label@Sep}} +\setcounter{@PCDC@Fold@M@Label@Y}{\value{@PCDC@Fold@M@Y}+4*\value{@PCDC@Label@Sep}} +%% +%% Text box coordinates. +\setcounter{@PCDC@Pouch@Matter@X}{\value{@PCDC@Fold@Length}+\value{@PCDC@Text@Margin}} +\setcounter{@PCDC@Pouch@Matter@Y}{\value{@PCDC@Text@Margin}} +\setcounter{@PCDC@Back@Matter@X}{\value{@PCDC@Fold@Length}+\value{@PCDC@Text@Margin}} +\setcounter{@PCDC@Back@Matter@Y}{\value{@PCDC@Pouch@Height}+\value{@PCDC@Back@Height}-\value{@PCDC@Text@Margin}} +\setcounter{@PCDC@Spine@Matter@X}{\value{@PCDC@Fold@Length}+\value{@PCDC@Back@Height}/2} +\setcounter{@PCDC@Spine@Matter@Y}{\value{@PCDC@Back@Matter@Y}+\value{@PCDC@Spine@Height}/2+\value{@PCDC@Text@Margin}} +\setcounter{@PCDC@Latch@Matter@X}{\value{@PCDC@Fold@Length}+\value{@PCDC@Text@Margin}} +\setcounter{@PCDC@Latch@Matter@Y}{\value{@PCDC@Spine@Matter@Y}+\value{@PCDC@Spine@Height}/2+\value{@PCDC@Text@Margin}} +%% +%% Typeset the folding scheme +\begin{picture}(\value{@PCDC@Design@width}, \value{@PCDC@Design@Height}) +%% Fold mark 1, left +\put(\value{@PCDC@Fold@A@Lft@X}, \value{@PCDC@Fold@A@Lft@Y}){\line(-1, 0){\value{@PCDC@Fold@Length}}} +\put(\value{@PCDC@Fold@A@Lft@Label@X}, \value{@PCDC@Fold@A@Lft@Label@Y}){\makebox(0, 0)[br]{\rotatebox{180}{1}}} +%% +%% Fold mark 1, right +\put(\value{@PCDC@Fold@A@Rgt@X}, \value{@PCDC@Fold@A@Rgt@Y}){\line(1, 0){\value{@PCDC@Fold@Length}}} +\put(\value{@PCDC@Fold@A@Rgt@Label@X}, \value{@PCDC@Fold@A@Rgt@Label@Y}){\makebox(0, 0)[bl]{\rotatebox{180}{1}}} +%% +%% Fold mark 2, left +\put(\value{@PCDC@Fold@B@Lft@X}, \value{@PCDC@Fold@B@Lft@Y}){\line(-1, 0){\value{@PCDC@Fold@Length}}} +\put(\value{@PCDC@Fold@B@Lft@Label@X}, \value{@PCDC@Fold@B@Lft@Label@Y}){\makebox(0, 0)[tr]{2}} +%% +%% Fold mark 2, right +\put(\value{@PCDC@Fold@B@Rgt@X}, \value{@PCDC@Fold@B@Rgt@Y}){\line(1, 0){\value{@PCDC@Fold@Length}}} +\put(\value{@PCDC@Fold@B@Rgt@Label@X}, \value{@PCDC@Fold@B@Rgt@Label@Y}){\makebox(0, 0)[tl]{2}} +%% +%% Fold mark 3, top +\put(\value{@PCDC@Fold@C@Top@X}, \value{@PCDC@Fold@C@Top@Y}){\line(0, -1){\value{@PCDC@Fold@Length}}} +\put(\value{@PCDC@Fold@C@Top@Label@X}, \value{@PCDC@Fold@C@Top@Label@Y}){\makebox(0, 0)[bl]{\rotatebox{90}{3}}} +%% +%% Fold mark 3, bottom +\put(\value{@PCDC@Fold@C@Bot@X}, \value{@PCDC@Fold@C@Bot@Y}){\line(0, 1){\value{@PCDC@Fold@Length}}} +\put(\value{@PCDC@Fold@C@Bot@Label@X}, \value{@PCDC@Fold@C@Bot@Label@Y}){\makebox(0, 0)[tl]{\rotatebox{90}{3}}} +%% +%% Fold mark 4, top +\put(\value{@PCDC@Fold@D@Top@X}, \value{@PCDC@Fold@D@Top@Y}){\line(0, -1){\value{@PCDC@Fold@Length}}} +\put(\value{@PCDC@Fold@D@Top@Label@X}, \value{@PCDC@Fold@D@Top@Label@Y}){\makebox(0, 0)[br]{\rotatebox{270}{4}}} +%% +%% Fold mark 4, bottom +\put(\value{@PCDC@Fold@D@Bot@X}, \value{@PCDC@Fold@D@Bot@Y}){\line(0, 1){\value{@PCDC@Fold@Length}}} +\put(\value{@PCDC@Fold@D@Bot@Label@X}, \value{@PCDC@Fold@D@Bot@Label@Y}){\makebox(0, 0)[tr]{\rotatebox{270}{4}}} +%% +%% Fold mark 5, left +\multiput(\value{@PCDC@Fold@E@Lft@X}, \value{@PCDC@Fold@E@Lft@Y})(-2, 0){\value{@PCDC@Fold@Dash@Number}}{\line(-1, 0){1}} +\put(\value{@PCDC@Fold@E@Lft@Label@X}, \value{@PCDC@Fold@E@Lft@Label@Y}){\makebox(0, 0)[tr]{5 (bottom)}} +%% +%% Fold mark 5, right +\multiput(\value{@PCDC@Fold@E@Rgt@X}, \value{@PCDC@Fold@E@Rgt@Y})(2, 0){\value{@PCDC@Fold@Dash@Number}}{\line(1, 0){1}} +\put(\value{@PCDC@Fold@E@Rgt@Label@X}, \value{@PCDC@Fold@E@Rgt@Label@Y}){\makebox(0, 0)[tl]{5 (bottom)}} +%% +%% Fold mark 6, left +\multiput(\value{@PCDC@Fold@F@Lft@X}, \value{@PCDC@Fold@F@Lft@Y})(-2, 0){\value{@PCDC@Fold@Dash@Number}}{\line(-1, 0){1}} +\put(\value{@PCDC@Fold@F@Lft@Label@X}, \value{@PCDC@Fold@F@Lft@Label@Y}){\makebox(0, 0)[br]{\rotatebox{180}{6 (top)}}} +%% +%% Fold mark 6, right +\multiput(\value{@PCDC@Fold@F@Rgt@X}, \value{@PCDC@Fold@F@Rgt@Y})(2, 0){\value{@PCDC@Fold@Dash@Number}}{\line(1, 0){1}} +\put(\value{@PCDC@Fold@F@Rgt@Label@X}, \value{@PCDC@Fold@F@Rgt@Label@Y}){\makebox(0, 0)[bl]{\rotatebox{180}{6 (top)}}} +%% +%% Fold mark 7, left +\multiput(\value{@PCDC@Fold@G@Lft@X}, \value{@PCDC@Fold@G@Lft@Y})(-2, 0){\value{@PCDC@Fold@Dash@Number}}{\line(-1, 0){1}} +\put(\value{@PCDC@Fold@G@Lft@Label@X}, \value{@PCDC@Fold@G@Lft@Label@Y}){\makebox(0, 0)[br]{\rotatebox{180}{7 (top)}}} +%% +%% Fold mark 7, right +\multiput(\value{@PCDC@Fold@G@Rgt@X}, \value{@PCDC@Fold@G@Rgt@Y})(2, 0){\value{@PCDC@Fold@Dash@Number}}{\line(1, 0){1}} +\put(\value{@PCDC@Fold@G@Rgt@Label@X}, \value{@PCDC@Fold@G@Rgt@Label@Y}){\makebox(0, 0)[bl]{\rotatebox{180}{7 (top)}}} +%% +%% Fold mark 8 +\put(\value{@PCDC@Fold@H@X}, \value{@PCDC@Fold@H@Y}){\line(1, 1){\value{@PCDC@Fold@Length}}} +\put(\value{@PCDC@Fold@H@Label@X}, \value{@PCDC@Fold@H@Label@Y}){\makebox(0, 0)[tl]{\rotatebox{ 45}{8}}} +%% +%% Fold mark 9 +\put(\value{@PCDC@Fold@I@X}, \value{@PCDC@Fold@I@Y}){\line(1, -1){\value{@PCDC@Fold@Length}}} +\put(\value{@PCDC@Fold@I@Label@X}, \value{@PCDC@Fold@I@Label@Y}){\makebox(0, 0)[tr]{\rotatebox{315}{9}}} +%% +%% Fold mark 10 +\put(\value{@PCDC@Fold@J@X}, \value{@PCDC@Fold@J@Y}){\line(-1, 1){\value{@PCDC@Fold@Length}}} +\put(\value{@PCDC@Fold@J@Label@X}, \value{@PCDC@Fold@J@Label@Y}){\makebox(0, 0)[tr]{\rotatebox{315}{10}}} +%% +%% Fold mark 11 +\put(\value{@PCDC@Fold@K@X}, \value{@PCDC@Fold@K@Y}){\line(-1, -1){\value{@PCDC@Fold@Length}}} +\put(\value{@PCDC@Fold@K@Label@X}, \value{@PCDC@Fold@K@Label@Y}){\makebox(0, 0)[tl]{\rotatebox{ 45}{11}}} +%% +%% Fold mark 12 +\put(\value{@PCDC@Fold@L@X}, \value{@PCDC@Fold@L@Y}){\line(1, 1){\value{@PCDC@Fold@Short@Length}}} +\put(\value{@PCDC@Fold@L@Label@X}, \value{@PCDC@Fold@L@Label@Y}){\makebox(0, 0)[tl]{\rotatebox{ 45}{12}}} +%% +%% Fold mark 13 +\put(\value{@PCDC@Fold@M@X}, \value{@PCDC@Fold@M@Y}){\line(-1, 1){\value{@PCDC@Fold@Short@Length}}} +\put(\value{@PCDC@Fold@M@Label@X}, \value{@PCDC@Fold@M@Label@Y}){\makebox(0, 0)[tr]{\rotatebox{315}{13}}} +%% +%% Latch matter +\put(\value{@PCDC@Latch@Matter@X}, \value{@PCDC@Latch@Matter@Y}){\makebox(0, 0)[bl]{\rotatebox{180}{\parbox{\value{@PCDC@Text@width}\unitlength}{\@PCDC@Latch@Matter}}}} +%% +%% Spine matter +\put(\value{@PCDC@Spine@Matter@X}, \value{@PCDC@Spine@Matter@Y}){\makebox(0, 0)[cc]{\@PCDC@Spine@Matter}} +%% +%% Back matter +\put(\value{@PCDC@Back@Matter@X}, \value{@PCDC@Back@Matter@Y}){\makebox(0, 0)[tl]{\parbox{\value{@PCDC@Text@width}\unitlength}{\@PCDC@Back@Matter}}} +%% +%% Pouch matter +\put(\value{@PCDC@Pouch@Matter@X}, \value{@PCDC@Pouch@Matter@Y}){\makebox(0, 0)[bl]{\rotatebox{180}{\parbox{\value{@PCDC@Text@width}\unitlength}{\@PCDC@Pouch@Matter}}}} +\end{picture}} + +\makeatother +\endinput +%% +%% End of file `papercdcase.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/papercdcase.tlpobj new/tlpkg/tlpobj/papercdcase.tlpobj --- old/tlpkg/tlpobj/papercdcase.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/papercdcase.tlpobj 2017-04-14 17:53:12.000000000 +0200 @@ -0,0 +1,13 @@ +name papercdcase +category Package +revision 15878 +shortdesc Origami-style folding paper CD case +relocated 1 +longdesc This package implements a LaTeX style file to produce origami- +longdesc style folding paper CD cases. +runfiles size=6 + RELOC/tex/latex/papercdcase/papercdcase.sty +catalogue-ctan /macros/latex/contrib/papercdcase +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license lppl +catalogue-topics covers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/properties.doc.tlpobj new/tlpkg/tlpobj/properties.doc.tlpobj --- old/tlpkg/tlpobj/properties.doc.tlpobj 2016-04-14 19:36:20.000000000 +0200 +++ new/tlpkg/tlpobj/properties.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -name properties.doc -category Package -revision 15878 -shortdesc doc files of properties -relocated 1 -docfiles size=2 - RELOC/doc/latex/properties/readme.de - RELOC/doc/latex/properties/testprop.tex ++++++ protocol.doc.tar.xz -> paracol.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/paracol/README new/doc/latex/paracol/README --- old/doc/latex/paracol/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/paracol/README 2016-11-25 19:29:46.000000000 +0100 @@ -0,0 +1,114 @@ +paracol (v1.32): a multi-column package to typeset columns in "parallel". +=== +Copyright (C) 2005-2013 + Hiroshi Nakashima <h.nakashima@DOMAIN; DOMAIN=media.kyoto-u.ac.jp> + (Kyoto Univerisity) +This package can be redistributed and/or modified under the terms +of the LaTeX Project Public License distributed from CTAN +archives in directory macros/latex/base/lppl.txt; either +version 1 of the License, or any later version. +=== + +[Contents] + +- README ............ this document +- paracol.ins ....... for docstrip +- paracol.dtx ....... main dtx for manual and implementation document +- man.dtx ........... source of Section 1 to 6 of user's manual +- ref.dtx ........... source of Section 7 of user's manual +- pwfnote.dtx ....... source of Section 8 of user's manual +- ppts.dtx .......... source of Section 9 of user's manual +- bgpaint.dtx ....... source of Section 10 of user's manual +- probs.dtx ......... source of Section 11 of user's manual +- impl.dtx .......... source of implementation document +- paracol-man.pdf ... PDF of user's manual + +[How to "make"] + + % tex paracol.ins # you'll have paracol.sty and paracol-man.tex + +# to have user's manual (its PDF is included in the distribution) + % latex paracol-man + % latex paracol-man # you need do it twice to make index correct. + % makeindex -s gind.ist -o paracol-man.ind paracol-man.idx + % latex paracol-man + +# to have implementation document of almmost 300 pages(!!) + % latex paracol.dtx + % latex paracol.dtx # you need do it twice to make index correct. + % makeindex -s gind.ist -o paracol.ind paracol.idx + % makeindex -s gglo.ist -o paracol.gls paracol.glo + % latex paracol.dtx + +Note that if you want LaTeXing paracol-man.tex and/or paracol.dtx, +you need newvbtm.sty being also available in CTAN. + +[Features] + ++ "paracol" environment in which you may "switch" and "synchronize columns + by \switchcolumn(*). + ++ "column", "nthcolumn", "leftcolumn" and "rightcolumn" environments used in + "paracol" to enclose texts to appear in a column. + ++ Counters are "local" to each column in default but you may make some of + them global to all columns by \globalcounter{<ctr>}. + ++ \definethecounter{<ctr>}{<col>}{<rep>} to give <ctr> its <rep>resentaion + specific to <col>-th column. + ++ \addcontentsonly{<file>}{<col>} to allow contents output for <file> only + from <col> (new for v1.00). + ++ \columnratio{<r_0>,<r_1>,...} to control the width of each column rather + than splitting columns evenly (new for v1.1). + +- \columncolor[<mode>]{<color>}[<col>] to give the default <color> (with + <mode>) to the column <col> (new for v1.2). + +- \footnotelayout{<layout>} to choose ordinary column-wise footnote + typesetting or page-wise typesetting to gather footnotes in all columns + (new for v1.2 and *NEW* for v1.3 with better API). + +- \twosided{<t_1><t_2>...} to enable ordinary two-sided typesetting + (<t_i>=p), reversal of printing order of columns in even-numbered pages + (<t_i>=c), reversal of margins where marginal notes go to (<t_i>=m), + and/or mirroring background painting (<t_i>=b) ('m' and 'b' and better API + are *NEW* for v1.3). + +- "paracol" environment has options for "parallel-paging" to typeset + parallel-columns in adjacent page pairs (*NEW* for v1.3). + +- \thecolumn to let your macros know which columns they are in (*NEW* for + v1.3). + +- \ensurevspace{<len>} to force a page break if a synchronization point + would be set leaving a small space less than <len> (*NEW* for v1.3). + +- \setcolumnwidth{<s_1>,<s_2>,...}[<s'_1>,<s'_2>,...] to specify widths of + columns and column-separating gaps more detailedly than \columnratio + (*NEW* for v1.3). + +- \marginparthreshold{<k>}[<k'>] to specify the minimum ordinal <k> of + columns whose marginal notes go to right margin (*NEW* for v1.3). + +- \[no]coloredwordhyphenated to allow/disallow hyphenating the first word + following a coloring command (*NEW* for v1.3). + +- \colseprulecolor[<mode>]{<color>}[<col>] to specify the color of rules + drawn in gaps separating columns, i.e., now they can be drawn (*NEW* for + v1.3). + +- \backgroundcolor{<regino>}{<color>}[<mode>] to paint the background of a + <region> by <color> (*NEW* for v1.3). + +- \globalcounter* to make all counters global (*NEW* for v1.32). + +- Compatible with the new implemenatation of LaTeX (2015/01/10 or + later) now (*NEW* for v 1.32). + +- A bug found in v1.31 has been fixed. + +Enjoy! + +Hiroshi Nakashima <h.nakashima@DOMAIN; DOMAIN=media.kyoto-u.ac.jp> Binary files old/doc/latex/paracol/paracol-man.pdf and new/doc/latex/paracol/paracol-man.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/paracol/paracol-man.tex new/doc/latex/paracol/paracol-man.tex --- old/doc/latex/paracol/paracol-man.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/paracol/paracol-man.tex 2016-11-25 19:29:46.000000000 +0100 @@ -0,0 +1,30 @@ +%% LaTeX file 'paracol-man'. +%% Copyright (C) 2005-2015 +%% Hiroshi Nakashima <h.nakashima@DOMAIN; DOMAIN=media.kyoto-u.ac.jp> +%% (Kyoto University) +%% This program can be redistributed and/or modified under the terms +%% of the LaTeX Project Public License distributed from CTAN +%% archives in directory macros/latex/base/lppl.txt; either +%% version 1 of the License, or any later version. + +\ProvidesFile{paracol-man.tex} +[2015/10/10 v1.32 ] +\documentclass{ltxdoc}\normalmarginpar +\usepackage{color} +\usepackage{paracol} +\usepackage{newvbtm} +\DisableCrossrefs +\PageIndex +\CodelineNumbered +\RecordChanges +\OnlyDescription +\def\ONLYDESCRIPTION{} +\textwidth210mm +\advance\textwidth-40mm \oddsidemargin20mm \advance\oddsidemargin-1in +\columnsep10mm +\marginparwidth20mm \advance\marginparwidth-\marginparsep +\marginparsep.5\marginparsep +\raggedbottom +\begin{document} +\DocInput{paracol.dtx} +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/protocol/README new/doc/latex/protocol/README --- old/doc/latex/protocol/README 2012-03-05 01:56:28.000000000 +0100 +++ new/doc/latex/protocol/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,91 +0,0 @@ -README for the package protocol - - -Please note: Without changes, this package is only useful for - german users! It is planned to internationalize it, but - up to now, I had no time for it. Everybody, who likes to - help is welcome. - -License -======= - -The files in this directory (protocol distribution) are - - Copyright (C) 1997 Projektgruppe ACIT, Lehrstuhl VII, - Fachbereich Informatik, Universit"at Dortmund - 1997-1999,2006,2009-2012 Thomas Leineweber (protocol(a)tleine.de) - - This work may be distributed and/or modified under the - conditions of the LaTeX Project Public License, either version 1.3 - of this license or (at your option) any later version. - The latest version of this license is in - http://www.latex-project.org/lppl.txt - and version 1.3 or later is part of all distributions of LaTeX - version 2005/12/01 or later. - - This work has the LPPL maintenance status `maintained'. - - The Current Maintainer of this work is Thomas Leineweber. - - This work consists of the files protocol.dtx, protocol.ins, - protest.tex, readme - and the derived file protocol.cls. - - -ERROR REPORTS -============= - -Before you report an error, please check that: - - - the error isn't caused by obsolete versions of other software; - LaTeX from 1986 is a good candidate ... - - - you use an original version of the package. - - - If you think you found a genuine bug please report it together - with the following information: - - - version of the file - - - version (date!) of your LaTeX - - - a short test file showing the behavior with all unnecessary - code removed. - - - a transcript (log file) of the session that shows the error. - -Please note that it is important to make the file as small as possible -to allow me to find and fix the error soon. - -If you have an unchanged version of my package protocol, you can send me -error reports to - - protocol(a)tleine.de - - -Files distributed with this package -=================================== - -protocol.ins This is the installation script that will produce - the executable file protocol.cls when run through LaTeX - or TeX. -protocol.dtx `protocol' style for LaTeX in docstrip format. -README This file. -protocol.pdf Documentation generated from protocol.dtx. -protest.tex A test file showing the usage of the package. - - - -Acknowledgements -================ - -- This readme is mostly copied from the readme from the dinbrief package by - K.D. Braune and R. Gussmann. -- Boris Majowski made a better implementation for the next meeting. -- Ludger Humbert and Christoffer Timm showed me an error in the next meeting - logic. -- Johannes Pieper had many nice enhancement requests. -- Andre Dierker provided a better logic in the case the place of the next - meeting is not provided. -- The commands \vote and \actionitem are proposals from K. Lautenschläger. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/protocol/protest.tex new/doc/latex/protocol/protest.tex --- old/doc/latex/protocol/protest.tex 2012-03-05 01:56:28.000000000 +0100 +++ new/doc/latex/protocol/protest.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -\documentclass[signatures,a4paper]{protocol} - -\usepackage{german} -\usepackage[T1]{fontenc} -\usepackage[latin1]{inputenc} - -\groupname{Arbeitsgruppe 08/15} -\chair{Lothar Laber} -\writer{Siggi Schreiber} -\place{woauchimmer} -\date{9. Juni 1997} -\begintime{9:30} -\endtime{10:30} - -\nextdate{16. Juni 1997} -\nexttime{10.30} -\nextplace{wie immer} - -\begin{document} -\begin{Persons} -Es waren alle bis auf Susi Schl"afer anwesend. -\end{Persons} - -\section{Untergruppenberichte} -Die Gruppe 1 hat ihren Bericht noch nicht abgeliefert. - -\actionitem{Bericht der Gruppe 1 abliefern}{Willi Wirsing}{21.02.2012} - -Hoffentlich passiert das nicht wieder -\vote{Sollen wir etwas neues machen?}{5}{3}{12}{Der Beschluss wurde angenommen.} -\vote{Sollen wir nichts neues machen?}{Willi, Horst}{Kevin}{keine}{Der Beschluss wurde mit einer Gegenstimme angenommen.} -\end{document} Binary files old/doc/latex/protocol/protocol.pdf and new/doc/latex/protocol/protocol.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paracol.doc.tlpobj new/tlpkg/tlpobj/paracol.doc.tlpobj --- old/tlpkg/tlpobj/paracol.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/paracol.doc.tlpobj 2017-04-14 17:53:13.000000000 +0200 @@ -0,0 +1,9 @@ +name paracol.doc +category Package +revision 38621 +shortdesc doc files of paracol +relocated 1 +docfiles size=154 + RELOC/doc/latex/paracol/README + RELOC/doc/latex/paracol/paracol-man.pdf + RELOC/doc/latex/paracol/paracol-man.tex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/protocol.doc.tlpobj new/tlpkg/tlpobj/protocol.doc.tlpobj --- old/tlpkg/tlpobj/protocol.doc.tlpobj 2016-04-14 19:36:23.000000000 +0200 +++ new/tlpkg/tlpobj/protocol.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -name protocol.doc -category Package -revision 25562 -shortdesc doc files of protocol -relocated 1 -docfiles size=81 - RELOC/doc/latex/protocol/README - RELOC/doc/latex/protocol/protest.tex - RELOC/doc/latex/protocol/protocol.pdf ++++++ protocol.tar.xz -> paracol.tar.xz ++++++ ++++ 3062 lines of diff (skipped) ++++++ pmxchords.doc.tar.xz -> parades.doc.tar.xz ++++++ ++++ 2806 lines of diff (skipped) ++++++ pmxchords.tar.xz -> parades.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/parades/paravesp.sty new/tex/latex/parades/paravesp.sty --- old/tex/latex/parades/paravesp.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/parades/paravesp.sty 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,58 @@ +\ProvidesPackage{paravesp}[2016/02/05 space above and below paragraphs] + +\newcount\pd@lastpenalty + +\newcommand\pd@remember@penalty{\pd@lastpenalty=\lastpenalty\relax} + +\newcommand\pd@restore@penalty{\ifnum 0=\pd@lastpenalty \else + \penalty\pd@lastpenalty\relax \fi} + +\newcommand\ParaSpaceAbove[1]{\relax % Mask \ifdim from possible expansion +\ifvmode + \skip0=#1\relax + \ifdim\parskip<0pt\relax + \skip0=0pt\relax + \fi + \ifdim\skip0=0pt\relax + \IssueParaSpace + \else + \ifdim\prevdepth>-1000pt\relax + \advance\parskip by \prevdepth\relax % assumed: was set by SpaceBelow + \pd@remember@penalty + \vskip-\prevdepth\relax + \pd@restore@penalty + \prevdepth=-1000pt\relax + \fi + \ifdim\skip0>\parskip\relax + \parskip=#1\relax + \fi + \fi +\fi +} + +\newcommand\ParaSpaceBelow[1]{\relax +\parskip=#1\relax +\advance\parskip by -\prevdepth\relax +\ifdim\parskip<0pt\relax + \ifdim#1<0pt\relax \parskip=#1\relax \else \parskip=0pt\relax \fi + \nointerlineskip +\else% >=10000pt + \ifdim\parskip>999pt\relax \parskip=#1\relax\fi +\fi} + +\newcommand\IssueParaSpace{\relax +\ifhmode \typeout{! LaTeX warning: IssueParaSpace in horizontal mode.}\par \fi +\ifdim\parskip>0pt\relax + \pd@remember@penalty + \vskip\parskip\relax + \pd@restore@penalty + \prevdepth=-1000pt\relax + \parskip=0pt\relax +\fi +} + +\newcommand\IgnoreSpaceAboveNextPara{% +\ParaSpaceBelow{-0.01pt}} + +\newcommand\CancelIgnoreSpaceAboveNextPara{% +\relax\ifdim\parskip<0pt\relax \parskip=0pt\relax \fi} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pmxchords/ChordsTr.lua new/texmf-dist/scripts/pmxchords/ChordsTr.lua --- old/texmf-dist/scripts/pmxchords/ChordsTr.lua 2015-12-31 23:39:54.000000000 +0100 +++ new/texmf-dist/scripts/pmxchords/ChordsTr.lua 1970-01-01 01:00:00.000000000 +0100 @@ -1,124 +0,0 @@ ---[[ - (c) Copyright 2013 Ondrej Fafejta <fafejtao(a)gmail.com> - https://github.com/fafejtao/pmxChords -]] -- --- --- Chords transposition class --- -ChordsTr = {} -- the table representing the class, which will double as the metatable for the instances -ChordsTr.__index = ChordsTr -- failed table lookups on the instances should fallback to the class table, to get methods -setmetatable(ChordsTr, - { - __call = function(cls, ...) - return cls.new(...) - end, - }) - --- --- global constants --- -ChordsTr.CHORDS_BEGIN = "\\ch." -ChordsTr.CHORDS_END = ".\\" -ChordsTr.BASE_CHORDS_ARR = { - -- lua is indexing from 1 I need from 0 ... - [0] = "C", - [1] = "Cs", - [2] = "D", - [3] = "Ef", - [4] = "E", - [5] = "F", - [6] = "Fs", - [7] = "G", - [8] = "Af", - [9] = "A", - [10] = "Bf", - [11] = "B" -} - --- --- Create instance of chords transposition class --- params iSig input signature e.g. -1 - F major --- oSig output signature e.g. 2 - D major --- -function ChordsTr.new(iSig, oSig) - local self = setmetatable({}, ChordsTr) - self.trMap = ChordsTr.__createTransposeMap(oSig - iSig) - return self -end - --- --- Core of transposition. --- Prepare map of transposed chords. --- Key is input base chord and value is output base chord. --- -function ChordsTr.__createTransposeMap(sigDiff) - local size = 12 - local halfTones = (sigDiff * 7) % size - if (halfTones < 0) then - halfTones = halfTones + size - end - - -- generate transpose map of base chords ... - local res = {} - local i - for i = 0, size - 1, 1 do - local key = ChordsTr.BASE_CHORDS_ARR[i] - local trIdx = (i + halfTones) % size; - res[key] = ChordsTr.BASE_CHORDS_ARR[trIdx] - end - return res -end - --- --- transpose one line. --- Find each chords in line and transpose it into output signature. --- return transposed line. --- -function ChordsTr:lineTranspose(line) - local pos = 0; - local trLine = "" -- transposed line (result) - while true do - local i = line:find(ChordsTr.CHORDS_BEGIN, pos) - if i == nil then - trLine = trLine .. line:sub(pos) - break - end - i = i + 3 -- move after \ch. - trLine = trLine .. line:sub(pos, i) -- append non chord string into result - pos = line:find(ChordsTr.CHORDS_END, i) - if pos == nil then -- TODO check correctly end of chords ... e.g. check wrong line (first chord is not finished correctly): \ch.C. c \ch.G7.\ b - io.stderr:write("End of chords was not found!\n") - os.exit(-1) - end - local chord = line:sub(i + 1, pos - 1) - trLine = trLine .. self:doTranspose(chord) - end - return trLine -end - --- --- do transpose of one chord. --- -function ChordsTr:doTranspose(chord) - local base, alt = ChordsTr.splitChord(chord) - return self.trMap[base] .. alt -end - --- --- Split chord into two part: base chord and chord alteration. --- e.g. Fsm7 - base chord is Fs, alteration is m7 --- -function ChordsTr.splitChord(chord) - if (chord.len == 1) then - return chord, "" - end - local secondChar = chord:sub(2, 2) - if (secondChar == 's' or secondChar == 'f') then - return chord:sub(1, 2), chord:sub(3) - else - return chord:sub(1, 1), chord:sub(2) - end -end --- --- end of ChordsTr class --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/pmxchords/pmxchords.lua new/texmf-dist/scripts/pmxchords/pmxchords.lua --- old/texmf-dist/scripts/pmxchords/pmxchords.lua 2015-12-31 23:39:54.000000000 +0100 +++ new/texmf-dist/scripts/pmxchords/pmxchords.lua 1970-01-01 01:00:00.000000000 +0100 @@ -1,244 +0,0 @@ -#! /usr/bin/env texlua --- --- global constants --- -VERSION = "0.9.3" -FILE_SUFFIX = "_chtr" -PMX_CMD = "pmxab" - ---[[ - pmxchords.lua: transpose chords (\ch.C.\) and process pmxab - - (c) Copyright 2013 Ondrej Fafejta <fafejtao(a)gmail.com> - https://github.com/fafejtao/pmxChords - -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2 of the License, or (at your -option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - ---]] - ---[[ - ChangeLog: - version 0.9.3 2014-04-21 - fixed transposition problem: - If song began in E-minor and signature is changed in half of song to A-minor - transposition must be omitted. - - version 0.9.2 2013-12-13 - fixed: stop processing when pmxab fail. - - When pmxab is called generated file pmxaerr.dat is not removed. - - version 0.9.1 2013-12-09 - added some options. Improved processing. - - version 0.9 2013-12-05 - rewritted code from perl to lua... ---]] - -function usage() - print("Usage: [texlua] pmxchords.lua basename[.pmx] ") - print(" 1. transpose chords into new file basename" .. FILE_SUFFIX .. ".pmx") - print(" 2. call pmxab on transposed file basename" .. FILE_SUFFIX .. ".pmx") - print(" 3. rename basename" .. FILE_SUFFIX .. ".tex to basename.tex") - print("options: -v version") - print(" -h help") - print(" -s stop after fist step. e.g. generate only transposed basename" .. FILE_SUFFIX .. ".pmx file") -end - -function whoami() - print("This is pmxchords.lua version " .. VERSION) -end - -whoami() -if #arg == 0 then - usage() - os.exit(0) -end - -kpse.set_program_name("luatex") -require"ChordsTr" - -function parseInputSignature(line) - -- parse input signature from pmx digits line. Only one line digits format is supported! - -- e.g. - -- 1 1 2 4 2 4 0 -1 - -- signature is -1 : F major - local res = string.match(line, "^%s*[0-9]+%s+[0-9]+%s+[0-9]+%s+[0-9]+%s+[0-9]+%s+[0-9]+%s+[0-9]+%s+([%+%-]?[0-9]+)%s*$") - return tonumber(res) -end - -function parseOutputSignature(line) - -- parse output signature from pmx - -- e.g. - -- K-2+2 - -- output signature is +2 : D major - local res = string.match(line, "^K[%+%-]?[0-9]+([%+%-]?[0-9]+)") - return tonumber(res) -end - --- --- Strip comments from line --- Comments begin with % character --- -function lineWithoutComment(line) - local i = string.find(line, "%%") - if (i == nil) then - return line - end - return line:sub(0, i - 1) -end - --- --- Function checks only if the line contains \ch. string. --- It does not check correctly if notes already started. It checks only if chords started.. --- Scenario bellow will fail! --- d44 f a r / % first line does not contain chords symbol --- % signature is changed --- K+0+0 --- \ch.C.\ c44 e g r4 / --- -function checkChordsAlreadyStarted(line) - local i = string.find(lineWithoutComment(line), ChordsTr.CHORDS_BEGIN) - if (i ~= nil) then - return true - end - return false; -end - -function handleErr(msg) - io.stderr:write(msg .. "\n") - os.exit(2) -end - --- --- get file name without .pmx suffix --- -function getBaseFileName(fileName) - if fileName ~= "" and string.sub(fileName, -4, -1) == ".pmx" then - return string.sub(fileName, 1, -5) - else - return fileName - end -end - --- --- Make chords transposition. Generates new pmx file with transposed chords. --- --- param baseName input file name without .pmx suffix --- return outputBaseName transposed pmx file name without .pmx suffix --- -function makeChordsTransposition(baseName) - local inputFileName = baseName .. ".pmx" - local inputFile = io.open(inputFileName, "r") - if (inputFile == nil) then - handleErr("File does not exist: " .. inputFileName) - end - - local outputBaseName = baseName .. FILE_SUFFIX -- output base name without suffix. Used for renaming generated .tex file ... - local outputFileName = outputBaseName .. ".pmx" - local outputFile = io.open(outputFileName, "w") - if (outputFile == nil) then - handleErr("Can not create temporary file: " .. outputFileName) - end - - -- - -- transpose chords from inputFile into outputFile - -- - -- input and output signature will be parsed from input pmx file - -- - local iSig = nil -- input signature - local chTr = nil -- chords transposition class - - -- If song began in E-minor and signature is changed in half of song to A-minor - -- transposition must be omitted. - local chordsAlreadyStarted = false; - - for line in inputFile:lines() do - if (chTr ~= nil) then - outputFile:write(chTr:lineTranspose(line) .. "\n") - else - outputFile:write(line .. "\n") - end - if (iSig == nil) then - iSig = parseInputSignature(line) - if (iSig ~= nil) then - io.stderr:write("Chords: input signature detected: " .. iSig .. "\n") - end - elseif (chTr == nil and not chordsAlreadyStarted) then - local oSig = parseOutputSignature(line) - if (oSig ~= nil) then - io.stderr:write("Chords: output signature detected: " .. oSig .. "\n") - chTr = ChordsTr(iSig, oSig) - elseif (checkChordsAlreadyStarted(line)) then - io.stderr:write("Chords: notes already started. Chords transposition is omitted.\n") - chordsAlreadyStarted = true; - end - end - end - inputFile:close() - outputFile:close() - - return outputBaseName -end - --- --- Make pmxab process. --- param baseName input file name without .pmx suffix --- param outputBaseName transposed pmx file name without .pmx suffix --- -function pmxabProcess(baseName, outputBaseName) - -- - -- call pmxab to generate .tex file - -- - os.execute(PMX_CMD .. " " .. outputBaseName) - -- check error - local pmxaerr = io.open("pmxaerr.dat", "r") - if (not pmxaerr) then - handleErr("No log file.") - end - local linebuf = pmxaerr:read() - local err = tonumber(linebuf) - pmxaerr:close() - if (err ~= 0) then - handleErr("PMX process fail! " .. outputBaseName .. ".pmx") - end - - os.rename(outputBaseName .. ".tex", baseName .. ".tex") - - -- remove temporary files - os.remove(outputBaseName .. ".pmx") - os.remove(outputBaseName .. ".pml") -end - -narg = 1 -onlyTranspose = false - -repeat - local this_arg = arg[narg] - if this_arg == "-v" then - os.exit(0) - elseif this_arg == "-h" then - usage() - os.exit(0) - elseif this_arg == "-s" then - onlyTranspose = true - else - local baseName = getBaseFileName(this_arg) - local outputBaseName = makeChordsTransposition(baseName) - - if (onlyTranspose) then - os.exit(0) - end - pmxabProcess(baseName, outputBaseName) - end - - narg = narg + 1 -until narg > #arg - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/pmxchords/chords.tex new/texmf-dist/tex/generic/pmxchords/chords.tex --- old/texmf-dist/tex/generic/pmxchords/chords.tex 2013-12-13 23:20:40.000000000 +0100 +++ new/texmf-dist/tex/generic/pmxchords/chords.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,333 +0,0 @@ -\font\chFont=cmbx10 scaled \magstep0 -\font\chFontRm=cmbx8 scaled \magstep0 -\font\chFontIdx=cmbx7 scaled \magstep0 - - -\def\ch.#1.{\csname ch:#1\endcsname} -\def\defch.#1.{\expandafter \def \csname ch:#1\endcsname} - -\def\chFlat{$\scriptstyle\flat$} -\def\chSharp{$\scriptstyle\sharp$} -%\def\chDim{$\circ$} -\def\chDim{dim} -\def\chMaj{$\scriptstyle\bigtriangleup$} -%\def\chMaj{maj} - -% -% Base chords -% -\def\chVerticalAlign{13}% basic vertical align \internotes -\def\chBase#1{\zchar{\chVerticalAlign}{\chFont #1}} - -% -% Macros for chords without sharp or flat -% it means C, D, E, F, G, A, B -% -\def\chX#1{\chBase{#1}} -\def\chXOneParam#1#2{\chBase{#1{\chFontRm #2}}} -\def\chXm#1{\chXOneParam{#1}{m}} -\def\chXPlus#1{\chXOneParam{#1}{+}} -\def\chXSus#1{\chXOneParam{#1}{sus}} -\def\chXDim#1{\chXOneParam{#1}{\chDim}} -\def\chXMaj#1{\chXOneParam{#1}{\chMaj}} - -\def\chXOneParamUpper#1#2{\chBase{#1\lower-1ex\hbox{\chFontIdx #2}}} -%\def\chXDim#1{\chXOneParamUpper{#1}{\chDim}} -\def\chXSix#1{\chXOneParamUpper{#1}{6}} -\def\chXSeven#1{\chXOneParamUpper{#1}{7}} -\def\chXNine#1{\chXOneParamUpper{#1}{9}} -\def\chXNineFlat#1{\chXOneParamUpper{#1}{\chFontIdx 9\chFlat}} - -\def\chXTwoParams#1#2#3{\chBase{#1{\chFontRm #2}\lower-1ex\hbox{\chFontIdx #3}}} -\def\chXmSeven#1{\chXTwoParams{#1}{m}{7}} -\def\chXmSix#1{\chXTwoParams{#1}{m}{6}} -\def\chXmFiveFlat#1{\chXTwoParams{#1}{m}{5\chFlat}} -\def\chXSusSeven#1{\chXTwoParams{#1}{sus}{7}} - -\def\chXmSevenFiveFlat#1{\chBase{#1{\chFontRm m}\lower0.5ex\vbox{\baselineskip=1ex\hbox{\chFontIdx 7}\hbox{\chFontIdx 5\chFlat}}}} -%\def\chXmSevenFiveFlat#1{\chBase{#1{\chFontRm m}\lower0.5ex\vbox{\baselineskip=1ex\hbox{\chFontIdx 7}\hbox{\chFontIdx 5\chFlat}}}} - - -% -% Macros for chords with flat -% it means Ef, Af, Bf -% -\def\chXFlat#1{\chXOneParamUpper{#1}{\chFlat}} - -\def\chXFlatOneParam#1#2{\chBase{#1\lower-1.1ex\hbox{\chFlat}\kern-0.3em\hbox{\chFontRm #2}}} -\def\chXFlatm#1{\chXFlatOneParam{#1}{m}} -\def\chXFlatPlus#1{\chXFlatOneParam{#1}{+}} -\def\chXFlatSus#1{\chXFlatOneParam{#1}{sus}} -\def\chXFlatDim#1{\chXFlatOneParam{#1}{\chDim}} -\def\chXFlatMaj#1{\chXFlatOneParam{#1}{\chMaj}} - - -\def\chXFlatOneParamUpper#1#2{\chXOneParamUpper{#1}{\chFlat\kern 0.2ex\chFontIdx #2}} -\def\chXFlatSix#1{\chXFlatOneParamUpper{#1}{6}} -\def\chXFlatSeven#1{\chXFlatOneParamUpper{#1}{7}} -\def\chXFlatNine#1{\chXFlatOneParamUpper{#1}{9}} -\def\chXFlatNineFlat#1{\chXFlatOneParamUpper{#1}{9\chFlat}} - -\def\chXFlatTwoParams#1#2#3{\chBase{#1\lower-1.1ex\hbox{\chFlat}\kern-0.3em\hbox{\chFontRm #2}\lower-1ex\hbox{\chFontIdx #3}}} -\def\chXFlatmSeven#1{\chXFlatTwoParams{#1}{m}{7}} -\def\chXFlatmSix#1{\chXFlatTwoParams{#1}{m}{6}} -\def\chXFlatmFiveFlat#1{\chXFlatTwoParams{#1}{m}{5\chFlat}} -\def\chXFlatSusSeven#1{\chXFlatTwoParams{#1}{sus}{7}} - -\def\chXFlatmSevenFiveFlat#1{\chBase{#1\lower-1.1ex\hbox{\chFlat}\kern-0.3em{\chFontRm m\lower0.5ex\vbox{\baselineskip=1ex\hbox{\chFontIdx 7}\hbox{\chFontIdx 5\chFlat}}}}} - -% -% Macros for chords with sharp -% it means Cs, Fs -% -\def\chXSharp#1{\chXOneParamUpper{#1}{\chSharp}} - -\def\chXSharpOneParam#1#2{\chBase{#1\lower-1.4ex\hbox{\chSharp}\kern-0.3em\hbox{\chFontRm #2}}} -\def\chXSharpm#1{\chXSharpOneParam{#1}{m}} -\def\chXSharpPlus#1{\chXSharpOneParam{#1}{+}} -\def\chXSharpSus#1{\chXSharpOneParam{#1}{sus}} -\def\chXSharpDim#1{\chXSharpOneParam{#1}{\chDim}} -\def\chXSharpMaj#1{\chXSharpOneParam{#1}{\chMaj}} - - -\def\chXSharpOneParamUpper#1#2{\chXOneParamUpper{#1}{\chFontIdx\chSharp\kern 0.2ex#2}} -\def\chXSharpSix#1{\chXSharpOneParamUpper{#1}{6}} -\def\chXSharpSeven#1{\chXSharpOneParamUpper{#1}{7}} -\def\chXSharpNine#1{\chXSharpOneParamUpper{#1}{9}} -\def\chXSharpNineFlat#1{\chXSharpOneParamUpper{#1}{9\chFlat}} - -\def\chXSharpTwoParams#1#2#3{\chBase{#1\lower-1.4ex\hbox{\chSharp}\kern-0.3em\hbox{\chFontRm #2}\lower-1ex\hbox{\chFontIdx #3}}} -\def\chXSharpmSeven#1{\chXSharpTwoParams{#1}{m}{7}} -\def\chXSharpmSix#1{\chXSharpTwoParams{#1}{m}{6}} -\def\chXSharpmFiveFlat#1{\chXSharpTwoParams{#1}{m}{5\chFlat}} -\def\chXSharpSusSeven#1{\chXSharpTwoParams{#1}{sus}{7}} - -\def\chXSharpmSevenFiveFlat#1{\chBase{#1\lower-1.4ex\hbox{\chSharp}\kern-0.3em{\chFontRm m\lower0.5ex\vbox{\baselineskip=1ex\hbox{\chFontIdx 7}\hbox{\chFontIdx 5\chFlat}}}}} - -% -% C -% -\defch.C.{\chX{C}} -\defch.Cm.{\chXm{C}} -\defch.C+.{\chXPlus{C}} -\defch.C4.{\chXSus{C}} -\defch.Cdim.{\chXDim{C}} -\defch.Cmaj.{\chXMaj{C}} -\defch.C6.{\chXSix{C}} -\defch.C7.{\chXSeven{C}} -\defch.C9.{\chXNine{C}} -\defch.C9f.{\chXNineFlat{C}} -\defch.Cm7.{\chXmSeven{C}} -\defch.Cm6.{\chXmSix{C}} -\defch.Cm5f.{\chXmFiveFlat{C}} -\defch.C47.{\chXSusSeven{C}} -\defch.Cm75f.{\chXmSevenFiveFlat{C}} - -% -% D -% -\defch.D.{\chX{D}} -\defch.Dm.{\chXm{D}} -\defch.D+.{\chXPlus{D}} -\defch.D4.{\chXSus{D}} -\defch.Ddim.{\chXDim{D}} -\defch.Dmaj.{\chXMaj{D}} -\defch.D6.{\chXSix{D}} -\defch.D7.{\chXSeven{D}} -\defch.D9.{\chXNine{D}} -\defch.D9f.{\chXNineFlat{D}} -\defch.Dm7.{\chXmSeven{D}} -\defch.Dm6.{\chXmSix{D}} -\defch.Dm5f.{\chXmFiveFlat{D}} -\defch.D47.{\chXSusSeven{D}} -\defch.Dm75f.{\chXmSevenFiveFlat{D}} - -% -% E -% -\defch.E.{\chX{E}} -\defch.Em.{\chXm{E}} -\defch.E+.{\chXPlus{E}} -\defch.E4.{\chXSus{E}} -\defch.Edim.{\chXDim{E}} -\defch.Emaj.{\chXMaj{E}} -\defch.E6.{\chXSix{E}} -\defch.E7.{\chXSeven{E}} -\defch.E9.{\chXNine{E}} -\defch.E9f.{\chXNineFlat{E}} -\defch.Em7.{\chXmSeven{E}} -\defch.Em6.{\chXmSix{E}} -\defch.Em5f.{\chXmFiveFlat{E}} -\defch.E47.{\chXSusSeven{E}} -\defch.Em75f.{\chXmSevenFiveFlat{E}} - -% -% F -% -\defch.F.{\chX{F}} -\defch.Fm.{\chXm{F}} -\defch.F+.{\chXPlus{F}} -\defch.F4.{\chXSus{F}} -\defch.Fdim.{\chXDim{F}} -\defch.Fmaj.{\chXMaj{F}} -\defch.F6.{\chXSix{F}} -\defch.F7.{\chXSeven{F}} -\defch.F9.{\chXNine{F}} -\defch.F9f.{\chXNineFlat{F}} -\defch.Fm7.{\chXmSeven{F}} -\defch.Fm6.{\chXmSix{F}} -\defch.Fm5f.{\chXmFiveFlat{F}} -\defch.F47.{\chXSusSeven{F}} -\defch.Fm75f.{\chXmSevenFiveFlat{F}} - -% -% G -% -\defch.G.{\chX{G}} -\defch.Gm.{\chXm{G}} -\defch.G+.{\chXPlus{G}} -\defch.G4.{\chXSus{G}} -\defch.Gdim.{\chXDim{G}} -\defch.Gmaj.{\chXMaj{G}} -\defch.G6.{\chXSix{G}} -\defch.G7.{\chXSeven{G}} -\defch.G9.{\chXNine{G}} -\defch.G9f.{\chXNineFlat{G}} -\defch.Gm7.{\chXmSeven{G}} -\defch.Gm6.{\chXmSix{G}} -\defch.Gm5f.{\chXmFiveFlat{G}} -\defch.G47.{\chXSusSeven{G}} -\defch.Gm75f.{\chXmSevenFiveFlat{G}} - -% -% A -% -\defch.A.{\chX{A}} -\defch.Am.{\chXm{A}} -\defch.A+.{\chXPlus{A}} -\defch.A4.{\chXSus{A}} -\defch.Adim.{\chXDim{A}} -\defch.Amaj.{\chXMaj{A}} -\defch.A6.{\chXSix{A}} -\defch.A7.{\chXSeven{A}} -\defch.A9.{\chXNine{A}} -\defch.A9f.{\chXNineFlat{A}} -\defch.Am7.{\chXmSeven{A}} -\defch.Am6.{\chXmSix{A}} -\defch.Am5f.{\chXmFiveFlat{A}} -\defch.A47.{\chXSusSeven{A}} -\defch.Am75f.{\chXmSevenFiveFlat{A}} - -% -% Cs -% -\defch.Cs.{\chXSharp{C}} -\defch.Csm.{\chXSharpm{C}} -\defch.Cs+.{\chXSharpPlus{C}} -\defch.Cs4.{\chXSharpSus{C}} -\defch.Csdim.{\chXSharpDim{C}} -\defch.Csmaj.{\chXSharpMaj{C}} -\defch.Cs6.{\chXSharpSix{C}} -\defch.Cs7.{\chXSharpSeven{C}} -\defch.Cs9.{\chXSharpNine{C}} -\defch.Cs9f.{\chXSharpNineFlat{C}} -\defch.Csm7.{\chXSharpmSeven{C}} -\defch.Csm6.{\chXSharpmSix{C}} -\defch.Csm5f.{\chXSharpmFiveFlat{C}} -\defch.Cs47.{\chXSharpSusSeven{C}} -\defch.Csm75f.{\chXSharpmSevenFiveFlat{C}} - -% -% Fs -% -\defch.Fs.{\chXSharp{F}} -\defch.Fsm.{\chXSharpm{F}} -\defch.Fs+.{\chXSharpPlus{F}} -\defch.Fs4.{\chXSharpSus{F}} -\defch.Fsdim.{\chXSharpDim{F}} -\defch.Fsmaj.{\chXSharpMaj{F}} -\defch.Fs6.{\chXSharpSix{F}} -\defch.Fs7.{\chXSharpSeven{F}} -\defch.Fs9.{\chXSharpNine{F}} -\defch.Fs9f.{\chXSharpNineFlat{F}} -\defch.Fsm7.{\chXSharpmSeven{F}} -\defch.Fsm6.{\chXSharpmSix{F}} -\defch.Fsm5f.{\chXSharpmFiveFlat{F}} -\defch.Fs47.{\chXSharpSusSeven{F}} -\defch.Fsm75f.{\chXSharpmSevenFiveFlat{F}} - -% -% Ef -% -\defch.Ef.{\chXFlat{E}} -\defch.Efm.{\chXFlatm{E}} -\defch.Ef+.{\chXFlatPlus{E}} -\defch.Ef4.{\chXFlatSus{E}} -\defch.Efdim.{\chXFlatDim{E}} -\defch.Efmaj.{\chXFlatMaj{E}} -\defch.Ef6.{\chXFlatSix{E}} -\defch.Ef7.{\chXFlatSeven{E}} -\defch.Ef9.{\chXFlatNine{E}} -\defch.Ef9f.{\chXFlatNineFlat{E}} -\defch.Efm7.{\chXFlatmSeven{E}} -\defch.Efm6.{\chXFlatmSix{E}} -\defch.Efm5f.{\chXFlatmFiveFlat{E}} -\defch.Ef47.{\chXFlatSusSeven{E}} -\defch.Efm75f.{\chXFlatmSevenFiveFlat{E}} - -% -% Af -% -\defch.Af.{\chXFlat{A}} -\defch.Afm.{\chXFlatm{A}} -\defch.Af+.{\chXFlatPlus{A}} -\defch.Af4.{\chXFlatSus{A}} -\defch.Afdim.{\chXFlatDim{A}} -\defch.Afmaj.{\chXFlatMaj{A}} -\defch.Af6.{\chXFlatSix{A}} -\defch.Af7.{\chXFlatSeven{A}} -\defch.Af9.{\chXFlatNine{A}} -\defch.Af9f.{\chXFlatNineFlat{A}} -\defch.Afm7.{\chXFlatmSeven{A}} -\defch.Afm6.{\chXFlatmSix{A}} -\defch.Afm5f.{\chXFlatmFiveFlat{A}} -\defch.Af47.{\chXFlatSusSeven{A}} -\defch.Afm75f.{\chXFlatmSevenFiveFlat{A}} - -% -% B -% -\defch.B.{\chX{B}} -\defch.Bm.{\chXm{B}} -\defch.B+.{\chXPlus{B}} -\defch.B4.{\chXSus{B}} -\defch.Bdim.{\chXDim{B}} -\defch.Bmaj.{\chXMaj{B}} -\defch.B6.{\chXSix{B}} -\defch.B7.{\chXSeven{B}} -\defch.B9.{\chXNine{B}} -\defch.B9f.{\chXNineFlat{B}} -\defch.Bm7.{\chXmSeven{B}} -\defch.Bm6.{\chXmSix{B}} -\defch.Bm5f.{\chXmFiveFlat{B}} -\defch.B47.{\chXSusSeven{B}} -\defch.Bm75f.{\chXmSevenFiveFlat{B}} - -% -% Bf -% -\defch.Bf.{\chXFlat{B}} -\defch.Bfm.{\chXFlatm{B}} -\defch.Bf+.{\chXFlatPlus{B}} -\defch.Bf4.{\chXFlatSus{B}} -\defch.Bfdim.{\chXFlatDim{B}} -\defch.Bfmaj.{\chXFlatMaj{B}} -\defch.Bf6.{\chXFlatSix{B}} -\defch.Bf7.{\chXFlatSeven{B}} -\defch.Bf9.{\chXFlatNine{B}} -\defch.Bf9f.{\chXFlatNineFlat{B}} -\defch.Bfm7.{\chXFlatmSeven{B}} -\defch.Bfm6.{\chXFlatmSix{B}} -\defch.Bfm5f.{\chXFlatmFiveFlat{B}} -\defch.Bf47.{\chXFlatSusSeven{B}} -\defch.Bfm75f.{\chXFlatmSevenFiveFlat{B}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/pmxchords/chordsCZ.tex new/texmf-dist/tex/generic/pmxchords/chordsCZ.tex --- old/texmf-dist/tex/generic/pmxchords/chordsCZ.tex 2013-12-13 23:20:40.000000000 +0100 +++ new/texmf-dist/tex/generic/pmxchords/chordsCZ.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,333 +0,0 @@ -\font\chFont=cmbx10 scaled \magstep0 -\font\chFontRm=cmbx8 scaled \magstep0 -\font\chFontIdx=cmbx7 scaled \magstep0 - - -\def\ch.#1.{\csname ch:#1\endcsname} -\def\defch.#1.{\expandafter \def \csname ch:#1\endcsname} - -\def\chFlat{$\scriptstyle\flat$} -\def\chSharp{$\scriptstyle\sharp$} -%\def\chDim{$\circ$} -\def\chDim{dim} -\def\chMaj{$\scriptstyle\bigtriangleup$} -%\def\chMaj{maj} - -% -% Base chords -% -\def\chVerticalAlign{13}% basic vertical align \internotes -\def\chBase#1{\zchar{\chVerticalAlign}{\chFont #1}} - -% -% Macros for chords without sharp or flat -% it means C, D, E, F, G, A, B -% -\def\chX#1{\chBase{#1}} -\def\chXOneParam#1#2{\chBase{#1{\chFontRm #2}}} -\def\chXm#1{\chXOneParam{#1}{m}} -\def\chXPlus#1{\chXOneParam{#1}{+}} -\def\chXSus#1{\chXOneParam{#1}{sus}} -\def\chXDim#1{\chXOneParam{#1}{\chDim}} -\def\chXMaj#1{\chXOneParam{#1}{\chMaj}} - -\def\chXOneParamUpper#1#2{\chBase{#1\lower-1ex\hbox{\chFontIdx #2}}} -%\def\chXDim#1{\chXOneParamUpper{#1}{\chDim}} -\def\chXSix#1{\chXOneParamUpper{#1}{6}} -\def\chXSeven#1{\chXOneParamUpper{#1}{7}} -\def\chXNine#1{\chXOneParamUpper{#1}{9}} -\def\chXNineFlat#1{\chXOneParamUpper{#1}{\chFontIdx 9\chFlat}} - -\def\chXTwoParams#1#2#3{\chBase{#1{\chFontRm #2}\lower-1ex\hbox{\chFontIdx #3}}} -\def\chXmSeven#1{\chXTwoParams{#1}{m}{7}} -\def\chXmSix#1{\chXTwoParams{#1}{m}{6}} -\def\chXmFiveFlat#1{\chXTwoParams{#1}{m}{5\chFlat}} -\def\chXSusSeven#1{\chXTwoParams{#1}{sus}{7}} - -\def\chXmSevenFiveFlat#1{\chBase{#1{\chFontRm m}\lower0.5ex\vbox{\baselineskip=1ex\hbox{\chFontIdx 7}\hbox{\chFontIdx 5\chFlat}}}} -%\def\chXmSevenFiveFlat#1{\chBase{#1{\chFontRm m}\lower0.5ex\vbox{\baselineskip=1ex\hbox{\chFontIdx 7}\hbox{\chFontIdx 5\chFlat}}}} - - -% -% Macros for chords with flat -% it means Ef, Af, Bf -% -\def\chXFlat#1{\chXOneParamUpper{#1}{\chFlat}} - -\def\chXFlatOneParam#1#2{\chBase{#1\lower-1.1ex\hbox{\chFlat}\kern-0.3em\hbox{\chFontRm #2}}} -\def\chXFlatm#1{\chXFlatOneParam{#1}{m}} -\def\chXFlatPlus#1{\chXFlatOneParam{#1}{+}} -\def\chXFlatSus#1{\chXFlatOneParam{#1}{sus}} -\def\chXFlatDim#1{\chXFlatOneParam{#1}{\chDim}} -\def\chXFlatMaj#1{\chXFlatOneParam{#1}{\chMaj}} - - -\def\chXFlatOneParamUpper#1#2{\chXOneParamUpper{#1}{\chFlat\kern 0.2ex\chFontIdx #2}} -\def\chXFlatSix#1{\chXFlatOneParamUpper{#1}{6}} -\def\chXFlatSeven#1{\chXFlatOneParamUpper{#1}{7}} -\def\chXFlatNine#1{\chXFlatOneParamUpper{#1}{9}} -\def\chXFlatNineFlat#1{\chXFlatOneParamUpper{#1}{9\chFlat}} - -\def\chXFlatTwoParams#1#2#3{\chBase{#1\lower-1.1ex\hbox{\chFlat}\kern-0.3em\hbox{\chFontRm #2}\lower-1ex\hbox{\chFontIdx #3}}} -\def\chXFlatmSeven#1{\chXFlatTwoParams{#1}{m}{7}} -\def\chXFlatmSix#1{\chXFlatTwoParams{#1}{m}{6}} -\def\chXFlatmFiveFlat#1{\chXFlatTwoParams{#1}{m}{5\chFlat}} -\def\chXFlatSusSeven#1{\chXFlatTwoParams{#1}{sus}{7}} - -\def\chXFlatmSevenFiveFlat#1{\chBase{#1\lower-1.1ex\hbox{\chFlat}\kern-0.3em{\chFontRm m\lower0.5ex\vbox{\baselineskip=1ex\hbox{\chFontIdx 7}\hbox{\chFontIdx 5\chFlat}}}}} - -% -% Macros for chords with sharp -% it means Cs, Fs -% -\def\chXSharp#1{\chXOneParamUpper{#1}{\chSharp}} - -\def\chXSharpOneParam#1#2{\chBase{#1\lower-1.4ex\hbox{\chSharp}\kern-0.3em\hbox{\chFontRm #2}}} -\def\chXSharpm#1{\chXSharpOneParam{#1}{m}} -\def\chXSharpPlus#1{\chXSharpOneParam{#1}{+}} -\def\chXSharpSus#1{\chXSharpOneParam{#1}{sus}} -\def\chXSharpDim#1{\chXSharpOneParam{#1}{\chDim}} -\def\chXSharpMaj#1{\chXSharpOneParam{#1}{\chMaj}} - - -\def\chXSharpOneParamUpper#1#2{\chXOneParamUpper{#1}{\chFontIdx\chSharp\kern 0.2ex#2}} -\def\chXSharpSix#1{\chXSharpOneParamUpper{#1}{6}} -\def\chXSharpSeven#1{\chXSharpOneParamUpper{#1}{7}} -\def\chXSharpNine#1{\chXSharpOneParamUpper{#1}{9}} -\def\chXSharpNineFlat#1{\chXSharpOneParamUpper{#1}{9\chFlat}} - -\def\chXSharpTwoParams#1#2#3{\chBase{#1\lower-1.4ex\hbox{\chSharp}\kern-0.3em\hbox{\chFontRm #2}\lower-1ex\hbox{\chFontIdx #3}}} -\def\chXSharpmSeven#1{\chXSharpTwoParams{#1}{m}{7}} -\def\chXSharpmSix#1{\chXSharpTwoParams{#1}{m}{6}} -\def\chXSharpmFiveFlat#1{\chXSharpTwoParams{#1}{m}{5\chFlat}} -\def\chXSharpSusSeven#1{\chXSharpTwoParams{#1}{sus}{7}} - -\def\chXSharpmSevenFiveFlat#1{\chBase{#1\lower-1.4ex\hbox{\chSharp}\kern-0.3em{\chFontRm m\lower0.5ex\vbox{\baselineskip=1ex\hbox{\chFontIdx 7}\hbox{\chFontIdx 5\chFlat}}}}} - -% -% C -% -\defch.C.{\chX{C}} -\defch.Cm.{\chXm{C}} -\defch.C+.{\chXPlus{C}} -\defch.C4.{\chXSus{C}} -\defch.Cdim.{\chXDim{C}} -\defch.Cmaj.{\chXMaj{C}} -\defch.C6.{\chXSix{C}} -\defch.C7.{\chXSeven{C}} -\defch.C9.{\chXNine{C}} -\defch.C9f.{\chXNineFlat{C}} -\defch.Cm7.{\chXmSeven{C}} -\defch.Cm6.{\chXmSix{C}} -\defch.Cm5f.{\chXmFiveFlat{C}} -\defch.C47.{\chXSusSeven{C}} -\defch.Cm75f.{\chXmSevenFiveFlat{C}} - -% -% D -% -\defch.D.{\chX{D}} -\defch.Dm.{\chXm{D}} -\defch.D+.{\chXPlus{D}} -\defch.D4.{\chXSus{D}} -\defch.Ddim.{\chXDim{D}} -\defch.Dmaj.{\chXMaj{D}} -\defch.D6.{\chXSix{D}} -\defch.D7.{\chXSeven{D}} -\defch.D9.{\chXNine{D}} -\defch.D9f.{\chXNineFlat{D}} -\defch.Dm7.{\chXmSeven{D}} -\defch.Dm6.{\chXmSix{D}} -\defch.Dm5f.{\chXmFiveFlat{D}} -\defch.D47.{\chXSusSeven{D}} -\defch.Dm75f.{\chXmSevenFiveFlat{D}} - -% -% E -% -\defch.E.{\chX{E}} -\defch.Em.{\chXm{E}} -\defch.E+.{\chXPlus{E}} -\defch.E4.{\chXSus{E}} -\defch.Edim.{\chXDim{E}} -\defch.Emaj.{\chXMaj{E}} -\defch.E6.{\chXSix{E}} -\defch.E7.{\chXSeven{E}} -\defch.E9.{\chXNine{E}} -\defch.E9f.{\chXNineFlat{E}} -\defch.Em7.{\chXmSeven{E}} -\defch.Em6.{\chXmSix{E}} -\defch.Em5f.{\chXmFiveFlat{E}} -\defch.E47.{\chXSusSeven{E}} -\defch.Em75f.{\chXmSevenFiveFlat{E}} - -% -% F -% -\defch.F.{\chX{F}} -\defch.Fm.{\chXm{F}} -\defch.F+.{\chXPlus{F}} -\defch.F4.{\chXSus{F}} -\defch.Fdim.{\chXDim{F}} -\defch.Fmaj.{\chXMaj{F}} -\defch.F6.{\chXSix{F}} -\defch.F7.{\chXSeven{F}} -\defch.F9.{\chXNine{F}} -\defch.F9f.{\chXNineFlat{F}} -\defch.Fm7.{\chXmSeven{F}} -\defch.Fm6.{\chXmSix{F}} -\defch.Fm5f.{\chXmFiveFlat{F}} -\defch.F47.{\chXSusSeven{F}} -\defch.Fm75f.{\chXmSevenFiveFlat{F}} - -% -% G -% -\defch.G.{\chX{G}} -\defch.Gm.{\chXm{G}} -\defch.G+.{\chXPlus{G}} -\defch.G4.{\chXSus{G}} -\defch.Gdim.{\chXDim{G}} -\defch.Gmaj.{\chXMaj{G}} -\defch.G6.{\chXSix{G}} -\defch.G7.{\chXSeven{G}} -\defch.G9.{\chXNine{G}} -\defch.G9f.{\chXNineFlat{G}} -\defch.Gm7.{\chXmSeven{G}} -\defch.Gm6.{\chXmSix{G}} -\defch.Gm5f.{\chXmFiveFlat{G}} -\defch.G47.{\chXSusSeven{G}} -\defch.Gm75f.{\chXmSevenFiveFlat{G}} - -% -% A -% -\defch.A.{\chX{A}} -\defch.Am.{\chXm{A}} -\defch.A+.{\chXPlus{A}} -\defch.A4.{\chXSus{A}} -\defch.Adim.{\chXDim{A}} -\defch.Amaj.{\chXMaj{A}} -\defch.A6.{\chXSix{A}} -\defch.A7.{\chXSeven{A}} -\defch.A9.{\chXNine{A}} -\defch.A9f.{\chXNineFlat{A}} -\defch.Am7.{\chXmSeven{A}} -\defch.Am6.{\chXmSix{A}} -\defch.Am5f.{\chXmFiveFlat{A}} -\defch.A47.{\chXSusSeven{A}} -\defch.Am75f.{\chXmSevenFiveFlat{A}} - -% -% Cs -% -\defch.Cs.{\chXSharp{C}} -\defch.Csm.{\chXSharpm{C}} -\defch.Cs+.{\chXSharpPlus{C}} -\defch.Cs4.{\chXSharpSus{C}} -\defch.Csdim.{\chXSharpDim{C}} -\defch.Csmaj.{\chXSharpMaj{C}} -\defch.Cs6.{\chXSharpSix{C}} -\defch.Cs7.{\chXSharpSeven{C}} -\defch.Cs9.{\chXSharpNine{C}} -\defch.Cs9f.{\chXSharpNineFlat{C}} -\defch.Csm7.{\chXSharpmSeven{C}} -\defch.Csm6.{\chXSharpmSix{C}} -\defch.Csm5f.{\chXSharpmFiveFlat{C}} -\defch.Cs47.{\chXSharpSusSeven{C}} -\defch.Csm75f.{\chXSharpmSevenFiveFlat{C}} - -% -% Fs -% -\defch.Fs.{\chXSharp{F}} -\defch.Fsm.{\chXSharpm{F}} -\defch.Fs+.{\chXSharpPlus{F}} -\defch.Fs4.{\chXSharpSus{F}} -\defch.Fsdim.{\chXSharpDim{F}} -\defch.Fsmaj.{\chXSharpMaj{F}} -\defch.Fs6.{\chXSharpSix{F}} -\defch.Fs7.{\chXSharpSeven{F}} -\defch.Fs9.{\chXSharpNine{F}} -\defch.Fs9f.{\chXSharpNineFlat{F}} -\defch.Fsm7.{\chXSharpmSeven{F}} -\defch.Fsm6.{\chXSharpmSix{F}} -\defch.Fsm5f.{\chXSharpmFiveFlat{F}} -\defch.Fs47.{\chXSharpSusSeven{F}} -\defch.Fsm75f.{\chXSharpmSevenFiveFlat{F}} - -% -% Ef -% -\defch.Ef.{\chXFlat{E}} -\defch.Efm.{\chXFlatm{E}} -\defch.Ef+.{\chXFlatPlus{E}} -\defch.Ef4.{\chXFlatSus{E}} -\defch.Efdim.{\chXFlatDim{E}} -\defch.Efmaj.{\chXFlatMaj{E}} -\defch.Ef6.{\chXFlatSix{E}} -\defch.Ef7.{\chXFlatSeven{E}} -\defch.Ef9.{\chXFlatNine{E}} -\defch.Ef9f.{\chXFlatNineFlat{E}} -\defch.Efm7.{\chXFlatmSeven{E}} -\defch.Efm6.{\chXFlatmSix{E}} -\defch.Efm5f.{\chXFlatmFiveFlat{E}} -\defch.Ef47.{\chXFlatSusSeven{E}} -\defch.Efm75f.{\chXFlatmSevenFiveFlat{E}} - -% -% Af -% -\defch.Af.{\chXFlat{A}} -\defch.Afm.{\chXFlatm{A}} -\defch.Af+.{\chXFlatPlus{A}} -\defch.Af4.{\chXFlatSus{A}} -\defch.Afdim.{\chXFlatDim{A}} -\defch.Afmaj.{\chXFlatMaj{A}} -\defch.Af6.{\chXFlatSix{A}} -\defch.Af7.{\chXFlatSeven{A}} -\defch.Af9.{\chXFlatNine{A}} -\defch.Af9f.{\chXFlatNineFlat{A}} -\defch.Afm7.{\chXFlatmSeven{A}} -\defch.Afm6.{\chXFlatmSix{A}} -\defch.Afm5f.{\chXFlatmFiveFlat{A}} -\defch.Af47.{\chXFlatSusSeven{A}} -\defch.Afm75f.{\chXFlatmSevenFiveFlat{A}} - -% -% B -% -\defch.B.{\chX{H}} -\defch.Bm.{\chXm{H}} -\defch.B+.{\chXPlus{H}} -\defch.B4.{\chXSus{H}} -\defch.Bdim.{\chXDim{H}} -\defch.Bmaj.{\chXMaj{H}} -\defch.B6.{\chXSix{H}} -\defch.B7.{\chXSeven{H}} -\defch.B9.{\chXNine{H}} -\defch.B9f.{\chXNineFlat{H}} -\defch.Bm7.{\chXmSeven{H}} -\defch.Bm6.{\chXmSix{H}} -\defch.Bm5f.{\chXmFiveFlat{H}} -\defch.B47.{\chXSusSeven{H}} -\defch.Bm75f.{\chXmSevenFiveFlat{H}} - -% -% Bf -% -\defch.Bf.{\chX{B}} -\defch.Bfm.{\chXm{B}} -\defch.Bf+.{\chXPlus{B}} -\defch.Bf4.{\chXSus{B}} -\defch.Bfdim.{\chXDim{B}} -\defch.Bfmaj.{\chXMaj{B}} -\defch.Bf6.{\chXSix{B}} -\defch.Bf7.{\chXSeven{B}} -\defch.Bf9.{\chXNine{B}} -\defch.Bf9f.{\chXNineFlat{B}} -\defch.Bfm7.{\chXmSeven{B}} -\defch.Bfm6.{\chXmSix{B}} -\defch.Bfm5f.{\chXmFiveFlat{B}} -\defch.Bf47.{\chXSusSeven{B}} -\defch.Bfm75f.{\chXmSevenFiveFlat{B}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/parades.tlpobj new/tlpkg/tlpobj/parades.tlpobj --- old/tlpkg/tlpobj/parades.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/parades.tlpobj 2017-04-14 17:53:14.000000000 +0200 @@ -0,0 +1,15 @@ +name parades +category Package +revision 40042 +shortdesc Tabulators and space between paragraphs in galley approach +relocated 1 +longdesc The LaTeX package paravesp controls the spaces above and below +longdesc paragraphs. The python script parades.py generates paragraph +longdesc styles with support of space above, space below and tabulators. +longdesc The system imposes the galley approach on the document. +runfiles size=1 + RELOC/tex/latex/parades/paravesp.sty +catalogue-ctan /macros/latex/contrib/parades +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license lppl1.3 +catalogue-topics parshape diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pmxchords.tlpobj new/tlpkg/tlpobj/pmxchords.tlpobj --- old/tlpkg/tlpobj/pmxchords.tlpobj 2016-04-14 19:35:25.000000000 +0200 +++ new/tlpkg/tlpobj/pmxchords.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -name pmxchords -category Package -revision 39249 -shortdesc Produce chord information to go with pmx output -longdesc The bundle supplements pmx, providing the means of typesetting -longdesc chords above the notes of a score. The bundle contains: macros -longdesc for typing the chords; a Lua script to transpose chord macros -longdesc to the required key signature; and support scripts for common -longdesc requirements. -depend pmxchords.ARCH -runfiles size=9 - texmf-dist/scripts/pmxchords/ChordsTr.lua - texmf-dist/scripts/pmxchords/pmxchords.lua - texmf-dist/tex/generic/pmxchords/chords.tex - texmf-dist/tex/generic/pmxchords/chordsCZ.tex -catalogue-ctan /support/pmxchords -catalogue-date 2016-01-04 06:20:16 +0100 -catalogue-license gpl2 -catalogue-topics use-lua music -catalogue-version 2.0.2 ++++++ pressrelease.doc.tar.xz -> paresse.doc.tar.xz ++++++ Binary files old/doc/latex/paresse/paresse-en.pdf and new/doc/latex/paresse/paresse-en.pdf differ Binary files old/doc/latex/paresse/paresse-ex-en.pdf and new/doc/latex/paresse/paresse-ex-en.pdf differ Binary files old/doc/latex/paresse/paresse-ex-fr.pdf and new/doc/latex/paresse/paresse-ex-fr.pdf differ Binary files old/doc/latex/paresse/paresse-fr.pdf and new/doc/latex/paresse/paresse-fr.pdf differ Binary files old/doc/latex/paresse/paresse.pdf and new/doc/latex/paresse/paresse.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/CHANGES new/doc/latex/pressrelease/CHANGES --- old/doc/latex/pressrelease/CHANGES 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/CHANGES 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -v1.0 (2014-09-10): - - * Initial release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/README new/doc/latex/pressrelease/README --- old/doc/latex/pressrelease/README 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -LaTeX Class : pressrelease v1.0 - -Last Modified : 2014-09-10 - -Author : Nicola Talbot - -The pressrelease class is designed for typesetting press releases. - - -This material is subject to the LaTeX Project Public License. -See http://www.ctan.org/license/lppl1.3 for the details of that license. - -http://www.dickimaw-books.com/ - Binary files old/doc/latex/pressrelease/pressrelease.pdf and new/doc/latex/pressrelease/pressrelease.pdf differ Binary files old/doc/latex/pressrelease/samples/sample-pressrelease.pdf and new/doc/latex/pressrelease/samples/sample-pressrelease.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/samples/sample-pressrelease.tex new/doc/latex/pressrelease/samples/sample-pressrelease.tex --- old/doc/latex/pressrelease/samples/sample-pressrelease.tex 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/samples/sample-pressrelease.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -% arara: pdflatex -% arara: pdflatex -\documentclass[a4paper,11pt]{pressrelease} - -\usepackage[british]{babel} -\usepackage{graphicx} - -\PRlogo{\includegraphics[height=2cm]{example-image}} - -\PRcompany{Some Company} -\PRdepartment{Some Department} -\PRcontact{Ann Other} -\PRlocation{Some City} -\PRaddress{1 The Street\\The Town\\AB1 2YZ} -\PRphone{01234 56789} -\PRmobile{07123456789} -\PRfax{01234 56788} -\PRurl{http://www.some-company.com/~abc} -\PRemail{ann.other(a)some-company.com} -\PRhours{9:00--17:30 Mon--Fri} - -\PRheadline{Some amazing news} -\PRsubheadline{subheading} - -\begin{document} - -\begin{pressrelease} - -This is an example press release. Keep it short and use the third -person. Avoid the use of exclamation marks and all-caps. Put all the -pertinent details in the first paragraph. Answer who, what, when, -where and why. - -Use short paragraphs. Try not to exceed 500 words. Keep to the point -and avoid jargon. This is the default layout. The image is from the -\textsf{mwe} package. - -\begin{about} -Some Company was set up in 2014. -\end{about} - -\end{pressrelease} - -\end{document} Binary files old/doc/latex/pressrelease/samples/sample-pressrelease2.pdf and new/doc/latex/pressrelease/samples/sample-pressrelease2.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/samples/sample-pressrelease2.tex new/doc/latex/pressrelease/samples/sample-pressrelease2.tex --- old/doc/latex/pressrelease/samples/sample-pressrelease2.tex 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/samples/sample-pressrelease2.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -% arara: pdflatex -% arara: pdflatex -\documentclass[a4paper,11pt]{pressrelease} - -\usepackage[british]{babel} -\usepackage{graphicx} - -\PRset{head=below,logo=below right,smashlogo,ruled=false} - -\PRlogo{\includegraphics[height=2cm]{example-image}} - -\PRcompany{Some Company} -\PRdepartment{Some Department} -\PRcontact{Ann Other} -\PRlocation{Some City} -\PRaddress{1 The Street\\The Town\\AB1 2YZ} -\PRphone{01234 56789} -\PRmobile{07123456789} -\PRfax{01234 56788} -\PRurl{http://www.some-company.com/} -\PRemail{ann.other(a)some-company.com} -\PRhours{9:00--17:30 Mon--Fri} - -\PRheadline{Some amazing news} -\PRsubheadline{subheading} - -\begin{document} - -\begin{pressrelease} - -This is an example press release. Keep it short and use the third -person. Avoid the use of exclamation marks and all-caps. Put all the -pertinent details in the first paragraph. Answer who, what, when, -where and why. This sample file uses: -\begin{verbatim} -\PRset{head=below,logo=below right,smashlogo,ruled=false} -\end{verbatim} -The image is from the \textsf{mwe} package. - -Use short paragraphs. Try not to exceed 500 words. Keep to the point -and avoid jargon. - -\begin{about} -Some Company was set up in imaginary year $i$. -\end{about} - -\end{pressrelease} - -\end{document} Binary files old/doc/latex/pressrelease/samples/sample-pressrelease3.pdf and new/doc/latex/pressrelease/samples/sample-pressrelease3.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/samples/sample-pressrelease3.tex new/doc/latex/pressrelease/samples/sample-pressrelease3.tex --- old/doc/latex/pressrelease/samples/sample-pressrelease3.tex 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/samples/sample-pressrelease3.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -% arara: pdflatex -% arara: pdflatex -\documentclass[a4paper,11pt]{pressrelease} - -\usepackage[british]{babel} -\usepackage{graphicx} - -\usepackage{lipsum}% dummy text - -\PRlogo{\includegraphics[height=2cm]{example-image}} - -\PRcompany{Some Company} -\PRdepartment{Some Department} -\PRcontact{Ann Other} -\PRlocation{Some City} -\PRaddress{1 The Street\\The Town\\AB1 2YZ} -\PRphone{01234 56789} -\PRmobile{07123456789} -\PRfax{01234 56788} -\PRurl{http://www.some-company.com/} -\PRemail{ann.other(a)some-company.com} -\PRhours{9:00--17:30 Mon--Fri} - -\PRheadline{Some amazing news} -\PRsubheadline{subheading} - -\renewcommand*{\PRheaderfont}[1]{\textsc{#1}} -\renewcommand*{\PRnOfm}[2]{\ifnum#1<#2\relax--More--\fi} - -\begin{document} - -\begin{pressrelease} - -This is a bad example of a press release as it's not generally a -good idea to have more than one page of text, but perhaps you have -some amazing world-changing news. This sample file uses the -\textsf{lipsum} -package to insert some dummy text to pad out the document. -The image is from the \textsf{mwe} package. - -\lipsum[1-4] - -\begin{about} -\lipsum[5] -\end{about} - -\end{pressrelease} - -\end{document} Binary files old/doc/latex/pressrelease/samples/sample-pressrelease4.pdf and new/doc/latex/pressrelease/samples/sample-pressrelease4.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/samples/sample-pressrelease4.tex new/doc/latex/pressrelease/samples/sample-pressrelease4.tex --- old/doc/latex/pressrelease/samples/sample-pressrelease4.tex 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/samples/sample-pressrelease4.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -% arara: pdflatex -% arara: pdflatex -\documentclass[a4paper,11pt]{pressrelease} - -\usepackage[british]{babel} -\usepackage{graphicx} - -% The location won't appear as it's not listed in -% topinfo or bottominfo - -\PRset{head=below,logo=below left,releasealign=right, - topinfoalign=right,bottominfoalign=left, - topinfo=company/date, - bottominfo=contact/department/address/phone/hours/email} - -\PRlogo{\includegraphics[height=2cm]{example-image}} - -\PRcompany{Some Company} -\PRdepartment{Some Department} -\PRcontact{Ann Other} -\PRlocation{Some City} -\PRaddress{1 The Street\\The Town\\AB1 2YZ} -\PRphone{01234 56789} -\PRmobile{07123456789} -\PRfax{01234 56788} -\PRurl{http://www.some-company.com/} -\PRemail{ann.other(a)some-company.com} -\PRhours{9:00--17:30 Mon--Fri} - -\PRheadline{Some amazing news} -\PRsubheadline{subheading} - -\begin{document} - -\begin{pressrelease} - -This is an example press release. Keep it short and use the third -person. Avoid the use of exclamation marks and all-caps. Put all the -pertinent details in the first paragraph. Answer who, what, when, -where and why. - -Use short paragraphs. Try not to exceed 500 words. Keep to the point -and avoid jargon. The layout was set using: -\begin{verbatim} -\PRset{head=below,logo=below left,releasealign=right, - topinfoalign=right,bottominfoalign=left, - topinfo=company/date, - bottominfo=contact/department/address/phone/hours/email} -\end{verbatim} -The image is from the \textsf{mwe} package. - -\begin{about} -Some Company was set up in imaginary year $i$. -\end{about} - -\end{pressrelease} - -\end{document} Binary files old/doc/latex/pressrelease/samples/sample-pressrelease5.pdf and new/doc/latex/pressrelease/samples/sample-pressrelease5.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/samples/sample-pressrelease5.tex new/doc/latex/pressrelease/samples/sample-pressrelease5.tex --- old/doc/latex/pressrelease/samples/sample-pressrelease5.tex 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/samples/sample-pressrelease5.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,55 +0,0 @@ -% arara: pdflatex -% arara: pdflatex -\documentclass[a4paper,11pt]{pressrelease} - -\usepackage[british]{babel} -\usepackage{graphicx} - -% Remove textual tags from top info block -\renewcommand*{\PRinfotopline}[2]{% - \PRinfoentry{#2}\tabularnewline -} - -\PRlogo{\includegraphics[height=2cm]{example-image}} - -\PRcompany{Some Company} -\PRcontact{Ann Other} -\date{Some City, \today} -\PRaddress{1 The Street\\The Town\\AB1 2YZ} -\PRphone{01234 56789} -\PRmobile{07123456789} -\PRfax{01234 56788} -\PRurl{http://www.some-company.com/} -\PRemail{ann.other(a)some-company.com} -\PRhours{9:00--17:30 Mon--Fri} - -\PRheadline{Some amazing news} -\PRsubheadline{subheading} - -\begin{document} - -\begin{pressrelease} - -This is an example press release. Keep it short and use the third -person. Avoid the use of exclamation marks and all-caps. Put all the -pertinent details in the first paragraph. Answer who, what, when, -where and why. - -Use short paragraphs. Try not to exceed 500 words. Keep to the point -and avoid jargon. This layout has removed the textual tags in the -top info block by redefining: -\begin{verbatim} -\renewcommand*{\PRinfotopline}[2]{% - \PRinfoentry{#2}\tabularnewline -} -\end{verbatim} -The image is from the -\textsf{mwe} package. - -\begin{about} -Some Company was set up in imaginary year $i$. -\end{about} - -\end{pressrelease} - -\end{document} Binary files old/doc/latex/pressrelease/samples/sample-pressrelease6.pdf and new/doc/latex/pressrelease/samples/sample-pressrelease6.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/samples/sample-pressrelease6.tex new/doc/latex/pressrelease/samples/sample-pressrelease6.tex --- old/doc/latex/pressrelease/samples/sample-pressrelease6.tex 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/samples/sample-pressrelease6.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,55 +0,0 @@ -% arara: pdflatex -% arara: pdflatex -\documentclass[a4paper,11pt,symbols]{pressrelease} - -\usepackage[british]{babel} -\usepackage{graphicx} - -\PRset{releasealign=right,ruled=false,logo=below right,smashlogo} - -\PRlogo{\includegraphics[height=2cm]{example-image}} - -\PRcompany{Some Company} -\PRdepartment{Some Department} -\PRcontact{Ann Other} -\PRaddress{1 The Street\\The Town\\AB1 2YZ} -\PRphone{01234 56789} -\PRmobile{07123456789} -\PRfax{01234 56788} -\PRurl{http://www.some-company.com/~abc} -\PRemail{ann.other(a)some-company.com} -\PRhours{9:00--17:30 Mon--Fri} -\PRencl{some stuff} - -\date{Some City, \today} - -\PRheadline{Some amazing news} -\PRsubheadline{subheading} - -\begin{document} - -\begin{pressrelease} - -This is an example press release. Keep it short and use the third -person. Avoid the use of exclamation marks and all-caps. Put all the -pertinent details in the first paragraph. Answer who, what, when, -where and why. - -Use short paragraphs. Try not to exceed 500 words. Keep to the point -and avoid jargon. This example has loaded the -\textsf{pressrelease-symbols} package (via the \texttt{symbols} -class option) to use symbols (from the -\textsf{marvosym} package and one designed using \textsf{tikz}) instead of text. -The image is from the \textsf{mwe} package. The header layout has -been changed using: -\begin{verbatim} -\PRset{releasealign=right,ruled=false,logo=below right,smashlogo} -\end{verbatim} - -\begin{about} -Some Company was set up in imaginary year $i$. -\end{about} - -\end{pressrelease} - -\end{document} Binary files old/doc/latex/pressrelease/samples/sample-pressrelease7.pdf and new/doc/latex/pressrelease/samples/sample-pressrelease7.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/samples/sample-pressrelease7.tex new/doc/latex/pressrelease/samples/sample-pressrelease7.tex --- old/doc/latex/pressrelease/samples/sample-pressrelease7.tex 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/samples/sample-pressrelease7.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -% arara: pdflatex -% arara: pdflatex -\documentclass[a4paper,11pt]{pressrelease} - -\usepackage[british]{babel} -\usepackage{graphicx} -\usepackage[hidelinks]{hyperref} - -\usepackage{pressrelease-symbols} - -\PRset{releasealign=right,ruled=false,logo=below right,smashlogo} - -\renewcommand*{\PRemailformat}[1]{\href{mailto:#1}{\texttt{#1}}} - -\PRlogo{\includegraphics[height=2cm]{example-image}} - -\PRcompany{Some Company} -\PRdepartment{Some Department} -\PRcontact{Ann Other} -\PRaddress{1 The Street\\The Town\\AB1 2YZ} -\PRphone{01234 56789} -\PRmobile{07123456789} -\PRfax{01234 56788} -\PRurl{http://www.some-company.com/~abc} -\PRemail{ann.other(a)some-company.com} -\PRhours{9:00--17:30 Mon--Fri} -\PRencl{some stuff} - -\date{Some City, \today} - -\PRheadline{Some amazing news} -\PRsubheadline{subheading} - -\begin{document} - -\begin{pressrelease} - -This is an example press release. Keep it short and use the third -person. Avoid the use of exclamation marks and all-caps. Put all the -pertinent details in the first paragraph. Answer who, what, when, -where and why. - -Use short paragraphs. Try not to exceed 500 words. Keep to the point -and avoid jargon. This example has loaded the -\textsf{pressrelease-symbols} package to use symbols (from the -\textsf{marvosym} package and one designed using \textsf{tikz}) instead of text. -The image is from the \textsf{mwe} package. The header layout has -been changed using: -\begin{verbatim} -\PRset{releasealign=right,ruled=false,logo=below right,smashlogo} -\end{verbatim} - -\begin{about} -Some Company was set up in imaginary year $i$. -\end{about} - -\end{pressrelease} - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paresse.doc.tlpobj new/tlpkg/tlpobj/paresse.doc.tlpobj --- old/tlpkg/tlpobj/paresse.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/paresse.doc.tlpobj 2017-04-14 17:53:23.000000000 +0200 @@ -0,0 +1,11 @@ +name paresse.doc +category Package +revision 29803 +shortdesc doc files of paresse +relocated 1 +docfiles size=406 + RELOC/doc/latex/paresse/paresse-en.pdf + RELOC/doc/latex/paresse/paresse-ex-en.pdf + RELOC/doc/latex/paresse/paresse-ex-fr.pdf + RELOC/doc/latex/paresse/paresse-fr.pdf + RELOC/doc/latex/paresse/paresse.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pressrelease.doc.tlpobj new/tlpkg/tlpobj/pressrelease.doc.tlpobj --- old/tlpkg/tlpobj/pressrelease.doc.tlpobj 2016-04-14 19:36:16.000000000 +0200 +++ new/tlpkg/tlpobj/pressrelease.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -name pressrelease.doc -category Package -revision 35147 -shortdesc doc files of pressrelease -relocated 1 -docfiles size=267 - RELOC/doc/latex/pressrelease/CHANGES - RELOC/doc/latex/pressrelease/README - RELOC/doc/latex/pressrelease/pressrelease.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease.tex - RELOC/doc/latex/pressrelease/samples/sample-pressrelease2.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease2.tex - RELOC/doc/latex/pressrelease/samples/sample-pressrelease3.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease3.tex - RELOC/doc/latex/pressrelease/samples/sample-pressrelease4.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease4.tex - RELOC/doc/latex/pressrelease/samples/sample-pressrelease5.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease5.tex - RELOC/doc/latex/pressrelease/samples/sample-pressrelease6.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease6.tex - RELOC/doc/latex/pressrelease/samples/sample-pressrelease7.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease7.tex ++++++ pressrelease.doc.tar.xz -> paresse.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/CHANGES new/doc/latex/pressrelease/CHANGES --- old/doc/latex/pressrelease/CHANGES 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/CHANGES 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -v1.0 (2014-09-10): - - * Initial release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/README new/doc/latex/pressrelease/README --- old/doc/latex/pressrelease/README 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -LaTeX Class : pressrelease v1.0 - -Last Modified : 2014-09-10 - -Author : Nicola Talbot - -The pressrelease class is designed for typesetting press releases. - - -This material is subject to the LaTeX Project Public License. -See http://www.ctan.org/license/lppl1.3 for the details of that license. - -http://www.dickimaw-books.com/ - Binary files old/doc/latex/pressrelease/pressrelease.pdf and new/doc/latex/pressrelease/pressrelease.pdf differ Binary files old/doc/latex/pressrelease/samples/sample-pressrelease.pdf and new/doc/latex/pressrelease/samples/sample-pressrelease.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/samples/sample-pressrelease.tex new/doc/latex/pressrelease/samples/sample-pressrelease.tex --- old/doc/latex/pressrelease/samples/sample-pressrelease.tex 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/samples/sample-pressrelease.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,44 +0,0 @@ -% arara: pdflatex -% arara: pdflatex -\documentclass[a4paper,11pt]{pressrelease} - -\usepackage[british]{babel} -\usepackage{graphicx} - -\PRlogo{\includegraphics[height=2cm]{example-image}} - -\PRcompany{Some Company} -\PRdepartment{Some Department} -\PRcontact{Ann Other} -\PRlocation{Some City} -\PRaddress{1 The Street\\The Town\\AB1 2YZ} -\PRphone{01234 56789} -\PRmobile{07123456789} -\PRfax{01234 56788} -\PRurl{http://www.some-company.com/~abc} -\PRemail{ann.other(a)some-company.com} -\PRhours{9:00--17:30 Mon--Fri} - -\PRheadline{Some amazing news} -\PRsubheadline{subheading} - -\begin{document} - -\begin{pressrelease} - -This is an example press release. Keep it short and use the third -person. Avoid the use of exclamation marks and all-caps. Put all the -pertinent details in the first paragraph. Answer who, what, when, -where and why. - -Use short paragraphs. Try not to exceed 500 words. Keep to the point -and avoid jargon. This is the default layout. The image is from the -\textsf{mwe} package. - -\begin{about} -Some Company was set up in 2014. -\end{about} - -\end{pressrelease} - -\end{document} Binary files old/doc/latex/pressrelease/samples/sample-pressrelease2.pdf and new/doc/latex/pressrelease/samples/sample-pressrelease2.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/samples/sample-pressrelease2.tex new/doc/latex/pressrelease/samples/sample-pressrelease2.tex --- old/doc/latex/pressrelease/samples/sample-pressrelease2.tex 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/samples/sample-pressrelease2.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -% arara: pdflatex -% arara: pdflatex -\documentclass[a4paper,11pt]{pressrelease} - -\usepackage[british]{babel} -\usepackage{graphicx} - -\PRset{head=below,logo=below right,smashlogo,ruled=false} - -\PRlogo{\includegraphics[height=2cm]{example-image}} - -\PRcompany{Some Company} -\PRdepartment{Some Department} -\PRcontact{Ann Other} -\PRlocation{Some City} -\PRaddress{1 The Street\\The Town\\AB1 2YZ} -\PRphone{01234 56789} -\PRmobile{07123456789} -\PRfax{01234 56788} -\PRurl{http://www.some-company.com/} -\PRemail{ann.other(a)some-company.com} -\PRhours{9:00--17:30 Mon--Fri} - -\PRheadline{Some amazing news} -\PRsubheadline{subheading} - -\begin{document} - -\begin{pressrelease} - -This is an example press release. Keep it short and use the third -person. Avoid the use of exclamation marks and all-caps. Put all the -pertinent details in the first paragraph. Answer who, what, when, -where and why. This sample file uses: -\begin{verbatim} -\PRset{head=below,logo=below right,smashlogo,ruled=false} -\end{verbatim} -The image is from the \textsf{mwe} package. - -Use short paragraphs. Try not to exceed 500 words. Keep to the point -and avoid jargon. - -\begin{about} -Some Company was set up in imaginary year $i$. -\end{about} - -\end{pressrelease} - -\end{document} Binary files old/doc/latex/pressrelease/samples/sample-pressrelease3.pdf and new/doc/latex/pressrelease/samples/sample-pressrelease3.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/samples/sample-pressrelease3.tex new/doc/latex/pressrelease/samples/sample-pressrelease3.tex --- old/doc/latex/pressrelease/samples/sample-pressrelease3.tex 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/samples/sample-pressrelease3.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -% arara: pdflatex -% arara: pdflatex -\documentclass[a4paper,11pt]{pressrelease} - -\usepackage[british]{babel} -\usepackage{graphicx} - -\usepackage{lipsum}% dummy text - -\PRlogo{\includegraphics[height=2cm]{example-image}} - -\PRcompany{Some Company} -\PRdepartment{Some Department} -\PRcontact{Ann Other} -\PRlocation{Some City} -\PRaddress{1 The Street\\The Town\\AB1 2YZ} -\PRphone{01234 56789} -\PRmobile{07123456789} -\PRfax{01234 56788} -\PRurl{http://www.some-company.com/} -\PRemail{ann.other(a)some-company.com} -\PRhours{9:00--17:30 Mon--Fri} - -\PRheadline{Some amazing news} -\PRsubheadline{subheading} - -\renewcommand*{\PRheaderfont}[1]{\textsc{#1}} -\renewcommand*{\PRnOfm}[2]{\ifnum#1<#2\relax--More--\fi} - -\begin{document} - -\begin{pressrelease} - -This is a bad example of a press release as it's not generally a -good idea to have more than one page of text, but perhaps you have -some amazing world-changing news. This sample file uses the -\textsf{lipsum} -package to insert some dummy text to pad out the document. -The image is from the \textsf{mwe} package. - -\lipsum[1-4] - -\begin{about} -\lipsum[5] -\end{about} - -\end{pressrelease} - -\end{document} Binary files old/doc/latex/pressrelease/samples/sample-pressrelease4.pdf and new/doc/latex/pressrelease/samples/sample-pressrelease4.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/samples/sample-pressrelease4.tex new/doc/latex/pressrelease/samples/sample-pressrelease4.tex --- old/doc/latex/pressrelease/samples/sample-pressrelease4.tex 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/samples/sample-pressrelease4.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,58 +0,0 @@ -% arara: pdflatex -% arara: pdflatex -\documentclass[a4paper,11pt]{pressrelease} - -\usepackage[british]{babel} -\usepackage{graphicx} - -% The location won't appear as it's not listed in -% topinfo or bottominfo - -\PRset{head=below,logo=below left,releasealign=right, - topinfoalign=right,bottominfoalign=left, - topinfo=company/date, - bottominfo=contact/department/address/phone/hours/email} - -\PRlogo{\includegraphics[height=2cm]{example-image}} - -\PRcompany{Some Company} -\PRdepartment{Some Department} -\PRcontact{Ann Other} -\PRlocation{Some City} -\PRaddress{1 The Street\\The Town\\AB1 2YZ} -\PRphone{01234 56789} -\PRmobile{07123456789} -\PRfax{01234 56788} -\PRurl{http://www.some-company.com/} -\PRemail{ann.other(a)some-company.com} -\PRhours{9:00--17:30 Mon--Fri} - -\PRheadline{Some amazing news} -\PRsubheadline{subheading} - -\begin{document} - -\begin{pressrelease} - -This is an example press release. Keep it short and use the third -person. Avoid the use of exclamation marks and all-caps. Put all the -pertinent details in the first paragraph. Answer who, what, when, -where and why. - -Use short paragraphs. Try not to exceed 500 words. Keep to the point -and avoid jargon. The layout was set using: -\begin{verbatim} -\PRset{head=below,logo=below left,releasealign=right, - topinfoalign=right,bottominfoalign=left, - topinfo=company/date, - bottominfo=contact/department/address/phone/hours/email} -\end{verbatim} -The image is from the \textsf{mwe} package. - -\begin{about} -Some Company was set up in imaginary year $i$. -\end{about} - -\end{pressrelease} - -\end{document} Binary files old/doc/latex/pressrelease/samples/sample-pressrelease5.pdf and new/doc/latex/pressrelease/samples/sample-pressrelease5.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/samples/sample-pressrelease5.tex new/doc/latex/pressrelease/samples/sample-pressrelease5.tex --- old/doc/latex/pressrelease/samples/sample-pressrelease5.tex 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/samples/sample-pressrelease5.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,55 +0,0 @@ -% arara: pdflatex -% arara: pdflatex -\documentclass[a4paper,11pt]{pressrelease} - -\usepackage[british]{babel} -\usepackage{graphicx} - -% Remove textual tags from top info block -\renewcommand*{\PRinfotopline}[2]{% - \PRinfoentry{#2}\tabularnewline -} - -\PRlogo{\includegraphics[height=2cm]{example-image}} - -\PRcompany{Some Company} -\PRcontact{Ann Other} -\date{Some City, \today} -\PRaddress{1 The Street\\The Town\\AB1 2YZ} -\PRphone{01234 56789} -\PRmobile{07123456789} -\PRfax{01234 56788} -\PRurl{http://www.some-company.com/} -\PRemail{ann.other(a)some-company.com} -\PRhours{9:00--17:30 Mon--Fri} - -\PRheadline{Some amazing news} -\PRsubheadline{subheading} - -\begin{document} - -\begin{pressrelease} - -This is an example press release. Keep it short and use the third -person. Avoid the use of exclamation marks and all-caps. Put all the -pertinent details in the first paragraph. Answer who, what, when, -where and why. - -Use short paragraphs. Try not to exceed 500 words. Keep to the point -and avoid jargon. This layout has removed the textual tags in the -top info block by redefining: -\begin{verbatim} -\renewcommand*{\PRinfotopline}[2]{% - \PRinfoentry{#2}\tabularnewline -} -\end{verbatim} -The image is from the -\textsf{mwe} package. - -\begin{about} -Some Company was set up in imaginary year $i$. -\end{about} - -\end{pressrelease} - -\end{document} Binary files old/doc/latex/pressrelease/samples/sample-pressrelease6.pdf and new/doc/latex/pressrelease/samples/sample-pressrelease6.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/samples/sample-pressrelease6.tex new/doc/latex/pressrelease/samples/sample-pressrelease6.tex --- old/doc/latex/pressrelease/samples/sample-pressrelease6.tex 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/samples/sample-pressrelease6.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,55 +0,0 @@ -% arara: pdflatex -% arara: pdflatex -\documentclass[a4paper,11pt,symbols]{pressrelease} - -\usepackage[british]{babel} -\usepackage{graphicx} - -\PRset{releasealign=right,ruled=false,logo=below right,smashlogo} - -\PRlogo{\includegraphics[height=2cm]{example-image}} - -\PRcompany{Some Company} -\PRdepartment{Some Department} -\PRcontact{Ann Other} -\PRaddress{1 The Street\\The Town\\AB1 2YZ} -\PRphone{01234 56789} -\PRmobile{07123456789} -\PRfax{01234 56788} -\PRurl{http://www.some-company.com/~abc} -\PRemail{ann.other(a)some-company.com} -\PRhours{9:00--17:30 Mon--Fri} -\PRencl{some stuff} - -\date{Some City, \today} - -\PRheadline{Some amazing news} -\PRsubheadline{subheading} - -\begin{document} - -\begin{pressrelease} - -This is an example press release. Keep it short and use the third -person. Avoid the use of exclamation marks and all-caps. Put all the -pertinent details in the first paragraph. Answer who, what, when, -where and why. - -Use short paragraphs. Try not to exceed 500 words. Keep to the point -and avoid jargon. This example has loaded the -\textsf{pressrelease-symbols} package (via the \texttt{symbols} -class option) to use symbols (from the -\textsf{marvosym} package and one designed using \textsf{tikz}) instead of text. -The image is from the \textsf{mwe} package. The header layout has -been changed using: -\begin{verbatim} -\PRset{releasealign=right,ruled=false,logo=below right,smashlogo} -\end{verbatim} - -\begin{about} -Some Company was set up in imaginary year $i$. -\end{about} - -\end{pressrelease} - -\end{document} Binary files old/doc/latex/pressrelease/samples/sample-pressrelease7.pdf and new/doc/latex/pressrelease/samples/sample-pressrelease7.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pressrelease/samples/sample-pressrelease7.tex new/doc/latex/pressrelease/samples/sample-pressrelease7.tex --- old/doc/latex/pressrelease/samples/sample-pressrelease7.tex 2014-09-10 23:17:19.000000000 +0200 +++ new/doc/latex/pressrelease/samples/sample-pressrelease7.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -% arara: pdflatex -% arara: pdflatex -\documentclass[a4paper,11pt]{pressrelease} - -\usepackage[british]{babel} -\usepackage{graphicx} -\usepackage[hidelinks]{hyperref} - -\usepackage{pressrelease-symbols} - -\PRset{releasealign=right,ruled=false,logo=below right,smashlogo} - -\renewcommand*{\PRemailformat}[1]{\href{mailto:#1}{\texttt{#1}}} - -\PRlogo{\includegraphics[height=2cm]{example-image}} - -\PRcompany{Some Company} -\PRdepartment{Some Department} -\PRcontact{Ann Other} -\PRaddress{1 The Street\\The Town\\AB1 2YZ} -\PRphone{01234 56789} -\PRmobile{07123456789} -\PRfax{01234 56788} -\PRurl{http://www.some-company.com/~abc} -\PRemail{ann.other(a)some-company.com} -\PRhours{9:00--17:30 Mon--Fri} -\PRencl{some stuff} - -\date{Some City, \today} - -\PRheadline{Some amazing news} -\PRsubheadline{subheading} - -\begin{document} - -\begin{pressrelease} - -This is an example press release. Keep it short and use the third -person. Avoid the use of exclamation marks and all-caps. Put all the -pertinent details in the first paragraph. Answer who, what, when, -where and why. - -Use short paragraphs. Try not to exceed 500 words. Keep to the point -and avoid jargon. This example has loaded the -\textsf{pressrelease-symbols} package to use symbols (from the -\textsf{marvosym} package and one designed using \textsf{tikz}) instead of text. -The image is from the \textsf{mwe} package. The header layout has -been changed using: -\begin{verbatim} -\PRset{releasealign=right,ruled=false,logo=below right,smashlogo} -\end{verbatim} - -\begin{about} -Some Company was set up in imaginary year $i$. -\end{about} - -\end{pressrelease} - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/paresse/paresse.sty new/tex/latex/paresse/paresse.sty --- old/tex/latex/paresse/paresse.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/paresse/paresse.sty 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,112 @@ +%% +%% This is file `paresse.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% paresse.dtx (with options: `common,package') +%% This is a generated file. +%% +%% Copyright (C) 2011, 2013 +%% by Yvon Henel, alias le TeXnicien de surface +%% <le.texnicien.de.surface(a)wanadoo.fr> +%% +%% This file may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, either version 1.2 of this license +%% or (at your option) any later version. The latest version of this +%% license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.2 or later is part of all distributions of LaTeX +%% version 1999/12/01 or later. +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\def\fileversion{v4.1} +\def\filedate{2013/02/16} +\def\fileinfo{fichier paresse par le TeXnicien de surface} +\ProvidesPackage{paresse} + [\filedate\space\fileversion\space\fileinfo] +\RequirePackage{skeyval-bc} +\RequirePackage{ifluatex} +\RequirePackage{ifxetex} +\define@bitogkeys[GA]{paresse.sty}[GA@]{legacy}[true]{levi}{}{} +\define@bitogkeys[GA]{paresse.sty}[GA@]{wild}[true]{tame}{}{} +\define@bitogkeys[GA]{paresse.sty}[GA@]{ttau}[true]{ttheta}{}{} +\define@bitogkeys[GA]{paresse.sty}[GA@]{varepsilon}[true]{epsilon}{}{} +\define@bitogkeys[GA]{paresse.sty}[GA@]{varphi}[true]{phi}{}{} +\define@bitogkeys[GA]{paresse.sty}[GA@]{pi}[true]{varpi}{}{} +\define@bitogkeys[GA]{paresse.sty}[GA@]{sigma}[true]{varsigma}{}{} +\define@bitogkeys[GA]{paresse.sty}[GA@]{rho}[true]{varrho}{}{} +\define@bitogkeys[GA]{paresse.sty}[GA@]{theta}[true]{vartheta}{}{} +\DeclareOptionX*{\PackageError{paresse} {The option "\CurrentOption" + is not known!\MessageBreak The default options are:\MessageBreak + legacy, varepsilon, theta, pi, rho, sigma, and varphi.}% + {Choose between `wild' (for an active Paresse in all the document) + \MessageBreak and `tame', so that the character obtained by + \string\S\MessageBreak prints the section symbol \string\S). + \MessageBreak See the documentation for other options.}} +\ExecuteOptionsX[GA]{legacy,wild,varepsilon,theta,pi,rho,sigma,varphi} +\ProcessOptionsX[GA]\relax +\iftogon{GA@varepsilon}{% + \def\GA@epsilon{\varepsilon}}{\def\GA@epsilon{\epsilon}} +\iftogon{GA@vartheta}{\def\GA@theta{\vartheta}}{\def\GA@theta{\theta}} +\iftogon{GA@varpi}{\def\GA@pi{\varpi}}{\def\GA@pi{\pi}} +\iftogon{GA@varrho}{\def\GA@rho{\varrho}}{\def\GA@rho{\rho}} +\iftogon{GA@varsigma}{\def\GA@sigma{\varsigma}}{\def\GA@sigma{\sigma}} +\iftogon{GA@varphi}{\def\GA@phi{\varphi}}{\def\GA@phi{\phi}} +\ifluatex + \PackageInfo{paresse}{compiling with luatex} + \InputIfFileExists{paresseold.sto}{% + \PackageInfo{paresse}{paresseold loaded}}{% + \PackageInfo{paresse}{paresseold not loaded}} +\else + \ifxetex + \PackageInfo{paresse}{compiling with xetex} + \InputIfFileExists{paresseold.sto}{% + \PackageInfo{paresse}{paresseold loaded}}{% + \PackageInfo{paresse}{paresseold not loaded}} + \else +\newcommand\encoding@error{% + \@latex@error{% + paresse needs inputenc loaded with option "utf8" + or option such as "latin1" (8 bits encodign).}{}\stop} +\@ifpackageloaded{inputenc}\relax +{\PackageError{paresse}{% + Please, load inputenc package before paresse}{% + With LaTeX, "paresse" needs to know the encoding to work well and so + the package "inputenc" must be loaded, with \string\usepackage, before + loading "paresse" itself}} +\AtBeginDocument{% + \@ifpackageloaded{inputenc}\find@encoding\encoding@error} +\newtog[GA@]{utf8}[false] +\newcommand\find@encoding{% + \begingroup + \def\utf@encoding{utf8}% + \def\temp@a{\togoff{GA@utf8}% + \PackageInfo{paresse}{8-bit encoding expected\@gobble}} + \ifx\utf@encoding\inputencodingname + \def\temp@a{\togon{GA@utf8}% + \PackageInfo{paresse}{utf8 encoding detected\@gobble}} + \fi + \expandafter\endgroup\temp@a} +\AtBeginDocument{% + \makeatletter + \iftogoff{GA@utf8}{% + \InputIfFileExists{paresseold.sto}{% + \PackageInfo{paresse}{old loaded\@gobble}}{% + \PackageError{paresse}{paresseold.sto not found}{% + The package "paresse" needs to load the file "paresseold.sto" + but can't find it. Something seems to be broken in your TeX + system}}}{% + \InputIfFileExists{paresseutf8.sto}{% + \PackageInfo{paresse}{utf8 loaded\@gobble}}{% + \PackageError{paresse}{paresseutf8 not found}{% + The package "paresse" needs to load the file "paresseutf8.sto" + but can't find it. Something seems to be broken in your TeX + system}}} + \makeatother} +\fi +\fi +\endinput +%% +%% End of file `paresse.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/paresse/paresseold.sto new/tex/latex/paresse/paresseold.sto --- old/tex/latex/paresse/paresseold.sto 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/paresse/paresseold.sto 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,97 @@ +%% +%% This is file `paresseold.sto', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% paresse.dtx (with options: `oldpack') +%% This is a generated file. +%% +%% Copyright (C) 2011, 2013 +%% by Yvon Henel, alias le TeXnicien de surface +%% <le.texnicien.de.surface(a)wanadoo.fr> +%% +%% This file may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, either version 1.2 of this license +%% or (at your option) any later version. The latest version of this +%% license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.2 or later is part of all distributions of LaTeX +%% version 1999/12/01 or later. +\ProvidesFile{paresseold.sto} +\count@=\catcode`\^^a7 +\let\GA@LaVieilleParesse= ^^a7 +\def\^^a7{\S} +\newcommand{\makeparesseletter}{\catcode `\^^a7=11\relax} +\newcommand{\makeparesseother}{\catcode `\^^a7=12\relax} +\newcommand{\GA@MakeParesseActive}{\catcode `\^^a7=\active} +\def\GA@ActiveLaParessexii{\catcode `\^^a7=\active} +\def\GA@ActiveLaParessexiii{\catcode `\^^a7=\active + \def^^a7##1{\ensuremath{\csname \string^^a7##1\endcsname}}} +\ifnum\count@=12 + \let\GA@ActiveLaParesse \GA@ActiveLaParessexii +\else + \let\GA@ActiveLaParesse \GA@ActiveLaParessexiii +\fi +\newcommand{\ActiveLaParesse}{\GA@ActiveLaParesse} +\newenvironment{ParesseActive}{\GA@ActiveLaParesse}{} +\makeparesseletter +\def\^^a7a {\alpha} +\def\^^a7b {\beta} +\def\^^a7g {\gamma} +\def\^^a7d {\delta} +\def\^^a7e {\GA@epsilon} +\def\^^a7z {\zeta} +\def\^^a7h {\eta} +\def\^^a7i {\iota} +\def\^^a7k {\kappa} +\def\^^a7l {\lambda} +\def\^^a7m {\mu} +\def\^^a7n {\nu} +\def\^^a7x {\xi} +\def\^^a7p {\GA@pi} +\def\^^a7r {\GA@rho} +\def\^^a7s {\GA@sigma} +\def\^^a7u {\upsilon} +\def\^^a7f {\GA@phi} +\def\^^a7w {\omega} +\iftogon{GA@legacy}{% + \def\^^a7v {\GA@theta} + \def\^^a7y {\tau} + \def\^^a7c {\chi} + \def\^^a7q {\psi} + \iftogon{GA@ttau}{\def\^^a7t {\tau}}{\def\^^a7t {\GA@theta}}}{% + \def\^^a7j {\GA@theta} + \def\^^a7t {\tau} + \def\^^a7q {\chi} + \def\^^a7y {\psi} + \def\^^a7c {\varsigma}} +\def\^^a7G {\Gamma} +\def\^^a7D {\Delta} +\def\^^a7L {\Lambda} +\def\^^a7P {\Pi} +\def\^^a7S {\Sigma} +\def\^^a7U {\Upsilon} +\def\^^a7F {\Phi} +\def\^^a7X {\Xi} +\def\^^a7W {\Omega} +\iftogon{GA@legacy}{% + \def\^^a7V {\Theta} + \def\^^a7T {\Theta} + \def\^^a7Q {\Psi} +}{% + \def\^^a7J {\Theta} + \def\^^a7Y {\Psi} +}% +\def\^^a7Z {\S} +\catcode `\^^a7=\active +\def^^a7#1{\ensuremath{\csname \string^^a7#1\endcsname}} +\iftogon{GA@tame}{% + \catcode`\^^a7=\count@ + \ifnum\count@=13 \let ^^a7=\GA@LaVieilleParesse \fi +}% +\endinput +%% +%% End of file `paresseold.sto'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/paresse/paresseutf8.sto new/tex/latex/paresse/paresseutf8.sto --- old/tex/latex/paresse/paresseutf8.sto 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/paresse/paresseutf8.sto 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,140 @@ +%% +%% This is file `paresseutf8.sto', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% paresse.dtx (with options: `utf8pack') +%% This is a generated file. +%% +%% Copyright (C) 2011, 2013 +%% by Yvon Henel, alias le TeXnicien de surface +%% <le.texnicien.de.surface(a)wanadoo.fr> +%% +%% This file may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, either version 1.2 of this license +%% or (at your option) any later version. The latest version of this +%% license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.2 or later is part of all distributions of LaTeX +%% version 1999/12/01 or later. +\ProvidesFile{paresseutf8.sto} +\begingroup +\catcode`\"=12 +\catcode`\<=12 +\catcode`\.=12 +\catcode`\,=12 +\catcode`\;=12 +\catcode`\!=12 +\catcode`\~=13 +\global\let\GA@parse@UTFviii@a=\parse@UTFviii@a +\global\let\GA@parse@UTFviii@b=\parse@UTFviii@b +\gdef\declareunicodecharacter#1#2{% + \count@"#1\relax + \wlog{\space\space Redefining Unicode char U+#1 (decimal \the\count@)}% + \begingroup + \GA@parse@XML@charref + \def\UTFviii@two@octets##1##2{\csname u8:##1\string##2\endcsname}% + \def\UTFviii@three@octets##1##2##3{\csname u8:##1% + \string##2\string##3\endcsname}% + \def\UTFviii@four@octets##1##2##3##4{\csname u8:##1% + \string##2\string##3\string##4\endcsname}% + \expandafter\expandafter\expandafter + \expandafter\expandafter\expandafter + \expandafter + \gdef\UTFviii@tmp{\IeC{#2}}% + \endgroup} +\gdef\GA@parse@XML@charref{% + \ifnum\count@<"A0\relax + \PackageError{inputenc}{Cannot\space define\space Unicode\space + char\space value\space <\space 00A0}\@eha + \else\ifnum\count@<"800\relax + \GA@parse@UTFviii@a,% + \GA@parse@UTFviii@b C\UTFviii@two@octets.,% + \else\ifnum\count@<"10000\relax + \GA@parse@UTFviii@a;% + \GA@parse@UTFviii@a,% + \GA@parse@UTFviii@b E\UTFviii@three@octets.{,;}% + \else + \GA@parse@UTFviii@a;% + \GA@parse@UTFviii@a,% + \GA@parse@UTFviii@a!% + \GA@parse@UTFviii@b F\UTFviii@four@octets.{!,;}% + \fi + \fi +\fi} +\endgroup +\newcommand{\makeparesseletter}{\DeclareUnicodeCharacter{00A7}\S} +\newcommand{\makeparesseother}{% + \PackageWarning{paresse}{% + Command \string\makeparesseother disabled}{% + The command \string\makeparesseother would have been meaningless + in the current context}} +\newcommand{\ActiveLaParesse}{\declareunicodecharacter{00A7}\@paresse} +\newenvironment{ParesseActive}{\ActiveLaParesse}{} +\ActiveLaParesse +\def\@paresse{\futurelet\@toks\@i@paresse} +\def\@i@paresse{% + \csname\ifcat a\@toks @ii@paresse\else S\fi\endcsname} +\def\@ii@paresse#1{% + \ifcsname @paresse@#1\endcsname + \csname @paresse@#1\endcsname\expandafter\@gobble + \else + \expandafter\@firstofone + \fi{\S#1}} +\def\define@paresse@car#1#2{% + \expandafter\def\csname @paresse@#1\endcsname{\ensuremath{#2}}} +\define@paresse@car Z\S +\define@paresse@car a\alpha +\define@paresse@car b\beta +\define@paresse@car g\gamma +\define@paresse@car d\delta +\define@paresse@car e\GA@epsilon +\define@paresse@car z\zeta +\define@paresse@car h\eta +\define@paresse@car i\iota +\define@paresse@car k\kappa +\define@paresse@car l\lambda +\define@paresse@car m\mu +\define@paresse@car n\nu +\define@paresse@car x\xi +\define@paresse@car p\GA@pi +\define@paresse@car r\GA@rho +\define@paresse@car s\GA@sigma +\define@paresse@car u\upsilon +\define@paresse@car f\GA@phi +\define@paresse@car w\omega +\iftogon{GA@legacy}{% + \define@paresse@car v\GA@theta + \define@paresse@car y\tau + \define@paresse@car c\chi + \define@paresse@car q\psi + \iftogon{GA@ttau}{% + \define@paresse@car t\tau}{% + \define@paresse@car t\GA@theta}}{% + \define@paresse@car j\GA@theta + \define@paresse@car t\tau + \define@paresse@car q\chi + \define@paresse@car y\psi + \define@paresse@car c\varsigma} +\define@paresse@car G\Gamma +\define@paresse@car D\Delta +\define@paresse@car L\Lambda +\define@paresse@car P\Pi +\define@paresse@car S\Sigma +\define@paresse@car U\Upsilon +\define@paresse@car F\Phi +\define@paresse@car X\Xi +\define@paresse@car W\Omega +\iftogon{GA@legacy}{% + \define@paresse@car V\Theta + \define@paresse@car T\Theta + \define@paresse@car Q\Psi}{% + \define@paresse@car J\Theta + \define@paresse@car Y\Psi}% +\iftogon{GA@tame}{\makeparesseletter} +\endinput +%% +%% End of file `paresseutf8.sto'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/paresse.tlpobj new/tlpkg/tlpobj/paresse.tlpobj --- old/tlpkg/tlpobj/paresse.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/paresse.tlpobj 2017-04-14 17:53:23.000000000 +0200 @@ -0,0 +1,17 @@ +name paresse +category Package +revision 29803 +shortdesc Define simple macros for greek letters +relocated 1 +longdesc The package defines macros using SS to type greek letters. so +longdesc that the user may (for example) type SSa to get the effect of +longdesc $\alpha$. +runfiles size=5 + RELOC/tex/latex/paresse/paresse.sty + RELOC/tex/latex/paresse/paresseold.sto + RELOC/tex/latex/paresse/paresseutf8.sto +catalogue-ctan /macros/latex/contrib/paresse +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license lppl +catalogue-topics shortcut +catalogue-version 4.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pressrelease.doc.tlpobj new/tlpkg/tlpobj/pressrelease.doc.tlpobj --- old/tlpkg/tlpobj/pressrelease.doc.tlpobj 2016-04-14 19:36:16.000000000 +0200 +++ new/tlpkg/tlpobj/pressrelease.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -name pressrelease.doc -category Package -revision 35147 -shortdesc doc files of pressrelease -relocated 1 -docfiles size=267 - RELOC/doc/latex/pressrelease/CHANGES - RELOC/doc/latex/pressrelease/README - RELOC/doc/latex/pressrelease/pressrelease.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease.tex - RELOC/doc/latex/pressrelease/samples/sample-pressrelease2.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease2.tex - RELOC/doc/latex/pressrelease/samples/sample-pressrelease3.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease3.tex - RELOC/doc/latex/pressrelease/samples/sample-pressrelease4.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease4.tex - RELOC/doc/latex/pressrelease/samples/sample-pressrelease5.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease5.tex - RELOC/doc/latex/pressrelease/samples/sample-pressrelease6.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease6.tex - RELOC/doc/latex/pressrelease/samples/sample-pressrelease7.pdf - RELOC/doc/latex/pressrelease/samples/sample-pressrelease7.tex ++++++ platex.doc.tar.xz -> pax.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/latex/pax/README new/texmf-dist/doc/latex/pax/README --- old/texmf-dist/doc/latex/pax/README 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/latex/pax/README 2016-11-25 19:29:47.000000000 +0100 @@ -0,0 +1,247 @@ +README for project pax (PDFAnnotExtractor), 2012/04/23 v0.1l + + +TABLE OF CONTENTS +================= + +A. Project pax +B. Copyright, License +C. Files +D. Author +E. Requirements +F. Download +G. Installation +H. Use +I. History + + +A. PROJECT PAX +============== + +If PDF files are included using pdfTeX, PDF annotations +are stripped. This project tries a solution without +altering pdfTeX. A Java program (pax.jar) parses the PDF file that +will later be included. It writes the data of the annotations +in a file that can be read by TeX. Then a LaTeX package (pax.sty) +extends the graphics package. If a PDF file is included, the package +looks for the file with the annotation data, reads them and puts +the annotations in the right place. + +Project status: experimental + + +B. COPYRIGHT, LICENSE +===================== + +Copyright (C) 2006-2008, 2011, 2012 Heiko Oberdiek. + +The project consists of two parts: +* The Java program pax.jar with sources. + The Perl wrapper pdfannotextractor.pl. + License is GPL, see license/gpl.txt. +* The LaTeX package pax.sty. + License is LPPL 1.3. +The file README belongs to both parts. + +The Java program uses the PDF library PDFBox, +see http://pdfbox.apache.org/. + + +C. FILES +======== + +The project is available in CTAN (ftp.ctan.org): + CTAN:macros/latex/contrib/pax/ + +There are the following files: +* README + This file. +* pax.tds.zip + The whole project, ready to unpack in a TDS (texmf) tree. + +The files inside pax.tds.zip: +* doc/latex/pax/README + This file. +* scripts/pax/pax.jar + The Java program. +* scripts/pax/pdfannotextractor.pl + Perl wrapper for calling the Java program in pax.jar. +* source/latex/pax/license/LaTeX/lppl.txt + License (LPPL) for the LaTeX package. +* source/latex/pax/license/PDFAnnotExtractor/gpl.txt + License (GPL) for the Java program. +* source/latex/pax/src/Constants.java + source/latex/pax/src/Entry.java + source/latex/pax/src/EntryWriteException.java + source/latex/pax/src/PDFAnnotExtractor.java + source/latex/pax/src/StringVisitor.java + Java source files. +* source/latex/pax/src/MANIFEST.MF + Manifest file for the JAR file. +* source/latex/pax/src/build.xml + Ant build file for generating the JAR file. +* tex/latex/pax/pax.sty + The LaTeX package. + + +D. AUTHOR +========= + +Heiko Oberdiek <heiko.oberdiek at googlemail.com> + + +E. REQUIREMENTS +=============== + +* Java 1.4+. +* PDFBox 0.7.2 or 0.7.3. + However, PDFAnnotExtractor does not work with the recent + versions of PDFBox, currently only the older versions + 0.7.2 or 0.7.3 are supported. The older versions are + available at SourceForge: + http://sourceforge.net/project/showfiles.php?group_id=78314 +* The Perl wrapper (optional) needs: + * Perl + * kpsewhich + * java in PATH + The option --install also requires: + * wget or curl + * unzip + * texhash or mktexlsr + + +F. DOWNLOAD +=========== + +1. Download pax.tds.zip from CTAN: + ftp://ftp.ctan.org/tex-archive/install/macros/latex/contrib/pax-tds.zip + +2. Download PDFBox-0.7.3.jar from http://www.pdfbox.org/ (22 MB) + http://prdownloads.sourceforge.net/pdfbox/PDFBox-0.7.3.zip?download + Or install PDFBox as RPM package or whatever. + + +G. INSTALLATION +=============== + +Examples are given for linux. + +3. Install PDFBox (from its home page, RPM package, ...). + The wrapper pdfannotextractor.pl looks for the JAR file in directories: + /usr/share/java/ + /usr/local/share/java/ + TDS:scripts/pax/lib/ (TDS:scripts//) + assuming one of the following names: + pdfbox.jar + PDFBox.jar + pdfbox-0.7.3.jar + PDFBox-0.7.3.jar + pdfbox-0.7.2.jar + PDFBox-0.7.2.jar + +Alternative for 2. and 3. + * Continue with 4. and 5.a). + * Call `pdfannotextractor --install' (or with option --debug). + It downloads PDFBox from its homepage and installs it + in TEXMFVAR(VARTEXMF) below TDS:scripts/pax/ + +4. Unzip pax-tds.zip inside the TDS tree, where you want to put this + project, e.g.: + unzip pax-tds -d /usr/local/share/texmf + Don't forget to update the database (texhash, mktexlsr, ...). + +5.a) Install the wrapper Perl script pdfannotextractor.pl + as `pdfannotextractor' somewhere in your PATH (/usr/local/bin, + /usr/bin, ...). +5.b) Or write a wrapper script or whatever to ease the call of the + Java program, e.g.: + #!/bin/sh + java -cp pax.jar:pdfbox.jar pax.PDFAnnotExtractor "$@" + +Version of PDFBox +----------------- +Developing the pax project I have used and tested version 0.7.2, +also the current version 0.7.3 seems to be fine. Older versions +are not supported at all, they may work or do not. + + +H. USE +====== + +As example I am using usrguide.pdf (with links from project latex-tds) +that will be included in test.tex: + +%%% cut %%% test.tex %%% cut %%% +\documentclass[a4paper,12pt,landscape]{article} +\usepackage[ + hmargin=1in, + vmargin=1in, +]{geometry} + +\usepackage{pdfpages} +% pdfpages loads graphicx + +\usepackage{pax} + +\iffalse + \usepackage{hyperref} + \hypersetup{ + filebordercolor={1 1 0}, + } +\fi + +\begin{document} + \includepdf[pages=-,nup=2x1]{usrguide} +\end{document} +%%% cut %%% test.tex %%% cut %%% + +First run the Java program on usrguide.pdf: + + $ java -jar pax.jar usrguide.pdf + +It generates usrguide.pax. +Next run pdflatex on test.tex twice at least: + + $ pdflatex test + $ pdflatex test + +Then the links should work. + +Additionally package hyperref can be used (replace \iffase by \iftrue). +Then the links can be configured using hyperref settings. +(But keep in mind, the colored links by option colorlinks can't +be changed in included documents. + + +I. History +========== + +2006/08/24 v0.1a + * First release. +2006/09/04 v0.1b + * Bug fix in PDFAnnotExtractor.add_dest()/named destinations. +2007/06/29 v0.1c + * \l@addto@macro renamed to \PAX@l@addto@macro to avoid + collision with classes of KOMA-Script. +2007/06/30 v0.1d + * Use of package `etexmcds'. +2007/07/12 v0.1e + * The Java program can be called with several files. +2007/07/16 v0.1f + * PDF files are explicitely closed to avoid warnings. +2007/07/18 v0.1g + * Compiled for Java 1.4. +2007/07/19 v0.1h + * JAR file without TDS tree. +2008/10/01 v0.1i + * Perl wrapper `pdfannotextractor.pl' added. + * Section `Installation' from README rewritten. + * Class-Path removed from MANIFEST.MF. +2011/04/22 v0.1j + * Update of email address and updating version dates + for all files. +2011/07/06 v0.1k + * Package `pax' uses package `kvsetkeys' to avoid + problems with incompatible `xkeyval'. +2012/04/18 v0.1l + * Option --version added to pdfannotextractor.pl. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/platex/base/Changes_asciimw.txt new/texmf-dist/doc/platex/base/Changes_asciimw.txt --- old/texmf-dist/doc/platex/base/Changes_asciimw.txt 2016-05-10 01:46:07.000000000 +0200 +++ new/texmf-dist/doc/platex/base/Changes_asciimw.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,299 +0,0 @@ -<2006/11/10> - * plfonts.dtx: $a^\mathrm{b}, a_\mathrm{b}$$B$N$h$&$J5-=R$r$7$?>l9g$K(B - $B%(%i!<$K$J$kLdBj$KBP=h!#!J$"$j$,$H$&$4$6$$$^$9!"(Bymt$B$5$s!K(B - * jclasses.dtx: $B2r@b$rDI2C!#!J$"$j$,$H$&$4$6$$$^$9!"(Bymt$B$5$s!K(B ----------------- -<2006/06/27> - * plfonts.dtx: \reDeclareMathAlphabet$B$r(BLaTeX <2005/12/01>$B$G?t<0MQ=q(B - $BBNJQ99L?Na$,(Brubust$B$K$J$C$?$N$KBP1~!#!J$"$j$,$H$&$4$6$$$^$9!"(Bymt$B$5$s!K(B - * jclasses.dtx: pLaTeX 209$B8_49%b!<%I$G?t<0(Bfam$B$,=EJ#;HMQ$5$l$F$$$?$N(B - $B$r2r>C!#!J$"$j$,$H$&$4$6$$$^$9!"(Bymt$B$5$s!K(B - * tascmac.sty: itembox,screen$B4D6-$G7S@~$,$:$l$k%P%0$r=$@5!#(B - $B!J$"$j$,$H$&$4$6$$$^$9!"KL8+$5$s!K(B ----------------- -<2006/01/04> - * nidanfloat.dtx: $BI,?\%U%)!<%^%C%H%U%!%$%k$r(BpLaTeX2e$B$+$i(BLaTeX2e$B$XJQ99!#(B - * plfonts.dtx: \DeclareFontEncoding@ $BCf$G(B \LastDeclaredEncodeng $B$N:FDj5A$,(B - $BH4$1$F$$$?$N$GDI2C!#(B - * plvers.dtx: $B%P!<%8%g%sHV9f99?7(B(platex<2006/01/04>) ----------------- -<2005/01/04> - * plfonts.dtx: \fontfamily$BCf$N%U%i%0$r=$@5!#(B - $B!J$"$j$,$H$&$4$6$$$^$9!"3QF#$5$s!K(B - * plvers.dtx: $B%P!<%8%g%sHV9f99?7(B(platex<2005/01/04>) ----------------- -<2004/08/10> - * plfonts.dtx: verbatim$B4D6-$GM>7W$JA08e6u$-$,H/@8$7$J$$$h$&$K(B \fontfamily - $B$r=$@5!#(B - $B!J$"$j$,$H$&$4$6$$$^$9!"K\ED$5$s!K(B - * plfonts.dtx: JY1,JT1$B0J30$NOBJ8%(%s%3!<%G%#%s%0$b;HMQ$G$-$k$h$&$K=$@5!#(B - $B!J$"$j$,$H$&$4$6$$$^$9!"0f>e$5$s!K(B - * jclasses.dtx: \part, \chapter $B$N(B \@afterindentfalse $B$r(B \@afterindenttrue - $B$KJQ99!#(B - * jclasses.dtx: \section, \subsection, \subsubsection $B$NA08e6u$-$N(B - $B?-=LI}$r=$@5!#(B - $B!J$"$j$,$H$&$4$6$$$^$9!"NkLZ$?!w(BMILN$B$5$s!K(B - * LaTeX2e 2003/12/01 $BHG$X$NBP1~$r3NG'!#(B ----------------- -<2002/04/09> - * jclasses.dtx: $B=DAH%9%?%$%k$G(B \flushbottom $B$7$J$$$h$&$K$7$?!#(B ----------------- -<2002/04/05> - * plfonts.dtx: |\adjustbaseline|$B$N(B|\iftdir|$B$N0LCV$r!"OBJ8%U%)%s%H$N4p(B - $B=`CM$r@_Dj$7$?8e$K0\F0!#!J$"$j$,$H$&!"1|B<$5$s!K(B ----------------- -<2002/04/01> - * tascmac.sty: \ascii, \Ascii, \ASCII $B%^%/%m$,%(%i!<$K$J$C$F$$$?$N$r=$@5!#(B ----------------- -<2002/01/17> - * plvers.dtx: v1.0i $B$N99?7F|IU$,(B 2009 $BG/$K$J$C$F$$$?$N$r(B 2001 $B$K=$@5!#(B - LaTeX $B$N%P!<%8%g%s$b(B 2000 $B$K$J$C$F$$$?$N$r(B 2001 $B$K=$@5!#(B ----------------- -<2001/10/04> - * jclasses.dtx: $BL\<!$G=PNO$5$l$k%Z!<%8HV9f$N=qBN$r(B|\normalfont|$B$KJQ99(B - $B!J$"$j$,$H$&!"NkLZ$?!w(BMILN$B$5$s!K(B - * plnews07.tex: $B>e5-$NJQ99$N5-=R$rDI2C(B ----------------- -<2001/09/26> - * plnews07.tex: $BDI2C(B - * plvers.dtx: LaTeX <2001/06/01> $BMQ$K=$@5(B - * plcore.dtx: LaTeX <2001/06/01> $BMQ$K=$@5(B - * plext.dtx: $B%?%0L>$r(B plcore $B$+$i(B package $B$KJQ99(B - * plfmt.ins: plext.dtx $B$NE83+$KMQ$$$k%?%0L>$NJQ99(B ----------------- -<2001/09/14> - * nidanfloat.dtx: $B%Q%C%1!<%8%*%W%7%g%s(B(balance, nobalance)$B$rDI2C(B ----------------- -<2001/09/04> - * README.txt: $B;HMQ>r9`$r:o=|!J(Bptex-texmf $B$N(B COPYRIGHT $B$r:NMQ!K(B - * Copyright: $B:o=|!J(Bptex-texmf $B$N(B COPYRIGHT $B$r:NMQ!K(B - * plvers.dtx: pLaTeX <2001/09/04> $BMQ$K=$@5(B - * plpatch.ltx: pLaTeX <2001/09/04> $BMQ$K=$@5(B - * plcore.dtx: \enlargethispage $B$r;H$C$?$H$-!"5SCm$N@~$,K\J8$H=E$J$k$N$r=$@5(B - * jclasses.dtx: \chapter $B%3%^%s%I$r%"%9%?%j%9%/7A<0$G;H$C$?$H$-$H(B - $B$=$&$G$J$$$H$-$G!"=PNO0LCV$,0[$J$k$N$r=$@5!J$"$j$,$H$&!"NkLZ!wDE$5$s!K(B ----------------- -<2001/05/10> - * plext.dtx: $B=DAH$N$H$-(B z $B%*%W%7%g%s$G%(%i!<$,=P$k$N$r=$@5(B - $B!J$"$j$,$H$&!"Bg@P$5$s!K(B - * plfonts.dtx: $B%Y!<%9%i%$%s%7%U%H$ND4@0CM$,Bg$-$/$J$C$F$$$k$N$r=$@5(B ----------------- -<2001/02/19> - * nidanfloat.dtx: $B:G=*%Z!<%8$G:81&$N9T4V$,B7$o$J$$$N$r=$@5(B - * nidanfloat.dtx: $BCl$,=P$J$$$N$r=$@5(B ----------------- -<2000/12/20> - * nidanfloat.dtx: $B0lCJH4$-$N%U%m!<%H$r:.$<$k$H%(%i!<$K$J$k$N$r=$@5(B - $B!J$"$j$,$H$&!"ARBt!w(BQUIPU$B$5$s!K(B ----------------- -<2000/11/03> - * plvers.dtx: LaTeX <2000/06/01> $B$K9g$o$;$F=$@5!#(B - * plpatch.ltx: pLaTeX<2000/11/03> $BMQ$K=$@5!#(B ----------------- -<2000/10/24> - * plfonts.dtx: \adjustbaseline$B$GM>J,$J%"%-$,F~$i$J$$$h$&$K$7$?(B ----------------- -<2000/07/14> - * plfonts.dtx: \textbf $B$J$I$N=qBNJQ99%3%^%s%I$G!":8C<$N2$J8$H$N4V$K(B - \xkanjiskip $B$,F~$i$J$$$N$r=$@5!J$"$j$,$H$&!"25It!wElBg$5$s!K(B ----------------- -<2000/07/13> - * nidanfloat.{dtx,ins,sty} $B$rDI2C!#(B ----------------- -<2000/02/29> - * plvers.dtx: LaTeX <1999/12/01> $B$K9g$o$;$F=$@5!#(B - * plpatch.ltx: pLaTeX<2000/02/29> $BMQ$K=$@5!#(B ----------------- -<1999/05/18> - * jclasses.dtx: enumerate ----------------- -<1999/04/05> - * plvers.dtx: LaTeX <1998/12/01> $B$K9g$o$;$F=$@5!#(B - pLaTeX $B$N%P!<%8%g%s$r(B <1999/04/05> $B$K$7$?!#(B - * plfonts.dtx: $BJ8=q$N@hF,$G!"OBJ8%G%U%)%k%H%U%)%s%H$NJQ99$,H?1G(B - $B$5$l$J$$$N$r=$@5!J$"$j$,$H$&!";3K\!wM}2JBg$5$s!K!#(B - * plcore.dtx: \\ $B$K%*%W%7%g%s$rIU$1$?$H$-$KM>7W$J%9%Z!<%9$,=PNO(B - $B$5$l$F$7$^$&$N$r=$@5!J$"$j$,$H$&!"NkLZ!w5~Bg$5$s!K!#(B - * plpatch.ltx: pLaTeX<1999/04/05> $BMQ$K=$@5!#(B - * README.txt: $B%P!<%8%g%s$NJQ99(B - * plnews05.txt: $B?75,DI2C(B ----------------- -<1999/01/27> - * docstrip.cfg: $B:o=|(B ----------------- -<1998/09/01> - * plvers.dtx: pLaTeX $B%P!<%8%g%s$r(B <1998/09/01> $B$H$7$?!#(B - * plpatch.ltx: pLaTeX <1998/09/01> $BMQ$K=$@5!#(B ----------------- -<1998/08/10> - * plfonts.dtx: \DeclareFixedFont $B%3%^%s%I$,(B \@onlypreambre $B$K$J$C$F$$$?(B - $B$N$r=$@5$7$?!#(B - * plnews.cls: itemize$B4D6-$r:FDj5A(B ----------------- -<1998/04/09> - * jclasses.dtx: \rightmark $B%3%^%s%I$N0z?t$K(B \today $B%3%^%s%I$r=$@5$7$?(B - $B$H$-!"=PNO$5$l$kF|IU$,!VJ?@.85G/!W$K$J$C$F$7$^$&$N$r=$@5(B - $B!J(Bpl980409.patch$B!K!#(B ----------------- -<1998/03/23> - * jclasses.dtx: report, book $B%/%i%9$G!"HV9f$NIU$+$J$$8+=P$7%l%Y%k$N(B - $B%Z%J%k%F%#$r(B \@M $B$K=$(a)5$7$?!J(Bpl980323.patch$B!K!#(B ----------------- -<1998/02/27> - * tascmac.sty: calc $B%Q%C%1!<%8$H$H$b$KMQ$$$?$H$-!"(Bscreen $B4D6-!"(B - itembox $B4D6-!"(Bboxnote $B4D6-$,%(%i!<$K$J$k$N$r=$(a)5!J(Bpl980227.patch$B!K!#(B ----------------- -<1998/02/03> - * All: LaTeX <1997/12/01> $B$KBP1~$7$?!#(B - * hyphen.cfg $B%U%!%$%k$rDI2C$7$?!#(B - * Copyright $B%U%!%$%k$rDI2C$7$?!#(B - * jclasses.dtx: 2e$B%b!<%I;~$N(Ba5p$B$N%H%C%W%^!<%8%s$r(B0.7in$BA}$d$7$?!#(B ----------------- -<1997/12/12> - * jclasses.dtx: [j,t]report, [j,t]book$B%/%i%9$G(B oneside $B%*%W%7%g%s$r;XDj$7!"(B - bothstyle $B%9%?%$%k$K$9$k$H!"%3%s%Q%$%k%(%i!<$K$J$k$N$r=$@5!#(B ----------------- -<1997/09/03> - * jclasses.dtx: 2.09$B8_49%b!<%I$G(B landscape $B%*%W%7%g%s$,8z$+$J$$$N$r=$@5!#(B - * jclasses.dtx: landscape $B;~$K!"=D2#$N%5%$%:$r8r49$7$F$+$i!":81&%^!<%8%s(B - $B$J$I$r7W;;$9$k$h$&$KJQ99!#(B ----------------- -<1997/08/25> - * jclasses.dtx: $BJRLL0u:~$N$H$-!"(Bsection $B%l%Y%k$NJ8;zNs$,Cl$K=PNO$5$l$J$$(B - $B$N$r=$@5!#(B ----------------- -<1997/07/29> - * jltxdoc.dtx: \ $B$H(B " $B$NA0$K$b(B \xkanjiskip $B$,F~$k$h$&$K=$@5!#(B ----------------- -<1997/07/10> - * plfonts.dtx: fd$B%U%!%$%kL>$N>.J8;z2=$,8z$$$F$$$J$+$C$?$N$r=$@5!#(B ----------------- -<1997/07/08> - * jclasses.dtx: $B=DAH%/%i%9$G!"=qBN%5%$%:$rJQ99$7$?$H$-!"%Y!<%9%i%$%s$,(B - $B$*$+$7$/$J$k$N$r=$@5!#(B ----------------- -<1997/07/02> - * plnews02.tex: $B9`L\$N0\F0$H5-=RFbMF$N=$@5!#(B ----------------- -<1997/06/25> - * plcore.dtx: $B%*%j%8%J%k$N(B LaTeX2e $B$N2~9T%^%/%m$NJQ99$KBP1~!#(B - * plfonts.dtx, pl209.dtx: \em, \emph $B$GOBJ8=qBN$bJQ99$9$k$h$&$K=$@5!#(B - * plnews02.tex: $B>e5-(B 2$B$D$N=$@5$K$D$$$F5-=R!#(B ----------------- -<1997/04/24> - * plfonts.dtx: $B%U%)%s%HDj5A%U%!%$%kL>$r>.J8;z$KJQ49$7$F$+$iC5$9$h$&$K$7$?!#(B ----------------- -<1997/04/09> - * plfonts.dtx: $B=D2#%(%s%3!<%I!&%j%9%H$NJ,N%$K$h$k3HD%(B ----------------- -<1997/04/08> - * jclasses.dtx: $B2#AH%/%i%9$G$N%H%C%W%^!<%8%s$NCM$r=$@5$7$?!#(B - * plfonts.dtx: $BOBJ8%(%s%3!<%I4XO"$N=$@5(B - * plfonts.dtx: $BOBJ8%(%s%3!<%I@k8@%3%^%s%I$r=DAHMQ$H2#AHMQ$GJ,$1$k$h$&$K$7$?!#(B - * plnews02.tex (NEW): $BA02s$+$i$NJQ99$r$^$H$a$?J8=q%U%!%$%k!#(B ----------------- -<1997/03/11> - * plfonts.dtx: $BOBJ8%U%)%s%H$r$9$Y$F$N%5%$%:$G%m!<%I$G$-$k$h$&$K$7$?!#(B ----------------- -<1997/02/24> - * pl209.dtx: \RequirePackage{oldlfonts} $B$r(B \RequirePackage{oldlfonts} $B$K(B - $B=$@5!#(B - * jclasses.dtx: $B=DAH%/%i%9$N(B \thefigure $B$N(B \if $BJ8$NBP1~$,$*$+$7$$$N$r=$@5!#(B - * jclasses.dtx: $B=DAH%/%i%9$NI=;f$r=DAH$K$7$?!#(B ----------------- -<1997/02/02>+2 - * jclasses.dtx: \topmargin $B$N7W;;$r4V0c$($F$$$?$N$r=$@5!#(B - * jclasses.dtx: $B=DAH%/%i%9$G3+;O%Z!<%8$,$*$+$7$/$J$k$N$r=$@5!#(B ----------------- -<1997/02/02>+1 - * jclasses.dtx: disablejfam $B%*%W%7%g%s$N=hM}$G!"8_49%b!<%I$+$=$&$G$J$$$+$N(B - $BH=CG$,5U$J$N$r=$@5!#(B - * plnews01.tex: \mathrm, \mathbf $B$NItJ,$N5-=R$r=$@5(B ----------------- -<1997/02/01> - * plnews.cls (NEW): plnews01tex $BMQ$N%/%i%9%U%!%$%k$r:n@.$7$?!#(B - * plnews01.tex (NEW): $BA02s$+$i$NJQ99$r$^$H$a$?J8=q%U%!%$%k!#(B ----------------- -<1997/01/31> - * plcore.dtx: $B2<IU$-J8;z$r=PNO$9$k(B \textsubscript $B%3%^%s%I$r:o=|!#(B - * plfonts.dtx: $B?t<0J8;z%U%)%s%H$N@_Dj$r%/%i%9%U%!%$%k$K0\F0!#(B - * plfonts.dtx: $BOB2$J8$N?t<0J8;z%U%)%s%H$r0lEY$K@Z$jBX$($k$?$a$N%3%^%s%I$r(B - $BDj5A$9$k!"(B\reDeclareMathAlphabet $B%3%^%s%I$rDI2C!#(B - * jclasses.dtx: $B?t<0J8;z%U%)%s%H$N@_Dj$rDI2C!#(B - * jclasses.dtx: $BF|K\8l%U%!%_%j$r@k8@$7$J$$%*%W%7%g%s!J(Bdisablejfam$B!K$r(B - 2e $B%b!<%I$G$@$1;XDj2DG=$K$7$?!#(B ----------------- -<1997/01/30> - * README.euc: ltxcheck $B$K$h$k3NG';~$N5-=R$rDI2C(B - * plcore.dtx: $B2<IU$-J8;z$r=PNO$9$k(B \textsubscript $B%3%^%s%I$rDI2C!#(B - * plfonts.dtx: \mathrm, \mathbf $B$rOB2$J8%U%)%s%H$r@Z$jBX$($k$h$&$K3HD%!#(B - * jclasses.dtx: 2e$B%b!<%I$G!"DL>o$h$j%F%-%9%HNN0h$r9-$/$H$k@_Dj$r(B a4j - $B$J$I$N%*%W%7%g%s;XDj;~$KM-8z$K$J$k$h$&$K=$@5$7$?!#(B - * jclasses.dtx: \thefigure $B$NDj5AFb!"(B\c@chapter $B$N%?%$%W%_%9=$@5!#(B - * pl209.dtx: $B8_49%b!<%I$G$N(B \rm $B$d(B \tt $B$N$h$&$JFsJ8;z$N=qBNJQ99%3%^%s%I(B - $B$NF0:n$r(B pLaTeX 2.09 $B$G$NF0:n$HF1$8$K$7$?!#(B ----------------- -<1997/01/29> - * jclasses.dtx: $BF|K\8l%U%!%_%j$N@k8@$r$7$J$$%*%W%7%g%s!J(Bdisablejfam$B!K(B - $B$rDI2C!#(B - * jclasses.dtx: labelitemii $B$G(B \fi $B$7$F$$$J$$$N$H(B \bfseries $B$N(B - $B%?%$%W%_%9$r=$@5!#(B - * jclasses.dtx: \documentclass $B;~$N%l%$%"%&%H$r>/$79-$2$?!#(B - * pl209.dtx, jclasses.dtx, plfonts.dtx: $B?t<0%b!<%IFb$G(B \rm, \bf $B%3%^%s%I(B - $B$G%m!<%^%sBN!"%\!<%k%IBN$K$J$i$J$$%P%0$r=$@5!#(B ----------------- -<1997/01/26> - * All: $BJQ99MzNr$N@bL@$r(B mendex $B$G=hM}$G$-$k$h$&$K=$@5!#(B - * README.euc: EC $B%U%)%s%H$N5-=R$rDI2C$7$?!#(B - * platex.dtx: pldoc.ind $B$r:n@.$9$k$?$a$N(B mendex $B<-=q%U%!%$%k$r(B - pldoc.tex $B$r=hM}$7$?$H$-$K!"<+F0E*$KMQ0U$9$k$h$&$K$7$?!#(B - * plfonts.dtx: $B>.J8;z$N%U%)%s%HDj5A%U%!%$%k(B(jy1mc.fd $B$J$I(B)$B$r%m!<%I$9$k(B - $B$h$&$K$7$?!#(B - * jclasses.dtx: 2.09$B8_49%b!<%I$G(B tombow $B%*%W%7%g%s$,$*$+$7$/$J$k$N$r=$@5!#(B - * jclasses.dtx: 2.09$B8_49%b!<%I$G(B {a,b}{4,5}{j,p} $B$N%9%?%$%k%*%W%7%g%s(B - $B$r%5%]!<%H!#$?$@$7!"%i%s%I%9%1!<%W%b!<%IMQ$N@_Dj$O$7$F$$$J$$!#(B ----------------- -<1997/01/24> - * pl209.def: \let\jfam\symmincho $B$H$7$F$$$?$N$r=$@5!#(B ----------------- -<1997/01/23> - * All: LaTeX2e <1996/12/01> $B$KBP1~(B - * plcore.dtx: $B%/%i%9%*%W%7%g%s$K(B tombow $B$r;XDj$7$?$H$-!"%H%s%\$NOF$K(B - $B:n@.F|IU$r=PNO$9$k$h$&$K$7$?!#F|IU$N=PNO$rM^@)$7$?$$>l9g$O!"(Btombo - $B!J:G8e$N(B w $B$J$7!K$r;XDj$9$k!#(B - * jclasses.dtx: LaTeX2e <1996/06/01> $B$HAH$_9g$o$;$?$H$-!"(B - {j|t}{article|book} $B$N(B \part $B%3%^%s%I$N8e$m$GFsCJAH$K$J$C$F$7$^$&(B - $B$N$r=$@5!#(B - * jclasses.dtx: verse $B4D6-$G!V(B@centercr$B!W$H$$$&J8;zNs$,=PNO$5$l$k$N$r(B - $B=$@5!#(B - * jclasses.dtx, pl209.dtx: mincho, gothic $B$r?t<05-9f$H$7$F$G$O$J$/!"(B - $BJ8;z$H$7$F@k8@$9$k$h$&$K$7!"?t<0%U%!%_%j$r;HMQ$7$J$$$h$&$K$7$?!#(B - $B$?$@$7!"(B2.09$B8_49%b!<%I$G$O!"=>Mh$I$*$j!"F|K\8l%U%!%_%j$rDj5A$7$F$$$k!#(B - * jltxdoc.dtx: ltxdoc, doc, article $B%/%i%9$r%Y!<%9$K$9$k$h$&$K$7$?!#(B - * pl209.def: latex209.def $B$r%m!<%I$9$k$h$&$K$7$?!#(B ----------------- -<1996/03/05> - * All: $B=DAH3HD%ItJ,$r30It%Q%C%1!<%8!J(Bplext.sty$B!K$K$7$?!#(B - * All: $B$$$/$D$+$N%?%$%W%_%9=$@5!#(B - * plfonts.dtx: \DeclareFixedFont $B$NF|K\8l2=!#(B - * plfonts.dtx: $BOBJ8BeMQ%U%)%s%H$,;H$o$l$J$$$N$r=$@5!#(B - * plfonts.dtx: \notkfam@list, \notffam@list $B$N=i4|CM$rJQ99$7!"(B - $B5/F0D>8e$NB.EY$rB.$a$?!#(B - * jclasses.dtx: \evensidemargin $B$H(B \oddsidemargin $B$N1F6A$,=DAH$H2#AH$G(B - $B5U$J$N$r=$@5!#(B - * jclasses.dtx: report, article $B%/%i%9$N%Z!<%8%9%?%$%k$N%G%U%)%k%H$r(B - headings $B$+$i(B plain $B$K$7$?!#(B - * jclasses.dtx: bothstyle $B%Z!<%8%9%?%$%k$G$N6v?t%Z!<%8$H4q?t%Z!<%8$N(B - $B=PNO0LCV$,5U$J$N$r=$@5!#(B - * jclases.dtx: plain $B$d(B headings $B$+$i(B headnombre, footnombre, plain - $B$J$I$K@Z$jBX$($?$H$-$K!"%Z!<%8HV9f0LCV$,B7$o$J$$$N$r=$@5!#(B - * jclasses.dtx: \topmargin $B$NCM$,H?1G$5$l$J$$$N$r=$@5!#(B - * jclasses.dtx: \tabbing $B4D6-$GOB2$J84V%9%Z!<%9$,F~$k$N$r=$@5!#(B - * jclasses.dtx: landscape $B%*%W%7%g%s$r;XDj$7$F$b%i%s%I%9%1!<%W$K$J$i$J$$(B - $B$N$r=$@5!#(B - * pl209.def: $B8_49%b!<%I$N=DAH$G5SCm$,$*$+$7$/$J$k$N$r=$@5!#(B - * pl209.def: $B8_49%b!<%I$G(B \Rensuji, \prensuji $B$r;H$($k$h$&$K$7$?!#(B ----------------- -<1995/09/01> - * $B8x3+HG%j%j!<%9(B -=== EOT ===== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/platex/base/LICENSE new/texmf-dist/doc/platex/base/LICENSE --- old/texmf-dist/doc/platex/base/LICENSE 2016-05-10 01:46:07.000000000 +0200 +++ new/texmf-dist/doc/platex/base/LICENSE 1970-01-01 01:00:00.000000000 +0100 @@ -1,28 +0,0 @@ -Copyright (c) 2010 ASCII MEDIA WORKS -Copyright (c) 2016 Japanese TeX Development Community -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -* Neither the name of platex nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/platex/base/README.md new/texmf-dist/doc/platex/base/README.md --- old/texmf-dist/doc/platex/base/README.md 2016-05-10 01:46:07.000000000 +0200 +++ new/texmf-dist/doc/platex/base/README.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,70 +0,0 @@ -# platex - -The bundle provides pLaTeX2e and miscellaneous macros for pTeX and e-pTeX. - -The bundle is a community edition forked from the original ASCII edition -(ptex-texmf-2.5). The GitHub repository - -- https://github.com/texjporg/platex - -is now maintained by [Japanese TeX Development Community](http://texjp.org). - -The original ASCII edition can be obtained from: - -- http://ascii.asciimw.jp/pb/ptex/ - -## Changes from the original ASCII edition - -See the documents (platex.pdf, pldoc.pdf, platexrelease.pdf) for more information. - -- Fix macros which are inconsistent with the latest e-pTeX - (e.g. \footnote, tabular, \parbox, \underline). -- Fix several bugs in pLaTeX2e and ascmac.sty. -- Add platexrelease.sty. As with the latexrelease package, this - package enables us to use the old versions of pLaTeX2e (from - 2006/11/10 the ASCII edition). - -## Documentation - -A brief exposition of pLaTeX2e is provided in platex.pdf. -The document can be obtained by executing the following commands: - -~~~~ - platex platex.dtx - dvipdfmx platex.dvi -~~~~ - -The comprehensive explanation of pLaTeX2e source is included in -pldoc.pdf. If you are interested in typesetting pldoc.tex yourself, -the following commands will be helpful: - -~~~~ - platex pldocs.ins - platex Xins.ins - sh mkpldoc.sh - dvipdfmx pldoc.dvi -~~~~ - -## Character encoding - -All the text files containing Japanese characters in ptex-texmf are -encoded in ISO-2022-JP. This is because ISO-2022-JP encoded texts -are most suitable for the traditional pTeX engine. - -## Repository - -The bundle is maintained on GitHub: -https://github.com/texjporg/platex - -If you have issues, please let us know from the above page. - -## License - -The bundle may be distributed and/or modified under the terms of -the 3-clause BSD license (see LICENSE). - -## Release Date - -2016-05-08 - -Japanese TeX Development Community diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/platex/base/README2_asciimw.txt new/texmf-dist/doc/platex/base/README2_asciimw.txt --- old/texmf-dist/doc/platex/base/README2_asciimw.txt 2016-05-10 01:46:07.000000000 +0200 +++ new/texmf-dist/doc/platex/base/README2_asciimw.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,59 +0,0 @@ -==================================================-*-indented-text-*-= - $BCm0U(B -====================================================================== - -$B8=:_$N(B pTeX $B$G$O!"(B8 $B%S%C%H%3!<%I$NO"B3$O(B 16 $B%S%C%H%3!<%I$HG'<1(B -$B$5$l$k2DG=@-$,$"$j$^$9!#$=$N$?$a!"%U%i%s%98l$d%-%j%kJ8;z$J$I$N(B 8 $B%S%C(B -$B%H%3!<%I$NO"B3$9$k(B TeX $B%=!<%9$d%O%$%U%s%Q%?!<%s$O$^$:;H$($;$s!#(B - -$B$=$N$?$a!"(BpLaTeX2e $B$G$O(B $TEXMF/tex/platex/base/ $B%G%#%l%/%H%j$K(B -hyphen.cfg $B$rMQ0U$7$F!"ITMQ0U$KB>$N%O%$%U%s%Q%?!<%s$rFI$_9~$^$J$$$h$&(B -$B$KBP:v$r;\$7$F$"$j$^$9!#(B - -$B$3$N(B hyphen.cfg $B$rB>$NL>A0(B (phyphen.cfg $B$J$I(B) $B$KJQ99$7$F!"B>$N(B -hyphen.cfg $B$r;H$&$J$I$H$7$FI8=`0J30$N%O%$%U%s%Q%?!<%s$rFI$_9~$s$@>l9g!"(B -$B4A;z%3!<%I$H0lCW$7$?$H$-$O$=$N$^$^4A;z%3!<%I$HG'<1$7!"4A;z%3!<%I$H0lCW(B -$B$7$J$$>l9g$O%(%i!<$H$J$k>l9g$,$"$j$^$9!#Nc$($P(B cmcyralt $B%Q%C%1!<%8$G$O!"(B -$BESCf$G$D$.$N$h$&$J%(%i!<$K$J$j$^$9!#(B - -==== -(/prj/ptex-cd/share/texmf/tex/latex/contrib/other/cmcyralt/rhy -phen.tex Russian hyphenation -! Bad \patterns. -l.107 . $B$((B - 2 -? -==== - -$B$3$N$H$-$O!"!H(B?$B!I$N%W%m%s%W%H$KBP$7$F!H(Bx$B!I$G=*N;$7$F$/$@$5$$!#;DG0$J$,(B -$B$i!"$3$N%O%$%U%s%Q%?!<%s$O(B pTeX $B$G$OMxMQ$G$-$^$;$s!#(B - - -[babel $B%Q%C%1!<%8$rMxMQ$9$k>l9g(B] - -SJIS $B$N(B pTeX $B$G%U%i%s%98l$N%O%$%U%s%Q%?!<%s$rMxMQ$9$k$H!"%U%)!<%^%C%H(B -$B%U%!%$%k:n@.;~$K>e=R$N$h$&$J%(%i!<$,5/$3$k$3$H$,J,$+$C$F$$$^$9!#$d$O$j!"(B -8 $B%S%C%H%3!<%I$NO"B3$,(B 16 $B%S%C%H%3!<%I$H8mG'$5$l$F$7$^$&$?$a$G$9!#(B - -$B$=$l$G$b!"(Bbabel $B%Q%C%1!<%8$r(B pLaTeX $B$GMxMQ$9$k:]$O!"$^$:(B -$TEXMF/tex/platex/base/ $B$N(B hyphen.cfg $B$rB>$N(B phyphen.cfg $B$J$I$NL>A0$K(B -$BJQ$($F!"(Bbabel $B%Q%C%1!<%8$N(B hyphen.cfg $B$,;H$o$l$k$h$&$K$7$F$*$$$F$/$@$5(B -$B$$!#$=$N8e$O!"(Bbabel $B%Q%C%1!<%8$N(B install.txt $B$N5-=R$K=>$C$F!"%$%s%9%H!<(B -$B%k:n6H$r9T$C$F$/$@$5$$!#(B - -$B%$%s%9%H!<%k:n6HCf$K!"(B8 $B%S%C%H%3!<%I$NJB$S$r(B 16 $B%S%C%H%3!<%I$H8mG'$7$F!"(B -$BESCf$G!">e=R$N$h$&$J%(%i!<$K$J$k$3$H$,$"$k$+$b$7$l$^$;$s!#(B - -$B$3$N$H$-$O!"!H(B?$B!I$N%W%m%s%W%H$KBP$7$F!H(Bx$B!I$G=*N;$7$F$/$@$5$$!#;DG0$J$,(B -$B$i!"$3$N%O%$%U%)%M!<%7%g%s%Q%?!<%s$O(B pTeX $B$G$OMxMQ$G$-$^$;$s!#(B - -language.dat $B$+$i%(%i!<$N=P$?%O%$%U%s%Q%?!<%s$r:o=|$7$F!"%(%i!<$N$G$J(B -$B$$%O%$%U%)%M!<%7%g%s%Q%?!<%s$@$1$rA*Br$7$F$+$i!"$b$&0lEY%U%)!<%^%C%H%U%!(B -$B%$%k$r:n$jD>$7$F$/$@$5$$!#(B - -$B%U%)!<%^%C%H%U%!%$%k$,@5>o$K:n$i$l$F$b!"(B8 $B%S%C%H%3!<%I$NO"B3$,4A;z%3!<(B -$B%I$HG'<1$5$l$?$j!"%(%i!<$,=P$k$J$I$N;w$?8=>]$,!"(BLaTeX $B%=!<%9$r=hM}$9$k(B -$B:]$K5/$3$k2DG=@-$b$"$j$^$9!#(B - -== -$BIY3_(B $B=(><(B <hideak-t at ascii.co.jp> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/platex/base/README_asciimw.txt new/texmf-dist/doc/platex/base/README_asciimw.txt --- old/texmf-dist/doc/platex/base/README_asciimw.txt 2016-05-10 01:46:07.000000000 +0200 +++ new/texmf-dist/doc/platex/base/README_asciimw.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,170 +0,0 @@ -=========================================================================== - pLaTeX2e <2006/01/04> - - Copyright 1995-2006 ASCII Corporation -=========================================================================== - ---------------------------------------------------------------------------- -$B!|(B pLaTeX2e $B$K$D$$$F(B ---------------------------------------------------------------------------- - * pLaTeX2e <2006/01/04> $BHG$O(B LaTeX2e <2003/12/01> $BHG$KBP1~$7$F$$$^$9!#(B - - * pLaTeX2e $B$O!"(B TeX $B%P!<%8%g%s(B 3.1415 $B0J9_$r%Y!<%9$K$7$?(B pTeX $B$GF0:n$r$7(B - $B$^$9!#$=$l0J30$N(B TeX $B$G$OF0:n$7$^$;$s$N$G!"$4Cm0U$/$@$5$$!#(B - - * pLaTeX2e $B$O!"(BLaTeX2e $B$KF|K\8l$NAHHG5!G=$rDI2C$7$?$b$N$G$9!#(B - LaTeX2e $B$O!"(BLaTeX$B$N?7$7$$%P!<%8%g%s$G$"$j!"(B $B=>Mh$N(B LaTeX$B%P!<%8%g%s(B2.09 - $B$H$OFbIt9=B$$,Bg$-$/0[$J$C$F$$$^$9!#(B $B$=$N$?$a!"%P!<%8%g%s(B2.09 $B$H$N8_49(B - $B@-$O!V8_49%b!<%I!W$H$$$&7A$G<h$C$F$$$^$9!#(BpLaTeX2e$B$bF1MM$K!"%P!<%8%g%s(B - 2.09$B$r%Y!<%9$K$7$?!"(B jLaTeX $B$*$h$S(B pLaTeX $B$H$N8_49@-$O8_49%b!<%I$GBP=h(B - $B$7$F$$$^$9!#5l%P!<%8%g%s$H$N8_49@-$K$D$$$F$N>\:Y$O!"(Bpl209.dtx $B%U%!%$%k(B - $B$r;2>H$7$F$/$@$5$$!#(B - ---------------------------------------------------------------------------- -$B!|(B $B%$%s%9%H!<%k(B ---------------------------------------------------------------------------- -pLaTeX2e $B$r%$%s%9%H!<%k$9$k$K$O!"(BpTeX $B$H(B LaTeX2e $B$N%U%!%$%k$,I,MW$G$9!#(B -$B$3$N%I%-%e%a%s%H$G$O!"$9$G$K(B pTeX $B$,%$%s%9%H!<%k$5$l$F$$$k$b$N$H$7$F@b(B -$BL@$7$^$9!#(BpTeX $B$N%$%s%9%H!<%k$K$D$$$F$O!"(BpTeX $B$KIUB0$N%I%-%e%a%s%H$r;2(B -$B>H$7$F$/$@$5$$!#(B pTeX $B$N%=!<%9%U%!%$%k$O!"0J2<$N%5%$%H$J$I$+$iF~<j$9$k(B -$B$3$H$,$G$-$^$9!#(B - - * ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ - * ftp://ftp.kuis.kyoto-u.ac.jp/TeX/ASCII-pTeX/ - * ftp://bash.cc.keio.ac.jp/pub/TeX/ascii-ptex/ - * ftp://ftp.ring.gr.jp/pub/text/TeX/ascii-ptex/ - -LaTeX2e $B$O!"(BCTAN $B%5%$%H$N(B macros/latex/base $B%G%#%l%/%H%j$+$iF~<j$9$k$3(B -$B$H$,$G$-$^$9!#<g$J(B CTAN $B%5%$%H$O$D$.$N$H$*$j$G$9!#(B - - * ftp://ftp.ring.gr.jp/pub/text/CTAN/ - * ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/ - * ftp://ftp.riken.go.jp/pub/tex-archive/ - * ftp://lab.kdd.co.jp/TeX/CTAN/ - * ftp://ftp.shsu.edu/tex-archive/ - * ftp://ftp.dante.de/tex-archive/ - * ftp://ftp.tex.ac.uk/tex-archive/ - -LaTeX2e $B$G$O!"%G%U%)%k%H$G(B EC $B%(%s%3!<%I$N%U%)%s%H$,MQ$$$i$l$F$$$^$9!#(B -EC $B%(%s%3!<%I$N%U%)%s%H$O!"(BCTAN $B%5%$%H$N(B fonts/ec $B%G%#%l%/%H%j$K$"$j$^$9!#(B - -$B%$%s%9%H!<%k$O!"$D$.$N=g=x$G?J$a$F$$$-$^$9!#(B - - 1. LaTeX2e $B$N%$%s%9%H!<%k(B - 2. pLaTeX2e $B$N%$%s%9%H!<%k(B - -LaTeX2e $B$N%$%s%9%H!<%k$K$D$$$F$N>\:Y$O(B LaTeX2e $B$KIUB0$N(B install.txt $B$r(B -$B;2>H$7$F$/$@$5$$!#(BLaTeX 2.09 $B$N%7%9%F%`$NJ]B8J}K!$J$I$b=R$Y$i$l$F$$$^$9!#(B -$B$3$NJ8=q$G$O!"%$%s%9%H!<%k<j=g$N35MW$@$1<($7$^$9!#(B - -$B0JA0$N%P!<%8%g%s$N(B LaTeX2e $B$d(B pLaTeX2e $B$r%$%s%9%H!<%k$7$F$"$k>l9g$O!"(B -$B0J8e$N:n6H$r?J$a$kA0$K!"!JI,MW$J$i$P%P%C%/%"%C%W$r<h$C$F$+$i!K$=$l$i$r(B -$B:o=|$7$F$/$@$5$$!#%G%U%)%k%H$N@_Dj$G%$%s%9%H!<%k$7$F$"$k>l9g!"(B LaTeX2e -$B$H(B pLaTeX2e $B$O!"$=$l$>$l!"$D$.$N%G%#%l%/%H%j$K$"$j$^$9!#$3$3$G!"(B$TEXMF -$B$O!"(BTeX $B$N%i%$%V%i%j%G%#%l%/%H%j!J$?$H$($P!"(B/usr/local/share/texmf$B!K$r(B -$B0UL#$7$^$9!#(B - - LaTeX2e --- $TEXMF/tex/latex/base - pLaTeX2e --- $TEXMF/ptex/platex/base - ----------------------------------------- -1. LaTeX2e $B$N%$%s%9%H!<%k(B ----------------------------------------- -(1) $TEXMF/fonts/public/ec $B%G%#%l%/%H%j$K(B EC $B%U%)%s%H$N%U%!%$%kCV$-$^$9!#(B - DC $B%U%)%s%H$O:o=|$7$F$/$@$5$$!#(B - -(2) $TEXMF/tex/latex/base $B%G%#%l%/%H%j$K(B LaTeX2e $B$N%U%!%$%k$rCV$-$^$9!#(B - $B$3$3$G!"3F%U%!%$%k$K=q$-9~$_5v2D$,$"$k$+$I$&$+$r3NG'$7$F$/$@$5$$!#(B - $B$J$$>l9g$O!"(Bchmod $B%3%^%s%I$J$I$G!"=q$-9~$_5v2D$rM?$($F$/$@$5$$!#(B - -(3) unpack.ins $B$r=hM}$7$^$9!#(B - - tex -ini unpack.ins - -(4) $B%U%)!<%^%C%H%U%!%$%k$r:n@.$7$^$9!#(B - - tex -ini latex.ltx - -(5) $B%U%)!<%^%C%H%U%!%$%k$r0\F0$7$^$9!#(B - - mv -f latex.fmt $TEXMF/web2c - -(6) $B<B9T%U%!%$%k$r:n@.$7$^$9(B - - cd /usr/local/bin - ln -s tex latex - -(7) $B@5$7$/%$%s%9%H!<%k$G$-$?$+$r3NG'$9$k$K$O!"<!$N%3%^%s%I$r<B9T$7$^$9!#(B - - cd /tmp - latex ltxcheck - - $B<B9T7k2L$O(B ltxcheck.log $B$K5-O?$5$l$F$$$^$9!#@5$7$/%$%s%9%H!<%k$5$l(B - $B$F$$$l$P!"$9$Y$F$N%F%9%H$,(B "OK" $B$K$J$j$^$9!#%(%i!<$,I=<($5$l$?>l9g(B - $B$O!"$=$N;X<($K=>$C$F4D6-$r9=C[$7D>$7$^$9!#(B - ----------------------------------------- -2. pLaTeX2e $B$N%$%s%9%H!<%k(B ----------------------------------------- -(1) $TEXMF $B%G%#%l%/%H%j$K(B ptex-texmf-*.tar.gz $B$rE83+$7$^$9!#(B - -(2) $B%U%)!<%^%C%H%U%!%$%k$r:n@.$7$^$9!#(B - - ptex -ini platex.ltx - -(3) $B%U%)!<%^%C%H%U%!%$%k$r0\F0$7$^$9!#(B - - mv -f platex.fmt $TEXMF/web2c - -(4) $B<B9T%U%!%$%k$r:n@.$7$^$9!#(B - - cd /usr/local/bin - ln -s ptex platex - -(5) ls-R $B%U%!%$%k$r99?7$7$^$9!#(B - - mktexlsr - ---------------------------------------------------------------------------- -$B!|(B pLaTeX2e $B$NJ8=q%U%!%$%k$K$D$$$F(B ---------------------------------------------------------------------------- -pLaTeX2e $B$N%Q%C%1!<%8$K4^$^$l$F$$$k%U%!%$%k$N$&$A!"3HD%;R$,(B .dtx $B$N%U%!%$(B -$B%k$O!"(BpLaTeX2e $B$GDj5A$r$7$F$$$k%3%^%s%I$N%=!<%9%3!<%I!"%=!<%9%3!<%I$N@bL@!"(B -$B%3%^%s%I$N4JC1$J;H$$J}$J$I$r$^$H$a$?J8=q%U%!%$%k$G$9!#(B.dtx $B%U%!%$%k$O!"D>(B -$B@\!"(BpLaTeX2e $B$G=hM}$G$-$^$9!#(B - - platex platex.dtx - -$B$^$?!"(Bpldoc.tex $B%U%!%$%k$r=hM}$9$l$P!"$9$Y$F$N(B dtx $B%U%!%$%k$r$^$H$a$F!"0l(B -$B$D$NJ8=q%U%!%$%k$H$7$F:n@.$9$k$3$H$b$G$-$^$9!#(B - - platex pldoc.tex - -pldoc.tex $B$+$i(B pldoc.dvi $B$r:n@.$9$k<j=g$O!"(Bplatex.dtx $B%U%!%$%k$G@bL@$r$7$F(B -$B$$$^$9!#(BUNIX $B4D6-$J$i$P!"$D$.$NFs9T$r<B9T$9$k$@$1$G!"(BDVI$B%U%!%$%k$r:n@.$9$k(B -$B$3$H$,$G$-$^$9!#(B - - platex Xins.ins - sh mkpldoc.sh - -$B$J$*!"(B pLaTeX2e $B$NJ8=q%U%!%$%k(B pldoc.tex $B$+$i(B pldoc.dvi $B$r:n@.$9$k$H$-!":w(B -$B0z$N@8@.$K(B mendex $B%W%m%0%i%`$rMQ$$$^$9!#$3$N$H$-!"(Bmendex 2.3g $B$h$j8E$$%P!<(B -$B%8%g%s$G$O!":w0z%U%!%$%k$N@8@.;~$K%(%i!<$H$J$j$^$9$N$GCm0U$7$F$/$@$5$$!#(B - ---------------------------------------------------------------------------- -$B!|(B $B$=$NB>(B ---------------------------------------------------------------------------- -pLaTeX2e $B$G3HD%$5$l$?5!G=$K$D$$$F$O(B platex.dtx $B$r;2>H$7$F$/$@$5$$!#(B -LaTeX2e $B$G3HD%$5$l$?5!G=$K$D$$$F$O(B LaTeX2e $B$NIUB0J8=q$r;2>H$7$F$/$@$5$$!#(B -$BA02s$NHG$+$i$N=$@5$O!"(Bplnews*.tex $B$d(B ltnews*.tex $B$r;2>H$7$F$/$@$5$$!#(B - -pTeX $B$H(B pLaTeX2e $B$N:G?7>pJs$O!"(B - pTeX $B%[!<%`%Z!<%8!J(Bhttp://www.ascii.co.jp/pb/ptex$B!K(B -$B$K$F8x3+$7$F$$$^$9!#(B - -$B$*Ld$$9g$o$;$d%P%0%l%]!<%H$J$I$O!"EE;R%a!<%k$G(B www-ptex$B!w(Bascii.co.jp $B08$F(B -$B$K$*4j$$$7$^$9!#(B - ---------------------------------------------------------------------------- -$B3t<02q<R%"%9%-!<(B -=== EOT =================================================================== Binary files old/texmf-dist/doc/platex/base/ascmac.pdf and new/texmf-dist/doc/platex/base/ascmac.pdf differ Binary files old/texmf-dist/doc/platex/base/nidanfloat.pdf and new/texmf-dist/doc/platex/base/nidanfloat.pdf differ Binary files old/texmf-dist/doc/platex/base/platex.pdf and new/texmf-dist/doc/platex/base/platex.pdf differ Binary files old/texmf-dist/doc/platex/base/platexrelease.pdf and new/texmf-dist/doc/platex/base/platexrelease.pdf differ Binary files old/texmf-dist/doc/platex/base/pldoc.pdf and new/texmf-dist/doc/platex/base/pldoc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pax.doc.tlpobj new/tlpkg/tlpobj/pax.doc.tlpobj --- old/tlpkg/tlpobj/pax.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/pax.doc.tlpobj 2017-04-14 17:53:26.000000000 +0200 @@ -0,0 +1,6 @@ +name pax.doc +category Package +revision 26112 +shortdesc doc files of pax +docfiles size=2 + texmf-dist/doc/latex/pax/README diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/platex.doc.tlpobj new/tlpkg/tlpobj/platex.doc.tlpobj --- old/tlpkg/tlpobj/platex.doc.tlpobj 2016-05-12 03:21:01.000000000 +0200 +++ new/tlpkg/tlpobj/platex.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -name platex.doc -category Package -revision 41056 -shortdesc doc files of platex -docfiles size=328 - texmf-dist/doc/platex/base/Changes_asciimw.txt - texmf-dist/doc/platex/base/LICENSE - texmf-dist/doc/platex/base/README.md - texmf-dist/doc/platex/base/README2_asciimw.txt - texmf-dist/doc/platex/base/README_asciimw.txt - texmf-dist/doc/platex/base/ascmac.pdf - texmf-dist/doc/platex/base/nidanfloat.pdf - texmf-dist/doc/platex/base/platex.pdf - texmf-dist/doc/platex/base/platexrelease.pdf - texmf-dist/doc/platex/base/pldoc.pdf ++++++ platex.tar.xz -> pax.tar.xz ++++++ ++++ 14342 lines of diff (skipped) ++++++ productbox.doc.tar.xz -> pbox.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pbox/AUTHORS new/doc/latex/pbox/AUTHORS --- old/doc/latex/pbox/AUTHORS 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/pbox/AUTHORS 2016-11-25 19:29:47.000000000 +0100 @@ -0,0 +1 @@ +Simon Law <sfllaw(a)sfllaw.ca> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pbox/COPYING new/doc/latex/pbox/COPYING --- old/doc/latex/pbox/COPYING 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/pbox/COPYING 2016-11-25 19:29:47.000000000 +0100 @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pbox/ChangeLog new/doc/latex/pbox/ChangeLog --- old/doc/latex/pbox/ChangeLog 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/pbox/ChangeLog 2016-11-25 19:29:47.000000000 +0100 @@ -0,0 +1,18 @@ +For more details about the changes that are made to the style itself, +please see the Changes section of the documentation. + +2011-12-07 Simon Law <sfllaw(a)sfllaw.ca> + + Version 1.2. + * pbox.dtx: Really fix the minimum-width bug in \pbox. + +2011-11-24 Simon Law <sfllaw(a)sfllaw.ca> + + Version 1.1. Switch to GPLv3. + * pbox.dtx: Fix \pbox so that it works even when the contents + are larger than the minimum width. + +2003-04-06 Simon Law <sfllaw(a)engmail.uwaterloo.ca> + + * pbox.dtx, pbox.ins: Initial Release + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pbox/INSTALL new/doc/latex/pbox/INSTALL --- old/doc/latex/pbox/INSTALL 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/pbox/INSTALL 2016-11-25 19:29:47.000000000 +0100 @@ -0,0 +1,34 @@ +pbox +==== + +Overview +-------- + +In order to start quickly, just run + + make install + +and use whichever files you need. + +Unpacking +--------- + +In order to unpack the files in the included docstrip, just run: + + make pbox.sty + +whih will generate the following files: + + * pbox.drv + * pbox.sty + + You should take the pbox.sty and install it within your system. + +Manual +------ + +To generate the documentation, you should run: + + make dvi + + -- Simon Law <sfllaw(a)sfllaw.ca> Sun, 06 Apr 2003 15:32:23 -0400 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pbox/Makefile new/doc/latex/pbox/Makefile --- old/doc/latex/pbox/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/pbox/Makefile 2016-11-25 19:29:47.000000000 +0100 @@ -0,0 +1,109 @@ +## Makefile - Makefile for the pbox package. +## Copyright (C) 2003 Simon Law +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see <http://www.gnu.org/licenses/>. +## + +# Set the package name +PACKAGE = pbox + +# Use pdfLaTeX for best results +LATEX = pdflatex +LATEX2DVI = $(LATEX) \\pdfoutput=0 \\input +LATEX2PDF = $(LATEX) \\pdfoutput=1 \\input + +# MakeIndex parameters +MAKEINDEX = makeindex +GIND = gind.ist +GGLO = gglo.ist + +# Installation +INSTALL = /usr/bin/install -c +INSTALL_DATA = $(INSTALL) -m 644 +DESTDIR = . +TDSFORMAT = latex/ + +# Shell +RM = rm -f +ZIP = zip -9 + +TEXFILES=\ + $(PACKAGE).aux\ + $(PACKAGE).drv\ + $(PACKAGE).dvi\ + $(PACKAGE).glo\ + $(PACKAGE).gls\ + $(PACKAGE).idx\ + $(PACKAGE).ilg\ + $(PACKAGE).ind\ + $(PACKAGE).log\ + $(PACKAGE).pdf\ + $(PACKAGE).sty + +PKGFILES=\ + AUTHORS\ + COPYING\ + ChangeLog\ + INSTALL\ + Makefile\ + README\ + $(PACKAGE).dtx\ + $(PACKAGE).ins\ + $(PACKAGE).pdf + +.PHONY : all install uninstall dvi pdf clean + +all : $(PACKAGE).sty $(PACKAGE).dvi $(PACKAGE).pdf ; + +install : all + $(INSTALL) -d $(DESTDIR)/texmf/tex/$(TDSFORMAT)/$(PACKAGE) + $(INSTALL) -d $(DESTDIR)/texmf/doc/$(TDSFORMAT)/$(PACKAGE) + $(INSTALL_DATA) $(PACKAGE).sty $(DESTDIR)/texmf/tex/$(TDSFORMAT)/$(PACKAGE)/ + $(INSTALL_DATA) $(PACKAGE).dvi $(DESTDIR)/texmf/doc/$(TDSFORMAT)/$(PACKAGE)/ + $(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)/texmf/doc/$(TDSFORMAT)/$(PACKAGE)/ + +uninstall : all + $(RM) $(DESTDIR)/texmf/tex/$(TDSFORMAT)/$(PACKAGE)/$(PACKAGE).sty + $(RM) $(DESTDIR)/texmf/doc/$(TDSFORMAT)/$(PACKAGE)/$(PACKAGE).dvi + $(RM) $(DESTDIR)/texmf/doc/$(TDSFORMAT)/$(PACKAGE)/$(PACKAGE).pdf + ls $(DESTDIR)/texmf/tex/$(TDSFORMAT)/$(PACKAGE)/* >/dev/null 2>&1 \ + || $(RM) -r $(DESTDIR)/texmf/tex/$(TDSFORMAT)/$(PACKAGE) + ls $(DESTDIR)/texmf/doc/$(PACKAGE)/* >/dev/null 2>&1 \ + || $(RM) -r $(DESTDIR)/texmf/doc/$(TDSFORMAT)/$(PACKAGE) + +dvi : $(PACKAGE).dvi + +pdf : $(PACKAGE).pdf + +%.sty : %.ins %.dtx + $(LATEX) $< + +%.dvi : %.dtx %.sty + $(LATEX2DVI) $< + $(MAKEINDEX) -s $(GIND) $*.idx + $(MAKEINDEX) -s $(GGLO) -o $*.gls $*.glo + $(LATEX2DVI) $< + +%.pdf : %.dtx %.sty + $(LATEX2PDF) $< + $(MAKEINDEX) -s $(GIND) $*.idx + $(MAKEINDEX) -s $(GGLO) -o $*.gls $*.glo + $(LATEX2DVI) $< + +$(PACKAGE).zip : $(PKGFILES) + $(RM) $@ + $(ZIP) $@ $^ + +clean : + $(RM) $(TEXFILES) $(PACKAGE).zip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pbox/README new/doc/latex/pbox/README --- old/doc/latex/pbox/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/pbox/README 2016-11-25 19:29:47.000000000 +0100 @@ -0,0 +1,19 @@ +pbox +==== + +This is pbox, version 1.2. It implements a variable-width \parbox and +some convenient length commands. The \pbox command is equivalent to +the \parbox command, only the width specified is merely the maximum +width; the \pbox tries to fit itself tightly around the specified text. + +Installation instructions can be found in the INSTALL file. + +If you are looking for a variable-width minipage environment, +I would suggest looking at the varwidth package. + +You should also look into the eqparbox package, which allows you to +have a series of boxes, all with the same minimized width. + +Happy Hacking. + + -- Simon Law <sfllaw(a)sfllaw.ca> Thu 7 Dec 2011 2:21:51 PM -0600 Binary files old/doc/latex/pbox/pbox.pdf and new/doc/latex/pbox/pbox.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/productbox/Makefile new/doc/latex/productbox/Makefile --- old/doc/latex/productbox/Makefile 2010-12-31 00:41:51.000000000 +0100 +++ new/doc/latex/productbox/Makefile 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -#****************************************************************************** -#* $Id: Makefile 8333 2010-12-29 19:58:06Z gene $ -#****************************************************************************** -#* Author: Gerd Neugebauer -#*============================================================================= - -DISTFILES = productbox.ins \ - productbox.dtx \ - productbox.bib \ - README \ - Makefile \ - productbox.pdf - -all: productbox.pdf - -%.pdf: %.dtx productbox.sty %.bbl %.ind %.gls - pdflatex -interaction=batchmode -draftmode $*.dtx - pdflatex -interaction=batchmode $*.dtx - ${RM} $*.out - -%.sty: %.dtx *.ins - rm -f $*.sty - tex $*.ins - -%.bbl: %.aux *.bib - bibtex $* - -%.ind: %.idx - makeindex -s gind $*.idx - -%.idx: %.dtx - pdflatex -draftmode $*.dtx - -%.aux: %.dtx - pdflatex -draftmode $*.dtx - -%.gls: %.glo - makeindex -s gglo -o $*.gls $*.glo - -%.glo: %.dtx - pdflatex -draftmode $*.dtx - -#------------------------------------------------------------------------------ - -productbox.tgz dist: productbox.pdf - tar -cvzf productbox.tgz ${DISTFILES} - -clean: - ${RM} productbox.aux productbox.ilg productbox.idx productbox.log productbox.toc productbox.glo productbox.out *~ - -distclean: clean - ${RM} productbox.sty productbox.pdf - -# diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/productbox/README new/doc/latex/productbox/README --- old/doc/latex/productbox/README 2010-12-31 00:41:51.000000000 +0100 +++ new/doc/latex/productbox/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -Purpose: - productbox.dtx provides a style file for typesetting a - three-dimensional product box. This product box can be rendered - as it is standing on a surface and some light is shed onto it. - Alternatively it can be typeset as a wireframe to be cut out - and glued together. This will lead to a physical product box. - -Documentation: - The documentation can be generated from the original file - productbox.dtx with the doc style/package. LaTeX the file - productbox.dtx to get the full documentation in pdf format. - -Prerequisite: - This package needs PGF and TikZ to be present at least in - version 2.0. - -Author: Gerd Neugebauer - Im Lerchelsb�hl 5 - 64521 Gro�-Gerau - gene(a)gerd-neugebauer.de - -Copyright (C) 2010 Gerd Neugebauer - - productbox.dtx is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY. No author or distributor accepts - responsibility to anyone for the consequences of using it or for - whether it serves any particular purpose or works at all, unless - he says so in writing. - - Everyone is granted permission to copy, modify and redistribute - productbox.dtx, provided this copyright notice is preserved and - any modifications are indicated. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/productbox/productbox.bib new/doc/latex/productbox/productbox.bib --- old/doc/latex/productbox/productbox.bib 2010-12-31 00:41:51.000000000 +0100 +++ new/doc/latex/productbox/productbox.bib 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%% $Id: productbox.bib,v 0.00 2010/12/26 22:09:16 gene Exp $ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -@Manual{tikz-manual, - title = {Ti{\it k}Z \& PGF: Manual for Version 2.0}, - author = {Till Tantau}, - year = 2008, - month = feb, - note = {\texttt{http://sourceforge.net/projects/pgf}} -} - -@Manual{geormetry-manual, - title = {The {\tt geometry} package}, - author = {Hideo Umeki}, - year = 2007, - month = jul, - note = {} -} Binary files old/doc/latex/productbox/productbox.pdf and new/doc/latex/productbox/productbox.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pbox.doc.tlpobj new/tlpkg/tlpobj/pbox.doc.tlpobj --- old/tlpkg/tlpobj/pbox.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/pbox.doc.tlpobj 2017-04-14 17:53:26.000000000 +0200 @@ -0,0 +1,13 @@ +name pbox.doc +category Package +revision 24807 +shortdesc doc files of pbox +relocated 1 +docfiles size=72 + RELOC/doc/latex/pbox/AUTHORS + RELOC/doc/latex/pbox/COPYING + RELOC/doc/latex/pbox/ChangeLog + RELOC/doc/latex/pbox/INSTALL + RELOC/doc/latex/pbox/Makefile + RELOC/doc/latex/pbox/README + RELOC/doc/latex/pbox/pbox.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/productbox.doc.tlpobj new/tlpkg/tlpobj/productbox.doc.tlpobj --- old/tlpkg/tlpobj/productbox.doc.tlpobj 2016-04-14 19:36:19.000000000 +0200 +++ new/tlpkg/tlpobj/productbox.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -name productbox.doc -category Package -revision 20886 -shortdesc doc files of productbox -relocated 1 -docfiles size=97 - RELOC/doc/latex/productbox/Makefile - RELOC/doc/latex/productbox/README - RELOC/doc/latex/productbox/productbox.bib - RELOC/doc/latex/productbox/productbox.pdf ++++++ productbox.tar.xz -> pbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pbox/pbox.sty new/tex/latex/pbox/pbox.sty --- old/tex/latex/pbox/pbox.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/pbox/pbox.sty 2016-11-25 19:33:56.000000000 +0100 @@ -0,0 +1,60 @@ +%% +%% This is file `pbox.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pbox.dtx (with options: `style') +%% +%% Copyright (C) 2003,2011 Simon Law +%% +%% This program is free software: you can redistribute it and/or modify +%% it under the terms of the GNU General Public License as published by +%% the Free Software Foundation, either version 3 of the License, or +%% (at your option) any later version. +%% +%% This program is distributed in the hope that it will be useful, +%% but WITHOUT ANY WARRANTY; without even the implied warranty of +%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +%% GNU General Public License for more details. +%% +%% You should have received a copy of the GNU General Public License +%% along with this program. If not, see <http://www.gnu.org/licenses/>. +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{pbox}[2011/12/07 v1.2 Dynamic parboxes] +\RequirePackage{calc} +\RequirePackage{ifthen} +\newcommand{\settominwidth}[3][\columnwidth]{% + \settowidth{#2}{\begin{tabular}{@{}l@{}}#3\end{tabular}}% + \ifthenelse{\lengthtest{#1<#2}}{\setlength{#2}{#1}}{}} +\newcommand{\widthofpbox}[1]{% + \widthof{\begin{tabular}{@{}l@{}}#1\end{tabular}}} +\DeclareRobustCommand*{\pbox}[1][]{% + \def\pb@xargi{#1}% + \pb@xi} +\DeclareRobustCommand*{\pb@xi}[1][]{% + \def\pb@xargii{#1}% + \pb@xii} +\DeclareRobustCommand*{\pb@xii}[1][]{% + \def\pb@xargiii{#1}% + \pb@xiii} +\newlength{\pb@xlen} +\DeclareRobustCommand{\pb@xiii}[2]{% + \settominwidth[#1]{\pb@xlen}{#2}% + \ifthenelse{\equal{\pb@xargi}{}} + {\parbox{\pb@xlen}{#2}} + {\ifthenelse{\equal{\pb@xargii}{}} + {\ifthenelse{\equal{\pb@xargiii}{}} + {\parbox[\pb@xargi]{\pb@xlen}{#2}} + {\parbox[\pb@xargi][][\pb@xargiii]{\pb@xlen}{#2}}} + {\ifthenelse{\equal{\pb@xargiii}{}} + {\parbox[\pb@xargi][\pb@xargii]{\pb@xlen}{#2}} + {\parbox[\pb@xargi][\pb@xargii][\pb@xargiii]{\pb@xlen}{#2}}}}% + \def\pb@xargi\relax + \def\pb@xargii\relax + \def\pb@xargiii\relax + \makebox[0pt]{}} +\endinput +%% +%% End of file `pbox.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/productbox/productbox.sty new/tex/latex/productbox/productbox.sty --- old/tex/latex/productbox/productbox.sty 2010-12-31 00:41:51.000000000 +0100 +++ new/tex/latex/productbox/productbox.sty 1970-01-01 01:00:00.000000000 +0100 @@ -1,654 +0,0 @@ -%% -%% This is file `productbox.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% productbox.dtx (with options: `style') -%% -%% IMPORTANT NOTICE: -%% -%% For the copyright see the source file. -%% -%% Any modified versions of this file must be renamed -%% with new filenames distinct from productbox.sty. -%% -%% For distribution of the original source see the terms -%% for copying and modification in the file productbox.dtx. -%% -%% This generated file may be distributed as long as the -%% original source files, as listed above, are part of the -%% same distribution. (The sources need not necessarily be -%% in the same archive or directory.) -%%^^A $Id: productbox.dtx 8333 2010-12-29 19:58:06Z gene $ -%%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% Purpose: -%% productbox.dtx provides a style file for typesetting a -%% three-dimensional product box. This product box can be rendered -%% as it is standing on a surface and some light is shed onto it. -%% Alternatively it can be typeset as a wireframe to be cut out -%% and glued together. This will lead to a physical product box. -%% -%% Documentation: -%% The documentation can be generated from the original file -%% productbox.dtx with the doc style/package. LaTeX the file -%% productbox.dtx to get the full documentation in pdf format. -%% -%% Prerequisite: -%% This package needs TikZ to be present at least in version 2.0. -%% -%% Author: Gerd Neugebauer -%% Im Lerchelsb\"ohl 5 -%% 64521 Gro\ss-Gerau -%% Mail: gene(a)gerd-neugebauer.de -%% -%% Copyright (C) 2010 Gerd Neugebauer -%% -%% productbox.dtx is distributed in the hope that it will be useful, -%% but WITHOUT ANY WARRANTY. No author or distributor accepts -%% responsibility to anyone for the consequences of using it or for -%% whether it serves any particular purpose or works at all, unless -%% he says so in writing. -%% -%% Everyone is granted permission to copy, modify and redistribute -%% productbox.dtx, provided this copyright notice is preserved and -%% any modifications are indicated. -%% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% \CharacterTable -%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z -%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren $ Right paren $ -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% -\begingroup - \def\ProductBox@VC$#1: #2 #3${#2} - \def\ProductBox@VCdate$#1: #2-#3-#4 #5${#2/#3/#4} - \xdef\fileversion{1.1} - \xdef\filerevision{\ProductBox@VC$Revision: 8333 $} - \xdef\filedate{\ProductBox@VCdate - $Date: 2010-12-29 20:58:06 +0100 (Mi, 29 Dez 2010) $} - \xdef\filename{productbox.dtx} -\endgroup -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{productbox}[\filedate Another type of boxes...] -\RequirePackage{keyval} -\RequirePackage{tikz} -\usetikzlibrary{calc} -\usetikzlibrary{fadings} -\define@key{ProductBox}{scale}{% - \def\ProductBox@scale{#1}} -\define@key{ProductBox}{width}{% - \def\ProductBox@x{#1}} -\define@key{ProductBox}{height}{% - \def\ProductBox@y{#1}} -\define@key{ProductBox}{depth}{% - \def\ProductBox@z{#1}} -\define@key{ProductBox}{clean}[true]{% - \csname ProductBox@clean#1\endcsname} -\define@key{ProductBox}{flat}[true]{% - \def\ProductBox@style{flat}} -\define@key{ProductBox}{fold}[true]{% - \def\ProductBox@style{fold}} -\define@key{ProductBox}{3d}[true]{% - \def\ProductBox@style{threeD}} -\define@key{ProductBox}{3D}[true]{% - \def\ProductBox@style{threeD}} -\define@key{ProductBox}{threeD}[true]{% - \def\ProductBox@style{threeD}} -\define@key{ProductBox}{top}[true]{% - \def\ProductBox@style{top}} -\define@key{ProductBox}{bottom}[true]{% - \def\ProductBox@style{bottom}} -\define@key{ProductBox}{front}[true]{% - \def\ProductBox@style{front}} -\define@key{ProductBox}{back}[true]{% - \def\ProductBox@style{back}} -\define@key{ProductBox}{left}[true]{% - \def\ProductBox@style{left}} -\define@key{ProductBox}{right}[true]{% - \def\ProductBox@style{right}} -\define@key{ProductBox}{empty}[true]{% - \def\ProductBox@style{empty}} -\define@key{ProductBox}{style}{% - \def\ProductBox@style{#1}} -\define@key{ProductBox}{shadow}[true]{% - \csname ProductBox@shadow#1\endcsname} -\define@key{ProductBox}{mirror}[true]{% - \csname ProductBox@mirror#1\endcsname} -\define@key{ProductBox}{flare}[true]{% - \csname ProductBox@flare#1\endcsname} -\define@key{ProductBox}{flareDiameter}{% - \def\ProductBox@flareDiameter{#1}} -\define@key{ProductBox}{edgeColor}{% - \def\productBox@edgeColor{#1}} -\define@key{ProductBox}{view}{% - \@nameuse{ProductBox@View@#1}} -\define@key{ProductBox}{earSize}{% - \def\ProductBox@earSize{#1}} -\define@key{ProductBox}{foldLine}{% - \def\ProductBox@foldLine{#1}} -\define@key{ProductBox}{foldOpacity}{% - \def\ProductBox@foldOpacity{#1}} -\define@key{ProductBox}{faceSep}{% - \def\ProductBox@FaceSep{#1}} -\newbox\ProductBox@Front -\newbox\ProductBox@Left -\newbox\ProductBox@Top -\newbox\ProductBox@Right -\newbox\ProductBox@Bottom -\newbox\ProductBox@Back -\newcommand\ProductBoxSet[1]{\setkeys{ProductBox}{#1}} -\newcommand\ProductBox@style{threeD} -\newcommand\ProductBox@x{88mm} -\newcommand\ProductBox@y{100mm} -\newcommand\ProductBox@z{30mm} -\newif\ifProductBox@clean -\newif\ifProductBox@active -\newif\ifProductBox@clip \ProductBox@cliptrue -\newcommand\ProductBox@FaceSep{1em} -\newenvironment{ProductBox}[1][]{% - \setkeys{ProductBox}{#1}% - \ifProductBox@clean - \global\setbox\ProductBox@Front\hbox{}% - \global\setbox\ProductBox@Back\hbox{}% - \global\setbox\ProductBox@Left\hbox{}% - \global\setbox\ProductBox@Right\hbox{}% - \global\setbox\ProductBox@Top\hbox{}% - \global\setbox\ProductBox@Bottom\hbox{}% - \fi - \ifProductBox@active - \errmessage{Trying to use an environment ProductBox inside the - environment ProductBox. This is not allowed.}% - \else - \ProductBox@activetrue - \fi - \let\Front\undefined \let\endFront\undefined - \let\Back\undefined \let\endBack\undefined - \let\Left\undefined \let\endLeft\undefined - \let\Right\undefined \let\endRight\undefined - \let\Top\undefined \let\endTop\undefined - \let\Bottom\undefined \let\endBottom\undefined - \let\FrontFace\undefined \let\endFrontFace\undefined - \let\BackFace\undefined \let\endBackFace\undefined - \let\LeftFace\undefined \let\endLeftFace\undefined - \let\RightFace\undefined \let\endRightFace\undefined - \let\TopFace\undefined \let\endTopFace\undefined - \let\BottomFace\undefined \let\endBottomFace\undefined - \newenvironment{Front}{\ProductBox@Start\ProductBox@Front - (\ProductBox@x,\ProductBox@y)}{\ProductBox@End}% - \newenvironment{Back}{\ProductBox@Start\ProductBox@Back - (\ProductBox@x,\ProductBox@y)}{\ProductBox@End}% - \newenvironment{Left}{\ProductBox@Start\ProductBox@Left - (\ProductBox@z,\ProductBox@y)}{\ProductBox@End}% - \newenvironment{Right}{\ProductBox@Start\ProductBox@Right - (\ProductBox@z,\ProductBox@y)}{\ProductBox@End}% - \newenvironment{Top}{\ProductBox@Start\ProductBox@Top - (\ProductBox@x,\ProductBox@z)}{\ProductBox@End}% - \newenvironment{Bottom}{\ProductBox@Start\ProductBox@Bottom( - \ProductBox@x,\ProductBox@z)}{\ProductBox@End}% - \newenvironment{FrontFace}[1][white]{\ProductBox@StartFace\ProductBox@Front - {\ProductBox@x}{\ProductBox@y}{##1}}{\ProductBox@EndFace}% - \newenvironment{BackFace}[1][white]{\ProductBox@StartFace\ProductBox@Back - {\ProductBox@x}{\ProductBox@y}{##1}}{\ProductBox@EndFace}% - \newenvironment{LeftFace}[1][white]{\ProductBox@StartFace\ProductBox@Left - {\ProductBox@z}{\ProductBox@y}{##1}}{\ProductBox@EndFace}% - \newenvironment{RightFace}[1][white]{\ProductBox@StartFace\ProductBox@Right - {\ProductBox@z}{\ProductBox@y}{##1}}{\ProductBox@EndFace}% - \newenvironment{TopFace}[1][white]{\ProductBox@StartFace\ProductBox@Top - {\ProductBox@x}{\ProductBox@z}{##1}}{\ProductBox@EndFace}% - \newenvironment{BottomFace}[1][white]{\ProductBox@StartFace\ProductBox@Bottom - {\ProductBox@x}{\ProductBox@z}{##1}}{\ProductBox@EndFace}% - \ignorespacesafterend -}{% - \@ifundefined{ProductBox@style@\ProductBox@style}{% - \errmessage{Box style '\ProductBox@style' for ProductBox is unknown}% - }{% - \@ifundefined{ProductBox@scale}{% - \@nameuse{ProductBox@style@\ProductBox@style}}{% - \scalebox{\ProductBox@scale}% - {\@nameuse{ProductBox@style@\ProductBox@style}} - }}% - \ProductBox@activefalse - \ignorespacesafterend -} -\def\ProductBox@Start#1(#2){% - \global\setbox#1\hbox\bgroup\begin{tikzpicture}% - \ifProductBox@clip \clip rectangle (#2); \fi - }% -\newcommand\ProductBox@End{\end{tikzpicture}\egroup\ignorespacesafterend} -\newcommand\ProductBox@StartFace[4]{% - \let\ProductBox@@box#1% - \def\ProductBox@@w{#2}% - \def\ProductBox@@h{#3}% - \def\ProductBox@@args{[#4]}% - \@tempdima=#2 - \advance\@tempdima-\ProductBox@FaceSep - \advance\@tempdima-\ProductBox@FaceSep - \setbox#1\hbox\bgroup\begin{minipage}{\the\@tempdima}% - \ignorespaces -} -\newcommand\ProductBox@EndFace{\end{minipage}\egroup - \global\setbox\ProductBox@@box=\hbox{\begin{tikzpicture} - \ifProductBox@clip \clip rectangle (\ProductBox@@w,\ProductBox@@h); \fi - \expandafter\fill \ProductBox@@args rectangle(\ProductBox@@w,\ProductBox@@h); - \draw (.5*\ProductBox@@w,.5*\ProductBox@@h) - node[inner sep=0pt] {\box\ProductBox@@box}; - \end{tikzpicture}}\ignorespacesafterend} -\newcommand\ProductBox@style@empty{} -\newcommand\ProductBox@style@flat{% - \par\noindent - \hspace*{\ProductBox@z}\kern1mm \copy\ProductBox@Top\\[1ex] - \copy\ProductBox@Left\kern1mm \copy\ProductBox@Front\kern1mm - \copy\ProductBox@Right\kern1mm \copy\ProductBox@Back\\[1ex] - \hspace*{\ProductBox@z}\kern1mm \copy\ProductBox@Bottom\par -} -\newcommand\ProductBox@style@front{% - \copy\ProductBox@Front -} -\newcommand\ProductBox@style@back{%class - \copy\ProductBox@Back -} -\newcommand\ProductBox@style@left{% - \copy\ProductBox@Left -} -\newcommand\ProductBox@style@right{% - \copy\ProductBox@Right -} -\newcommand\ProductBox@style@top{% - \copy\ProductBox@Top -} -\newcommand\ProductBox@style@bottom{% - \copy\ProductBox@Bottom -} -\newcommand\ProductBox@earSize{12mm} -\newcommand\ProductBox@foldLine{white!80!black} -\newcommand\ProductBox(a)foldOpacity{.5} -\newcommand\ProductBox@style@fold{% - \begin{tikzpicture}[sw/.style={anchor=south west, - inner sep=0pt}, - se/.style={anchor=south east, - inner sep=0pt}, - nw/.style={anchor=north west, - inner sep=0pt}, - num/.style={circle, - fill=white!90!black, - fill opacity=.5, - font=\tiny\bfseries\sffamily}] - \begin{scope} - \clip rectangle (\ProductBox@z,\ProductBox@y); - \draw node[sw]{\copy\ProductBox@Left}; - \draw[thin,opacity=\ProductBox@foldOpacity,\ProductBox@foldLine] - rectangle (\ProductBox@z,\ProductBox@y); - \end{scope} - \begin{scope}[xshift=\ProductBox@z] - \clip rectangle (\ProductBox@x,\ProductBox@y); - \draw node[sw]{\copy\ProductBox@Front}; - \draw[thin,opacity=\ProductBox@foldOpacity,\ProductBox@foldLine] - rectangle (\ProductBox@x,\ProductBox@y); - \end{scope} - \begin{scope}[xshift=\ProductBox@z+\ProductBox@x] - \clip rectangle (\ProductBox@z,\ProductBox@y); - \draw node[sw]{\copy\ProductBox@Right}; - \draw[thin,opacity=\ProductBox@foldOpacity,\ProductBox@foldLine] - rectangle (\ProductBox@z,\ProductBox@y); - \end{scope} - \begin{scope}[xshift=\ProductBox@x+2*\ProductBox@z] - \clip rectangle (\ProductBox@x,\ProductBox@y); - \draw node[sw]{\copy\ProductBox@Back}; - \draw[thin,opacity=\ProductBox@foldOpacity,\ProductBox@foldLine] - rectangle (\ProductBox@x,\ProductBox@y); - \end{scope} - \begin{scope}[xshift=\ProductBox@z,yshift=\ProductBox@y] - \clip rectangle (\ProductBox@x,\ProductBox@z); - \draw node[sw]{\copy\ProductBox@Top}; - \draw[thin,opacity=\ProductBox@foldOpacity,\ProductBox@foldLine] - rectangle (\ProductBox@x,\ProductBox@z); - \end{scope} - \begin{scope}[xshift=\ProductBox@z] - \clip - (0mm,0mm) -- (.5*\ProductBox@z,-.5*\ProductBox@z) -- - (.5*\ProductBox@z,-\ProductBox@z) -- - (\ProductBox@x-.5*\ProductBox@z,-\ProductBox@z) -- - (\ProductBox@x-.5*\ProductBox@z,-.5*\ProductBox@z) -- - (\ProductBox@x,0mm) -- cycle; - \draw (\ProductBox@x,-\ProductBox@z) - node[se]{\copy\ProductBox@Bottom}; - \draw [thin,opacity=\ProductBox@foldOpacity,\ProductBox@foldLine] - (0mm,0mm) -- (.5*\ProductBox@z,-.5*\ProductBox@z) -- - (.5*\ProductBox@z,-\ProductBox@z) -- - (\ProductBox@x-.5*\ProductBox@z,-\ProductBox@z) -- - (\ProductBox@x-.5*\ProductBox@z,-.5*\ProductBox@z) -- - (\ProductBox@x,0mm) -- cycle; - \draw (.5*\ProductBox@x,-.75*\ProductBox@z) node[num]{3}; - \end{scope} - \begin{scope}[xshift=\ProductBox@x+2*\ProductBox@z] - \clip - (0mm,0mm) -- (0mm,-\ProductBox@z) -- - (.5*\ProductBox@z,-\ProductBox@z) -- - (.5*\ProductBox@z,-.5*\ProductBox@z) -- - (\ProductBox@x-.5*\ProductBox@z,-.5*\ProductBox@z) -- - (\ProductBox@x-.5*\ProductBox@z,-\ProductBox@z) -- - (\ProductBox@x,-\ProductBox@z) -- (\ProductBox@x,0mm) -- - cycle; - \draw node[se,rotate=180]{\copy\ProductBox@Bottom}; - \draw[thin,opacity=\ProductBox@foldOpacity,\ProductBox@foldLine] - (0mm,0mm) -- (0mm,-\ProductBox@z) -- - (.5*\ProductBox@z,-\ProductBox@z) -- - (.5*\ProductBox@z,-.5*\ProductBox@z) -- - (\ProductBox@x-.5*\ProductBox@z,-.5*\ProductBox@z) -- - (\ProductBox@x-.5*\ProductBox@z,-\ProductBox@z) -- - (\ProductBox@x,-\ProductBox@z) -- (\ProductBox@x,0mm) -- - cycle; - \draw (.25*\ProductBox@z,-.75*\ProductBox@z) node[num]{1}; - \draw (\ProductBox@x-.25*\ProductBox@z,-.75*\ProductBox@z) - node[num]{1}; - \end{scope} - \begin{scope}[xshift=\ProductBox@z+\ProductBox@x] - \clip - (0mm,0mm) -- (\ProductBox@z,0mm) -- - (.5*\ProductBox@z,-.5*\ProductBox@z) -- - (.5*\ProductBox@z,-\ProductBox@z) -- (0mm,-\ProductBox@z) -- - cycle; - \draw (\ProductBox@z,0mm) - node[se,rotate=90]{\copy\ProductBox@Bottom}; - \draw[thin,opacity=\ProductBox@foldOpacity,\ProductBox@foldLine] - (0mm,0mm) -- (\ProductBox@z,0mm) -- - (.5*\ProductBox@z,-.5*\ProductBox@z) -- - (.5*\ProductBox@z,-\ProductBox@z) -- (0mm,-\ProductBox@z) -- - cycle; - \draw (.25*\ProductBox@z,-.75*\ProductBox@z) node[num]{2}; - \end{scope} - \begin{scope} - \clip - (0mm,0mm) -- (\ProductBox@z,0mm) -- - (\ProductBox@z,-\ProductBox@z) -- - (.5*\ProductBox@z,-\ProductBox@z) -- - (.5*\ProductBox@z,-.5*\ProductBox@z) -- cycle; - \draw - node[sw,rotate=270]{\copy\ProductBox@Bottom}; - \draw [thin,opacity=\ProductBox@foldOpacity,\ProductBox@foldLine] - (0mm,0mm) -- (\ProductBox@z,0mm) -- - (\ProductBox@z,-\ProductBox@z) -- - (.5*\ProductBox@z,-\ProductBox@z) -- - (.5*\ProductBox@z,-.5*\ProductBox@z) -- cycle; - \draw (.75*\ProductBox@z,-.75*\ProductBox@z) node[num]{2}; - \end{scope} - \begin{scope}[xshift=2*\ProductBox@x+2*\ProductBox@z] - \clip - (0mm,0mm) -- (\ProductBox@earSize/2,\ProductBox@earSize/4) -- - (\ProductBox@earSize/2,\ProductBox@y-\ProductBox@earSize/4) -- - (0mm,\ProductBox@y) -- cycle; - \draw node[sw]{\copy\ProductBox@Left}; - \draw[thin,opacity=\ProductBox@foldOpacity,\ProductBox@foldLine] - (0mm,0mm) -- (\ProductBox@earSize/2,\ProductBox@earSize/4) -- - (\ProductBox@earSize/2,\ProductBox@y-\ProductBox@earSize/4) -- - (0mm,\ProductBox@y) -- cycle; - \end{scope} - \begin{scope}[yshift=\ProductBox@y] - \clip - (0mm,0mm) -- (\ProductBox@earSize/2,\ProductBox@earSize) -- - (\ProductBox@z-\ProductBox@earSize/2,\ProductBox@earSize) -- - (\ProductBox@z,0mm) -- cycle; - \draw node[nw,rotate=90]{\copy\ProductBox@Top}; - \draw[thin,opacity=\ProductBox@foldOpacity,\ProductBox@foldLine] - (0mm,0mm) -- (\ProductBox@earSize/2,\ProductBox@earSize) -- - (\ProductBox@z-\ProductBox@earSize/2,\ProductBox@earSize) -- - (\ProductBox@z,0mm) -- cycle; - \end{scope} - \begin{scope}[xshift=\ProductBox@x+\ProductBox@z, - yshift=\ProductBox@y] - \clip - (0mm,0mm) -- (\ProductBox@earSize/2,\ProductBox@earSize) -- - (\ProductBox@z-\ProductBox@earSize/2,\ProductBox@earSize) -- - (\ProductBox@z,0mm) -- cycle; - \draw node[se,rotate=270]{\copy\ProductBox@Top}; - \draw[thin,opacity=\ProductBox@foldOpacity,\ProductBox@foldLine] - (0mm,0mm) -- (\ProductBox@earSize/2,\ProductBox@earSize) -- - (\ProductBox@z-\ProductBox@earSize/2,\ProductBox@earSize) -- - (\ProductBox@z,0mm) -- cycle; - \end{scope} - \begin{scope}[xshift=\ProductBox@z, - yshift=\ProductBox@y+\ProductBox@z] - \clip - (0mm,0mm) -- (\ProductBox@earSize/2,\ProductBox@earSize) -- - (\ProductBox@x-\ProductBox@earSize/2,\ProductBox@earSize) -- - (\ProductBox@x,0mm) -- cycle; - \draw (0mm,\ProductBox@y) - node[se,rotate=180]{\copy\ProductBox@Back}; - \draw[thin,opacity=\ProductBox@foldOpacity,\ProductBox@foldLine] - (0mm,0mm) -- (\ProductBox@earSize/2,\ProductBox@earSize) -- - (\ProductBox@x-\ProductBox@earSize/2,\ProductBox@earSize) -- - (\ProductBox@x,0mm) -- cycle; - \end{scope} - \end{tikzpicture}} -\newcommand\ProductBoxThreeDStartHook{} -\newcommand\ProductBoxThreeDEndHook{} -\newif\ifProductBox@shadow \ProductBox@shadowtrue -\newif\ifProductBox@mirror -\newif\ifProductBox@flare -\newcommand\ProductBox@edgeColor{white} -\newcommand\ProductBox@flareDiameter{24mm} -\newcommand\ProductBox@angleZ{8} -\newcommand\ProductBox@angleX{10} -\newcommand\ProductBox@style@threeD{ - \begin{tikzpicture}[sw/.style={anchor=south west, - inner sep=0pt}] - \ProductBoxThreeDStartHook - \ifProductBox@mirror \ProductBox@threeD@mirror \fi - \ifProductBox@shadow \ProductBox@threeD@shadow \fi - - \begin{scope} - \fill[white, - yslant=\ProductBox@p@front@yslant, - xscale=\ProductBox@p@front@xscale, - yscale=\ProductBox@p@front@yscale, - anchor=south west] - rectangle (\ProductBox@x,\ProductBox@y); - \draw - node[sw, - yslant=\ProductBox@p@front@yslant, - xscale=\ProductBox@p@front@xscale, - yscale=\ProductBox@p@front@yscale] - {\copy\ProductBox@Front}; - \fill[black, - fill opacity=.025, - yslant=\ProductBox@p@front@yslant, - xscale=\ProductBox@p@front@xscale, - yscale=\ProductBox@p@front@yscale, - anchor=south west] - rectangle (\ProductBox@x,\ProductBox@y); - \ifProductBox@flare - \begin{scope}[ - yslant=\ProductBox@p@front@yslant, - xscale=\ProductBox@p@front@xscale, - yscale=\ProductBox@p@front@yscale] - \clip rectangle(\ProductBox@x,\ProductBox@y); - \ProductBox@threeD@flare - \end{scope} - \fi - \end{scope} - \begin{scope}[shift={(-\ProductBox@p@left@xscale*\ProductBox@z, - \ProductBox@p@left@yslant - *\ProductBox@p@left@xscale - *\ProductBox@z)}] - \fill[white, - yslant=-\ProductBox@p@left@yslant, - xscale=\ProductBox@p@left@xscale, - yscale=\ProductBox@p@left@yscale, - anchor=south west] - rectangle (\ProductBox@z,\ProductBox@y); - \draw - node[sw, - yslant=-\ProductBox@p@left@yslant, - xscale=\ProductBox@p@left@xscale, - yscale=\ProductBox@p@left@yscale] - {\copy\ProductBox@Left}; - \fill[black, - fill opacity=.25, - yslant=-\ProductBox@p@left@yslant, - xscale=\ProductBox@p@left@xscale, - yscale=\ProductBox@p@left@yscale, - anchor=south west] - rectangle (\ProductBox@z,\ProductBox@y); - \end{scope} - \begin{scope}[yshift=\ProductBox@y] - \fill [white, - anchor=south west, - xslant=-\ProductBox@p@top@xslant, - xscale=\ProductBox@p@top@xscale, - yslant=\ProductBox@p@top@yslant, - yscale=\ProductBox@p@top@yscale] - rectangle (\ProductBox@x,\ProductBox@z); - \draw - node[sw, - xslant=-\ProductBox@p@top@xslant, - xscale=\ProductBox@p@top@xscale, - yslant=\ProductBox@p@top@yslant, - yscale=\ProductBox@p@top@yscale] - {\copy\ProductBox@Top}; - \fill [black, - fill opacity=.0025, - anchor=south west, - xslant=-\ProductBox@p@top@xslant, - xscale=\ProductBox@p@top@xscale, - yslant=\ProductBox@p@top@yslant, - yscale=\ProductBox@p@top@yscale] - rectangle (\ProductBox@x,\ProductBox@z); - \end{scope} - \begin{scope}[shift={(-\ProductBox@p@left@xscale*\ProductBox@z, - \ProductBox@p@left@yslant*\ProductBox@p@left@xscale*\ProductBox@z)}] - \draw [\ProductBox@edgeColor, - line width=.5mm, - draw opacity=.25, - yslant=-\ProductBox@p@left@yslant, - xscale=\ProductBox@p@left@xscale] - (\ProductBox@z,0mm) -- - (\ProductBox@z,\ProductBox@y) -- - (0mm,\ProductBox@y); - \end{scope} - \draw [\ProductBox@edgeColor, - line width=.5mm, - draw opacity=.25, - yslant=\ProductBox@p@front@yslant, - xscale=\ProductBox@p@front@xscale, - anchor=south west] - (0mm,\ProductBox@y) -- (\ProductBox@x,\ProductBox@y); - \ProductBoxThreeDEndHook - \end{tikzpicture}} -\newcommand\ProductBox@setFrontParams[3]{% - \def\ProductBox@p@front@yslant{#1}% - \def\ProductBox@p@front@xscale{#2}% - \def\ProductBox@p@front@yscale{#3}% -} -\newcommand\ProductBox@setLeftParams[3]{% - \def\ProductBox@p@left@yslant{#1}% - \def\ProductBox@p@left@xscale{#2}% - \def\ProductBox@p@left@yscale{#3}% -} -\newcommand\ProductBox@setTopParams[4]{% - \def\ProductBox@p@top@xslant{#1}% - \def\ProductBox@p@top@yslant{#2}% - \def\ProductBox@p@top@xscale{#3}% - \def\ProductBox@p@top@yscale{#4}% -} -\newcommand\ProductBox@setMirrorParams[1]{% - \def\ProductBox@p@mirror@yscale{#1}% -} -\@namedef{ProductBox@View@1}{% - \ProductBox(a)setFrontParams{.25}{.9090909}{1}% - \ProductBox(a)setLeftParams{.5}{.6666666}{1}% - \ProductBox(a)setTopParams{2}{.2265}{1.363}{.3333333}% - \ProductBox(a)setMirrorParams{.4}} -\@namedef{ProductBox@View@2}{% - \ProductBox(a)setFrontParams{.15}{.9090909}{1}% - \ProductBox(a)setLeftParams{.6666666}{.5}{1}% - \ProductBox(a)setTopParams{1.5}{.12}{1.11}{.333333}% - \ProductBox(a)setMirrorParams{.4}} -\@namedef{ProductBox@View@3}{% - \ProductBox(a)setFrontParams{.05}{.95}{1}% - \ProductBox(a)setLeftParams{.25}{.4}{1}% - \ProductBox(a)setTopParams{4}{.04}{1.133333}{.1}% - \ProductBox(a)setMirrorParams{.4}} -\@nameuse{ProductBox@View@1} -\newcommand\ProductBox@threeD@shadow{ - \begin{scope} - \foreach \x in {.5,1,1.5,2,2.5,3,4,5,6,8,10} { - \filldraw [black, - line width=\x mm, - rounded corners=2mm, - opacity=.01, - shift={(-1mm,1mm)}] - (0mm,0mm) -- - (-\ProductBox@p@top@xslant - *\ProductBox@p@left@xscale - *\ProductBox@z, - \ProductBox@p@top@yscale - *\ProductBox@z) -- - (0mm, - \ProductBox@p@top@yscale*\ProductBox@z + - \ProductBox@p@top@xslant - *\ProductBox@p@left@xscale - *\ProductBox@p@top@yslant - *\ProductBox@z) -- - cycle; - } - \end{scope} -} -\tikzfading[name=ProductBoxFade, - top color=transparent!100, - bottom color=transparent!50, - middle color=transparent!100] -\newcommand\ProductBox@threeD@mirror{% - \fill - node[anchor=south west, - inner sep=0pt, - yslant=\ProductBox@p@front@yslant, - xscale=\ProductBox@p@front@xscale, - yscale=-\ProductBox@p@mirror@yscale] - {\begin{tikzpicture} - \clip rectangle (\ProductBox@x, - \ProductBox@y*\ProductBox@p@mirror@yscale); - \fill node [scope fading=ProductBoxFade, - yscale=\ProductBox@p@mirror@yscale, - inner sep=0pt]{\copy\ProductBox@Front}; - \end{tikzpicture}}; - \fill[xshift=-\ProductBox@p@left@xscale*\ProductBox@z, - yshift=\ProductBox@p@top@yscale*\ProductBox@z] - node[anchor=south west, - inner sep=0pt, - yslant=-\ProductBox@p@left@yslant, - xscale=\ProductBox@p@left@xscale, - yscale=-\ProductBox@p@mirror@yscale] - {\begin{tikzpicture} - \clip rectangle (\ProductBox@z, - \ProductBox@y*\ProductBox@p@mirror@yscale); - \fill node [scope fading=ProductBoxFade, - yscale=\ProductBox@p@mirror@yscale, - inner sep=0pt]{\copy\ProductBox@Left}; - - \end{tikzpicture}}; -} -\newcommand\ProductBox@threeD@flare{ - \fill [white,path fading=ProductBoxFlare] - (.8*\ProductBox@x,.9*\ProductBox@y) - circle(\ProductBox@flareDiameter); -} -\tikzfading[name=ProductBoxFlare, - inner color=transparent!60, - outer color=transparent!100] -\@namedef{ProductBox@style@3D}{\ProductBox@style@threeD} -\@namedef{ProductBox@style@3d}{\ProductBox@style@threeD} -\endinput -%% -%% End of file `productbox.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pbox.tlpobj new/tlpkg/tlpobj/pbox.tlpobj --- old/tlpkg/tlpobj/pbox.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/pbox.tlpobj 2017-04-14 17:53:27.000000000 +0200 @@ -0,0 +1,17 @@ +name pbox +category Package +revision 24807 +shortdesc A variable-width \parbox command +relocated 1 +longdesc Defines a command \pbox{<max width>}{<text>} which adjusts its +longdesc width to that of the enclosed text, up to the maximum width +longdesc given. The package also defines some associated length +longdesc commands. +runfiles size=1 + RELOC/tex/latex/pbox/pbox.sty +catalogue-also varwidth +catalogue-ctan /macros/latex/contrib/pbox +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license gpl2 +catalogue-topics boxing +catalogue-version 1.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/productbox.tlpobj new/tlpkg/tlpobj/productbox.tlpobj --- old/tlpkg/tlpobj/productbox.tlpobj 2016-04-14 19:36:19.000000000 +0200 +++ new/tlpkg/tlpobj/productbox.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -name productbox -category Package -revision 20886 -shortdesc Typeset a three-dimensional product box -relocated 1 -longdesc The package enables typesetting of a three-dimensional product -longdesc box. This product box can be rendered as it is standing on a -longdesc surface and some light is shed onto it. Alternatively it can be -longdesc typeset as a wireframe to be cut out and glued together. This -longdesc will lead to a physical product box. The package requires pgf -longdesc and TikZ. -runfiles size=7 - RELOC/tex/latex/productbox/productbox.sty -catalogue-ctan /macros/latex/contrib/gene/productbox -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license other-free -catalogue-topics graphics-3d -catalogue-version 1.1 ++++++ plain-doc.doc.tar.xz -> pdf14.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdf14/README new/doc/latex/pdf14/README --- old/doc/latex/pdf14/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/pdf14/README 2016-11-25 19:29:47.000000000 +0100 @@ -0,0 +1,16 @@ + The pdf14 LaTeX package + + Manuel P\'egouri\'e-Gonnard + <mpg(a)elzevir.fr> + + + +Starting with TeX Live 2010, the various formats that directly generate PDF +default to PDF 1.5. While this allows for more compact documents thanks to +objects compression, it can also lead to compatibility issues with some older +PDF viewers. This package changes back the version of generated PDF to 1.4 with +formats based on pdfTeX or LuaTeX in PDF mode, for documents that need to +achieve maximal compatibility with old viewers. + +If you need to generate maximally compatible documents, you may also be +interested in the pdfx package. Binary files old/doc/latex/pdf14/pdf14.pdf and new/doc/latex/pdf14/pdf14.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdf14/test-pdf14.tex new/doc/latex/pdf14/test-pdf14.tex --- old/doc/latex/pdf14/test-pdf14.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/pdf14/test-pdf14.tex 2016-11-25 19:29:47.000000000 +0100 @@ -0,0 +1,21 @@ +%% +%% This is file `test-pdf14.tex', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pdf14.dtx (with options: `testfile') +%% +%% Written in 2010 by Manuel P\'egouri\'e-Gonnard <mpg(a)elzevir.fr>. +%% +%% This work can be distributed and/or modified under the terms of the LPPL. +%% This is a generated file, see source file pdf14.dtx for more details. +%% +\documentclass{minimal} +\usepackage{pdf14} +\begin{document} +Bla. +\end{document} +\endinput +%% +%% End of file `test-pdf14.tex'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/plain/plain-doc/csname.txt new/doc/plain/plain-doc/csname.txt --- old/doc/plain/plain-doc/csname.txt 2012-12-03 00:20:58.000000000 +0100 +++ new/doc/plain/plain-doc/csname.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,963 +0,0 @@ - CSNAME.TXT - -This file contains all unique control sequences used by TeX (primitive) -and the Plain macro package (plain.tex). - - -\ primitive (control space) -\! plain.tex -\" plain.tex -\# plain.tex -\$ plain.tex -\% plain.tex -\& plain.tex -\' plain.tex -$ plain.tex -$ plain.tex -\* plain.tex -\+ plain.tex -\, plain.tex -\- primitive (discretionary hyphen) -\. plain.tex -\/ primitive (italic correction) -\/ plain.tex -\: plain.tex -\; plain.tex -\< plain.tex -\= plain.tex -\> plain.tex -\? plain.tex -\@cclv plain.tex -\@cclvi plain.tex -\@crfalse plain.tex -\@crtrue plain.tex -\@foot plain.tex -\@if plain.tex -\@ins plain.tex -\@lign plain.tex -\@m plain.tex -\@M plain.tex -\@midfalse plain.tex -\@midtrue plain.tex -\@MM plain.tex -\@ne plain.tex -\@nother plain.tex -\@penup plain.tex -\@sf plain.tex -\@vereq plain.tex -\aa plain.tex -\AA plain.tex -\above primitive -\abovedisplayshortskip primitive -\abovedisplayskip primitive -\abovewithdelims primitive -\accent primitive -\active plain.tex -\acute plain.tex -\adjdemerits primitive -\advance primitive -\advancepageno plain.tex -\ae plain.tex -\AE plain.tex -\afterassignment primitive -\aftergroup primitive -\aleph plain.tex -\alloc@ plain.tex -\allocationnumber plain.tex -\allowbreak plain.tex -\alpha plain.tex -\amalg plain.tex -\angle plain.tex -\approx plain.tex -\arccos plain.tex -\arcsin plain.tex -\arctan plain.tex -\arg plain.tex -\arrowvert plain.tex -\Arrowvert plain.tex -\ast plain.tex -\asymp plain.tex -\atop primitive -\atopwithdelims primitive -\b plain.tex -\backslash plain.tex -\bar plain.tex -\baselineskip primitive -\batchmode primitive -\begingroup primitive -\beginsection primitive -\belowdisplayshortskip primitive -\belowdisplayskip primitive -\beta plain.tex -\bf plain.tex -\bffam plain.tex -\bgroup plain.tex -\big plain.tex -\Big plain.tex -\bigbreak plain.tex -\bigcap plain.tex -\bigcirc plain.tex -\bigcup plain.tex -\bigg plain.tex -\Bigg plain.tex -\biggl plain.tex -\Biggl plain.tex -\biggm plain.tex -\Biggm plain.tex -\biggr plain.tex -\Biggr plain.tex -\bigl plain.tex -\Bigl plain.tex -\bigm plain.tex -\Bigm plain.tex -\bigodot plain.tex -\bigoplus plain.tex -\bigotimes plain.tex -\bigr plain.tex -\Bigr plain.tex -\bigskip plain.tex -\bigskipamount plain.tex -\bigsqcup plain.tex -\bigtriangledown plain.tex -\bigtriangleup plain.tex -\biguplus plain.tex -\bigvee plain.tex -\bigwedge plain.tex -\binoppenalty primitive -\bmod plain.tex -\body plain.tex -\bordermatrix plain.tex -\bot plain.tex -\botmark primitive -\bowtie plain.tex -\box primitive -\box255 primitive (page contents) -\boxmaxdepth primitive -\brace plain.tex -\braceld plain.tex -\bracelu plain.tex -\bracerd plain.tex -\braceru plain.tex -\bracevert plain.tex -\brack plain.tex -\break plain.tex -\breve plain.tex -\brokenpenalty primitive -\buildrel plain.tex -\bullet plain.tex -\bye plain.tex -\c plain.tex -\c@ncel plain.tex -\cal plain.tex -\cap plain.tex -\cases plain.tex -\catcode primitive -\cdot plain.tex -\cdotp plain.tex -\cdots plain.tex -\centering plain.tex -\centerline plain.tex -\ch@ck plain.tex -\char primitive -\chardef primitive -\check plain.tex -\chi plain.tex -\choose plain.tex -\circ plain.tex -\cleaders primitive -\cleartabs plain.tex -\closein primitive -\closeout primitive -\clubpenalty primitive -\clubsuit plain.tex -\colon plain.tex -\columns plain.tex -\cong plain.tex -\coprod plain.tex -\copy plain.tex -\copyright plain.tex -\cos plain.tex -\cosh plain.tex -\cot plain.tex -\coth plain.tex -\count primitive -\count@ plain.tex -\count0 plain.tex (page number, \pageno) -\countdef primitive -\cr primitive -\crcr primitive -\csc plain.tex -\csname primitive -\cup plain.tex -\d plain.tex -\dag plain.tex -\dagger plain.tex -\dashv plain.tex -\day primitive -\ddag plain.tex -\ddagger plain.tex -\ddot plain.tex -\ddots plain.tex -\deadcycles primitive -\def primitive -\defaulthyphenchar primitive -\defaultskewchar primitive -\deg plain.tex -\delcode primitive -\delimiter primitive -\delimiterfactor primitive -\delimitershortfall primitive -\delta plain.tex -\Delta plain.tex -\det plain.tex -\diamond plain.tex -\diamondsuit plain.tex -\dim plain.tex -\dimen primitive -\dimen@ plain.tex -\dimen@i plain.tex -\dimen@ii plain.tex -\dimendef primitive -\discretionary primitive -\displ@y plain.tex -\displayindent primitive -\displaylimits primitive -\displaylines plain.tex -\displaystyle primitive -\displaywidowpenalty primitive -\displaywidth primitive -\div plain.tex -\divide primitive -\do plain.tex -\dospecials plain.tex -\dosupereject plain.tex -\dot plain.tex -\doteq plain.tex -\dotfill plain.tex -\dots plain.tex -\doublehyphendemerits primitive -\downarrow plain.tex -\Downarrow plain.tex -\downbracefill plain.tex -\dp primitive -\dt@pfalse plain.tex -\dt@ptrue plain.tex -\dump primitive -\edef primitive -\egroup plain.tex -\eject plain.tex -\ell plain.tex -\else primitive -\empty plain.tex -\emptyset plain.tex -\end primitive -\endcsname primitive -\endgraf plain.tex -\endgroup primitive -\endinput primitive -\endinsert plain.tex -\endline plain.tex -\endlinechar primitive -\enskip plain.tex -\enspace plain.tex -\epsilon plain.tex -\eqalign plain.tex -\eqalignno plain.tex -\eqno primitive -\equiv plain.tex -\errhelp primitive -\errmessage primitive -\errorstopmode primitive -\escapechar primitive -\eta plain.tex -\everycr primitive -\everydisplay primitive -\everyhbox primitive -\everyjob primitive -\everymath primitive -\everypar primitive -\everyvbox primitive -\exhyphenpenalty primitive -\exists plain.tex -\exp plain.tex -\expandafter primitive -\f@@t plain.tex -\f@t plain.tex -\fam primitive -\fi primitive -\filbreak primitive -\finalhyphendemerits primitive -\finph@nt plain.tex -\finsm@sh plain.tex -\firstmark primitive -\fivebf plain.tex -\fivei plain.tex -\fiverm plain.tex -\fivesy plain.tex -\flat plain.tex -\floatingpenalty primitive -\fmtname plain.tex -\fmtversion plain.tex -\fo@t plain.tex -\folio plain.tex -\font primitive -\fontdimen primitive -\fontname primitive -\footins plain.tex -\footline plain.tex -\footnote plain.tex -\footnoterule plain.tex -\footstrut plain.tex -\forall plain.tex -\frenchspacing plain.tex -\frown plain.tex -\futurelet primitive -\gamma plain.tex -\Gamma plain.tex -\gcd plain.tex -\gdef primitive -\ge plain.tex -\geq plain.tex -\gets plain.tex -\gg plain.tex -\global primitive -\globaldefs primitive -\goodbreak plain.tex -\grave plain.tex -\H plain.tex -\h@false plain.tex -\h@true plain.tex -\halign primitive -\hang plain.tex -\hangafter primitive -\hangindent primitive -\hat plain.tex -\hbadness primitive -\hbar plain.tex -\hbox primitive -\headline plain.tex -\heartsuit plain.tex -\hfil primitive -\hfill primitive -\hfilneg primitive -\hfuzz primitive -\hgl@ plain.tex -\hglue plain.tex -\hideskip plain.tex -\hidewidth plain.tex -\hoffset primitive -\hom plain.tex -\hookleftarrow plain.tex -\hookrightarrow plain.tex -\hphantom plain.tex -\hrule primitive -\hrulefill plain.tex -\hsize primitive -\hskip primitive -\hss primitive -\ht primitive -\hyphenation primitive -\hyphenchar primitive -\hyphenpenalty primitive -\i plain.tex -\ialign plain.tex -\if primitive -\if@ plain.tex -\if@cr plain.tex -\if@mid plain.tex -\ifcase primitive -\ifcat primitive -\ifdim primitive -\ifdt@p plain.tex -\ifeof primitive -\iff plain.tex -\iffalse primitive -\ifh@ plain.tex -\ifhbox primitive -\ifhmode primitive -\ifinner primitive -\ifmmode primitive -\ifnum primitive -\ifodd primitive -\ifp@ge plain.tex -\ifr@ggedbottom plain.tex -\iftrue primitive -\ifus@ plain.tex -\ifv@ plain.tex -\ifvbox primitive -\ifvmode primitive -\ifvoid primitive -\ifx primitive -\ignorespaces primitive -\Im plain.tex -\imath plain.tex -\immediate primitive -\in plain.tex -\indent primitive -\inf plain.tex -\infty plain.tex -\input primitive -\insc@unt plain.tex -\insert primitive -\insertpenalties primitive -\int plain.tex -\interdisplaylinepenalty plain.tex -\interfootnotelinepenalty plain.tex -\interlinepenalty primitive -\intop plain.tex -\iota plain.tex -\it plain.tex -\item plain.tex -\itemitem plain.tex -\iterate plain.tex -\itfam plain.tex -\j plain.tex -\jmath plain.tex -\jobname primitive -\joinrel plain.tex -\jot plain.tex -\kappa plain.tex -\ker plain.tex -\kern primitive -\l plain.tex -\L plain.tex -\lambda plain.tex -\Lambda plain.tex -\land plain.tex -\langle plain.tex -\lastbox primitive -\lastkern primitive -\lastpenalty primitive -\lastskip primitive -\lbrace plain.tex -\lbrack plain.tex -\lccode primitive -\lceil plain.tex -\ldotp plain.tex -\ldots plain.tex -\le plain.tex -\leaders primitive -\leavevmode plain.tex -\left primitive -\leftarrow plain.tex -\Leftarrow plain.tex -\leftarrowfill plain.tex -\leftharpoondown plain.tex -\leftharpoonup plain.tex -\leftline plain.tex -\leftrightarrow plain.tex -\Leftrightarrow plain.tex -\leftskip primitive -\leq plain.tex -\leqalignno plain.tex -\leqno primitive -\let primitive -\lfloor plain.tex -\lg plain.tex -\lgroup plain.tex -\lhook plain.tex -\lim plain.tex -\liminf plain.tex -\limits primitive -\limsup plain.tex -\line plain.tex -\linepenalty primitive -\lineskip primitive -\lineskiplimit primitive -\ll plain.tex -\llap plain.tex -\lmoustache plain.tex -\ln plain.tex -\lnot plain.tex -\log plain.tex -\long primitive -\longleftarrow plain.tex -\Longleftarrow plain.tex -\longleftrightarrow plain.tex -\Longleftrightarrow plain.tex -\longmapsto plain.tex -\Longrightarrow plain.tex -\longrightarrow plain.tex -\loop plain.tex -\looseness primitive -\lor plain.tex -\lower primitive -\lowercase primitive -\lq plain.tex -\m@g plain.tex -\m@ketabbox plain.tex -\m@ne plain.tex -\m@th plain.tex -\mag primitive -\magnification plain.tex -\magstep plain.tex -\magstephalf plain.tex -\makefootline plain.tex -\makeheadline plain.tex -\makeph@nt plain.tex -\makesm@sh plain.tex -\mapsto plain.tex -\mapstochar plain.tex -\mark primitive -\mathaccent primitive -\mathbin primitive -\mathchar primitive -\mathchardef primitive -\mathchoice primitive -\mathclose primitive -\mathcode primitive -\mathhexbox plain.tex -\mathinner primitive -\mathop primitive -\mathopen primitive -\mathord primitive -\mathpalette plain.tex -\mathph@nt plain.tex -\mathpunct primitive -\mathrel primitive -\mathsm@sh plain.tex -\mathstrut plain.tex -\mathsurround primitive -\matrix plain.tex -\max plain.tex -\maxdeadcycles primitive -\maxdepth primitive -\maxdimen plain.tex -\meaning primitive -\medbreak plain.tex -\medmuskip primitive -\medskip plain.tex -\medskipamount plain.tex -\message primitive -\mid plain.tex (symbol) -\midinsert plain.tex -\min plain.tex -\mit plain.tex -\mkern primitive -\models plain.tex -\month primitive -\moveleft primitive -\moveright primitive -\mp plain.tex -\mscount plain.tex -\mskip primitive -\mu plain.tex -\multiply primitive -\multispan plain.tex -\muskip primitive -\muskipdef primitive -\n@space plain.tex -\nabla plain.tex -\narrower plain.tex -\natural plain.tex -\ne plain.tex -\nearrow plain.tex -\neg plain.tex -\negthinspace plain.tex -\neq plain.tex -\newbox plain.tex -\newcount plain.tex -\newdimen plain.tex -\newfam plain.tex -\newhelp plain.tex -\newif plain.tex -\newinsert plain.tex -\newlinechar primitive -\newmuskip plain.tex -\newread plain.tex -\newskip plain.tex -\newtoks plain.tex -\newwrite plain.tex -\next plain.tex -\ni plain.tex -\noalign primitive -\nobreak plain.tex -\noexpand primitive -\noindent primitive -\nointerlineskip plain.tex -\nolimits primitive -\nonfrenchspacing plain.tex -\nonscript primitive -\nonstopmode primitive -\nopagenumbers plain.tex -\normalbaselines plain.tex -\normalbaselineskip plain.tex -\normalbottom plain.tex -\normallineskip plain.tex -\normallineskiplimit plain.tex -\not plain.tex -\notin plain.tex -\nu plain.tex -\null plain.tex -\nulldelimiterspace primitive -\number primitive -\nwarrow plain.tex -\o plain.tex -\O plain.tex -\oalign plain.tex -\obeylines plain.tex -\obeyspaces plain.tex -\odot plain.tex -\oe plain.tex -\OE plain.tex -\of plain.tex -\offinterlineskip plain.tex -\oint plain.tex -\ointop plain.tex -\oldstyle plain.tex -\omega plain.tex -\Omega plain.tex -\ominus plain.tex -\omit primitive -\ooalign plain.tex -\openin primitive -\openout primitive -\openup plain.tex -\oplus plain.tex -\or primitive -\oslash plain.tex -\otimes plain.tex -\outer primitive -\output primitive -\outputpenalty primitive -\over primitive -\overbrace plain.tex -\overfullrule primitive -\overleftarrow plain.tex -\overline primitive -\overrightarrow plain.tex -\overwithdelims primitive -\owns plain.tex -\P plain.tex -\p@ plain.tex -\p@gefalse plain.tex -\p@getrue plain.tex -\p@renwd plain.tex -\pagebody plain.tex -\pagecontents plain.tex -\pagedepth primitive -\pagefilllstretch primitive -\pagefillstretch primitive -\pagefilstretch primitive -\pagegoal primitive -\pageinsert plain.tex -\pageno plain.tex -\pageshrink primitive -\pagestretch primitive -\pagetotal primitive -\par primitive -\parallel plain.tex -\parfillskip primitive -\parindent primitive -\parshape primitive -\parskip primitive -\partial plain.tex -\patterns primitive -\pausing primitive -\penalty primitive -\perp plain.tex -\ph@nt plain.tex -\phantom plain.tex -\phi plain.tex -\Phi plain.tex -\pi plain.tex -\Pi plain.tex -\plainoutput plain.tex -\pm plain.tex -\pmatrix plain.tex -\pmod plain.tex -\postdisplaypenalty primitive -\Pr plain.tex -\pr@@@s plain.tex -\pr@@@t plain.tex -\pr@m@s plain.tex -\prec plain.tex -\preceq plain.tex -\predisplaypenalty primitive -\predisplaysize primitive -\preloaded plain.tex -\pretolerance primitive -\prevdepth primitive -\prevgraf primitive -\prim@s plain.tex -\prime plain.tex -\proclaim plain.tex -\prod plain.tex -\propto plain.tex -\psi plain.tex -\Psi plain.tex -\qquad plain.tex -\quad plain.tex -\r@@t plain.tex -\r@ggedbottomfalse plain.tex -\r@ggedbottomtrue plain.tex -\radical primitive -\raggedbottom plain.tex -\raggedright plain.tex -\raise primitive -\rangle plain.tex -\rbrace plain.tex -\rbrack plain.tex -\rceil plain.tex -\Re plain.tex -\read primitive -\relax primitive -\relbar plain.tex -\Relbar plain.tex -\relpenalty primitive -\removelastskip plain.tex -\repeat plain.tex -\rfloor plain.tex -\rgroup plain.tex -\rho plain.tex -\rhook plain.tex -\right primitive -\rightarrow plain.tex -\Rightarrow plain.tex -\rightarrowfill plain.tex -\rightharpoondown plain.tex -\rightharpoonup plain.tex -\rightleftharpoons plain.tex -\rightline plain.tex -\rightskip primitive -\rlap plain.tex -\rlh@ plain.tex -\rm plain.tex -\rmoustache plain.tex -\romannumeral primitive -\root plain.tex -\rootbox plain.tex -\rq plain.tex -\S plain.tex -\s@tcols plain.tex -\s@tt@b plain.tex -\sb plain.tex -\scriptfont primitive -\scriptscriptfont primitive -\scriptscriptstyle primitive -\scriptspace primitive -\scriptstyle primitive -\scrollmode primitive -\searrow plain.tex -\sec plain.tex -\setbox primitive -\setminus plain.tex -\sett@b plain.tex -\settabs plain.tex -\sevenbf plain.tex -\seveni plain.tex -\sevenrm plain.tex -\sevensy plain.tex -\sfcode primitive -\sharp plain.tex -\shipout primitive -\show primitive -\showbox primitive -\showboxbreadth primitive -\showboxdepth primitive -\showhyphens plain.tex -\showlists primitive -\showthe primitive -\sigma plain.tex -\Sigma plain.tex -\sim plain.tex -\simeq plain.tex -\sin plain.tex -\sinh plain.tex -\sixt@@n plain.tex -\skew plain.tex -\skewchar primitive -\skip primitive -\skip@ plain.tex -\skipdef primitive -\sl plain.tex -\slash plain.tex -\slfam plain.tex -\smallbreak plain.tex -\smallint plain.tex -\smallskip plain.tex -\smallskipamount plain.tex -\smash plain.tex -\smile plain.tex -\sp plain.tex -\sp@n plain.tex -\space plain.tex -\spacefactor primitive -\spaceskip primitive -\spadesuit plain.tex -\span primitive -\special primitive -\splitbotmark primitive -\splitfirstmark primitive -\splitmaxdepth primitive -\splittopskip primitive -\sqcap plain.tex -\sqcup plain.tex -\sqrt plain.tex -\sqsupseteq plain.tex -\ss plain.tex -\star plain.tex -\string primitive -\strut plain.tex -\strutbox plain.tex -\subset plain.tex -\subseteq plain.tex -\succ plain.tex -\succeq plain.tex -\sum plain.tex -\sup plain.tex -\supereject plain.tex -\supset plain.tex -\supseteq plain.tex -\surd plain.tex -\swarrow plain.tex -\t plain.tex -\t@bb@x plain.tex -\t@bbox plain.tex -\tabalign plain.tex -\tabs plain.tex -\tabsdone plain.tex -\tabskip primitive -\tabsyet plain.tex -\tan plain.tex -\tanh plain.tex -\tau plain.tex -\tenbf plain.tex -\tenex plain.tex -\teni plain.tex -\tenit plain.tex -\tenrm plain.tex -\tensl plain.tex -\tensy plain.tex -\tentt plain.tex -\TeX plain.tex -\textfont primitive -\textindent plain.tex -\textstyle primitive -\the primitive -\theta plain.tex -\Theta plain.tex -\thickmuskip primitive -\thinmuskip primitive -\thinspace plain.tex -\thr@@ plain.tex -\tilde plain.tex -\time primitive -\times plain.tex -\to plain.tex -\toks primitive -\toks@ plain.tex -\toksdef primitive -\tolerance primitive -\top plain.tex -\topins plain.tex -\topinsert plain.tex -\topmark primitive -\topskip primitive -\tracingall plain.tex -\tracingcommands primitive -\tracinglostchars primitive -\tracingmacros primitive -\tracingonline primitive -\tracingoutput primitive -\tracingpages primitive -\tracingparagraphs primitive -\tracingrestores primitive -\tracingstats primitive -\triangle plain.tex -\triangleleft plain.tex -\triangleright plain.tex -\tt plain.tex -\ttfam plain.tex -\ttraggedright plain.tex -\tw@ plain.tex -\u plain.tex -\uccode primitive -\uchyph primitive -\undefined plain.tex -\underbar plain.tex -\underbrace plain.tex -\underline primitive -\unhbox primitive -\unhcopy primitive -\unkern primitive -\unpenalty primitive -\unskip primitive -\unvbox primitive -\unvcopy primitive -\uparrow plain.tex -\Uparrow plain.tex -\upbracefill plain.tex -\updownarrow plain.tex -\Updownarrow plain.tex -\uplus plain.tex -\uppercase primitive -\upsilon plain.tex -\Upsilon plain.tex -\us@false plain.tex -\us@true plain.tex -\v plain.tex -\v@false plain.tex -\v@true plain.tex -\vadjust primitive -\valign primitive -\varepsilon plain.tex -\varphi plain.tex -\varpi plain.tex -\varrho plain.tex -\varsigma plain.tex -\vartheta plain.tex -\vbadness primitive -\vbox primitive -\vcenter primitive -\vdash plain.tex -\vdots plain.tex -\vec plain.tex -\vee plain.tex -\Vert plain.tex -\vert plain.tex -\vfil primitive -\vfill primitive -\vfilneg primitive -\vfootnote plain.tex -\vfuzz primitive -\vgl@ plain.tex -\vglue plain.tex -\voffset primitive -\voidb@x plain.tex -\vphantom plain.tex -\vrule primitive -\vsize primitive -\vskip primitive -\vsplit primitive -\vss primitive -\vtop primitive -\wd primitive -\wedge plain.tex -\widehat plain.tex -\widetilde plain.tex -\widowpenalty primitive -\wlog plain.tex -\wp plain.tex -\wr plain.tex -\write primitive -\xdef primitive -\xi plain.tex -\Xi plain.tex -\xleaders primitive -\xspaceskip primitive -\year primitive -\z@ plain.tex -\z@skip plain.tex -\zeta plain.tex -\[ plain.tex -\] plain.tex -\^ plain.tex -\^^I plain.tex -\^^M plain.tex -\_ plain.tex -\` plain.tex -\{ plain.tex -\| plain.tex -\} plain.tex -\~ plain.tex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdf14.doc.tlpobj new/tlpkg/tlpobj/pdf14.doc.tlpobj --- old/tlpkg/tlpobj/pdf14.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/pdf14.doc.tlpobj 2017-04-14 17:53:27.000000000 +0200 @@ -0,0 +1,9 @@ +name pdf14.doc +category Package +revision 17583 +shortdesc doc files of pdf14 +relocated 1 +docfiles size=91 + RELOC/doc/latex/pdf14/README + RELOC/doc/latex/pdf14/pdf14.pdf + RELOC/doc/latex/pdf14/test-pdf14.tex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/plain-doc.doc.tlpobj new/tlpkg/tlpobj/plain-doc.doc.tlpobj --- old/tlpkg/tlpobj/plain-doc.doc.tlpobj 2016-04-14 19:35:07.000000000 +0200 +++ new/tlpkg/tlpobj/plain-doc.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -name plain-doc.doc -category Package -revision 28424 -shortdesc doc files of plain-doc -relocated 1 -docfiles size=5 - RELOC/doc/plain/plain-doc/csname.txt ++++++ pdftex-def.tar.xz -> pdf14.tar.xz ++++++ ++++ 1985 lines of diff (skipped) ++++++ przechlewski-book.doc.tar.xz -> pdfbook2.doc.tar.xz ++++++ ++++ 2794 lines of diff (skipped) ++++++ przechlewski-book.doc.tar.xz -> pdfbook2.tar.xz ++++++ ++++ 2789 lines of diff (skipped) ++++++ pdfslide.doc.tar.xz ++++++ ++++++ pdfslide.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfslide.tlpobj new/tlpkg/tlpobj/pdfslide.tlpobj --- old/tlpkg/tlpobj/pdfslide.tlpobj 2016-04-14 19:32:52.000000000 +0200 +++ new/tlpkg/tlpobj/pdfslide.tlpobj 2017-04-14 17:53:30.000000000 +0200 @@ -25,6 +25,6 @@ RELOC/tex/latex/pdfslide/slide.clo catalogue-also prosper catalogue-ctan /macros/latex/contrib/pdfslide -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics presentation ++++++ pdfsync.doc.tar.xz ++++++ ++++++ pdfsync.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfsync.tlpobj new/tlpkg/tlpobj/pdfsync.tlpobj --- old/tlpkg/tlpobj/pdfsync.tlpobj 2016-04-14 19:32:52.000000000 +0200 +++ new/tlpkg/tlpobj/pdfsync.tlpobj 2017-04-14 17:53:30.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/tex/latex/pdfsync/pdfsync.sty catalogue-also vpe catalogue-ctan /macros/latex/contrib/pdfsync -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics debug-supp ++++++ pdftex.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pdfetex.1 new/texmf-dist/doc/man/man1/pdfetex.1 --- old/texmf-dist/doc/man/man1/pdfetex.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/pdfetex.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH PDFETEX 1 "16 June 2015" "Web2C 2016" +.TH PDFETEX 1 "16 June 2015" "Web2C 2017" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF Metafont Binary files old/texmf-dist/doc/man/man1/pdfetex.man1.pdf and new/texmf-dist/doc/man/man1/pdfetex.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pdftex.1 new/texmf-dist/doc/man/man1/pdftex.1 --- old/texmf-dist/doc/man/man1/pdftex.1 2016-05-05 01:10:15.000000000 +0200 +++ new/texmf-dist/doc/man/man1/pdftex.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH PDFTEX 1 "4 May 2016" "Web2C 2016" +.TH PDFTEX 1 "4 May 2016" "Web2C 2017" .\"===================================================================== .if n .ds MF Metafont .if t .ds MF Metafont @@ -379,7 +379,7 @@ timestamps in the PDF output, such as the CreationDate and ModDate keys. This is useful for making reproducible builds. .TP -.B SOURCE_DATE_EPOCH_TEX_PRIMITIVES +.B FORCE_SOURCE_DATE If set to the value "1", the time-related \*(TX primitives .RI ( \eyear , .IR \emonth , Binary files old/texmf-dist/doc/man/man1/pdftex.man1.pdf and new/texmf-dist/doc/man/man1/pdftex.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/NEWS new/texmf-dist/doc/pdftex/NEWS --- old/texmf-dist/doc/pdftex/NEWS 2016-04-25 22:46:03.000000000 +0200 +++ new/texmf-dist/doc/pdftex/NEWS 2017-04-21 01:19:14.000000000 +0200 @@ -1,9 +1,24 @@ -pdfTeX 3.14159265-2.6-1.40.17 (TeX Live 2016) +pdfTeX 3.14159265-2.6-1.40.18 (TeX Live 2017) - changes: - - if environment variable SOURCE_DATE_EPOCH is set, use its value for - the CreationDate and ModDate values, and to seed the trailer /ID. + - rename envvar SOURCE_DATE_EPOCH_TEX_PRIMITIVES to FORCE_SOURCE_DATE; + no changes in functionality. + - if the \pdfpageattr token list contains the string "/MediaBox", + omitting output of the default /MediaBox. + +- bugfixes: + - \pdflastmatch more reliable when there was no match + +--------------------------------------------------- +pdfTeX 3.14159265-2.6-1.40.17 (TeX Live 2016) (May 20, 2016) +- changes: + - if the environment variable SOURCE_DATE_EPOCH is set, use its value for + the PDF CreationDate and ModDate values, and to seed the trailer /ID. This by itself should suffice to create reproducible PDFs. The - other changes support more granular output tweaks along the same lines. + new primitives below support more granular output tweaks with the + same intent. + - if the environment variable SOURCE_DATE_EPOCH_TEX_PRIMITIVES is set + to 1, the \year, \day, and \time primitives are also initialized + from the SOURCE_DATE_EPOCH value, instead of the current time. - new primitive \pdfinfoomitdate to omit CreationDate and ModDate keys. - new primitive \pdftrailerid to set seed for the trailer /ID @@ -17,6 +32,7 @@ - bugfixes: - do not crash if font size of a vf >= 2048pt. + --------------------------------------------------- pdfTeX 3.14159265-2.6-1.40.16 (TeX Live 2015) - changes: @@ -26,6 +42,7 @@ - bugfixes: - ensure line-ending after a group dict in the output. + --------------------------------------------------- pdfTeX 3.14159265-2.6-1.40.15 (TeX Live 2014) - changes: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/README new/texmf-dist/doc/pdftex/README --- old/texmf-dist/doc/pdftex/README 2016-04-25 22:46:03.000000000 +0200 +++ new/texmf-dist/doc/pdftex/README 2017-04-21 01:19:14.000000000 +0200 @@ -2,14 +2,16 @@ TeX source files and enhance the result of TeX typesetting with the help of PDF. When PDF output is not selected, pdfTeX produces normal DVI output, otherwise it produces PDF output that looks essentially -identical to the DVI output. An important aspect of this project was to -investigate alternative justification algorithms, resulting in the -margin kerning and font expansion "microtypgraphy" features, inspired by -Peter Karow. +identical to the DVI output -pdfTeX is based on the original e-TeX sources and Web2c, and has been -successfully compiled on many systems. It is actively maintained, but -stability is paramount now; only bug fixes and small enhancements are expected. +An important aspect of this project was to investigate alternative +justification algorithms, resulting in the "microtypography" features of +margin kerning and font expansion. This was inspired by Peter Karow's +and Hermann Zapf's work. + +pdfTeX is integrated with the original e-TeX sources and Web2c. It is +actively maintained, but stability is paramount now; only bug fixes and +small enhancements are expected. Releases are made through TeX Live. See the file NEWS for changes to the program. Documentation about pdfTeX can be found at http://www.pdftex.org. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/manual/ChangeLog new/texmf-dist/doc/pdftex/manual/ChangeLog --- old/texmf-dist/doc/pdftex/manual/ChangeLog 2016-05-05 01:55:52.000000000 +0200 +++ new/texmf-dist/doc/pdftex/manual/ChangeLog 2017-04-21 01:19:14.000000000 +0200 @@ -1,3 +1,73 @@ +2017-04-20 Karl Berry <karl(a)freefriends.org> + + * pdftex-t.tex (\currentpdftex): 1.40.18 (for TeX Live 2017). + + * pdftex-t.tex (Map files): omit description of tfm-only map + entries (and pgc), since the behavior might change. Use "psname" + instead of "basename" for possible clarity. Various other rewordings. + + *pdftex-t.tex (--version, --pdf): do not erroneously output a tt + ligature. + +2017-03-18 Karl Berry <karl(a)freefriends.org> + + * pdftex-t.tex: starting from -> starting with + * pdftex-t.tex: starting from -> starting with. + +2017-03-17 Karl Berry <karl(a)freefriends.org> + + * pdftex-t.tex (\efcode, \rpcode, \lpcode, \knbscode, \knstcode, + \knshcode, \knbccode, \knaccode): state that changes to these + tables are global, not affected by TeX's grouping, and only to the + particular specified. Report from Doug McKenna. + +2017-03-16 Karl Berry <karl(a)freefriends.org> + + * pdftex-t.tex: behavior, not behaviour, for consistency with + seemingly all else (color, math, etc.). + + * pdftex-t.tex: behavior, not behaviour. Nothing else here is UK.Eng. + + * pdftex-t.tex (Map files) <encodingfile>: can be specified for + bitmap PK fonts now also. + + * pdftex-t.tex (\tagcode): use <8-bit number> like everything else, + rather than <character code>. Report from Doug McKenna. + +2017-02-18 Karl Berry <karl(a)freefriends.org> + + * pdftex-t.tex (\pdfpageattr): document new behavior of + omitting our /MediaBox if "/MediaBox" is present in this token list. + +2017-02-01 Karl Berry <karl(a)freefriends.org> + + * pdftex-t.tex (Map files): clarify that decimal 4 = bit position 3 + = symbolic, for embedded fonts, and specify the 0x22 default for + non-embedded fonts. + Report from Gernot Hassenpflug to pdftex, 1 Dec 2016 14:01:30. + +2016-07-05 Karl Berry <karl(a)freefriends.org> + + * pdftex-t.tex (\pdfcatalog): show "openaction <action spec>" + after the <general text>, instead of creating an <open-action spec>, + for (hopefully) more clarity. + (open-action spec): remove \Syntax item. + Report from Douglas McKenna to pdftex list, 3 Jul 2016 12:46:59. + + (\pdftrailer, \pdftrailerid): give simple examples. + +2016-06-12 Karl Berry <karl(a)freefriends.org> + + * pdftex-t.tex (\pdfmatch): mention default subcount 10; wording. + (\pdflastmatch): clarify match position, wording; + + * pdftex-t.tex (Invoking \PDFTEX): new name FORCE_SOURCE_DATE for + SOURCE_DATE_EPOCH_TEX_PRIMITIVES. + +2016-05-20 Karl Berry <karl(a)tug.org> + + * TeX Live 2016 release. + 2016-05-05 Karl Berry <karl(a)tug.org> * pdftex-t.tex: missed \ Binary files old/texmf-dist/doc/pdftex/manual/pdftex-a.pdf and new/texmf-dist/doc/pdftex/manual/pdftex-a.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/manual/pdftex-syntax.txt new/texmf-dist/doc/pdftex/manual/pdftex-syntax.txt --- old/texmf-dist/doc/pdftex/manual/pdftex-syntax.txt 2016-04-25 22:46:03.000000000 +0200 +++ new/texmf-dist/doc/pdftex/manual/pdftex-syntax.txt 2017-04-21 01:19:14.000000000 +0200 @@ -43,7 +43,7 @@ \rpcode <8-bit number> (integer) \shbscode <8-bit number> (integer) \stbscode <8-bit number> (integer) -\tagcode <character code> (integer) +\tagcode <8-bit number> (integer) %% Read-only integers: \pdfelapsedtime (read-only integer) @@ -118,7 +118,7 @@ %% General commands: \letterspacefont <control sequence> <integer> \pdfannot <annot type spec> (h, v, m) -\pdfcatalog <general text> [<open-action spec>] +\pdfcatalog <general text> [openaction <action spec>] \pdfcolorstack <stack number> <stack action> <general text> \pdfcopyfont <control sequence> \pdfdest <dest spec> (h, v, m) @@ -187,7 +187,6 @@ | <file spec> [<page spec>] <general text> <newwindow spec> <thread-action spec> --> [<file spec>] <numid> | [<file spec>] <nameid> -<open-action spec> --> openaction <action spec> <colorspace spec> --> colorspace <number> <pdf box spec> --> mediabox | cropbox | bleedbox | trimbox | artbox <map spec> --> { [<map modifier>] <balanced text> } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/manual/pdftex-t.tex new/texmf-dist/doc/pdftex/manual/pdftex-t.tex --- old/texmf-dist/doc/pdftex/manual/pdftex-t.tex 2016-05-09 19:21:10.000000000 +0200 +++ new/texmf-dist/doc/pdftex/manual/pdftex-t.tex 2017-04-21 01:19:14.000000000 +0200 @@ -1,7 +1,7 @@ % interface=english modes=letter,screen output=pdftex % vim: tw=79 -% $Id: pdftex-t.tex 753 2016-05-09 17:19:54Z karl $ +% $Id: pdftex-t.tex 777 2017-04-20 23:08:32Z karl $ % The number of lines on the title page depends on exactly % what \PDF\ code is generated. @@ -38,9 +38,9 @@ August\or September\or October\or November\or December\else ERROR\fi} } -\svnscan $Id: pdftex-t.tex 753 2016-05-09 17:19:54Z karl $ +\svnscan $Id: pdftex-t.tex 777 2017-04-20 23:08:32Z karl $ -\def\currentpdftex{1.40.17} +\def\currentpdftex{1.40.18} %*********************************************************************** @@ -88,7 +88,6 @@ \abbreviation [PERL] {Perl} {Perl programming environment} \abbreviation [PFA] {PFA} {Adobe PostScript Font format (ASCII)} \abbreviation [PFB] {PFB} {Adobe PostScript Font format (Binary)} -\abbreviation [PGC] {pgc} {\PDF\ Glyph Container} \abbreviation [PK] {pk} {Packed bitmap font} \abbreviation [PNG] {png} {Portable Network Graphics} \abbreviation [POSIX] {posix} {Portable Operating System Interface} @@ -682,7 +681,7 @@ \subsection{Legal Notice} -Copyright \copyright\ 1996||2016 \THANH. +Copyright \copyright\ 1996||2017 \THANH. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; @@ -785,7 +784,7 @@ for instance full screen or clipped. A closer look at the page object no.~2 (\typ{/Type /Page}) shows that a mediabox (\typ{/MediaBox}) is part of the page description. A mediabox acts like the (high-resolution) bounding box -in a \POSTSCRIPT\ file. \PDFTEX\ users can add dictionary stuff to page +in a \POSTSCRIPT\ file. \PDFTEX\ users can add dictionary entries to page objects with the \type{\pdfpageattr} primitive. Although in most cases macro packages will shield users from these @@ -812,9 +811,9 @@ Of course, this is just the barest introduction to \PDF\ format. For those who want to learn more about the gory \PDF\ details, the best bet -is to read the \PDFReference. As of the time of writing you can download -this book as a big \PDF\ file from Adobe's \PDF\ Technology Center, -\from[pdfreference] --- or get the heavy paper version. +is to read the \PDFReference. You can download this book as a big \PDF\ +file from Adobe's \PDF\ Technology Center, \from[pdfreference] --- or +get the heavy paper version. We now turn to specifics of \PDFTEX. @@ -864,9 +863,7 @@ needed to compile \PDFTEX: \startesctyping -cd $HOME/pdftex -unzip pdftex-(a)currentpdftex.zip -cd pdftex-@currentpdftex/source +cd pdftex.../source ./build-pdftex.sh \stopesctyping @@ -1324,21 +1321,20 @@ builds of documents. (See also \type{\pdfinfoomitdate}, \type{\pdfsuppressptexinfo}, et al.) -The second, related, environment variable is -\type{SOURCE_DATE_EPOCH_TEX_PRIMITIVES}. If this is set to~\type{1}, -\TEX's time-related primitives are also initialized from the value of -\type{SOURCE_DATE_EPOCH}. These primitives are \type{\year}, -\type{\month}, \type{\day}, and \type{\time}. If -\type{SOURCE_DATE_EPOCH} is not set, setting -\type{SOURCE_DATE_EPOCH_TEX_PRIMITIVES} has no effect. If -\type{SOURCE_DATE_EPOCH_TEX_PRIMITIVES} is unset, set to the empty -string, or set to~\type{0}, the primitives reflect the current time as -usual. Any other value elicits a warning, and the current time is used. -(This is useful only if one wants to make reproducible \PDF{}s for a set -of documents without changing them in any way, e.g., an operating system -distribution with manuals that use \type{\today}. Except in such -unusual circumstances, it is better not to set this, and let the \TEX\ -primitives retain the meaning they have always had.) +The second, related, environment variable is \type{FORCE_SOURCE_DATE}. +If this is set to~\type{1}, \TEX's time-related primitives are also +initialized from the value of \type{SOURCE_DATE_EPOCH}. These +primitives are \type{\year}, \type{\month}, \type{\day}, and +\type{\time}. If \type{SOURCE_DATE_EPOCH} is not set, setting +\type{FORCE_SOURCE_DATE} has no effect. If \type{FORCE_SOURCE_DATE} is +unset, set to the empty string, or set to~\type{0}, the primitives +reflect the current time as usual. Any other value elicits a warning, +and the current time is used. (This is useful only if one wants to make +reproducible \PDF{}s for a set of documents without changing them in any +way, e.g., an operating system distribution with manuals that use +\type{\today}. Except in such unusual circumstances, it is better not +to set this, and let the \TEX\ primitives retain the meaning they have +always had.) Finally, just to have the list of options and basic invocation at hand, here is a verbatim listing of the \type{-}\type{-help} output. All @@ -1413,7 +1409,7 @@ for \PDFTEX\ in its generalized hypertext features. Support for \PDFTEX\ is implemented as a special driver, and is invoked by typing \type{\setupoutput[pdftex]} or feeding \TEXEXEC\ with the - \type{-{}-pdf} option. + \hbox{\tt -{}-pdf} option. \item \PDF\ from \TEXINFO\ documents can be created by running \PDFTEX\ on the \TEXINFO\ file, instead of \TEX. Alternatively, run the shell @@ -1447,50 +1443,48 @@ \subsection[mapfile]{Map files} Font map files provide the connection between \TEX\ \TFM\ font files -and the outline font file names. They contain also information about +and outline font file names. They contain also information about re||encoding arrays, partial font embedding (``subsetting''), and character transformation parameters (like SlantFont and ExtendFont). Those map files were first created for \DVI\ postprocessors. But, as \PDFTEX\ in \PDF\ output mode includes all \PDF\ processing steps, it also needs to know about font mapping, and therefore reads in one or more map files. -Map files are not read in when \PDFTEX\ is in \DVI\ mode. Pixel fonts -can be used without being listed in the map file. +Map files are not read in when \PDFTEX\ is in \DVI\ mode. Bitmap fonts +can (and normally should) be used without being listed in the map file. By default, \PDFTEX\ reads the map file \filename{pdftex.map}. In \WEBC, map files are searched for using the \type{TEXFONTMAPS} config file value and environment variable. By default, the current directory and various system directories are searched. -Within the map file, each font is listed on an individual line. The syntax of +Within the map file, each font is listed on a single line. The syntax of each line is upward||compatible with \type{dvips} map files and can contain the following fields (some are optional; explanations follow): \startnarrower -{\em tfmname basename fontflags special encodingfile fontfile} +{\em tfmname psname fontflags special encodingfile fontfile} \stopnarrower -It is mandatory that {\em tfmname} is the first field. If -a {\em basename} is given, it must be the second field. Similarly if -{\em fontflags} is given it must be the third field (if {\em basename} -is present) or the second field (if {\em basename} is left out). It is -possible to mix the positions of {\em special}, {\em encodingfile}, -and {\em fontfile}, however the first three fields must be given in -fixed order. +It is mandatory that {\em tfmname} is the first field. If a {\em +psname} is given, it must be the second field. Similarly if {\em +fontflags} is given it must be the third field (if {\em psname} is +present) or the second field (if {\em psname} is left out). The +positions of {\em special}, {\em encodingfile}, and {\em fontfile} can +be mixed. \startdescription {tfmname} -sets the name of the \TFM\ file for a font --- the name \TEX\ sees. -This name must always -be given. +sets the name of the \TFM\ file for a font --- the file name given in a +\TEX\ \type{\font} command. This name must always be given. \stopdescription -\startdescription {basename} +\startdescription {psname} sets the (\POSTSCRIPT) base font name, which has two uses: First, when a \PDF\ file is embedded by \type{\pdfximage}, the \type{/BaseFont} names in the font dictionaries of Type~1 and Type~1C (CFF) fonts from the embedded \PDF\ file are checked against this {\em -basename} field. If names match, the glyphs of that font will not be +psname} field. If names match, the glyphs of that font will not be copied from the embedded \PDF\ file, but instead a local font is opened, and all needed glyphs will be taken from the Type~1 font file that is mentioned in the map line (see {\em fontfile} below). By this collecting @@ -1502,18 +1496,18 @@ (see below). Second, if a font file is not to be embedded into the \PDF\ output -({\em fontfile} field missing), then the {\em basename} field will be +({\em fontfile} field missing), then the {\em psname} field will be copied to the \type{/BaseFont} and \type{/FontName} dictionary entries in the \PDF\ file, so that the \POSTSCRIPT\ font name will be known to -the consumer application (\eg\ viewer). +reading applications (\eg\ viewers). -It is highly recommended to always use the {\em basename} field (but -strictly speaking it's optional). +It is highly recommended to use the {\em psname} field, but +strictly speaking it is optional. \stopdescription \startdescription {fontflags} -specify some characteristics of the font. The following description of +optionally specify some characteristics of the font. The following description of these flags is taken, with slight modification, from the \PDFReference\ (the section on font descriptor flags). Viewers can adapt their rendering to these flags, especially when they substitute a non-embedded font by @@ -1581,141 +1575,125 @@ \stopnarrower -If the {\em fontflags} field is not given, \PDFTEX\ treats it as being~4, -a symbolic font. If you do not know the correct value, it is best not -to specify it at all, as specifying a bad value of font flags may cause -trouble in viewers. On the other hand this option is not absolutely -useless because it provides backward compatibility with older map files -(see the {\em fontfile} description below). +If the {\em fontflags} field is not given, and the font is embedded, +\PDFTEX\ treats it as the value~4 (decimal, that is, bit position 3 is set), +a symbolic font. For non-embedded fonts, the default value is +\type{0x22}, a non-symbolic serif font. If you do not know the correct +value, it is best not to specify it at all, as specifying a bad value of +font flags may cause trouble in viewers. On the other hand this option +is not absolutely useless because it provides backward compatibility +with older map files (see the {\em fontfile} description below). \stopdescription \startdescription {special} -specifies instructions to manipulate fonts similar to the way -\type{dvips} does. Currently only the keywords \type{SlantFont} -and \type{ExtendFont} are interpreted, other instructions (as -\type{ReEncodeFont} with parameters, see {\em encoding} below) are +specifies font manipulations in the same way as +\type{dvips}. Currently only the keywords \type{SlantFont} +and \type{ExtendFont} are interpreted, other instructions (notably +\type{ReEncodeFont} and its parameters, see {\em encoding} below) are just ignored. The permitted \type{SlantFont} range is $-$1..1; for \type{ExtendFont} it's $-$2..2. The block of {\em special} -instruction must be enclosed by double quotes \type{"}. +instruction must be enclosed by double quote characters: \type{"}. \stopdescription -\startdescription {encodingfile} -specifies the name of the file containing the external encoding vector -to be used for the font. The encoding file must have name extension -\type{.enc}, and the full file name including this extension must be given -with preceding~\type{<} character. The format of the encoding vector is -identical to that used by \type{dvips}. If no encoding is specified, -the font's built||in default encoding is used. The {\em encodingfile} -field may be omitted if you are sure that the font resource has the -correct built||in encoding. In general this option is highly recommended, -and it is {\em required} when subsetting a TrueType font. +\startdescription {encodingfile} specifies the name of the file +containing the external encoding vector to be used for the font. The +encoding file name must have the extension \type{.enc}, and the file +name including extension must be given with either a preceding~\type{<} +character or a preceding~\type{<[}. The format of the encoding vector is +identical to that used by \type{dvips}. If no encoding is specified, the +font's built||in default encoding is used. The {\em encodingfile} field +may be omitted if you are sure that the font resource has the correct +built||in encoding. In general this option is highly recommended, and it +is {\em required} when subsetting a TrueType font. \stopdescription \startdescription {fontfile} sets the name of the font file to be embedded into the \PDF\ output for a -given \TeX\ font (the {\em tfmname}~$\longleftrightarrow$~{\em fontfile} +given \TeX\ font (the {\em tfmname}~$\leftrightarrow$~{\em fontfile} mapping is the most prominent use of the \filename{pdftex.map} file). The font file name must belong to a Type~1 or TrueType font file. If the {\em fontfile} field is missing, no font embedding can take place; -in case the {\em basename} field does not contain one of the 14 standard +in case the {\em psname} field does not contain one of the 14 standard font names also a warning will be given. Not embedding a font into a \PDF\ file might be troublesome, as it requires that the font or some similar looking replacement font is available within the \PDF\ viewer, so that it can render the glyphs with its own font version. The font file name should be preceded by one or two special characters, -which tells how to handle the font file: +specifying how to handle the font file: \startitemize \item If the font file name is preceded by a \type{<} character, the - font file will be only partially embedded into the \PDF\ file - (``subsetted''), meaning that only used glyphs are going into + font file will be only partially embedded in the \PDF\ output + (``subsetted''), meaning that only used glyphs are written to the \PDF\ file. This is the most common use and is {\em strongly recommended} for any font, as it ensures the portability and reduces the size of the \PDF\ output. Subsetted fonts are included in such a way that name and cache clashes are minimized. \item If the font file name is preceded by a double \type{<<}, the font - file will be included entirely --- all glyphs of the font - are embedded, including even the ones that are not used in the - document. Apart from causing large size \PDF\ output, this option - may cause troubles with TrueType fonts, so it is normally not - recommended for Type~1 or TrueType fonts. But this is currently - the only mode that allows the use of OpenType fonts. This mode - might also be useful in case the font is atypical and can not be - subsetted well by \PDFTEX. {\em Beware: some font vendors forbid - full font inclusion.} - -\item The case that no special character precedes the font file name - is deprecated since \PDFTEX\ version 1.40.0. These font files are - now completely ignored, and a corresponding warning is given. You - achieve exactly the same \PDF\ result if you just remove the - font file name from the map entry. Then the glyph widths that go - into the \PDF~file are extracted from the \TFM~file, and a font - descriptor object is created that contains approximations of the - font metrics for the selected font. - - This option is useful only as fallback when you do not want to - embed the font (\eg\ due to font license restrictions), but wish to - use the font metrics and let the \PDF\ viewer generate instances - that look close to the used font in case the font resource is not - installed on the system where the \PDF\ output will be viewed - or printed. To use this feature, the font flags {\em must} be + file will be included entirely --- all glyphs of the font are + embedded, including even those not used in the document. Apart + from causing large size \PDF\ output, this option may cause + troubles with TrueType fonts, so it is normally not recommended + for Type~1 or TrueType fonts. But this is currently the only mode + that allows the use of OpenType fonts. This mode might also be + useful in case the font is atypical and cannot be subsetted well + by \PDFTEX. {\em Beware: proprietary font vendors typically + forbid full font inclusion.} + +\item If no special character precedes the font file name, it is + ignored, with a warning (this case was deprecated in \PDFTEX\ + version 1.40.0). You achieve exactly the same \PDF\ result if you + just remove the font file name from the map entry. Then the glyph + widths that go into the \PDF~file are extracted from the + \TFM~file, and a font descriptor object is created that contains + approximations of the font metrics for the selected font. + +\item Specifying the {\em psname} and no font file name is only useful + as a last-ditch fallback when you do not want to embed the font + (\eg\ due to font license restrictions), but wish to use the font + metrics and let the \PDF\ viewer generate instances that look + close to the used font in case the font resource is not installed + on the system where the \PDF\ output will be viewed or + printed. To use this feature, the font flags {\em must} be specified, and it must have the bit~6 set on, which means that only fonts with the Adobe Standard Roman Character Set can be - simulated. The only exception is the case of a Symbolic font, + simulated. The only exception is the case of a symbolic font, which is not very useful. \stopitemize -When one suffers from invalid lookups, for instance when \PDFTEX\ tries -to open a \type{.pfa} file instead of a \type{.pfb} one, one can add +If you encounter problematic lookups, for instance if \PDFTEX\ tries +to open a \type{.pfa} file instead of a \type{.pfb}, you can add the suffix to the filename. In this respect, \PDFTEX\ completely relies on the \type{kpathsea} library. \stopdescription -If a used font is not present in the map files, first \PDFTEX\ will -look for a source with suffix \type{.pgc}, which is a so||called \PGC\ -source (\PDF\ Glyph Container) \footnote {This is a text file containing -a \PDF\ Type~3 font, created by \METAPOST\ using some utilities by Hans -Hagen. In general \PGC\ files can contain whatever is allowed in a \PDF\ page -description, which may be used to support fonts that are not available -in \METAFONT. \PGC\ fonts are not widely useful, as vector Type~3 fonts -are not displayed very well in older versions of Acrobat Reader, but may -be more useful when better Type~3 font handling is more common.}. If no -\PGC\ source is available, \PDFTEX\ will try to use \PK~fonts as \DVI\ -drivers do, creating \PK~fonts on||the||fly if needed. - -Lines containing nothing apart from {\em tfmname} stand for scalable -Type~3 fonts. For scalable fonts as Type~1, TrueType and scalable Type~3 -font, all the fonts loaded from a \TFM\ at various sizes will be included -only once in the \PDF\ output. Thus if a font, let's say \type{csr10}, is -described in one of the map files, then it will be treated as scalable. As -a result the font source for csr10 will be included only once for -\type{csr10}, \type{csr10 at 12pt} etc. So \PDFTEX\ tries to do its best -to avoid multiple embedding of identical font sources. Thus vector \PGC\ -fonts should be specified as scalable Type~3 in map files like: - -\starttyping -csr10 -\stoptyping - -It doesn't hurt much if a scalable Type~3 font is not given in map files, -except that the font source will be embedded into the \PDF\ file multiple -times for various sizes, which causes a much larger \PDF\ output. On -the other hand if a font in the map files is defined as scalable Type~3 -font and its \PGC\ source is not scalable or not available, \PDFTEX\ -will use \PK\ fonts instead; the \PDF\ output is still valid but some -fonts may look ugly because of the scaled bitmap. - -To summarize this rather confusing story, we include some example lines. -The most common way is to embed only a glyph subset from a font like this, -with re||encoding: +For Type~1 and TrueType fonts, the font file will be included only once +in the \PDF\ output, regardless of how many \TeX\ \type{\font} instances +are used in the document. For instance, given + +\starttyping +\font\a = cmr12 +\font\b = cmr12 at 11pt +\stoptyping + +the outline file \type{cmr12.pfb} will only be included once in the +\PDF, and merely scaled down to create the instance for \type{\b}. + +If a used font is not present in the map files, \PDFTEX\ will try to use +\PK~fonts as most \DVI\ drivers do, creating \PK~fonts on||the||fly if +needed. This is the normal, and recommended, way to use bitmap fonts. + +To summarize this rather confusing story, we include some example map +lines. The most common way is to embed only a subset of glyphs from a +font for a particular desired encoding, like this: \starttyping ptmri8r Times-Italic <8r.enc <ptmri8a.pfb @@ -1727,16 +1705,17 @@ cmr10 CMR10 <cmr10.pfb \stoptyping -A SlantFont is specified similarly as for \type{dvips}. The \type -{SlantFont} or \type{ExtendFont} entries work only with embedded Type~1 -fonts: +\type{SlantFont} and \type{ExtendFont} fields are specified as with +\type{dvips}. \type{SlantFont} and \type{ExtendFont} work only with +embedded Type~1 fonts: \starttyping psyro StandardSymL ".167 SlantFont" <usyr.pfb pcrr8rn Courier ".85 ExtendFont" <8r.enc <pcrr8a.pfb \stoptyping -Entirely embed a font into the \PDF\ file without and with re||encoding: +Entirely embed a font into the \PDF\ file without and with re||encoding +(not typically useful): \starttyping fmvr8x MarVoSym <<marvosym.pfb @@ -1749,7 +1728,7 @@ verdana8r Verdana <8r.enc <verdana.ttf \stoptyping -Now follow a few cases with non-embedded fonts. If the fontfile is +Finally, a few cases with non-embedded fonts. If the fontfile is missing, the viewer application will have to use its own approximation of the missing font (with and without re||encoding): @@ -1768,7 +1747,7 @@ \stoptyping Not embedding fonts is rather risky and should generally be avoided. -If in doubt, always embed all fonts, even the 14 standard ones. +The recommendation these days is to embed all fonts, even the 14 standard ones. %*********************************************************************** @@ -1942,11 +1921,6 @@ } \Syntax{ -\Something{open-action spec} \Means % - \Literal{openaction} \Something{action spec} -} - -\Syntax{ \Something{colorspace spec} \Means % \Literal{colorspace} \Something{number} } @@ -2332,20 +2306,20 @@ Multiple appearances of \type{\pdfinfo} are concatenated. Usually if a key is given more than once, the first appearance will be used, but this is viewer||dependent. Except for standard \TeX\ expansion, \PDFTEX\ does -not perform any further operations on \Something{general text} provided -by the user. +not perform any further operations in the \Something{general text} +provided by the user. Here is an example of using \type{\pdfinfo} to include the information not supplied by \PDFTEX: -\startesctyping +\starttyping \pdfinfo { /Title (example.pdf) /Author (Tom and Jerry) /Subject (Example) /Keywords (mouse, cat) } -\stopesctyping +\stoptyping For more details on all this, see the \PDFReference. @@ -2359,7 +2333,7 @@ \pdftexprimitive{\Syntax{\Tex{\pdfsuppressptexinfo} \Whatever{integer}}} \bookmark{\tex{pdfsuppressptexinfo}} -Treated as a bitmask, specifying which \type{PTEX.} keys to omit from +Treated as a bitmask, specifying which \type{PTEX.*} keys to omit from the output: \startbuffer @@ -2376,7 +2350,7 @@ \stopbuffer \placetable - [here][pagemode] + [here][suppressptexinfo] {\type{\pdfsuppressptexinfo} bit meanings.} {\getbuffer} @@ -2386,25 +2360,25 @@ \type{PTEX.Fullbanner} is included by default in the general document info dictionary, as mentioned under \type{\pdfinfo} above. The other \type{PTEX.*} keys are included when a \PDF\ is included in the document -(and not otherwise), as described in \in{section}[sec.addpdfkeys] +(and not otherwise), as described in \in{section}[sec.addpdfkeys]. This conditional suppression can be useful in making reproducible \PDF{}s. \introduced{1.40.17} \pdftexprimitive{\Syntax{\Tex{\pdfcatalog} \Something{general text} - \Optional{\Something{open-action spec}}}} + \Optional{\Literal{openaction} \Something{action spec}}}} \bookmark{\tex{pdfcatalog}} -Similar to the document info section is the document catalog, where keys -are \type{/URI}, which provides the base \URL\ of the document, and \type -{/PageMode}, which determines how the \PDF\ viewer displays the document -on startup. The possibilities for the latter are explained in \in {Table} -[pagemode]: +Similar to the document info section is the document catalog, where +possible keys are \type{/URI}, which specifies the base \URL\ of the +document, and \type {/PageMode}, which determines how the \PDF\ viewer +displays the document on startup. The possibilities for the latter are +explained in \in {table} [pagemode]: \startbuffer \starttabulate[|l|l|] \HL -\NC \bf value \NC \bf meaning \NC\NR +\NC \bf value \NC \bf meaning \NC\NR \HL \NC \tt /UseNone \NC neither outline nor thumbnails visible \NC\NR \NC \tt /UseOutlines \NC outline visible \NC\NR @@ -2419,13 +2393,26 @@ {Supported \type{/PageMode} values.} {\getbuffer} -In full||screen mode, there is no menu bar, window controls, nor any other -window present. The default setting is \type{/UseNone}. - -The \Something{openaction} is the action provided when opening the -document and is specified in the same way as internal links, see \in -{section} [linking]. Instead of using this method, one can also write the -open action directly into the catalog. +The default \type{/PageMode} setting is \type{/UseNone}. In +full||screen mode, there is no menu bar, window controls, nor any other +window present. + +After the \Something{general text}, a construct \Literal{openaction} +\Something{action spec} can be given, where \Literal{openaction} is a +\PDFTEX\ keyword, and \Something{action spec} specifies the action to be +taken when opening the document. This \Something{action spec} is the +same as for internal links; see \in {section} [linking]. (Instead of +using this method, one can also write the open action directly into the +catalog.) + +Several settings can be made in one \type{\pdfcatalog} call, for +example: + +\starttyping +\pdfcatalog{ + /PageMode /FullScreen +} openaction goto page 2 {/Fit} +\stoptyping \pdftexprimitive{\Syntax{\Tex{\pdfnames} \Something{general text}}} \bookmark{\tex{pdfnames}} @@ -2439,7 +2426,8 @@ \bookmark{\tex{pdftrailer}} This command puts its argument text verbatim into the file trailer -dictionary. \introduced{1.11a} +dictionary. Example: \type{\pdftrailer {/mytrlrkey /mytrlrval}}. +\introduced{1.11a} \pdftexprimitive{\Syntax{\Tex{\pdftrailerid} \Something{general text}}} \bookmark{\tex{pdftrailerid}} @@ -2447,8 +2435,8 @@ Use the \Something{general text} to seed the \type{/ID} value in the trailer, instead of the default combination of the absolute input file name and starting time. If the argument is empty, the \type{/ID} is -omitted entirely. This can be useful in making reproducible -\PDF{}s. \introduced{1.40.17} +omitted entirely. Example: \type{\pdftrailerid{}}. This can be useful +in making reproducible \PDF{}s. \introduced{1.40.17} %*********************************************************************** @@ -2552,7 +2540,7 @@ \type{\pdfadjustspacing} is set to~1, font expansion is applied {\em after} \TEX's normal paragraph breaking routines have broken the paragraph into lines. In this case, line breaks are identical to standard \TEX\ -behaviour. +behavior. When set to~2, the width changes that are the result of stretching and shrinking are taken into account {\em while} the paragraph is broken into @@ -2576,7 +2564,7 @@ to \type{\sfcode} (but with the \Something{font} required), and it defaults to~1000, meaning 100\,\% expandability. The given integer value is clipped to the range $0..1000$, corresponding to a usable -expandability range of 0..100\,\%. Example: +expandability range of $0..100$\,\%. Example: \starttyping \efcode\somefont`A=800 @@ -2589,6 +2577,9 @@ primitive, otherwise one would end up with more possible font inclusions than would be comfortable. +Changes to this table are global, i.e., ignore \TeX's usual grouping, +and apply only to the given \Something{font}. + \pdftexprimitive{\Syntax{\Tex{\pdfprotrudechars} \Whatever{integer}}} \bookmark{\tex{pdfprotrudechars}} @@ -2630,14 +2621,20 @@ was changed to a proportion of the em-width after \THANH\ finished his master's thesis. +Changes to this table are global, i.e., ignore \TeX's usual grouping, +and apply only to the given \Something{font}. + \pdftexprimitive{\Syntax{\Tex{\lpcode} \Something{font} \Something{8-bit number} \Whatever{integer}}} \bookmark{\tex{lpcode}} This is similar to \type{\rpcode}, but affects the amount by which -characters may protrude into the left margin. Also here the given integer +characters may protrude into the left margin. Here also the given integer value is clipped to the range $-1000..1000$. +Changes to this table are global, i.e., ignore \TeX's usual grouping, +and apply only to the given \Something{font}. + \pdftexprimitive{\Syntax{\Tex{\leftmarginkern} \Something{box number} \Whatever{expandable}}} \bookmark{\tex{leftmarginkern}} @@ -2833,7 +2830,7 @@ items given as arguments to \type{\pdfmapfile} or \type{\pdfmapline} the default map file will be read first --- if this hasn't already been done or been prevented by the above blocking cases. This should -be mostly compatible with the traditional behaviour. If you want to add +be mostly compatible with the traditional behavior. If you want to add support for a new font through an additional font map file while keeping all the existing mappings, don't use the primitive versions without modifier, but instead type either \type{\pdfmapfile{+myfont.map}} or @@ -2941,7 +2938,7 @@ \introduced{1.30.0} \pdftexprimitive{\Syntax{\Tex{\tagcode} \Something{font} - \Something{character code} \Whatever{integer}}} + \Something{8-bit number} \Whatever{integer}}} \bookmark{\tex{tagcode}} This primitive accesses a character's \type{char_tag} info. It is meant @@ -3066,8 +3063,12 @@ \subsection{Spacing} -Controlling spacing before and after characters was introduced in version 1.30, -mostly to handle punctuation rules in different languages. +Controlling spacing before and after characters was introduced in +version 1.30, mostly to handle punctuation rules in different +languages. The \type{\...code} tables here, like those in the previous +section, operate globally, i.e., ignore \TeX's usual grouping, and apply +only to the given \Something{font}, not other instances of the +underlying font. \pdftexprimitive{\Syntax{\Tex{\pdfadjustinterwordglue} \Whatever{integer}}} \bookmark{\tex{pdfadjustinterwordglue}} @@ -3079,9 +3080,11 @@ \Something{8-bit number} \Whatever{integer}}} \bookmark{\tex{knbscode}} -The amount of space, in thousandths of an em, added to the glue following -a character. This amounts is clipped to the range \type{-1000}||\type{1000}. -For instance, the following example means that glues after periods will be +The amount of space, in thousandths of an em, added to the natural width +of the glue following a character (the name stands for ``kern before +space'', although technically it is looking at glue items, not kern +items). This amounts is clipped to the range $-1000..1000$. For +instance, the following example means that glues after periods will be increased by .2\,em. \starttyping @@ -3112,7 +3115,7 @@ \bookmark{\tex{knbccode}} The width of the kern, in thousandths of an em, inserted before a character. -It is clipped to the range \type{-1000}||\type{1000}. For instance, with the +It is clipped to the range $-1000..1000$. For instance, with the following code, a .15\,em-kern will be inserted before all question marks (useful for \eg\ French punctuation): @@ -3240,7 +3243,7 @@ \type{/Rotate}, the number of degrees (in multiples of 90) the page should be rotated clockwise when it is displayed or printed. -% /MediaBox is not a good example, since will never take an effect +% /MediaBox is not a good example, since will never take effect \starttyping \pdfpagesattr @@ -3253,9 +3256,15 @@ This is similar to \type{\pdfpagesattr}, but has priority over it. It can be used to override any attribute given by \type{\pdfpagesattr} -for individual pages. The token list is expanded when \PDFTEX\ ships out +for an individual page. The token list is expanded when \PDFTEX\ ships out a page. The contents are added to the attributes of the current page. +If the \type{\pdfpageattr} value contains the string \type{/MediaBox}, +then \PDFTEX\ omits outputting its own \type{/MediaBox} value (which is +\type{[0 0 }\Something{\it page\_width} \Something{\it +page\_height}\type{]}). (This behavior was introduced in version +1.40.18.) + \pdftexprimitive{\Syntax{\Tex{\pdfpageresources} \Whatever{tokens}}} \bookmark{\tex{pdfpageresources}} @@ -3418,14 +3427,14 @@ While working with \PDF\ or \JBIG2\ images, \Something{page spec} allows to decide which page of the document is to be included; the \Something{page spec} is irrelevant for the other two image -formats. Starting from \PDFTEX\ 1.11 one may also decide in the \PDF\ +formats. Starting with \PDFTEX\ 1.11 one may also decide in the \PDF\ image case, which page box of the image is to be treated as a final bounding box. If \Something{pdf box spec} is present, it overrides the -default behaviour specified by the \type{\pdfpagebox} parameter, and is +default behavior specified by the \type{\pdfpagebox} parameter, and is overridden by the (obsolete) \type{\pdfforcepagebox} parameter. This option is irrelevant for non||\PDF\ inclusions. -Starting from \PDFTEX\ 1.21, \type{\pdfximage} command supports +Starting with \PDFTEX\ 1.21, \type{\pdfximage} command supports \type{colorspace} keyword followed by an object number (user||defined colorspace for the image being included). This feature works for \JPEG\ images only. \PNG s are \RGB\ palettes, \JBIG2 s are bitonal, and \PDF\ @@ -3500,7 +3509,7 @@ if the \type{\pdfimageresolution} is zero, finally a default resolution of 72\,dpi would be taken. The \type{\pdfimageresolution} is read when \PDFTEX\ creates an image via \type{\pdfximage}. The given value is -clipped to the range 0..65535\,[dpi]. +clipped to the range $0..65535$\,(dpi). Currently this parameter is used particularly for calculating the dimensions of \JPEG\ images in \EXIF\ format (unless at least one @@ -3535,10 +3544,10 @@ % object, i.\,e.\ the value used at \pdfximage is remembered. % See the PDF Reference for an explanation of the boxes. -The integer primitive \type{\pdfforcepagebox} allows to globally -override the choice of the page box used with \type{\pdfximage}. It +The integer primitive \type{\pdfforcepagebox} allows globally +overriding the choice of the page box used with \type{\pdfximage}. It takes the same values as \type{\pdfpagebox}. The command is available -starting from \PDFTEX\ 1.30.0, as a shortened synonym of obsolete +starting with \PDFTEX\ 1.30.0, as a shortened synonym of obsolete \type{\pdfoptionalwaysusepdfpagebox} instruction, but is itself now considered obsolete --- a mixture of \type{\pdfpagebox} and \Something{image attr spec} is better. @@ -3546,7 +3555,7 @@ \pdftexprimitive{\Syntax{\Tex{\pdfinclusionerrorlevel} \Whatever{integer}}} \bookmark{\tex{pdfinclusionerrorlevel}} -This controls the behaviour of \PDFTEX\ when a \PDF\ file is included +This controls the behavior of \PDFTEX\ when a \PDF\ file is included that has a newer version than the one specified by \type{\pdfminorversion}. If \type{\pdfinclusionerrorlevel} is set to~0 (the default), \PDFTEX\ gives only a warning; if 1, \PDFTEX\ raises an @@ -3639,7 +3648,7 @@ \type{\pdfimageresolution} and \type{\pdfpkresolution} parameters. \introduced{1.30.0} It used to be an integer register that gave the dimension 1\,px as number of scaled points, defaulting to 65536 -(1\,px equal to 65536\,sp~$=$~1\,pt). Starting from \PDFTEX\ 1.40.0, +(1\,px equal to 65536\,sp~$=$~1\,pt). Starting with \PDFTEX\ 1.40.0, \type{\pdfpxdimen} is now a real dimension parameter. \pdftexprimitive{\Syntax{\Tex{\pdfinclusioncopyfonts} \Whatever{integer}}} @@ -3805,7 +3814,7 @@ specifying \Something{file spec}\unkern, in which case \Something{newwindow spec} specifies whether the file should be opened in a new window. A \Something{file spec} can be either a \type{(string)} -or a \type{<<dictionary>>}. The default behaviour of the +or a \type{<<dictionary>>}. The default behavior of the \Something{newwindow spec} depends on the browser setting. A \Something{thread-action spec} performs an article thread reading. The @@ -3896,7 +3905,7 @@ boxes which have the same nesting level as the vbox/vboxes containing \type{\pdfstartthread} and \type{\pdfendthread}, they will be also added into the thread, which is probably not what you want. To avoid such -unconsidered behaviour, it's often enough to wrap boxes that shouldn't +unconsidered behavior, it's often enough to wrap boxes that shouldn't belong to the thread by a box to change their box nesting level. \pdftexprimitive{\Syntax{\Tex{\pdfendthread} \Modelist{v, m}}} @@ -3932,8 +3941,8 @@ is expanded when the whatsit node is created and not when it is shipped out, as with \type{\special}. -Starting from version 1.30.0, \PDFTEX\ allows to use a new keyword -\type{page} instead of \type{direct}. Both modify the default behaviour +Starting with version 1.30.0, \PDFTEX\ allows to use a new keyword +\type{page} instead of \type{direct}. Both modify the default behavior of \type{\pdfliteral}, avoiding translation of the coordinates space before inserting the literal code. The difference is that the \type{page} keyword instructs \PDFTEX\ to close a \type{BT ET} text block before @@ -3974,7 +3983,7 @@ \Whatever{expandable}}} \bookmark{\tex{pdfescapestring}} -Starting from version 1.30.0, \PDFTEX\ provides a mechanism for converting +Starting with version 1.30.0, \PDFTEX\ provides a mechanism for converting a general text into \PDF\ string. Many characters that may be needed inside such a text (especially parenthesis), have a special meaning inside a \PDF\ string object and thus, can't be used literally. The primitive replaces each @@ -4026,23 +4035,29 @@ \bookmark{\tex{pdfmatch}} This command implements pattern matching (using the syntax of \POSIX\ -regular expressions). The first \Something{general text} is a pattern, -the second is a string, and the command expands to \type{-1} if the -pattern is invalid, to \type{0} if no match is found, and to \type{1} if -a match is found. With the \type{icase} option, the matching is -case-insensitive. The \type{subcount} option sets the size of the table -storing found (sub)patterns. \introduced{1.30.0} +extended regular expressions). The first \Something{general text} is a +pattern and the second is a string. The command expands to \type{-1} if +the pattern is invalid, to \type{0} if no match is found, and to +\type{1} if a match is found. With the \type{icase} option, the matching +is case-insensitive. The \type{subcount} option sets the size of the +table storing the found (sub)patterns; its default is 10. +\introduced{1.30.0} \pdftexprimitive{\Syntax{\Tex{\pdflastmatch} \Something{integer} \Whatever{expandable}}} \bookmark{\tex{pdflastmatch}} -The matches found with \type{\pdfmatch} are stored in a table. This command -returns the entry \Something{integer}. Entry~0 contains the match, and -the following entries contain submatches corresponding to the subpatterns -(up to \type{subcount-1}); all matches are preceded by their positions, -separated by \type{->}. If the position is \type{-1} and the match is -empty, it means that the subpattern corresponding to that entry wasn't found. +The matches found with \type{\pdfmatch} are stored in a table. This +command returns the entry for \Something{integer}, in the format +\Something{position}\type{->}\Something{string}; \Something{position} is +the position of the match (starting at zero) or \type{-1} if no match +was found, and \Something{string} is the matched substring. + +Entry~0 contains the match as a whole; the subsequent entries contain +submatches corresponding to the subpatterns, up to \type{subcount-1}. + +If \Something{integer} is less than zero, an error is given. + For instance: \starttyping @@ -4054,7 +4069,7 @@ \stoptyping Entry~1 is empty because no match was found for \type{cd}, and entry~3 -is empty because it exceeds the table's size, as set by \type{subcount}. +is empty because it exceeds the table's size as set by \type{subcount}. \introduced{1.30.0} %*********************************************************************** @@ -4641,7 +4656,7 @@ \NC \bf key \NC \bf type \NC meaning \NC \NR \HL \NC PTEX.Fullbanner \NC string \NC The full version of the \pt binary that -produced the file as displayed by \typ {pdftex -{}-version}, \eg\ +produced the file as displayed by {\tt pdftex \hbox{-{}-version}}, \eg\ {\tt\pdftexbanner}. This is necessary because the string in the \type{Producer} key in the info dictionary is rather short, namely {\tt pdfTeX-\currentpdftex}. \NC \NR @@ -4982,7 +4997,7 @@ You may add a section Entitled ``Endorsements'', provided it contains nothing but endorsements of your Modified Version by various -parties--for example, statements of peer review or that the text has +parties---for example, statements of peer review or that the text has been approved by an organization as the authoritative definition of a standard. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/tests/01-fake-interword-space/Makefile new/texmf-dist/doc/pdftex/tests/01-fake-interword-space/Makefile --- old/texmf-dist/doc/pdftex/tests/01-fake-interword-space/Makefile 2016-04-25 22:46:03.000000000 +0200 +++ new/texmf-dist/doc/pdftex/tests/01-fake-interword-space/Makefile 2017-04-21 01:19:14.000000000 +0200 @@ -1,5 +1,7 @@ +# Public domain. + test: ../../source/build-pdftex/texk/web2c/pdftex -ini fake-interword-space.tex clean: - rm -f fake-interword-space.log fake-interword-space.pdf + $(clean) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/tests/02-pdfmatch/Makefile new/texmf-dist/doc/pdftex/tests/02-pdfmatch/Makefile --- old/texmf-dist/doc/pdftex/tests/02-pdfmatch/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/pdftex/tests/02-pdfmatch/Makefile 2017-04-21 01:19:14.000000000 +0200 @@ -0,0 +1,10 @@ +# $Id: Makefile 758 2016-06-12 16:54:10Z karl $ +# Public domain. + +include ../Common.mak + +testpdfmatch: + $(prog) test-pdfmatch.tex + +clean: + $(clean) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/tests/02-pdfmatch/test-pdfmatch.tex new/texmf-dist/doc/pdftex/tests/02-pdfmatch/test-pdfmatch.tex --- old/texmf-dist/doc/pdftex/tests/02-pdfmatch/test-pdfmatch.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/pdftex/tests/02-pdfmatch/test-pdfmatch.tex 2017-04-21 01:19:14.000000000 +0200 @@ -0,0 +1,22 @@ +% $Id: test-pdfmatch.tex 759 2016-06-12 18:11:28Z karl $ +% This file public domain. Bug report of \pdflastmatch crash: +% http://tug.org/pipermail/tex-live/2016-June/038664.html +% +\catcode`\{=1 \catcode`\}=2 \catcode`^=7 \newlinechar=`^^J +% +\message{^^Jpdflastmatch0 before any match: \pdflastmatch0} +\message{^^J}% +% +\message{^^Jmatch a to b: \pdfmatch{a}{b}} +\message{^^J}% +\message{pdflastmatch0: \pdflastmatch0} +\message{^^J}% +% +\message{^^Jmatch example: \pdfmatch subcount 3 {ab(cd)*ef(gh)(ij)}{abefghij}} +\message{^^J}% +\message{pdflastmatch0 (0->abefghij): \pdflastmatch0 ^^J} +\message{pdflastmatch1 (-1->): \pdflastmatch1 ^^J} +\message{pdflastmatch2 (4->gh): \pdflastmatch2 ^^J} +\message{pdflastmatch3 (-1->): \pdflastmatch3} +\message{^^J}% +\end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/tests/03-deterministic-output/Makefile new/texmf-dist/doc/pdftex/tests/03-deterministic-output/Makefile --- old/texmf-dist/doc/pdftex/tests/03-deterministic-output/Makefile 2016-05-05 01:10:15.000000000 +0200 +++ new/texmf-dist/doc/pdftex/tests/03-deterministic-output/Makefile 2017-04-21 01:19:14.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile 751 2016-05-04 22:57:38Z karl $ +# $Id: Makefile 772 2017-03-16 22:58:04Z karl $ # Public domain. include ../Common.mak @@ -10,7 +10,7 @@ $(prog) test-fixed-date-id.tex testprim: - SOURCE_DATE_EPOCH=120 SOURCE_DATE_EPOCH_TEX_PRIMITIVES=1 \ + SOURCE_DATE_EPOCH=120 FORCE_SOURCE_DATE=1 \ $(prog) test-prim.tex test = test-SOURCE_DATE_EPOCH @@ -41,7 +41,7 @@ force: clean: - rm -f *.log *.pdf *.fmt *.aux + $(clean) fmt: $(prog) \*pdflatex.ini diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/tests/03-deterministic-output/test-prim.tex new/texmf-dist/doc/pdftex/tests/03-deterministic-output/test-prim.tex --- old/texmf-dist/doc/pdftex/tests/03-deterministic-output/test-prim.tex 2016-05-05 01:10:15.000000000 +0200 +++ new/texmf-dist/doc/pdftex/tests/03-deterministic-output/test-prim.tex 2017-04-21 01:19:14.000000000 +0200 @@ -1,4 +1,4 @@ -% $Id$ +% $Id: test-prim.tex 762 2016-07-05 17:44:56Z karl $ % See the testprim: target in ./Makefile for the invocation. \catcode`\{ = 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/tests/04-pdfsuppressptexinfo/Makefile new/texmf-dist/doc/pdftex/tests/04-pdfsuppressptexinfo/Makefile --- old/texmf-dist/doc/pdftex/tests/04-pdfsuppressptexinfo/Makefile 2016-04-25 22:46:03.000000000 +0200 +++ new/texmf-dist/doc/pdftex/tests/04-pdfsuppressptexinfo/Makefile 2017-04-21 01:19:14.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: Makefile 740 2016-04-23 15:08:37Z karl $ +# $Id: Makefile 772 2017-03-16 22:58:04Z karl $ # Public domain. include ../Common.mak @@ -37,4 +37,4 @@ -$(diff) $^ # new /mytrlrkey, dates+id should be different clean: - rm -f *.log *.pdf *.fmt *.aux + $(clean) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/tests/05-mediabox/Makefile new/texmf-dist/doc/pdftex/tests/05-mediabox/Makefile --- old/texmf-dist/doc/pdftex/tests/05-mediabox/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/pdftex/tests/05-mediabox/Makefile 2017-04-21 01:19:14.000000000 +0200 @@ -0,0 +1,18 @@ +# $Id: Makefile 772 2017-03-16 22:58:04Z karl $ +# Public domain. + +include ../Common.mak + +default: test-normal test-omit-mediabox + +test-normal: + $(prog) test-normal.tex + grep -q /MediaBox.*314 test-normal.pdf + +test-omit-mediabox: + $(prog) test-omit-mediabox.tex + grep -q /MediaBox.*271 test-omit-mediabox.pdf # should be there + ! grep -q /MediaBox.*314 test-omit-mediabox.pdf # should not + +clean: + $(clean) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/tests/05-mediabox/test-normal.tex new/texmf-dist/doc/pdftex/tests/05-mediabox/test-normal.tex --- old/texmf-dist/doc/pdftex/tests/05-mediabox/test-normal.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/pdftex/tests/05-mediabox/test-normal.tex 2017-04-21 01:19:14.000000000 +0200 @@ -0,0 +1,7 @@ +% $Id: test-normal.tex 772 2017-03-16 22:58:04Z karl $ +% Public domain. + +\pdfoutput=1 +\pdfpagewidth=314bp +\pdfpageheight=315bp +X.\end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/tests/05-mediabox/test-omit-mediabox.tex new/texmf-dist/doc/pdftex/tests/05-mediabox/test-omit-mediabox.tex --- old/texmf-dist/doc/pdftex/tests/05-mediabox/test-omit-mediabox.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/pdftex/tests/05-mediabox/test-omit-mediabox.tex 2017-04-21 01:19:14.000000000 +0200 @@ -0,0 +1,8 @@ +% $Id: test-omit-mediabox.tex 772 2017-03-16 22:58:04Z karl $ +% Public domain. + +\pdfoutput=1 \catcode`\{=1 \catcode`\}=2 +\pdfpagewidth=314bp +\pdfpageheight=315bp +\pdfpageattr{/MediaBox [ 0 1 271 272 ]} +X.\end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/tests/06-pkmap/Makefile new/texmf-dist/doc/pdftex/tests/06-pkmap/Makefile --- old/texmf-dist/doc/pdftex/tests/06-pkmap/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/pdftex/tests/06-pkmap/Makefile 2017-04-21 01:19:14.000000000 +0200 @@ -0,0 +1,24 @@ +# $Id: Makefile 777 2017-04-20 23:08:32Z karl $ +# Public domain. + +include ../Common.mak + +default: test-pkmap + +test-pkenc: # cmr10.3600pk - not used + $(prog) test-pkmap.tex +# +# should work when and if patch is applied: +# grep -q /ffi test-pkenc.pdf # should end up with this encoded char +# grep -a ToUnicode test-pkenc.pdf +# +# dev convenience: +# pdffonts test-big.pdf +# pdftotext test-big.pdf - + +cmr10.3600pk: + mf-nowin '\mode:=ljfour;mag:=6;input cmr10' + gftopk cmr10.3600gf + +clean: + $(clean) Binary files old/texmf-dist/doc/pdftex/tests/06-pkmap/cmb10.72pk and new/texmf-dist/doc/pdftex/tests/06-pkmap/cmb10.72pk differ Binary files old/texmf-dist/doc/pdftex/tests/06-pkmap/cmr10.72pk and new/texmf-dist/doc/pdftex/tests/06-pkmap/cmr10.72pk differ Binary files old/texmf-dist/doc/pdftex/tests/06-pkmap/prepatch.pdf and new/texmf-dist/doc/pdftex/tests/06-pkmap/prepatch.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/tests/06-pkmap/test-pkmap.tex new/texmf-dist/doc/pdftex/tests/06-pkmap/test-pkmap.tex --- old/texmf-dist/doc/pdftex/tests/06-pkmap/test-pkmap.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/pdftex/tests/06-pkmap/test-pkmap.tex 2017-04-21 01:19:14.000000000 +0200 @@ -0,0 +1,37 @@ +% $Id: test-pkmap.tex 777 2017-04-20 23:08:32Z karl $ +% Public domain. +% Test map files with bitmap (i.e., Type 3) fonts. + +% A thread starting here: +% http://tug.org/pipermail/pdftex/2016-July/009064.html +% and continuing here (and more): +% http://tug.org/pipermail/pdftex/2016-August/009065.html +% discusses a patch for supporting an encoding file with Type 3. +% The patch has not yet been installed. +% +% For comparison, the PDF made before the patch was applied is saved +% here as prepatch.pdf. +% +% The default PK resolution is 72, so we made cmb10.72pk in this directory. +% (mf-nowin '\mode:=mactrue; input cmb10' && gftopk cmb10.72gf) +% (mf-nowin '\mode:=mactrue; input cmr10' && gftopk cmr10.72gf) +% +\pdfoutput=1 \catcode`\{=1 \catcode`\}=2 +\hsize=6pc \parfillskip=0pt plus1fil \vsize=6in \lineskip=1pc +\pdfcompresslevel=0 \pdfobjcompresslevel=0 + +\pdfglyphtounicode{ffi}{0066 0066 0069} %no need for all: \input glyphtounicode +\pdfgentounicode=1 + +\pdfmapline{cmr10}% type3 map without encoding - no ToUnicode, no /ffi. +\font\cmr=cmr10 \noindent \cmr ffi + +% if we install the patch. +%\pdfmapline{cmb10 <7t.enc}% type3 map with encoding +%\font\cmb=cmb10 \noindent \cmb ffi + +% geometrically-scaled tfm: the Type 3 should be scaled (resulting in +% blocky blown-up bits), instead of using a separately-generated +% cmr10.360pk (50*72/10). +\font\big = cmr10 at 50pt \big big +\end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/tests/07-mapwarn/Makefile new/texmf-dist/doc/pdftex/tests/07-mapwarn/Makefile --- old/texmf-dist/doc/pdftex/tests/07-mapwarn/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/pdftex/tests/07-mapwarn/Makefile 2017-04-21 01:19:14.000000000 +0200 @@ -0,0 +1,12 @@ +# $Id: Makefile 777 2017-04-20 23:08:32Z karl $ +# Public domain. + +include ../Common.mak + +default: test-mapwarn + +test-mapwarn: + $(prog) test-mapwarn.tex; test $$? = 1 # pdftex should exit 1 + +clean: + $(clean) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/tests/07-mapwarn/test-mapwarn.tex new/texmf-dist/doc/pdftex/tests/07-mapwarn/test-mapwarn.tex --- old/texmf-dist/doc/pdftex/tests/07-mapwarn/test-mapwarn.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/pdftex/tests/07-mapwarn/test-mapwarn.tex 2017-04-21 01:19:14.000000000 +0200 @@ -0,0 +1,18 @@ +% $Id: test-mapwarn.tex 777 2017-04-20 23:08:32Z karl $ +% Public domain. +% Ensure that various invalid map lines don't cause a crash. +% The last line aborts due to a (detected) buffer overflow. + +\pdfoutput=1 \catcode`\{=1 \catcode`\}=2 +\catcode`\^=7 \newlinechar=`\^^J + +% all but the first should cause warnings. +\message{empty^^J}\pdfmapline{} +\message{just <^^J}\pdfmapline{<} +\message{justtfm<^^J}\pdfmapline{cmb10x1<} +\message{justtfm <^^J}\pdfmapline{cmb10x2 <} +\message{justtfm < ^^J}\pdfmapline{cmb10x3 < } +\message{notfm slant^^J}\pdfmapline{" 167 SlantFont " <foo.pfb +\message{notfm extend^^J}\pdfmapline{" 167 ExtendFont " <bar.pfb} +\pdfmapline{xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx} +\end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/pdftex/tests/Common.mak new/texmf-dist/doc/pdftex/tests/Common.mak --- old/texmf-dist/doc/pdftex/tests/Common.mak 2016-04-25 22:46:03.000000000 +0200 +++ new/texmf-dist/doc/pdftex/tests/Common.mak 2017-04-21 01:19:14.000000000 +0200 @@ -1,10 +1,10 @@ -# $Id: Common.mak 737 2016-03-21 22:54:16Z karl $ +# $Id: Common.mak 777 2017-04-20 23:08:32Z karl $ # Public domain. # Common Makefile definitions to run pdftex from test hierarchy, # but use support files from an installation. -tl = /usr/local/texmf +tl = /usr/local/texlive-rel tl_dist = $(tl)/texmf-dist # plain = $(tl_dist)/tex/plain/base @@ -17,12 +17,18 @@ t1_cm = $(tl_dist)/fonts/type1/public/amsfonts/cm # env = TEXINPUTS=.:$(plain):$(plain_config):$(generic_config):$(generic_hyphen)\ - TEXFONTS=$(tfm_cm):$(tfm_knuth):$(t1_cm) \ + TEXFONTS=.:$(tfm_cm):$(tfm_knuth):$(t1_cm) \ TEXFONTMAPS=$(tl_dist)/fonts/map/pdftex/updmap \ + ENCFONTS=$(tl_dist)/fonts/enc/dvips/base \ MKTEXTFM=0 \ + MKTEXPK=0 \ KPATHSEA_WARNING=0 diff = diff --text -c0 pdftex = ../../source/build-pdftex/texk/web2c/pdftex +pdftex = $(W)/texk/web2c/pdftex prog = $(env) $(pdftex) -ini -interaction=nonstopmode + +# can't make the clean: target here since then it would be the default. +clean = rm -f *.log *.pdf *.fmt *.aux diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdftex.doc.tlpobj new/tlpkg/tlpobj/pdftex.doc.tlpobj --- old/tlpkg/tlpobj/pdftex.doc.tlpobj 2016-05-16 00:52:38.000000000 +0200 +++ new/tlpkg/tlpobj/pdftex.doc.tlpobj 2017-05-04 02:07:11.000000000 +0200 @@ -1,8 +1,8 @@ name pdftex.doc category TLCore -revision 41149 +revision 44166 shortdesc doc files of pdftex -docfiles size=684 +docfiles size=688 texmf-dist/doc/man/man1/pdfetex.1 texmf-dist/doc/man/man1/pdfetex.man1.pdf texmf-dist/doc/man/man1/pdftex.1 @@ -40,6 +40,8 @@ texmf-dist/doc/pdftex/tests/01-fake-interword-space/dummy-space.pfb texmf-dist/doc/pdftex/tests/01-fake-interword-space/dummy-space.tfm texmf-dist/doc/pdftex/tests/01-fake-interword-space/fake-interword-space.tex + texmf-dist/doc/pdftex/tests/02-pdfmatch/Makefile + texmf-dist/doc/pdftex/tests/02-pdfmatch/test-pdfmatch.tex texmf-dist/doc/pdftex/tests/03-deterministic-output/Makefile texmf-dist/doc/pdftex/tests/03-deterministic-output/test-SOURCE_DATE_EPOCH.tex texmf-dist/doc/pdftex/tests/03-deterministic-output/test-fixed-date-id.tex @@ -50,4 +52,14 @@ texmf-dist/doc/pdftex/tests/04-pdfsuppressptexinfo/test-pdfinfoomitdate.tex texmf-dist/doc/pdftex/tests/04-pdfsuppressptexinfo/test-pdfsuppressptexinfo.tex texmf-dist/doc/pdftex/tests/04-pdfsuppressptexinfo/test-pdftrailer.tex + texmf-dist/doc/pdftex/tests/05-mediabox/Makefile + texmf-dist/doc/pdftex/tests/05-mediabox/test-normal.tex + texmf-dist/doc/pdftex/tests/05-mediabox/test-omit-mediabox.tex + texmf-dist/doc/pdftex/tests/06-pkmap/Makefile + texmf-dist/doc/pdftex/tests/06-pkmap/cmb10.72pk + texmf-dist/doc/pdftex/tests/06-pkmap/cmr10.72pk + texmf-dist/doc/pdftex/tests/06-pkmap/prepatch.pdf + texmf-dist/doc/pdftex/tests/06-pkmap/test-pkmap.tex + texmf-dist/doc/pdftex/tests/07-mapwarn/Makefile + texmf-dist/doc/pdftex/tests/07-mapwarn/test-mapwarn.tex texmf-dist/doc/pdftex/tests/Common.mak ++++++ pdftex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdftex.tlpobj new/tlpkg/tlpobj/pdftex.tlpobj --- old/tlpkg/tlpobj/pdftex.tlpobj 2016-05-16 00:52:40.000000000 +0200 +++ new/tlpkg/tlpobj/pdftex.tlpobj 2017-05-04 02:07:12.000000000 +0200 @@ -1,6 +1,6 @@ name pdftex category TLCore -revision 41149 +revision 44166 shortdesc A TeX extension for direct creation of PDF longdesc An extension of TeX which can be configured to directly longdesc generate PDF documents instead of DVI. All current free TeX @@ -9,6 +9,12 @@ longdesc designed around use of pdfTeX, though nowadays it is focused on longdesc LuaTeX). depend kpathsea +depend cm +depend etex +depend hyphen-base +depend knuth-lib +depend plain +depend tex-ini-files depend pdftex.ARCH execute AddFormat name=pdftex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *pdfetex.ini" fmttriggers=cm,etex,hyphen-base,knuth-lib,plain,tex-ini-files execute AddFormat name=etex engine=pdftex patterns=language.def options="-translate-file=cp227.tcx *etex.ini" fmttriggers=cm,etex,hyphen-base,knuth-lib,plain @@ -22,6 +28,6 @@ texmf-dist/tex/generic/config/pdftex-dvi.tex texmf-dist/tex/generic/pdftex/glyphtounicode.tex texmf-dist/tex/generic/pdftex/pdfcolor.tex -catalogue-date 2016-04-27 08:06:41 +0200 +catalogue-date 2017-04-18 05:31:40 +0200 catalogue-license gpl catalogue-topics engine ++++++ pdftools.doc.tar.xz ++++++ Binary files old/texmf-dist/doc/man/man1/e2pall.man1.pdf and new/texmf-dist/doc/man/man1/e2pall.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/pdfclose.man1.pdf and new/texmf-dist/doc/man/man1/pdfclose.man1.pdf differ Binary files old/texmf-dist/doc/man/man1/pdfopen.man1.pdf and new/texmf-dist/doc/man/man1/pdfopen.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pdftosrc.1 new/texmf-dist/doc/man/man1/pdftosrc.1 --- old/texmf-dist/doc/man/man1/pdftosrc.1 2016-04-26 19:41:35.000000000 +0200 +++ new/texmf-dist/doc/man/man1/pdftosrc.1 2017-05-03 19:35:31.000000000 +0200 @@ -1,4 +1,4 @@ -.TH pdftosrc 1 "16 June 2015" "Web2C 2016" +.TH pdftosrc 1 "16 June 2015" "Web2C 2017" .SH NAME pdftosrc \- extract source file or stream from PDF file .SH SYNOPSIS Binary files old/texmf-dist/doc/man/man1/pdftosrc.man1.pdf and new/texmf-dist/doc/man/man1/pdftosrc.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdftools.doc.tlpobj new/tlpkg/tlpobj/pdftools.doc.tlpobj --- old/tlpkg/tlpobj/pdftools.doc.tlpobj 2016-04-27 03:21:59.000000000 +0200 +++ new/tlpkg/tlpobj/pdftools.doc.tlpobj 2017-05-04 02:07:13.000000000 +0200 @@ -1,8 +1,8 @@ name pdftools.doc category TLCore -revision 40768 +revision 44166 shortdesc doc files of pdftools -docfiles size=34 +docfiles size=19 texmf-dist/doc/man/man1/e2pall.1 texmf-dist/doc/man/man1/e2pall.man1.pdf texmf-dist/doc/man/man1/pdfclose.1 ++++++ pdftools.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdftools.tlpobj new/tlpkg/tlpobj/pdftools.tlpobj --- old/tlpkg/tlpobj/pdftools.tlpobj 2016-04-27 03:21:59.000000000 +0200 +++ new/tlpkg/tlpobj/pdftools.tlpobj 2017-05-04 02:07:13.000000000 +0200 @@ -1,6 +1,6 @@ name pdftools category TLCore -revision 40768 +revision 44166 catalogue xpdfopen shortdesc PDF-related utilities, including PostScript-to-PDF conversion longdesc The command-line programs pdfopen and pdfclose allow you to @@ -13,7 +13,7 @@ runfiles size=1 texmf-dist/scripts/texlive/e2pall.pl catalogue-ctan /support/xpdfopen -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics previewer catalogue-version 0.86 ++++++ pdftricks.doc.tar.xz ++++++ ++++++ pdftricks.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdftricks.tlpobj new/tlpkg/tlpobj/pdftricks.tlpobj --- old/tlpkg/tlpobj/pdftricks.tlpobj 2016-04-14 19:34:04.000000000 +0200 +++ new/tlpkg/tlpobj/pdftricks.tlpobj 2017-04-14 17:53:53.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/pdftricks/pdftricks.sty catalogue-also pst-pdf catalogue-ctan /graphics/pdftricks -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics callback pstricks catalogue-version 1.16 ++++++ pdftricks2.doc.tar.xz ++++++ ++++++ pdftricks2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdftricks2.tlpobj new/tlpkg/tlpobj/pdftricks2.tlpobj --- old/tlpkg/tlpobj/pdftricks2.tlpobj 2016-04-14 19:34:04.000000000 +0200 +++ new/tlpkg/tlpobj/pdftricks2.tlpobj 2017-04-14 17:53:53.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/pdftricks2/pdftricks2.sty catalogue-also pdftricks catalogue-ctan /graphics/pdftricks2 -catalogue-date 2015-08-15 05:39:34 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics callback pstricks catalogue-version 1.01 ++++++ pdfwin.doc.tar.xz ++++++ ++++++ pdfwin.tar.xz ++++++ ++++++ pdfx.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfx/AdobeColorProfiles.tex new/doc/latex/pdfx/AdobeColorProfiles.tex --- old/doc/latex/pdfx/AdobeColorProfiles.tex 2016-02-06 00:40:13.000000000 +0100 +++ new/doc/latex/pdfx/AdobeColorProfiles.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,323 +0,0 @@ -% This file gives macros to specify CMYK Color Profiles as supported by Adobe's Acrobat Pro DC software. -% Identifying names, comments and descriptions are taken from AC/DC's "Color Setup" Preferences panel. -% --- user-command --- CMYK profile needed with PDF/X-?? files -% \setCMYKcolorprofile{<filename>}{<output intent>}{<identifier>}{<registry URL>} -% e.g. -%\pdfx(a)setcmykprofile{coated_FOGRA39L_argl.icc}| -% {Coated FOGRA39}| -% {FOGRA39 \string$ISO Coated v2 300%\space \string\(ECI\string$\string\)}| -% {http://www.argyllcms.com/}|{http://www.color.org}| - -% Location of Adobe profiles on Mac OS X: -%\gdef\AdobeMacOSdir{/Library/Application Support/Adobe/Color/Profiles/Recommended/} -% Use \pdfxSetCMYKcolorProfileDir{\AdobeMacOSdir} within the .xmpdata file -% Location of Adobe profiles under Windows: -%\xdef\WindowsColordir{C:\string\Windows\string\System32\string\Spool\string\Drivers\string\Color\string/} - -% FOGRA39 -% "Europe General Purpose 3" -% General-purpose color settings for screen and print in Europe. Profile warnings are disabled. -% Uses the FOGRA39 press characterization. It is designed to produce quality separations for standard ISO printing using: 350% total ink coverage, positive film, and coated paper. -\gdef\FOGRAXXXIX{\setCMYKcolorprofile{CoatedFOGRA39.icc}% - {CoatedFOGRA39}% - {Coated FOGRA39 \string$ISO 12647-2:2004\string$}% /ProfileName - {http://www.color.org}% /RegistryName -}% - -% Coated GRACoL — no -% Coated GRACoL 2006 $ISO 12647-2:2004$ -\gdef\CoatedGRACoL{\setCMYKcolorprofile{CoatedGRACoL2006.icc}% - {CGATS TR 006}% /OutputConditionIdentifier -% {GRACoL2006_Coated1v2.icc}% /ProfileName - {Coated GRACoL 2006 \string$ISO 12647-2:2004\string$}% - {http://www.color.org}% /RegistryName -}% does not validate ??? - - -% ISO Web Coated -% Web Coated FOGRA28 $ISO 12647-2:2004$ -% Uses the FOGRA28 press characterization. -% It is designed to produce quality separations for standard ISO printing using: -% 350% total ink coverage, positive film, and coated paper. -\gdef\ISOWebCoated{\setCMYKcolorprofile{WebCoatedFOGRA28.icc}% - {FOGRA28}% /OutputConditionIdentifier -% {ISO Web Coated}% /ProfileName - {Web Coated FOGRA28 \string$ISO 12647-2:2004\string$}% - {http://www.color.org}% /RegistryName -}% does not validate - - -% Japan Color 2001 Coated -% "Japan General Purpose 2" -% General-purpose color settings for screen and print in Japan. Profile warnings are disabled. -% Uses the Japan Color 2001 specification for type 3 (coated) paper. -% It is designed to produce quality separations using: -% 350% total ink coverage, positive film and coated paper. -\gdef\JapanColorMMICoated{\setCMYKcolorprofile{JapanColor2001Coated.icc}% - {JC200103}% /OutputConditionIdentifier - {Japan Color 2001 Coated}% /ProfileName -% {Japan Color 2001 Coated: Printing process definition: ISO 12647-2:2004, sheet-fed offset printing, positive plates, paper type 3 \string$coated, 105 gsm\string$, screen frequency 69/cm.}% - {http://www.color.org}% /RegistryName -}% - - -% Japan Color 2001 Uncoated -% Uses the Japan Color 2001 specification for type 4 (uncoated) paper. -% It is designed to produce quality separations using: -% 310% total ink coverage, positive film and uncoated paper. -\gdef\JapanColorMMIUncoated{\setCMYKcolorprofile{JapanColor2001Uncoated.icc}% - {JCN200104}% /OutputConditionIdentifier - {Japan Color 2001 Uncoated}% /ProfileName -% {Japan Color 2001 Uncoated: Printing process definition: ISO 12647-2:2004, sheet-fed offset printing, positive plates, paper type 4 $uncoated, 105 gsm$, screen frequency 69/cm.}% - {http://www.color.org}% /RegistryName -}% - - -% Japan Color 2002 Newspaper -% "Japan Color for Newspaper" -% Preparation of content for common newspaper press conditions in Japan. CMYK values are preserved. Profile warnings are enabled. -% Uses the Japan Color 2002 for Newspapers specification. It is designed to produce quality separations using: 240% total ink coverage, positive film and standard newsprint paper. -\gdef\JapanColorMMIINewspaper{\setCMYKcolorprofile{JapanColor2002Newspaper.icc}% - {JCN2002}% /OutputConditionIdentifier - {Japan Color 2002 Newspaper}% /ProfileName -% {Japan Color 2002 for Newspaper Printing: Printing process definition: ISO/DIS 12647-3:2004, coldset offset printing, negative plates, newsprint, screen frequency 39/cm.}% /OutputCondition - {http://www.color.org}% /RegistryName -}% - - -% Japan Web Coated (Ad) -% "Japan Magazine Advertisement Color" -% Preparation of content using the Japan Magazine Publisher Association color standard for the Japan magazine and advertising market. -% CMYK values are preserved. Profile warnings are enabled. -% Uses specifications developed by the Japan Magazine Publisher Association for digital proofing of images in the Japanese magazine/advertising market. -\gdef\JapanWebCoatedAd{\setCMYKcolorprofile{JapanColor2003WebCoated.icc}% - {JCW2003}% /OutputConditionIdentifier - {Japan Web Coated \string$Ad\string$}% /ProfileName -% {Japan Color 2003 for Web Offset: Printing process definition: ISO 12647-2:2004, heat-set web offset printing, positive plates, paper type 3 \string$coated, 70 gsm\string$, screen frequency 69/cm.}% /OutputCondition - {http://www.color.org}% /RegistryName -}% - -\gdef\JapanWebCoated{\setCMYKcolorprofile{JapanWebCoated.icc}% - {JCW2002}% ???? /OutputConditionIdentifier - {Japan Web Coated}% /ProfileName -% {Japan Color 2003 for Web Offset: Printing process definition: ISO 12647-2:2004, heat-set web offset printing, positive plates, paper type 3 $coated, 70 gsm$, screen frequency 69/cm.}% /OutputCondition - {http://www.color.org}% /RegistryName -}% - - - -% U.S. Web Coated (SWOP) v2 -% "North America General Purpose 2" -% General-purpose color settings for screen and print in North America. Profile warnings are disabled. -\gdef\SWOPCGATSI{\setCMYKcolorprofile{USWebCoatedSWOP.icc}% - {CGATS TR 001}% /OutputConditionIdentifier - {U.S. Web Coated \string$SWOP\string$ v2}% /ProfileName -% {SWOP \string$Publication\string$ printing in USA \string$Printing process definition: ANSI CGATS.6\string$.}% /OutputCondition - {http://www.color.org}% /RegistryName -}% - - -% US Newsprint (SNAP 2007) -% "North America Newspaper" -% Preparation of content for common newspaper press conditions in Japan. CMYK values are preserved. Profile warnings are enabled. -\gdef\SNAPCGATSII{\setCMYKcolorprofile{USNewsprintSNAP2007.icc}% - {CGATS TR 002}% /OutputConditionIdentifier - {US Newsprint \string$SNAP 2007\string$}% /ProfileName - {http://www.color.org}% /RegistryName -}% - - -% U.S. Web Coated (SWOP) 3v2 – no -\gdef\SWOPCGATSIII{\setCMYKcolorprofile{WebCoatedSWOP2006Grade3.icc}% - {CGATS TR 003}% /OutputConditionIdentifier - {SWOP2006_Coated3v2.icc}% /ProfileName -% {Web Offset CTP plates ISO 2846-1 Inks - Variable screen frequency / G7 Methodology / Grade #3 paper}% /OutputCondition - {http://www.color.org}% /RegistryName -}% does not validate - - -% U.S. Web Coated (SWOP) 5v2 – no -\gdef\SWOPCGATSV{\setCMYKcolorprofile{WebCoatedSWOP2006Grade5.icc}% - {CGATS TR 005}% /OutputConditionIdentifier - {SWOP2006_Coated5v2.icc}% /ProfileName -% {Web Offset CTP plates ISO 2846-1 Inks - Variable screen frequency / G7 Methodology / grade #5 Paper}% /OutputCondition - {http://www.color.org}% /RegistryName -}% does not validate - - - -% ISO Coated v2 (ECI) – no -\gdef\ISOCoatedECI{\setCMYKcolorprofile{CoatedFOGRA39.icc}% - {FOGRA39}% /OutputConditionIdentifier - {ISO Coated v2 \string$ECI\string$}% /ProfileName -% {Offset commercial and specialty printing according to ISO 12647-2:2004 / Amd 1, paper type 1 or 2 $gloss or matte coated offset, 115 g/m2$, screen frequency 60/cm.}% /OutputCondition - {http://www.color.org}% /RegistryName -}% does not validate - - -% FOGRA29 -% Uncoated FOGRA29 $ISO 12647-2:2004$ -\gdef\UncoatedFOGRA{\setCMYKcolorprofile{UncoatedFOGRA29.icc}% - {FOGRA29}% - {Uncoated FOGRA29 \string$ISO 12647-2:2004\string$}% /ProfileName -% Uses the FOGRA29 press characterization. It is designed to produce quality separations for standard ISO printing using: 350% total ink coverage, positive film, and coated paper. - {http://www.color.org}% /RegistryName -}% - - -% FOGRA28 -% Web Coated FOGRA28 $ISO 12647-2:2004$ -\gdef\WebCoatedFOGRA{\setCMYKcolorprofile{WebCoatedFOGRA28.icc}% - {FOGRA28}% - {Web Coated FOGRA28 $ISO 12647-2:2004$}% -% Uses the FOGRA28 press characterization. It is designed to produce quality separations for standard ISO printing using: 350% total ink coverage, positive film, and coated paper. - {http://www.color.org}% /RegistryName -}% - - -% FOGRA27 -% Coated FOGRA27 $ISO 12647-2:2004$ -\gdef\CoatedFOGRA{\setCMYKcolorprofile{CoatedFOGRA27.icc}% - {FOGRA27}% - {Coated FOGRA27 $ISO 12647-2:2004$}% -%Uses the FOGRA27 press characterization. It is designed to produce quality separations for standard ISO printing using: 350% total ink coverage, positive film and coated paper. - {http://www.color.org}% /RegistryName -}% - - -\endinput - - -% U.S. Sheetfed Coated v2 -% USSheetfedCoated.icc -\gdef\SheetfedCoated{\setCMYKcolorprofile{USSheetfedCoated.icc}% - {}% ???? - {U.S. Sheetfed Coated v2}% - {http://www.color.org}% /RegistryName -}% - - -% U.S. Sheetfed Uncoated v2 -% USSheetfedUncoated.icc -\gdef\SheetfedUncoated{\setCMYKcolorprofile{USSheetfedUncoated.icc}% - {}% ???? - {U.S. Sheetfed Uncoated v2}% - {http://www.color.org}% /RegistryName -}% - - - -% ISO Newspaper (IFRA 26%) – no -\gdef\IFRAXXVI{\setEXTERNALprofile{ISOnewspaper26v4}% /ProfileName - {Printing process definition: ISO/DIS 12647-3:2004, Coldset offset printing, contact exposed negative acting plates or computer to plate $tone value increase of 26\%$, newsprint, screen ruling 40 lines per cm.}% /OutputCondition - {IFRA26}% /OutputConditionIdentifier /OutputCondition (dIDS_OUTPUTCOND_IFRA26_long) - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02400000}% /ICCVersion < ... > - {http://www.ifra.com}% URL - {ISOnewspaper26v4}% /Info - {BCA21A6AFA3A4B5CEF9CA8E91565C1B7}% /CheckSum < ... > -}% - - -% ISO Newspaper (IFRA 30%) – no -\gdef\IFRAXXX{\setEXTERNALprofile{ISOnewspaper30v4}% /ProfileName - {Printing process definition: ISO/DIS 12647-3:2004, Coldset offset printing, contact exposed negative acting plates or computer to plate $tone value increase of 30\%$, newsprint, screen ruling 40 lines per cm. $Principally applicable to the USA$.}% /OutputCondition - {IFRA30}% /OutputConditionIdentifier /OutputCondition (dIDS_OUTPUTCOND_IFRA30_long) - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02400000}% /ICCVersion < ... > - {http://www.ifra.com}% URL - {ISOnewspaper30v4}% /Info - {EE473D92AE08B385A0128F87B0D9EFC0}% /CheckSum < ... > -}% -%/OutputIntents[<</DestOutputProfileRef<</CheckSum<EE473D92AE08B385A0128F87B0D9EFC0>/ICCVersion<02400000>/ProfileCS(CMYK)/ProfileName(ISOnewspaper30v4)/URLs[<</F(http://www.ifra.com)/FS/URL>>]>>/Info(ISOnewspaper30v4)/OutputCondition(Printing process definition: ISO/DIS 12647-3:2004, Coldset offset printing, contact exposed negative acting plates or computer to plate $tone value increase of 30%$, newsprint, screen ruling 40 lines per cm. $Principally applicable to the USA$.)/OutputConditionIdentifier(IFRA30)/RegistryName(http://www.color.org)/S/GTS_PDFX/Type/OutputIntent>>] does not validate - - - - - -% Others available through "Custom" -% Adobe RGB (1998) -% Grayscale: Dot Gain 15% - - - -% JapanColor2003 -% Uses the Japan Color 2003 specification for type 3 (coated) paper. It is designed to produce quality separations using: 350% total ink coverage, positive film and coated paper on heat-set web offset presses. -% Japan Color 2003 Web Coated - -% EuroscaleCoated -% Uses specifications designed to produce quality separations using Euroscale inks under the following printing conditions: 350% total area of ink coverage, positive plate, bright white coated stock. -% Euroscale Coated v2 - -% EuroscaleUnCoated -% Uses specifications designed to produce quality separations using Euroscale inks under the following printing conditions: 260% total area of ink coverage, positive plate, uncoated white offset stock. -% Euroscale Uncoated v2 - -% U.S. Sheetfed Coated v2 -% USSheetfedCoated.icc - -% U.S. Sheetfed Uncoated v2 -% USSheetfedUncoated.icc - -% US Web UnCoated v2 - -% Generic CMYK Profile - - - - -\endinput - - - -/Library/Application Support/Adobe/Color -/Library/Application Support/Adobe/Color/Profiles -/Library/Application Support/Adobe/Color/Profiles/BlackWhite.icc -/Library/Application Support/Adobe/Color/Profiles/CIERGB.icc -/Library/Application Support/Adobe/Color/Profiles/EuroscaleCoated.icc -/Library/Application Support/Adobe/Color/Profiles/EuroscaleUncoated.icc -/Library/Application Support/Adobe/Color/Profiles/PAL_SECAM.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended -/Library/Application Support/Adobe/Color/Profiles/Recommended/AdobeRGB1998.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/AppleRGB.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/CoatedFOGRA27.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/CoatedFOGRA39.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/CoatedGRACoL2006.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/ColorMatchRGB.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/JapanColor2001Coated.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/JapanColor2001Uncoated.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/JapanColor2002Newspaper.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/JapanColor2003WebCoated.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/JapanWebCoated.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/ProPhoto.icm -/Library/Application Support/Adobe/Color/Profiles/Recommended/USNewsprintSNAP2007.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/USSheetfedCoated.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/USSheetfedUncoated.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/USWebCoatedSWOP.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/USWebUncoated.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/UncoatedFOGRA29.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/WebCoatedFOGRA28.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/WebCoatedSWOP2006Grade3.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/WebCoatedSWOP2006Grade5.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/sRGB Color Space Profile.icm -/Library/Application Support/Adobe/Color/Profiles/SMPTE-C.icc -/Library/Application Support/Adobe/Color/Profiles/WideGamutRGB.icc -/Library/Application Support/Adobe/Color/Settings -/Library/Application Support/Adobe/Color/Settings/Europe General Purpose 3.csf -/Library/Application Support/Adobe/Color/Settings/Europe Prepress 3.csf -/Library/Application Support/Adobe/Color/Settings/Europe Web Internet 2.csf -/Library/Application Support/Adobe/Color/Settings/Japan General Purpose.csf -/Library/Application Support/Adobe/Color/Settings/Japan Magazine.csf -/Library/Application Support/Adobe/Color/Settings/Japan Newspaper.csf -/Library/Application Support/Adobe/Color/Settings/Japan Prepress.csf -/Library/Application Support/Adobe/Color/Settings/Japan Web Internet.csf -/Library/Application Support/Adobe/Color/Settings/Monitor Color.csf -/Library/Application Support/Adobe/Color/Settings/North America General Purpose.csf -/Library/Application Support/Adobe/Color/Settings/North America Newspaper.csf -/Library/Application Support/Adobe/Color/Settings/North America Prepress.csf -/Library/Application Support/Adobe/Color/Settings/North America Web Internet.csf - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfx/AdobeExternalProfiles.tex new/doc/latex/pdfx/AdobeExternalProfiles.tex --- old/doc/latex/pdfx/AdobeExternalProfiles.tex 2016-02-06 00:40:13.000000000 +0100 +++ new/doc/latex/pdfx/AdobeExternalProfiles.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,345 +0,0 @@ -% This file gives macros to specify CMYK Color Profiles as supported by Adobe's Acrobat Pro DC software. -% Identifying names, comments and descriptions are taken from AC/DC's "Color Setup" Preferences panel. - - -% FOGRA39 -% "Europe General Purpose 3" -% General-purpose color settings for screen and print in Europe. Profile warnings are disabled. -% Uses the FOGRA39 press characterization. It is designed to produce quality separations for standard ISO printing using: 350% total ink coverage, positive film, and coated paper. -\gdef\FOGRAXXXIX{\setEXTERNALprofile{Coated FOGRA39 $ISO 12647-2:2004$}% /ProfileName - {Offset commercial and specialty printing according to ISO 12647-2:2004 / Amd 1, paper type 1 or 2 $gloss or matte coated offset, 115 g/m2$, screen frequency 60/cm.}% /OutputCondition - {FOGRA39}% /OutputConditionIdentifier /OutputCondition (dIDS_OUTPUTCOND_FOGRA39L_long) - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02100000}% /ICCVersion < ... > - {http://www.adobe.com}% URL - {Coated FOGRA39 $ISO 12647-2:2004$}% /Info - {74FF62F330BF0DBE4495B5720542D511}% /CheckSum < ... > -}% -% sRGB IEC61966-2.1 -% Grayscale: Dot Gain 15% -% /OutputIntents[<</DestOutputProfileRef<</CheckSum<74FF62F330BF0DBE4495B5720542D511>/ICCVersion<02100000>/ProfileCS(CMYK)/ProfileName(Coated FOGRA39 $ISO 12647-2:2004$)/URLs[<</F(http://www.adobe.com)/FS/URL>>]>>/Info(Coated FOGRA39 $ISO 12647-2:2004$)/OutputCondition(Offset commercial and specialty printing according to ISO 12647-2:2004 / Amd 1, paper type 1 or 2 $gloss or matte coated offset, 115 g/m2$, screen frequency 60/cm.)/OutputConditionIdentifier(FOGRA39)/RegistryName(http://www.color.org)/S/GTS_PDFX/Type/OutputIntent>>] -% also "Europe Prepress 3" -% Preparation of content for common printing conditions in Europe. CMYK values are preserved. Profile warnings are enabled. -% Adobe RGB (1998) -% also "Europe Web/Internet 2" -% Preparation of content for non-print usage like the World Wide Web (WWW) in Europe. RGB content is converted to sRGB. -% sRGB IEC61966-2.1 -% Grayscale: Gray Gamma 2.2 - - -% Coated GRACoL — no -% Coated GRACoL 2006 $ISO 12647-2:2004$ -\gdef\CoatedGRACoL{\setEXTERNALprofile{GRACoL2006_Coated1v2.icc}% /ProfileName -%{Coated GRACoL 2006 $ISO 12647-2:2004$}% - {Printing process definition according to ISO 12647-2:2004: Sheetfed Offset Commercial CTP plates ISO 2846-1 Inks - Variable screen frequency / G7 Methodology / grade#1 paper}% /OutputCondition - {CGATS TR 006}% /OutputConditionIdentifier /OutputCondition (dIDS_OUTPUTCOND_CGATSTR006_long) - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02000000}% /ICCVersion < ... > - {http://www.gracol.org}% URL - {Coated GRACoL 2006 $ISO 12647-2:2004$ alpha 1}% /Info - {CC7A6196271B13DBAE4622AA1FA0FCA9}% /CheckSum < ... > -}% -%/OutputIntents[<</DestOutputProfileRef<</CheckSum<CC7A6196271B13DBAE4622AA1FA0FCA9>/ICCVersion<02000000>/ProfileCS(CMYK)/ProfileName(GRACoL2006_Coated1v2.icc)/URLs[<</F(http://www.gracol.org)/FS/URL>>]>>/Info(Coated GRACoL 2006 $ISO 12647-2:2004$ alpha 1)/OutputCondition(Printing process definition according to ISO 12647-2:2004: Sheetfed Offset Commercial CTP plates ISO 2846-1 Inks - Variable screen frequency / G7 Methodology / grade#1 paper)/OutputConditionIdentifier(CGATS TR 006)/RegistryName(http://www.color.org)/S/GTS_PDFX/Type/OutputIntent>>] does not validate - - -% ISO Web Coated -% Uses the FOGRA28 press characterization. It is designed to produce quality separations for standard ISO printing using: 350% total ink coverage, positive film, and coated paper. -% Web Coated FOGRA28 $ISO 12647-2:2004$ -\gdef\ISOWebCoated{\setEXTERNALprofile{ISO Web Coated}% /ProfileName -%{Web Coated FOGRA28 $ISO 12647-2:2004$}% - {Offset printing according to ISO/DIS 12647-2:2003, OFCOM, paper type 3 = low weight coated web offset, 60 g/m2, screen ruling 60 cm-1, positive-acting plates.}% /OutputCondition - {FOGRA28}% /OutputConditionIdentifier /OutputCondition (dIDS_OUTPUTCOND_FOGRA28L_long) - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02400000}% /ICCVersion < ... > - {http://www.adobe.com}%{http://www.eci.org}% URL - %{Web Coated FOGRA28 $ISO 12647-2:2004$}% - {ISO Web Coated}% /Info - {0051E65BF3F29BFBB75720217A9C7A5D}% /CheckSum < ... > -}% -%/OutputIntents[<</DestOutputProfileRef<</CheckSum<0051E65BF3F29BFBB75720217A9C7A5D>/ICCVersion<02400000>/ProfileCS(CMYK)/ProfileName(ISO Web Coated)/URLs[<</F(http://www.eci.org)/FS/URL>>]>>/Info(ISO Web Coated)/OutputCondition(Offset printing according to ISO/DIS 12647-2:2003, OFCOM, paper type 3 = low weight coated web offset, 60 g/m2, screen ruling 60 cm-1, positive-acting plates.)/OutputConditionIdentifier(FOGRA28)/RegistryName(http://www.color.org)/S/GTS_PDFX/Type/OutputIntent>>] does not validate - - -% Japan Color 2001 Coated -% "Japan General Purpose 2" -% General-purpose color settings for screen and print in Japan. Profile warnings are disabled. -% Uses the Japan Color 2001 specification for type 3 (coated) paper. It is designed to produce quality separations using: 350% total ink coverage, positive film and coated paper. -\gdef\JapanColorMMICoated{\setEXTERNALprofile{Japan Color 2001 Coated}% /ProfileName - {Japan Color 2001 Coated: Printing process definition: ISO 12647-2:2004, sheet-fed offset printing, positive plates, paper type 3 $coated, 105 gsm$, screen frequency 69/cm.}% /OutputCondition - {JC200103}% /OutputConditionIdentifier /OutputCondition(dIDS_OUTPUTCOND_JC200103_long) - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02100000}% /ICCVersion < ... > - {http://www.adobe.com}% URL - {Japan Color 2001 Coated}% /Info - {4CB167869183B59BBAD20FB90CCF3E0C}% /CheckSum < ... > -}% -% sRGB IEC61966-2.1 -% Grayscale: Dot Gain 15% -%/OutputIntents[<</DestOutputProfileRef<</CheckSum<4CB167869183B59BBAD20FB90CCF3E0C>/ICCVersion<02100000>/ProfileCS(CMYK)/ProfileName(Japan Color 2001 Coated)/URLs[<</F(http://www.adobe.com)/FS/URL>>]>>/Info(Japan Color 2001 Coated)/OutputCondition(Japan Color 2001 Coated: Printing process definition: ISO 12647-2:2004, sheet-fed offset printing, positive plates, paper type 3 $coated, 105 gsm$, screen frequency 69/cm.)/OutputConditionIdentifier(JC200103)/RegistryName(http://www.color.org)/S/GTS_PDFX/Type/OutputIntent>>] -% also "Japan prepress 2" -% Preparation of content for common printing conditions in Japan. CMYK values are preserved. Profile warnings are enabled. -% Adobe RGB (1998) -% Grayscale: Dot Gain 15% -% also "Japan Web/Internet" -% Preparation of content for non-print usage like the World Wide Web (WWW) in Japan. RGB content is converted to sRGB. -% sRGB IEC61966-2.1 -% Grayscale: Gray Gamma 2.2 - - -% Japan Color 2001 Uncoated -% Uses the Japan Color 2001 specification for type 4 (uncoated) paper. It is designed to produce quality separations using: 310% total ink coverage, positive film and uncoated paper. -\gdef\JapanColorMMIUncoated{\setEXTERNALprofile{Japan Color 2001 Uncoated}% /ProfileName - {Japan Color 2001 Uncoated: Printing process definition: ISO 12647-2:2004, sheet-fed offset printing, positive plates, paper type 4 $uncoated, 105 gsm$, screen frequency 69/cm.}% /OutputCondition - {JCN200104}% /OutputConditionIdentifier /OutputCondition(dIDS_OUTPUTCOND_JC200104_long) - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02100000}% /ICCVersion < ... > - {http://www.adobe.com}% URL - {Japan Color 2001 Uncoated}% /Info - {B4E3FBD4C04CC702A93EB806D974DBF2}% /CheckSum < ... > -}% -%/OutputIntents[<</DestOutputProfileRef<</CheckSum<B4E3FBD4C04CC702A93EB806D974DBF2>/ICCVersion<02100000>/ProfileCS(CMYK)/ProfileName(Japan Color 2001 Uncoated)/URLs[<</F(http://www.adobe.com)/FS/URL>>]>>/Info(Japan Color 2001 Uncoated)/OutputCondition(Japan Color 2001 Uncoated: Printing process definition: ISO 12647-2:2004, sheet-fed offset printing, positive plates, paper type 4 $uncoated, 105 gsm$, screen frequency 69/cm.)/OutputConditionIdentifier(JC200104)/RegistryName(http://www.color.org)/S/GTS_PDFX/Type/OutputIntent>>] - - -% Japan Color 2002 Newspaper -% "Japan Color for Newspaper" -% Preparation of content for common newspaper press conditions in Japan. CMYK values are preserved. Profile warnings are enabled. -% Uses the Japan Color 2002 for Newspapers specification. It is designed to produce quality separations using: 240% total ink coverage, positive film and standard newsprint paper. -\gdef\JapanColorMMIINewspaper{\setEXTERNALprofile{Japan Color 2002 Newspaper}% /ProfileName - {Japan Color 2002 for Newspaper Printing: Printing process definition: ISO/DIS 12647-3:2004, coldset offset printing, negative plates, newsprint, screen frequency 39/cm.}% /OutputCondition - {JCN2002}% /OutputConditionIdentifier /OutputCondition (dIDS_OUTPUTCOND_JCN2002_long) - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02100000}% /ICCVersion < ... > - {http://www.adobe.com}% URL - {Japan Color 2002 Newspaper}% /Info - {FA5BE8D5B4EB756BF1399AFC2CDA7D1C}% /CheckSum < ... > -}% -% Adobe RGB (1998) -% Grayscale: Dot Gain 25% -%OutputIntents[<</DestOutputProfileRef<</CheckSum<FA5BE8D5B4EB756BF1399AFC2CDA7D1C>/ICCVersion<02100000>/ProfileCS(CMYK)/ProfileName(Japan Color 2002 Newspaper)/URLs[<</F(http://www.adobe.com)/FS/URL>>]>>/Info(Japan Color 2002 Newspaper)/OutputCondition(Japan Color 2002 for Newspaper Printing: Printing process definition: ISO/DIS 12647-3:2004, coldset offset printing, negative plates, newsprint, screen frequency 39/cm.)/OutputConditionIdentifier(JCN2002)/RegistryName(http://www.color.org)/S/GTS_PDFX/Type/OutputIntent>>] - - -% Japan Web Coated (Ad) -% "Japan Magazine Advertisement Color" -% Preparation of content using the Japan Magazine Publisher Association color standard for the Japan magazine and advertising market. CMYK values are preserved. Profile warnings are enabled. -% Uses specifications developed by the Japan Magazine Publisher Association for digital proofing of images in the Japanese magazine/advertising market. -\gdef\JapanWebCoatedAd{\setEXTERNALprofile{Japan Web Coated $Ad$}% /ProfileName - {Japan Color 2003 for Web Offset: Printing process definition: ISO 12647-2:2004, heat-set web offset printing, positive plates, paper type 3 $coated, 70 gsm$, screen frequency 69/cm.}% /OutputCondition - {JCW2003}% /OutputConditionIdentifier /OutputCondition (dIDS_OUTPUTCOND_JCW2003_long) - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02100000}% /ICCVersion < ... > - {http://www.adobe.com}% URL - {Japan Web Coated $Ad$}% /Info - {F8607E551233CEFDDA26D7D6BAAA2A4F}% /CheckSum < ... > -}% -% Adobe RGB (1998) -% Grayscale: Dot Gain 15% -%/OutputIntents[<</DestOutputProfileRef<</CheckSum<F8607E551233CEFDDA26D7D6BAAA2A4F>/ICCVersion<02100000>/ProfileCS(CMYK)/ProfileName(Japan Web Coated $Ad$)/URLs[<</F(http://www.adobe.com)/FS/URL>>]>>/Info(Japan Web Coated $Ad$)/OutputCondition(Japan Color 2003 for Web Offset: Printing process definition: ISO 12647-2:2004, heat-set web offset printing, positive plates, paper type 3 $coated, 70 gsm$, screen frequency 69/cm.)/OutputConditionIdentifier(JCW2003)/RegistryName(http://www.color.org)/S/GTS_PDFX/Type/OutputIntent>>] - - -% ISO Newspaper (IFRA 26%) – no -\gdef\IFRAXXVI{\setEXTERNALprofile{ISOnewspaper26v4}% /ProfileName - {Printing process definition: ISO/DIS 12647-3:2004, Coldset offset printing, contact exposed negative acting plates or computer to plate $tone value increase of 26\%$, newsprint, screen ruling 40 lines per cm.}% /OutputCondition - {IFRA26}% /OutputConditionIdentifier /OutputCondition (dIDS_OUTPUTCOND_IFRA26_long) - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02400000}% /ICCVersion < ... > - {http://www.ifra.com}% URL - {ISOnewspaper26v4}% /Info - {BCA21A6AFA3A4B5CEF9CA8E91565C1B7}% /CheckSum < ... > -}% -%/OutputIntents[<</DestOutputProfileRef<</CheckSum<BCA21A6AFA3A4B5CEF9CA8E91565C1B7>/ICCVersion<02400000>/ProfileCS(CMYK)/ProfileName(ISOnewspaper26v4)/URLs[<</F(http://www.ifra.com)/FS/URL>>]>>/Info(ISOnewspaper26v4)/OutputCondition(Printing process definition: ISO/DIS 12647-3:2004, Coldset offset printing, contact exposed negative acting plates or computer to plate $tone value increase of 26%$, newsprint, screen ruling 40 lines per cm.)/OutputConditionIdentifier(IFRA26)/RegistryName(http://www.color.org)/S/GTS_PDFX/Type/OutputIntent>>] does not validate - - -% ISO Newspaper (IFRA 30%) – no -\gdef\IFRAXXX{\setEXTERNALprofile{ISOnewspaper30v4}% /ProfileName - {Printing process definition: ISO/DIS 12647-3:2004, Coldset offset printing, contact exposed negative acting plates or computer to plate $tone value increase of 30\%$, newsprint, screen ruling 40 lines per cm. $Principally applicable to the USA$.}% /OutputCondition - {IFRA30}% /OutputConditionIdentifier /OutputCondition (dIDS_OUTPUTCOND_IFRA30_long) - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02400000}% /ICCVersion < ... > - {http://www.ifra.com}% URL - {ISOnewspaper30v4}% /Info - {EE473D92AE08B385A0128F87B0D9EFC0}% /CheckSum < ... > -}% -%/OutputIntents[<</DestOutputProfileRef<</CheckSum<EE473D92AE08B385A0128F87B0D9EFC0>/ICCVersion<02400000>/ProfileCS(CMYK)/ProfileName(ISOnewspaper30v4)/URLs[<</F(http://www.ifra.com)/FS/URL>>]>>/Info(ISOnewspaper30v4)/OutputCondition(Printing process definition: ISO/DIS 12647-3:2004, Coldset offset printing, contact exposed negative acting plates or computer to plate $tone value increase of 30%$, newsprint, screen ruling 40 lines per cm. $Principally applicable to the USA$.)/OutputConditionIdentifier(IFRA30)/RegistryName(http://www.color.org)/S/GTS_PDFX/Type/OutputIntent>>] does not validate - - -% U.S. Web Coated (SWOP) v2 -% "North America General Purpose 2" -% General-purpose color settings for screen and print in North America. Profile warnings are disabled. -\gdef\SWOPCGATSI{\setEXTERNALprofile{U.S. Web Coated $SWOP$ v2}% /ProfileName - {SWOP $Publication$ printing in USA $Printing process definition: ANSI CGATS.6$.}% /OutputCondition - {CGATS TR 001}% /OutputConditionIdentifier /OutputCondition(dIDS_OUTPUTCOND_CGATSTR001_long) - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02100000}% /ICCVersion < ... > - {http://www.adobe.com}% URL - {U.S. Web Coated $SWOP$ v2}% /Info - {79D7E984EA3AC74EED7CC92BF6B22A0D}% /CheckSum < ... > -}% -% sRGB IEC61966-2.1 -% Grayscale: Dot Gain 20% -%/OutputIntents[<</DestOutputProfileRef<</CheckSum<79D7E984EA3AC74EED7CC92BF6B22A0D>/ICCVersion<02100000>/ProfileCS(CMYK)/ProfileName(U.S. Web Coated $SWOP$ v2)/URLs[<</F(http://www.adobe.com)/FS/URL>>]>>/Info(U.S. Web Coated $SWOP$ v2)/OutputCondition(SWOP $Publication$ printing in USA $Printing process definition: ANSI CGATS.6$.)/OutputConditionIdentifier(CGATS TR 001)/RegistryName(http://www.color.org)/S/GTS_PDFX/Type/OutputIntent>>] -% also "North America Prepress 2" -% Preparation of content for common printing conditions in North America. CMYK values are preserved. Profile warnings are enabled. -% Adobe RGB (1998) -% Grayscale: Dot Gain 20% -% also "North America Web/Internet" -% Preparation of content for non-print usage like the World Wide Web (WWW) in North America. RGB content is converted to sRGB. -% sRGB IEC61966-2.1 -% Grayscale: Gray Gamma 2.2 -% also "Monitor Color" -% Preparation of content for video and on-screen presentation. Emulates color behavior of most video applications. This setting is not recommended for documents with CMYK data. -% Monitor RGB - Display -% Grayscale: Gray Gamma 2.2 - - -% U.S. Web Coated (SWOP) 3v2 – no -\gdef\SWOPCGATSIII{\setEXTERNALprofile{SWOP2006_Coated3v2.icc}% /ProfileName - {Web Offset CTP plates ISO 2846-1 Inks - Variable screen frequency / G7 Methodology / Grade #3 paper}% /OutputCondition - {CGATS TR 003}% /OutputConditionIdentifier /OutputCondition (dIDS_OUTPUTCOND_CGATSTR003_long) - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02000000}% /ICCVersion < ... > - {http://www.swop.org}% URL - {Web Coated SWOP 2006 Grade 3 Paper alpha 1}% /Info - {7FBAD4C0AE1CB7195C34BFC20E623437}% /CheckSum < ... > -}% -%/OutputIntents[<</DestOutputProfileRef<</CheckSum<7FBAD4C0AE1CB7195C34BFC20E623437>/ICCVersion<02000000>/ProfileCS(CMYK)/ProfileName(SWOP2006_Coated3v2.icc)/URLs[<</F(http://www.swop.org)/FS/URL>>]>>/Info(Web Coated SWOP 2006 Grade 3 Paper alpha 1)/OutputCondition(Web Offset CTP plates ISO 2846-1 Inks - Variable screen frequency / G7 Methodology / Grade #3 paper)/OutputConditionIdentifier(CGATS TR 003)/RegistryName(http://www.color.org)/S/GTS_PDFX/Type/OutputIntent>>] does not validate - - -% U.S. Web Coated (SWOP) 5v2 – no -\gdef\SWOPCGATSV{\setEXTERNALprofile{SWOP2006_Coated5v2.icc}% /ProfileName - {Web Offset CTP plates ISO 2846-1 Inks - Variable screen frequency / G7 Methodology / grade #5 Paper}% /OutputCondition - {CGATS TR 005}% /OutputConditionIdentifier /OutputCondition (dIDS_OUTPUTCOND_CGATSTR005_long) - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02000000}% /ICCVersion < ... > - {http://www.swop.org}% URL - {Web Coated SWOP 2006 Grade 5 Paper alpha 1}% /Info - {34F7C3C809B926B173EE54E13D655BEE}% /CheckSum < ... > -}% -%/OutputIntents[<</DestOutputProfileRef<</CheckSum<34F7C3C809B926B173EE54E13D655BEE>/ICCVersion<02000000>/ProfileCS(CMYK)/ProfileName(SWOP2006_Coated5v2.icc)/URLs[<</F(http://www.swop.org)/FS/URL>>]>>/Info(Web Coated SWOP 2006 Grade 5 Paper alpha 1)/OutputCondition(Web Offset CTP plates ISO 2846-1 Inks - Variable screen frequency / G7 Methodology / grade #5 Paper)/OutputConditionIdentifier(CGATS TR 005)/RegistryName(http://www.color.org)/S/GTS_PDFX/Type/OutputIntent>>] does not validate - - - -% ISO Coated v2 (ECI) – no -\gdef\ISOCoatedECI{\setEXTERNALprofile{ISO Coated v2 $ECI$}% /ProfileName - {Offset commercial and specialty printing according to ISO 12647-2:2004 / Amd 1, paper type 1 or 2 $gloss or matte coated offset, 115 g/m2$, screen frequency 60/cm.}% /OutputCondition - {FOGRA39}% /OutputConditionIdentifier - {http://www.color.org}% /RegistryName - {CMYK}% /ProfileCS - {02400000}% /ICCVersion < ... > - {http://www.eci.org}% URL - {ISO Coated v2 $ECI$}% /Info - {BDA07EFCACF5377E91EDACB0454EA7E5}% /CheckSum < ... > -}% -%/OutputIntents[<</DestOutputProfileRef<</CheckSum<BDA07EFCACF5377E91EDACB0454EA7E5>/ICCVersion<02400000>/ProfileCS(CMYK)/ProfileName(ISO Coated v2 $ECI$)/URLs[<</F(http://www.eci.org)/FS/URL>>]>>/Info(ISO Coated v2 $ECI$)/OutputCondition(Offset commercial and specialty printing according to ISO 12647-2:2004 / Amd 1, paper type 1 or 2 $gloss or matte coated offset, 115 g/m2$, screen frequency 60/cm.)/OutputConditionIdentifier(FOGRA39)/RegistryName(http://www.color.org)/S/GTS_PDFX/Type/OutputIntent>>] does not validate - - -% US Newsprint (SNAP 2007) -% "North America Newspaper" -% Preparation of content for common newspaper press conditions in Japan. CMYK values are preserved. Profile warnings are enabled. -% Adobe RGB (1998) -% Grayscale: Dot Gain 25% - - - -% Others available through "Custom" -% Adobe RGB (1998) -% Grayscale: Dot Gain 15% - -% FOGRA27 -% Coated FOGRA27 $ISO 12647-2:2004$ -%Uses the FOGRA27 press characterization. It is designed to produce quality separations for standard ISO printing using: 350% total ink coverage, positive film and coated paper. - -% FOGRA28 -% Uses the FOGRA28 press characterization. It is designed to produce quality separations for standard ISO printing using: 350% total ink coverage, positive film, and coated paper. -% Web Coated FOGRA28 $ISO 12647-2:2004$ - -% FOGRA29 -% Uses the FOGRA29 press characterization. It is designed to produce quality separations for standard ISO printing using: 350% total ink coverage, positive film, and coated paper. -% Uncoated FOGRA29 $ISO 12647-2:2004$ - -% JapanColor2003 -% Uses the Japan Color 2003 specification for type 3 (coated) paper. It is designed to produce quality separations using: 350% total ink coverage, positive film and coated paper on heat-set web offset presses. -% Japan Color 2003 Web Coated - -% EuroscaleCoated -% Uses specifications designed to produce quality separations using Euroscale inks under the following printing conditions: 350% total area of ink coverage, positive plate, bright white coated stock. -% Euroscale Coated v2 - -% EuroscaleUnCoated -% Uses specifications designed to produce quality separations using Euroscale inks under the following printing conditions: 260% total area of ink coverage, positive plate, uncoated white offset stock. -% Euroscale Uncoated v2 - -% US Sheetfed Coated v2 - -% US Sheetfed UnCoated v2 - -% US Web UnCoated v2 - -% Generic CMYK Profile - - - - -\endinput - - - -/Library/Application Support/Adobe/Color -/Library/Application Support/Adobe/Color/Profiles -/Library/Application Support/Adobe/Color/Profiles/BlackWhite.icc -/Library/Application Support/Adobe/Color/Profiles/CIERGB.icc -/Library/Application Support/Adobe/Color/Profiles/EuroscaleCoated.icc -/Library/Application Support/Adobe/Color/Profiles/EuroscaleUncoated.icc -/Library/Application Support/Adobe/Color/Profiles/PAL_SECAM.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended -/Library/Application Support/Adobe/Color/Profiles/Recommended/AdobeRGB1998.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/AppleRGB.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/CoatedFOGRA27.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/CoatedFOGRA39.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/CoatedGRACoL2006.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/ColorMatchRGB.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/JapanColor2001Coated.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/JapanColor2001Uncoated.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/JapanColor2002Newspaper.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/JapanColor2003WebCoated.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/JapanWebCoated.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/ProPhoto.icm -/Library/Application Support/Adobe/Color/Profiles/Recommended/USNewsprintSNAP2007.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/USSheetfedCoated.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/USSheetfedUncoated.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/USWebCoatedSWOP.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/USWebUncoated.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/UncoatedFOGRA29.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/WebCoatedFOGRA28.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/WebCoatedSWOP2006Grade3.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/WebCoatedSWOP2006Grade5.icc -/Library/Application Support/Adobe/Color/Profiles/Recommended/sRGB Color Space Profile.icm -/Library/Application Support/Adobe/Color/Profiles/SMPTE-C.icc -/Library/Application Support/Adobe/Color/Profiles/WideGamutRGB.icc -/Library/Application Support/Adobe/Color/Settings -/Library/Application Support/Adobe/Color/Settings/Europe General Purpose 3.csf -/Library/Application Support/Adobe/Color/Settings/Europe Prepress 3.csf -/Library/Application Support/Adobe/Color/Settings/Europe Web Internet 2.csf -/Library/Application Support/Adobe/Color/Settings/Japan General Purpose.csf -/Library/Application Support/Adobe/Color/Settings/Japan Magazine.csf -/Library/Application Support/Adobe/Color/Settings/Japan Newspaper.csf -/Library/Application Support/Adobe/Color/Settings/Japan Prepress.csf -/Library/Application Support/Adobe/Color/Settings/Japan Web Internet.csf -/Library/Application Support/Adobe/Color/Settings/Monitor Color.csf -/Library/Application Support/Adobe/Color/Settings/North America General Purpose.csf -/Library/Application Support/Adobe/Color/Settings/North America Newspaper.csf -/Library/Application Support/Adobe/Color/Settings/North America Prepress.csf -/Library/Application Support/Adobe/Color/Settings/North America Web Internet.csf - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfx/ICC_LICENSE.txt new/doc/latex/pdfx/ICC_LICENSE.txt --- old/doc/latex/pdfx/ICC_LICENSE.txt 2016-02-06 00:40:13.000000000 +0100 +++ new/doc/latex/pdfx/ICC_LICENSE.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -For the file sRGB_IEC61966-2-1_black_scaled.icc: - - Copyright International Color Consortium, 2009 - - It is hereby acknowledged that the file "sRGB_IEC61966-2-1_black - scaled.icc" is provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY. - - Licensing - - This profile is made available by the International Color Consortium, - and may be copied, distributed, embedded, made, used, and sold without - restriction. Altered versions of this profile shall have the original - identification and copyright information removed and shall not be - misrepresented as the original profile. - - Terms of use - - To anyone who acknowledges that the file "sRGB_IEC61966-2-1_black - scaled.icc" is provided "AS IS" WITH NO EXPRESS OR IMPLIED WARRANTY, - permission to use, copy and distribute these file for any purpose is - hereby granted without fee, provided that the file is not changed - including the ICC copyright notice tag, and that the name of ICC shall - not be used in advertising or publicity pertaining to distribution of - the software without specific, written prior permission. ICC makes no - representations about the suitability of this software for any - purpose. - -For the file coated_FOGRA39L_argl.icc: - - The zlib/libpng License - - Copyright (c) 2008 Kai-Uwe Behrmann - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you - must not claim that you wrote the original software. If you use - this software in a product, an acknowledgment in the product - documentation would be appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and - must not be misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfx/armglyphs.dfu new/doc/latex/pdfx/armglyphs.dfu --- old/doc/latex/pdfx/armglyphs.dfu 2016-05-11 23:27:08.000000000 +0200 +++ new/doc/latex/pdfx/armglyphs.dfu 1970-01-01 01:00:00.000000000 +0100 @@ -1,137 +0,0 @@ -\pdfglyphtounicode{armabbrev}{055F} -\pdfglyphtounicode{armnum}{0559} -\pdfglyphtounicode{Armdza}{0541} -\pdfglyphtounicode{Armghat}{0542} -\pdfglyphtounicode{Armtche}{0543} -\pdfglyphtounicode{Arme}{0537} -\pdfglyphtounicode{Armat}{0538} -\pdfglyphtounicode{Armto}{0539} -\pdfglyphtounicode{Armzhe}{053A} -\pdfglyphtounicode{Armsha}{0547} -\pdfglyphtounicode{Armcha}{0549} -\pdfglyphtounicode{Armra}{054C} -\pdfglyphtounicode{Armtsa}{053E} -\pdfglyphtounicode{Armpyur}{0553} -\pdfglyphtounicode{Armo}{0555} -\pdfglyphtounicode{armdram}{058F} -\pdfglyphtounicode{armeternity}{058D} -\pdfglyphtounicode{armdza}{0571} -\pdfglyphtounicode{armghat}{0572} -\pdfglyphtounicode{armtche}{0573} -\pdfglyphtounicode{arme}{0567} -\pdfglyphtounicode{armat}{0568} -\pdfglyphtounicode{armto}{0569} -\pdfglyphtounicode{armzhe}{056A} -\pdfglyphtounicode{armsha}{0577} -\pdfglyphtounicode{armcha}{0579} -\pdfglyphtounicode{armra}{057C} -\pdfglyphtounicode{armtsa}{056E} -\pdfglyphtounicode{armpyur}{0583} -\pdfglyphtounicode{armo}{0585} -\pdfglyphtounicode{armew}{0587} -\pdfglyphtounicode{armexclam}{055C} -%\pdfglyphtounicode{quotedblright}{201D} -%\pdfglyphtounicode{numbersign}{0023 -%\pdfglyphtounicode{dollar}{0024} -%\pdfglyphtounicode{percent}{0025} -%\pdfglyphtounicode{ampersand}{00026} -\pdfglyphtounicode{armapostrophe}{055A} -\pdfglyphtounicode{armparenleft}{0028} -\pdfglyphtounicode{armparenright}{0029} -%\pdfglyphtounicode{asterisk}{002A} -%\pdfglyphtounicode{plus}{002B} -\pdfglyphtounicode{armcomma}{002C} -\pdfglyphtounicode{armendash}{2010} -\pdfglyphtounicode{armdot}{2024} -\pdfglyphtounicode{armellipsis}{2026} -%\pdfglyphtounicode{slash}{002F} -%\pdfglyphtounicode{zero}{0030} -%\pdfglyphtounicode{one}{0031} -%\pdfglyphtounicode{two}{0032} -%\pdfglyphtounicode{three}{0033} -%\pdfglyphtounicode{four}{0034} -%\pdfglyphtounicode{five}{0035} -%\pdfglyphtounicode{six}{0036} -%\pdfglyphtounicode{seven}{0037} -%\pdfglyphtounicode{eight}{0038} -%\pdfglyphtounicode{nine}{0039} -\pdfglyphtounicode{armfullstop}{0589} -%\pdfglyphtounicode{semicolon}{003B} -\pdfglyphtounicode{armsection}{00A7} -\pdfglyphtounicode{armquotleft}{00AB} -%\pdfglyphtounicode{equal}{003D} -\pdfglyphtounicode{armquotright}{00BB} -\pdfglyphtounicode{armquestion}{055E} -%\pdfglyphtounicode{at}{0040} -\pdfglyphtounicode{Armayb}{0531} -\pdfglyphtounicode{Armben}{0532} -\pdfglyphtounicode{Armtso}{0551} -\pdfglyphtounicode{Armda}{0534} -\pdfglyphtounicode{Armyech}{0535} -\pdfglyphtounicode{Armfe}{0556} -\pdfglyphtounicode{Armgim}{0533} -\pdfglyphtounicode{Armho}{0540} -\pdfglyphtounicode{Armini}{053B} -\pdfglyphtounicode{Armje}{054B} -\pdfglyphtounicode{Armken}{053F} -\pdfglyphtounicode{Armlyun}{053C} -\pdfglyphtounicode{Armmen}{0544} -\pdfglyphtounicode{Armnu}{0546} -\pdfglyphtounicode{Armvo}{0548} -\pdfglyphtounicode{Armpe}{054A} -\pdfglyphtounicode{Armke}{0554} -\pdfglyphtounicode{Armre}{0550} -\pdfglyphtounicode{Armse}{054D} -\pdfglyphtounicode{Armtyun}{054F} -\pdfglyphtounicode{Armvovyun}{05480552} -\pdfglyphtounicode{Armvev}{054E} -\pdfglyphtounicode{Armvyun}{0552} -\pdfglyphtounicode{Armkhe}{053D} -\pdfglyphtounicode{Armhi}{0545} -\pdfglyphtounicode{Armza}{0536} -%\pdfglyphtounicode{bracketleft}{05} -%\pdfglyphtounicode{quotedblleft}{05} -%\pdfglyphtounicode{bracketright}{05} -%\pdfglyphtounicode{braceleft}{05} -%\pdfglyphtounicode{braceright}{05} -\pdfglyphtounicode{armsep}{055D} -\pdfglyphtounicode{armayb}{0561} -\pdfglyphtounicode{armben}{0562} -\pdfglyphtounicode{armtso}{0581} -\pdfglyphtounicode{armda}{0564} -\pdfglyphtounicode{armyech}{0565} -\pdfglyphtounicode{armfe}{0586} -\pdfglyphtounicode{armgim}{0563} -\pdfglyphtounicode{armho}{0570} -\pdfglyphtounicode{armini}{056B} -\pdfglyphtounicode{armje}{057B} -\pdfglyphtounicode{armken}{056F} -\pdfglyphtounicode{armlyun}{056C} -\pdfglyphtounicode{armmen}{0574} -\pdfglyphtounicode{armnu}{0576} -\pdfglyphtounicode{armvo}{0578} -\pdfglyphtounicode{armpe}{057A} -\pdfglyphtounicode{armke}{0584} -\pdfglyphtounicode{armre}{0580} -\pdfglyphtounicode{armse}{057D} -\pdfglyphtounicode{armtyun}{057F} -\pdfglyphtounicode{armvovyun}{05780582} -\pdfglyphtounicode{armvev}{057E} -\pdfglyphtounicode{armvyun}{0582} -\pdfglyphtounicode{armkhe}{056D} -\pdfglyphtounicode{armhi}{0575} -\pdfglyphtounicode{armza}{0566} -\pdfglyphtounicode{armyentamna}{058A} -\pdfglyphtounicode{armaccent}{055B} -\pdfglyphtounicode{armemdash}{2014} -%\pdfglyphtounicode{emdash}{2014} -%\pdfglyphtounicode{exclam}{0021} -%\pdfglyphtounicode{question}{003F} -% -% ligatures — probably not in use -% -\pdfglyphtounicode{armmennu}{FB13} -\pdfglyphtounicode{armmenyech}{FB14} -\pdfglyphtounicode{armmenini}{FB15} -\pdfglyphtounicode{armvevnu}{FB16} -\pdfglyphtounicode{armmenkhe}{FB17} Binary files old/doc/latex/pdfx/pdfx.pdf and new/doc/latex/pdfx/pdfx.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pdfx/sample.tex new/doc/latex/pdfx/sample.tex --- old/doc/latex/pdfx/sample.tex 2016-05-11 23:27:08.000000000 +0200 +++ new/doc/latex/pdfx/sample.tex 2017-05-18 23:44:40.000000000 +0200 @@ -1,6 +1,4 @@ -\pdfcompresslevel=0 -\pdfobjcompresslevel=0 -\providecommand{\pdfxopt}{a-1b,mathxmp} +\providecommand{\pdfxopt}{a-1b,allxmp,mathxmp} % XMP Metadata first \begin{filecontents*}{\jobname.xmpdata} \Title{Unicode: U₄(ℤ[1/√2, i]). — @@ -39,6 +37,7 @@ \usepackage[\pdfxopt]{pdfx} %\usepackage[LY1]{fontenc} \usepackage[OT1,T1]{fontenc} +\usepackage{textcomp,ptmxcomp,tipa,extraipa} %\listfiles \tracingstats=2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfx.doc.tlpobj new/tlpkg/tlpobj/pdfx.doc.tlpobj --- old/tlpkg/tlpobj/pdfx.doc.tlpobj 2016-05-12 03:20:56.000000000 +0200 +++ new/tlpkg/tlpobj/pdfx.doc.tlpobj 2017-05-19 02:22:10.000000000 +0200 @@ -1,12 +1,9 @@ name pdfx.doc category Package -revision 41039 +revision 44412 shortdesc doc files of pdfx relocated 1 -docfiles size=1224 - RELOC/doc/latex/pdfx/AdobeColorProfiles.tex - RELOC/doc/latex/pdfx/AdobeExternalProfiles.tex - RELOC/doc/latex/pdfx/ICC_LICENSE.txt +docfiles size=1217 RELOC/doc/latex/pdfx/Makefile.src RELOC/doc/latex/pdfx/README RELOC/doc/latex/pdfx/TL-POL-meta.png @@ -14,7 +11,6 @@ RELOC/doc/latex/pdfx/TL-RU-metadata.png RELOC/doc/latex/pdfx/TL-RU-toc.png RELOC/doc/latex/pdfx/arm-start.tex - RELOC/doc/latex/pdfx/armglyphs.dfu RELOC/doc/latex/pdfx/armtex-meta.png RELOC/doc/latex/pdfx/koi8-example.tex RELOC/doc/latex/pdfx/koi8-example2.tex ++++++ pdfx.tar.xz ++++++ ++++ 2762 lines of diff (skipped) ++++++ pdfxup.doc.tar.xz ++++++ ++++++ pdfxup.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pdfxup.tlpobj new/tlpkg/tlpobj/pdfxup.tlpobj --- old/tlpkg/tlpobj/pdfxup.tlpobj 2016-04-23 03:19:07.000000000 +0200 +++ new/tlpkg/tlpobj/pdfxup.tlpobj 2017-04-14 17:53:56.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=7 texmf-dist/scripts/pdfxup/pdfxup catalogue-ctan /support/pdfxup -catalogue-date 2016-04-21 23:30:53 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics pdfprocess catalogue-version 1.30 ++++++ pecha.doc.tar.xz ++++++ ++++++ pecha.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pecha.tlpobj new/tlpkg/tlpobj/pecha.tlpobj --- old/tlpkg/tlpobj/pecha.tlpobj 2016-04-14 19:34:06.000000000 +0200 +++ new/tlpkg/tlpobj/pecha.tlpobj 2017-04-14 17:53:56.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/pecha/ctibmantra.sty RELOC/tex/latex/pecha/pecha.cls catalogue-ctan /language/tibetan/pecha -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics tibetan catalogue-version 0.1 ++++++ pedigree-perl.doc.tar.xz ++++++ ++++++ pedigree-perl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pedigree-perl.tlpobj new/tlpkg/tlpobj/pedigree-perl.tlpobj --- old/tlpkg/tlpobj/pedigree-perl.tlpobj 2016-04-14 19:34:08.000000000 +0200 +++ new/tlpkg/tlpobj/pedigree-perl.tlpobj 2017-04-14 17:53:57.000000000 +0200 @@ -21,7 +21,7 @@ texmf-dist/scripts/pedigree-perl/Pedigree/TwinsNode.pm texmf-dist/scripts/pedigree-perl/pedigree.pl catalogue-ctan /graphics/pstricks/contrib/pedigree/pedigree-perl -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics humanities csv-support catalogue-version 1.0 ++++++ perception.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/bibtex/perception/README new/doc/bibtex/perception/README --- old/doc/bibtex/perception/README 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/bibtex/perception/README 2016-12-12 00:01:08.000000000 +0100 @@ -0,0 +1,4 @@ +This is just a .bst for the journal Perception. Maybe it will save +someone else a little time. + +Jed Singer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/perception/README new/doc/latex/perception/README --- old/doc/latex/perception/README 2006-01-09 01:44:40.000000000 +0100 +++ new/doc/latex/perception/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -This is just a .bst for the journal Perception. Maybe it will save -someone else a little time. - -Jed Singer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/perception.doc.tlpobj new/tlpkg/tlpobj/perception.doc.tlpobj --- old/tlpkg/tlpobj/perception.doc.tlpobj 2016-04-14 19:34:08.000000000 +0200 +++ new/tlpkg/tlpobj/perception.doc.tlpobj 2017-04-14 17:53:57.000000000 +0200 @@ -1,7 +1,7 @@ name perception.doc category Package -revision 15878 +revision 42683 shortdesc doc files of perception relocated 1 docfiles size=1 - RELOC/doc/latex/perception/README + RELOC/doc/bibtex/perception/README ++++++ perception.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/perception.tlpobj new/tlpkg/tlpobj/perception.tlpobj --- old/tlpkg/tlpobj/perception.tlpobj 2016-04-14 19:34:08.000000000 +0200 +++ new/tlpkg/tlpobj/perception.tlpobj 2017-04-14 17:53:57.000000000 +0200 @@ -1,12 +1,12 @@ name perception category Package -revision 15878 +revision 42683 shortdesc BibTeX style for the journal Perception relocated 1 longdesc A product of custom-bib, provided simply to save others' time. runfiles size=8 RELOC/bibtex/bst/perception/perception.bst catalogue-ctan /biblio/bibtex/contrib/perception -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics bibtex-sty journalpub ++++++ perfectcut.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/perfectcut/README new/doc/latex/perfectcut/README --- old/doc/latex/perfectcut/README 2014-11-03 22:51:47.000000000 +0100 +++ new/doc/latex/perfectcut/README 2017-05-03 23:29:26.000000000 +0200 @@ -16,6 +16,15 @@ Release notes: + 2.2 04/17: * By default, use the scalerel package instead of the mathstyle + package to compute the nested mathstyle. + * The option nomathstyle and the command \cutstyle are + deprecated. + * The option mathstyle is introduced, to use when scalerel is + too slow. + 2.1 06/15: * the spacing inside cases can be contolled with \cutcasebarskip + * corrected a bug where vertical bars would shrink horizontally + * corrected the spacing of middle delimiters 2.0 11/14: * The package now offers general-purpose commands for defining arbitrary nested delimiters that consistently grow regardless of the contents (\perfectunary and @@ -42,7 +51,7 @@ Author: Guillaume Munch-Maccagnoni -http://www.pps.univ-paris-diderot.fr/~munch/ +https://github.com/gadmm/perfectcut This work may be distributed and/or modified under the conditions of @@ -53,8 +62,8 @@ and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later. -The work consists in the files "perfectcut.sty", "perfectcut.tex" and -the derived files. +The work consists in the files "perfectcut.sty", "perfectcut.lyx", +"perfectcut.tex", and the derived files. This work has the LPPL maintenance status `maintained'. The Current Maintainer of this work is Guillaume Munch-Maccagnoni. Binary files old/doc/latex/perfectcut/perfectcut.pdf and new/doc/latex/perfectcut/perfectcut.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/perfectcut/perfectcut.tex new/doc/latex/perfectcut/perfectcut.tex --- old/doc/latex/perfectcut/perfectcut.tex 2014-11-03 22:51:47.000000000 +0100 +++ new/doc/latex/perfectcut/perfectcut.tex 2017-05-03 23:29:26.000000000 +0200 @@ -2,7 +2,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%% %%% Author: Guillaume Munch-Maccagnoni -%%% http://www.pps.univ-paris-diderot.fr/~munch/ +%%% https://github.com/gadmm/perfectcut %%% %%% This work may be distributed and/or modified under the conditions of %%% the LaTeX Project Public License, either version 1.3 of this license @@ -27,28 +27,21 @@ \begin{document} \global\long\def\cut#1#2{\perfectcut{#1}{#2}} -\global\long\def\mt{\bar{\mu}} +\global\long\def\mt{\bar{\mu}} \title{\texttt{perfectcut.sty} documentation} +\author{\noindent {\large{}Guillaume Munch-Maccagnoni}\thanks{\protect\href{https://github.com/gadmm/perfectcut}… -\author{\noindent {\large{}Guillaume Munch-Maccagnoni}% -\thanks{\protect\href{http://www.pps.univ-paris-diderot.fr/~munch/}{http://www.pps.univ-paris-diderot.fr/$\sim$munch/}% -}} - - -\date{2nd November 2014} +\date{23rd April 2017} \maketitle - \tableofcontents{} - \section{Use} - \paragraph{Original use} This package supplies the following commands: @@ -58,54 +51,45 @@ \toprule Command & Produces\tabularnewline \midrule -\texttt{\textbackslash{}perfectcut\{\#1\}\{\#2\}} & $\perfectcut{\#1}{\#2}$\tabularnewline -\texttt{\textbackslash{}perfectbra\{\#1\}} & $\perfectbra{\#1}$\tabularnewline -\texttt{\textbackslash{}perfectket\{\#1\}} & $\perfectket{\#1}$\tabularnewline +\texttt{\textbackslash perfectcut\{\#1\}\{\#2\}} & $\perfectcut{\#1}{\#2}$\tabularnewline +\texttt{\textbackslash perfectbra\{\#1\}} & $\perfectbra{\#1}$\tabularnewline +\texttt{\textbackslash perfectket\{\#1\}} & $\perfectket{\#1}$\tabularnewline \bottomrule \end{tabular}\quad{}% \begin{tabular}{ll} \toprule Command & Produces\tabularnewline \midrule -\texttt{\textbackslash{}perfectcase\{\#1\}} & $\perfectcase{\#1}{\#2}$\tabularnewline -\texttt{\textbackslash{}perfectbrackets\{\#1\}} & $\perfectbrackets{\#1}$\tabularnewline -\texttt{\textbackslash{}perfectparens\{\#1\}} & $\perfectparens{\#1}$\tabularnewline +\texttt{\textbackslash perfectcase\{\#1\}} & $\perfectcase{\#1}{\#2}$\tabularnewline +\texttt{\textbackslash perfectbrackets\{\#1\}} & $\perfectbrackets{\#1}$\tabularnewline +\texttt{\textbackslash perfectparens\{\#1\}} & $\perfectparens{\#1}$\tabularnewline \bottomrule \end{tabular} \par\end{center} The effect of these commands is to let the delimiters grow according -to the number of nested \texttt{\textbackslash{}perfect}\texttt{\emph{command}}s +to the number of nested \texttt{\textbackslash perfect}\texttt{\emph{command}}s (regardless of the size of contents). The package is originally intended for solving a notational issue regarding the representation of abstract-machine-like calculi in proof theory and computer science. - \paragraph{General use} -The package also defines \texttt{\textbackslash{}perfectunary} and -\texttt{\textbackslash{}perfectbinary} for defining custom delimiters -that behave similarly to the above ones. These commands should be considered when -facing the need of nested delimiters that consistently grow regardless -of the contents. (See ``Advanced Use''.)\medskip{} - - -If the package causes incompatibility errors, refer to the option -\texttt{nomathstyle} below. - +The package also defines \texttt{\textbackslash perfectunary} and +\texttt{\textbackslash perfectbinary} for defining custom delimiters +that behave similarly to the above ones. These commands should be +considered when facing the need of nested delimiters that consistently +grow regardless of the contents. (See ``Advanced Use''.) \section{Example} - - \subsection{Using \texttt{perfectcut.sty}} \global\long\def\cut#1#2{\cutprimitive{#1}{#2}} - -\noindent \texttt{\footnotesize{}\textbackslash{}usepackage\{perfectcut\}}~\\ -\texttt{\footnotesize{}\textbackslash{}let\textbackslash{}cut\textbackslash{}perfectcut}{\footnotesize \par} +\noindent \texttt{\footnotesize{}\textbackslash usepackage\{perfectcut\}}~\\ +\texttt{\footnotesize{}\textbackslash let\textbackslash cut\textbackslash perfectcut} \begin{center} \fbox{\begin{minipage}[t]{0.8\columnwidth}% @@ -114,12 +98,11 @@ \cut t{\mt x.\cut{\mu\alpha.\cut ue}{e'}}=\cut{\mu\alpha.\cut t{\mt x.\cut ue}}{e'} \] - The following states the commutativity of a strong monad: \[ \cut t{\mt x.\cut u{\mt y.\cut ve}}=\cut u{\mt y.\cut t{\mt x.\cut ve}} \] -Using \texttt{\textbackslash{}underline} to mark redexes: +Using \texttt{\textbackslash underline} to mark redexes: \begin{align*} & \delta(V,x.y,x.y)\\ & =\mu{\star}.\cut V{\perfectcase{\mt x.\underline{\cut y{\star}}}{\mt x.\underline{\cut y{\star}}}}\\ @@ -131,15 +114,13 @@ \end{minipage}} \par\end{center} +\subsection{Using \texttt{\textbackslash left}, \texttt{\textbackslash middle} +and \texttt{\textbackslash right} instead} -\subsection{Using \texttt{\textbackslash{}left}, \texttt{\textbackslash{}middle} -and \texttt{\textbackslash{}right} instead} - -\global\long\def\fakecut#1#2{\left\langle #1\middle|\mkern-2mu\middle|#2\right\rangle } - +\global\long\def\fakecut#1#2{\left\langle #1\middle|\mkern-2mu \middle|#2\right\rangle } -\noindent \texttt{\footnotesize{}\textbackslash{}renewcommand\{\textbackslash{}cut\}{[}2{]}\{\textbackslash{}left\textbackslash{}langle -\#1\textbackslash{}middle|\textbackslash{}mkern-2mu\textbackslash{}middle|\#2\textbackslash{}right\textbackslash{}rangle\}}{\footnotesize \par} +\noindent \texttt{\footnotesize{}\textbackslash renewcommand\{\textbackslash cut\}{[}2{]}\{\textbackslash left\textbackslash langle +\#1\textbackslash middle|\textbackslash mkern-2mu\textbackslash middle|\#2\textbackslash right\textbackslash rangle\}} \begin{center} \fbox{\parbox[t]{0.8\columnwidth}{% @@ -148,14 +129,12 @@ \fakecut t{\mt x.\fakecut{\mu\alpha.\fakecut ue}{e'}}=\fakecut{\mu\alpha.\fakecut t{\mt x.\fakecut ue}}{e'} \] - The following states the commutativity of a strong monad: \[ \fakecut t{\mt x.\fakecut u{\mt y.\fakecut ve}}=\fakecut u{\mt y.\fakecut t{\mt x.\fakecut ve}} \] - -Using \texttt{\textbackslash{}underline} to mark redexes: +Using \texttt{\textbackslash underline} to mark redexes: \begin{align*} & \delta(V,x.y,x.y)\\ & =\mu{\star}.\fakecut V{\left[\mt x.\underline{\fakecut y{\star}}\middle|\mt x.\underline{\fakecut y{\star}}\right]}\\ @@ -173,28 +152,25 @@ grow, and the spacing could be improved. The package is designed to fix these issues. - \section{Advanced use} The package lets you define your own growing delimiters. Let us first stress that the size of these delimiters is entirely determined by the number of nestings and is insensitive to the size of the contents. If you need the size of the contents to be taken into account then -it is probably sufficient to use \texttt{\textbackslash{}left} and -\texttt{\textbackslash{}right} while tweaking \texttt{\textbackslash{}delimitershortfall} -and \texttt{\textbackslash{}delimiterfactor}. - +it is probably sufficient to use \texttt{\textbackslash left} and +\texttt{\textbackslash right} while tweaking \texttt{\textbackslash delimitershortfall} +and \texttt{\textbackslash delimiterfactor}. \subsection{Example} The following displays a set $\{\#1\mid\#2\}$ with delimiters appropriately -sized if there are other \texttt{\textbackslash{}perfectcommands} +sized if there are other \texttt{\textbackslash perfectcommands} inside \texttt{\#1} and \texttt{\#2}.\medskip{} +\texttt{\footnotesize{}\textbackslash def\textbackslash Set\#1\#2\{\textbackslash perfectbinary\{IncreaseHeight\}\textbackslash\{|\textbackslash\}\{\#1\textbackslash mathrel\{\}\}\{\textbackslash mathrel\{\}\#2\}\}}{\footnotesize \par} -\texttt{\footnotesize{}\textbackslash{}def\textbackslash{}Set\#1\#2\{\textbackslash{}perfectbinary\{IncreaseHeight\}\textbackslash{}\{|\textbackslash{}\}\{\#1\textbackslash{}mathrel\{\}\}\{\textbackslash{}mathrel\{\}\#2\}\}}{\footnotesize \par} - -\texttt{\footnotesize{}\textbackslash{}{[}\textbackslash{}Set\{\textbackslash{}perfectparens\{a\}\}\{\textbackslash{}perfectparens\{b\}\}\textbackslash{}{]}}{\footnotesize \par} +\texttt{\footnotesize{}\textbackslash{[}\textbackslash Set\{\textbackslash perfectparens\{a\}\}\{\textbackslash perfectparens\{b\}\}\textbackslash{]}}{\footnotesize \par} \def\Set#1#2{\perfectbinary{IncreaseHeight}\{|\}{#1\mathrel{}}{\mathrel{}#2}} @@ -202,15 +178,13 @@ \fbox{\ensuremath{\Set{\perfectparens{a}}{\perfectparens{b}}}} \] - - \subsection{Custom delimiters} \begin{description} -\item [{\texttt{\textbackslash{}perfectunary\#1\#2\#3\#4}}] Displays \texttt{\#2} +\item [{\texttt{\textbackslash perfectunary\#1\#2\#3\#4}}] Displays \texttt{\#2} \texttt{\#4} \texttt{\#3} where \texttt{\#2} and \texttt{\#3} are delimiters. The delimiters grow according to \texttt{\#1} which must be one of \texttt{IncreaseHeight}, \texttt{CurrentHeight}, or \texttt{CurrentHeightPlusOne}. -\item [{\texttt{\textbackslash{}perfectbinary\#1\#2\#3\#4\#5\#6}}] Displays +\item [{\texttt{\textbackslash perfectbinary\#1\#2\#3\#4\#5\#6}}] Displays \texttt{\#2} \texttt{\#5} \texttt{\#3} \texttt{\#6} \texttt{\#4} where \texttt{\#2}, \texttt{\#3} and \texttt{\#4} are delimiters. The delimiters grow according to \texttt{\#1} which must be one of \texttt{IncreaseHeight}, @@ -226,60 +200,47 @@ \toprule Command & Produces & Growth & Inserts skips\tabularnewline \midrule -\texttt{\textbackslash{}perfectcut\{\#1\}\{\#2\}} & $\perfectcut{\#1}{\#2}$ & \texttt{IncreaseHeight} & Yes\tabularnewline -\texttt{\textbackslash{}perfectbra\{\#1\}} & $\perfectbra{\#1}$ & \texttt{IncreaseHeight} & Yes\tabularnewline -\texttt{\textbackslash{}perfectket\{\#1\}} & $\perfectket{\#1}$ & \texttt{IncreaseHeight} & Yes\tabularnewline -\texttt{\textbackslash{}perfectcase\{\#1\}} & $\perfectcase{\#1}{\#2}$ & \texttt{CurrentHeightPlusOne} & Yes\tabularnewline -\texttt{\textbackslash{}perfectbrackets\{\#1\}} & $\perfectbrackets{\#1}$ & \texttt{CurrentHeightPlusOne} & Only inside\tabularnewline -\texttt{\textbackslash{}perfectparens\{\#1\}} & $\perfectparens{\#1}$ & \texttt{CurrentHeight} & Only inside\tabularnewline -\texttt{\textbackslash{}perfectunary\{\#1\}}~\\ +\texttt{\textbackslash perfectcut\{\#1\}\{\#2\}} & $\perfectcut{\#1}{\#2}$ & \texttt{IncreaseHeight} & Yes\tabularnewline +\texttt{\textbackslash perfectbra\{\#1\}} & $\perfectbra{\#1}$ & \texttt{IncreaseHeight} & Yes\tabularnewline +\texttt{\textbackslash perfectket\{\#1\}} & $\perfectket{\#1}$ & \texttt{IncreaseHeight} & Yes\tabularnewline +\texttt{\textbackslash perfectcase\{\#1\}} & $\perfectcase{\#1}{\#2}$ & \texttt{CurrentHeightPlusOne} & Yes\tabularnewline +\texttt{\textbackslash perfectbrackets\{\#1\}} & $\perfectbrackets{\#1}$ & \texttt{CurrentHeightPlusOne} & Only inside\tabularnewline +\texttt{\textbackslash perfectparens\{\#1\}} & $\perfectparens{\#1}$ & \texttt{CurrentHeight} & Only inside\tabularnewline +\texttt{\textbackslash perfectunary\{\#1\}}~\\ \texttt{~\{\#2\}\{\#3\}\{\#4\}} & $\#2\,\#4\,\#3$ & \#1 & No\tabularnewline -\texttt{\textbackslash{}perfectbinary\{\#1\}}~\\ +\texttt{\textbackslash perfectbinary\{\#1\}}~\\ \texttt{~\{\#2\}\{\#3\}\{\#4\}\{\#5\}\{\#6\}} & $\#2\,\#5\,\#3\,\#6\,\#4$ & \#1 & No\tabularnewline \bottomrule \end{tabular} \par\end{center} - \section{Options} +\subsection{Option \texttt{mathstyle}} -\subsection{Option \texttt{nomathstyle}} - -The use of \texttt{\textbackslash{}currentmathstyle} from the package -\texttt{mathstyle} prevents the exponential blowup in recursions that -would occur if we used \texttt{\textbackslash{}mathpalette} instead. -To record the \texttt{\textbackslash{}currentmath\-style}, \texttt{mathstyle} -redefines many primitives and is therefore a source of incompatibilities. -If you run into such issues, please refer to the \texttt{mathstyle} -manual. - -If you want to disable the loading of \texttt{mathstyle}, use the -\texttt{nomathstyle} option. With the \texttt{nomathstyle} option, -the style is set to \texttt{\textbackslash{}cutstyle}, which you must - define by hand to be \texttt{\textbackslash{}displaystyle}, \texttt{\textbackslash{}textstyle -}(default), \texttt{\textbackslash{}scriptstyle}, \texttt{\textbackslash{}scriptscriptstyle}. -This means that cuts in subscripts and superscripts do not have the -proper size unless \texttt{\textbackslash{}cutstyle }is redefined. - +With this option, the command \texttt{\textbackslash currentmathstyle} +from the package \texttt{mathstyle} is used instead of the command +\texttt{\textbackslash ThisStyle} from the \texttt{scalerel} package. +The latter (default) uses \texttt{\textbackslash mathchoice} which +has exponential time complexity in the number of nestings. The former +does not use \texttt{\textbackslash mathchoice} but redefines many +primitives and is therefore a source of incompatibilities. \subsection{Option \texttt{realVert}} With the option \texttt{realVert}, the double bars are obtained with -the \texttt{\textbackslash{}Vert} command. Without it, two \texttt{\textbackslash{}vert} -symbols are used and their spacing is controlled with \texttt{\textbackslash{}cutinterbarskip}. -But, if \texttt{realVert} is not activated, then a penalty (\texttt{binoppenalty}) +the \texttt{\textbackslash Vert} command. But without it, two \texttt{\textbackslash vert} +symbols are used and their spacing is controlled with \texttt{\textbackslash cutinterbarskip}. +Also, if \texttt{realVert} is not activated, then a penalty (\texttt{binoppenalty}) is added, such that $\cut{\mu\alpha.\cut ab}{\mt x.\cut cd}$ splits across lines. - \subsection{Option \texttt{fixxits}} For some reason that the author was unable to identify, the vertical alignment is wrong with the Opentype XITS math font with XeTeX. The option \texttt{fixxits} fixes this behaviour. - \subsection{Customisation} The following mu-skips can be redefined in your preamble: @@ -289,24 +250,23 @@ \toprule Command & Defines the spacing...\tabularnewline \midrule -\texttt{\textbackslash{}cutbarskip=5.0mu plus 8mu minus 2.0mu} & around bars\tabularnewline -\texttt{\textbackslash{}cutangleskip=0.0mu plus 8mu minus 1.0mu} & around delimiters (inside)\tabularnewline -\texttt{\textbackslash{}cutangleouterskip=0.0mu plus 8mu minus 0mu} & around delimiters (outside)\tabularnewline -\texttt{\textbackslash{}cutinterbarskip=0.8mu plus 0mu minus 0mu} & between bars (excl. \texttt{realVert})\tabularnewline +\texttt{\textbackslash cutbarskip=5.0mu plus 8mu minus 2.0mu} & around bars\tabularnewline +\texttt{\textbackslash cutangleskip=0.0mu plus 8mu minus 1.0mu} & around delimiters (inside)\tabularnewline +\texttt{\textbackslash cutangleouterskip=0.0mu plus 8mu minus 0mu} & around delimiters (outside)\tabularnewline +\texttt{\textbackslash cutinterbarskip=0.8mu plus 0mu minus 0mu} & between bars (excl. \texttt{realVert})\tabularnewline \bottomrule \end{tabular} \par\end{center} \noindent (1 mu equals $1/18$ of an em in the current math font.) - \section{Reimplementation of fixed-size delimiters} In addition, I provide the following corrections and generalisations -of \texttt{\textbackslash{}big},\texttt{\textbackslash{}bigg}, etc. +of \texttt{\textbackslash big},\texttt{\textbackslash bigg}, etc. Why not using the latter? Because both the plain \TeX{} and the \texttt{amsmath} versions can be incorrect when changing the math font, the font size, -the math style or \texttt{\textbackslash{}delimitershortfall}. Moreover, +the math style or \texttt{\textbackslash delimitershortfall}. Moreover, Opentype math fonts sometimes offer more than five sizes. For this package we need a robust solution. @@ -316,49 +276,45 @@ Command & Example & \tabularnewline \midrule \multicolumn{3}{l}{\emph{\#1-th size of delimiter \#2}}\tabularnewline -\texttt{\textbackslash{}nthleft\{\#1\}\{\#2\} } & \texttt{\textbackslash{}nthleft\{2\}(} & $\nthleft{2}($\tabularnewline\addlinespace[0.1em] -\texttt{\textbackslash{}nthmiddle\{\#1\}\{\#2\}} & \texttt{\textbackslash{}nthmiddle\{2\}\textbackslash{}Vert} & $\nthmiddle{2}\Vert$\tabularnewline\addlinespace[0.1em] -\texttt{\textbackslash{}nthright\{\#1\}\{\#2\}} & \texttt{\textbackslash{}nthright\{2\})} & $\nthright{2})$\tabularnewline\addlinespace[0.1em] +\texttt{\textbackslash nthleft\{\#1\}\{\#2\} } & \texttt{\textbackslash nthleft\{2\}(} & $\nthleft{2}($\tabularnewline\addlinespace[0.1em] +\texttt{\textbackslash nthmiddle\{\#1\}\{\#2\}} & \texttt{\textbackslash nthmiddle\{2\}\textbackslash Vert} & $\nthmiddle{2}\Vert$\tabularnewline\addlinespace[0.1em] +\texttt{\textbackslash nthright\{\#1\}\{\#2\}} & \texttt{\textbackslash nthright\{2\})} & $\nthright{2})$\tabularnewline\addlinespace[0.1em] \multicolumn{1}{l}{\emph{delimiter \#2 of height at least \#1}} & & \tabularnewline\addlinespace[0.1em] -\texttt{\textbackslash{}lenleft\{\#1\}\{\#2\}} & \texttt{\textbackslash{}lenleft\{3.2mm\}{[}} & $\lenleft{3mm}[$\tabularnewline\addlinespace[0.1em] -\texttt{\textbackslash{}lenmiddle\{\#1\}\{\#2\}} & \texttt{\textbackslash{}lenmiddle\{3.2mm\}|} & $\lenmiddle{3mm}|$\tabularnewline\addlinespace[0.1em] -\texttt{\textbackslash{}lenright\{\#1\}\{\#2\}} & \texttt{\textbackslash{}lenright\{3.2mm\}{]}} & $\lenright{3mm}]$\tabularnewline\addlinespace[0.1em] +\texttt{\textbackslash lenleft\{\#1\}\{\#2\}} & \texttt{\textbackslash lenleft\{3.2mm\}{[}} & $\lenleft{3mm}[$\tabularnewline\addlinespace[0.1em] +\texttt{\textbackslash lenmiddle\{\#1\}\{\#2\}} & \texttt{\textbackslash lenmiddle\{3.2mm\}|} & $\lenmiddle{3mm}|$\tabularnewline\addlinespace[0.1em] +\texttt{\textbackslash lenright\{\#1\}\{\#2\}} & \texttt{\textbackslash lenright\{3.2mm\}{]}} & $\lenright{3mm}]$\tabularnewline\addlinespace[0.1em] \multicolumn{3}{l}{\emph{delimiter \#2 of height exactly \#1 obtained by scaling the above one}}\tabularnewline\addlinespace[0.1em] -\texttt{\textbackslash{}reallenleft\{\#1\}\{\#2\}} & \texttt{\textbackslash{}reallenleft\{3.2mm\}{[}} & $\reallenleft{3mm}[$\tabularnewline\addlinespace[0.1em] -\texttt{\textbackslash{}reallenmiddle\{\#1\}\{\#2\}} & \texttt{\textbackslash{}reallenmiddle\{3.2mm\}|} & $\reallenmiddle{3mm}|$\tabularnewline\addlinespace[0.1em] -\texttt{\textbackslash{}reallenright\{\#1\}\{\#2\}} & \texttt{\textbackslash{}reallenright\{3.2mm\}{]}} & $\reallenright{3mm}]$\tabularnewline +\texttt{\textbackslash reallenleft\{\#1\}\{\#2\}} & \texttt{\textbackslash reallenleft\{3.2mm\}{[}} & $\reallenleft{3mm}[$\tabularnewline\addlinespace[0.1em] +\texttt{\textbackslash reallenmiddle\{\#1\}\{\#2\}} & \texttt{\textbackslash reallenmiddle\{3.2mm\}|} & $\reallenmiddle{3mm}|$\tabularnewline\addlinespace[0.1em] +\texttt{\textbackslash reallenright\{\#1\}\{\#2\}} & \texttt{\textbackslash reallenright\{3.2mm\}{]}} & $\reallenright{3mm}]$\tabularnewline \bottomrule \end{tabular} \par\end{center} +\subsection{Example with \texttt{\textbackslash nthleft}} -\subsection{Example with \texttt{\textbackslash{}nthleft}} - -\texttt{\footnotesize{}\textbackslash{}nrthleft0{[}\textbackslash{}nthleft1{[}\textbackslash{}nthleft2{[}\textbackslash{}nthleft3{[}\textbackslash{}nthleft4{[}\textbackslash{}nthleft5{[}\textbackslash{}nthleft6{[}}{\footnotesize \par} +\texttt{\footnotesize{}\textbackslash nrthleft0(\textbackslash nthleft1(\textbackslash nthleft2(\textbackslash nthleft3(\textbackslash nthleft4(\textbackslash nthleft5(\textbackslash nthleft6(}{\footnotesize \par} \[ \nthleft0(\nthleft1(\nthleft2(\nthleft3(\nthleft4(\nthleft5(\nthleft6( \] +\subsection{Example with \texttt{\textbackslash big},\texttt{\textbackslash Big},\texttt{\textbackslash bigg},\texttt{\textbackslash Bigg}} - -\subsection{Example with \texttt{\textbackslash{}big},\texttt{\textbackslash{}Big},\texttt{\textbackslash{}bigg},\texttt{\textbackslash{}Bigg}} - -\texttt{\footnotesize{}{[}\textbackslash{}big{[}\textbackslash{}Big{[}\textbackslash{}bigg{[}\textbackslash{}Bigg{[}}{\footnotesize \par} +\texttt{\footnotesize{}(\textbackslash big(\textbackslash Big(\textbackslash bigg(\textbackslash Bigg(}{\footnotesize \par} \[ (\big(\Big(\bigg(\Bigg( \] -The above uses the \texttt{\textbackslash{}big} commands from the +The above uses the \texttt{\textbackslash big} commands from the \texttt{amsmath} package. The \texttt{amsmath} package corrects issues with the original \TeX{} commands, but I could still notice inconsistencies, -such as \texttt{\textbackslash{}big} starting at size 2, under some -font combinations. \texttt{\textbackslash{}nthleft}, \texttt{\textbackslash{}nthright} -and \texttt{\textbackslash{}nthmiddle} are implemented in a more robust +such as \texttt{\textbackslash big} starting at size 2, under some +font combinations. \texttt{\textbackslash nthleft}, \texttt{\textbackslash nthright} +and \texttt{\textbackslash nthmiddle} are implemented in a more robust way. - \section{License} This work may be distributed and/or modified under the conditions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/perfectcut.doc.tlpobj new/tlpkg/tlpobj/perfectcut.doc.tlpobj --- old/tlpkg/tlpobj/perfectcut.doc.tlpobj 2016-04-14 19:34:08.000000000 +0200 +++ new/tlpkg/tlpobj/perfectcut.doc.tlpobj 2017-05-04 02:07:13.000000000 +0200 @@ -1,9 +1,9 @@ name perfectcut.doc category Package -revision 35501 +revision 44175 shortdesc doc files of perfectcut relocated 1 -docfiles size=45 +docfiles size=50 RELOC/doc/latex/perfectcut/README RELOC/doc/latex/perfectcut/perfectcut.pdf RELOC/doc/latex/perfectcut/perfectcut.tex ++++++ perfectcut.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/perfectcut/perfectcut.sty new/tex/latex/perfectcut/perfectcut.sty --- old/tex/latex/perfectcut/perfectcut.sty 2014-11-03 22:51:47.000000000 +0100 +++ new/tex/latex/perfectcut/perfectcut.sty 2017-05-03 23:29:26.000000000 +0200 @@ -2,23 +2,23 @@ %%%%%%%%%%%%%%%%%%% %%% %%% Author: Guillaume Munch-Maccagnoni -%%% http://www.pps.univ-paris-diderot.fr/~munch/ -%%% +%%% http://guillaume.munch.name/ +%%% %%% This work may be distributed and/or modified under the conditions of %%% the LaTeX Project Public License, either version 1.3 of this license %%% or (at your option) any later version. Refer to the README file. -%%% %%% -\ProvidesPackage{perfectcut}[03/11/2014 Perfect Cut v2.0] +%%% +\ProvidesPackage{perfectcut}[04/22/2017 Perfect Cut v2.2] %%% Option processing \newif\ifcut@mathstyle@ -\cut@mathstyle@true +\cut@mathstyle@false \newif\ifcut@realVert@ \cut@realVert@false \newif\ifcut@fixxits@ \cut@fixxits@false -\DeclareOption{nomathstyle}{\cut@mathstyle@false} -\let\cutstyle\textstyle +\DeclareOption{nomathstyle}{\cut@mathstyle@false}%backwards compat +\DeclareOption{mathstyle}{\cut@mathstyle@true} \DeclareOption{realVert}{\cut@realVert@true} \DeclareOption{fixxits}{\cut@fixxits@true} \ProcessOptions* @@ -29,6 +29,7 @@ \newmuskip\cutbarskip \newmuskip\cutinterbarskip \newmuskip\cutangleouterskip +\newmuskip\cutcasebarskip \newif\ifcutdebug %%% Exported commands %%See end of file for a more detailed description of the commands @@ -54,6 +55,7 @@ \cutangleskip=0.0mu plus 8mu minus 1.0mu \cutangleouterskip=0.0mu plus 8mu minus 0.0mu \cutinterbarskip=1.4mu plus 0mu minus 0mu +\cutcasebarskip=3.0mu plus 5.0mu minus 1.5mu \cutdebugfalse%% print the size after each \rangle? %%% Various reimplementations of \left, \right and \middle. %% \nthleft{4}\langle ==> fourth size of \langle; begins at 0 @@ -83,9 +85,12 @@ %% setting up mathstyle \ifcut@mathstyle@ \RequirePackage{mathstyle} - \def\currentcutstyle{\currentmathstyle} + \def\cut@currentcutstyle{\currentmathstyle} + \def\cut@setcurrentcutstyle{} \else - \def\currentcutstyle{\cutstyle} + \RequirePackage{scalerel} + \def\cut@setcurrentcutstyle{\ThisStyle} + \def\cut@currentcutstyle{\SavedStyle} \fi %% sets the behaviour of delimiters to always grow while evaluating #1 @@ -94,24 +99,24 @@ \global\delimitershortfall=-0.1pt%that's the trick to get perfect growth \count0=\delimiterfactor% \global\delimiterfactor=901\relax% - \hbox{$\m@th\currentcutstyle#1$}% + \hbox{$\m@th\cut@currentcutstyle#1$}% \global\delimitershortfall=\skip0% \global\delimiterfactor=\count0% } %% scale #2 to size #1 (length) \newcommand{\cut@resizetoheight}[2]{% - \resizebox{!}{#1}{\hbox{$\m@th\currentcutstyle#2$}}% + \resizebox{!}{#1}{\hbox{$\m@th\cut@currentcutstyle#2$}}% } \newsavebox\cut@boxi \newsavebox\cut@boxj %% scale #2 to the size of #1. Assumes that #1 goes above and below the base line. \newcommand{\cut@resizetoheightof}[2]{% - \sbox{\cut@boxi}{$\m@th\currentcutstyle#1$}% - \sbox{\cut@boxj}{$\m@th\currentcutstyle#2$}% + \sbox{\cut@boxi}{$\m@th\cut@currentcutstyle#1$}% + \sbox{\cut@boxj}{$\m@th\cut@currentcutstyle#2$}% \raisebox{-\dp\cut@boxi}{% - \resizebox{!}{\ht\cut@boxi+\dp\cut@boxi}{% + \resizebox{\width}{\ht\cut@boxi+\dp\cut@boxi}{% \raisebox{\dp\cut@boxj}{\usebox{\cut@boxj}}% }% }% @@ -128,17 +133,17 @@ %% used in order to have vertical bars of the perfect size \newcommand{\cut@matchingldelim}[2]{\mathopen{\cut@resizetoheightof{#1}{\cut@nextldelim{#2}{#1}}}} \newcommand{\cut@matchingrdelim}[2]{\mathclose{\cut@resizetoheightof{#1}{\cut@nextrdelim{#2}{#1}}}} -\newcommand{\cut@matchingmdelim}[2]{\mathrel{\cut@resizetoheightof{#1}{\cut@nextmdelim{#2}{#1}}}} +\newcommand{\cut@matchingmdelim}[2]{\mathord{\cut@resizetoheightof{#1}{\cut@nextmdelim{#2}{#1}}}} %% gives the delimiter #2 which is immediately longer than #1 (length) -\newcommand{\cut@lengthldelim}[2]{\mathopen{\cut@setshortfall{\cut@nextldelim#2{\rule[-0.101pt]{0pt}{#1}}}}} -\newcommand{\cut@lengthrdelim}[2]{\mathclose{\cut@setshortfall{\cut@nextrdelim#2{\rule[-0.101pt]{0pt}{#1}}}}} -\newcommand{\cut@lengthmdelim}[2]{\mathrel{\cut@setshortfall{\cut@nextmdelim#2{\rule[-0.101pt]{0pt}{#1}}}}} - -%% like the previous one but resized to exactly match #1 (length) -\newcommand{\cut@reallengthldelim}[2]{\mathopen{\cut@resizetoheight{#1}{\cut@nextldelim#2{\rule[-0.101pt]{0pt}{#1}}}}} -\newcommand{\cut@reallengthrdelim}[2]{\mathclose{\cut@resizetoheight{#1}{\cut@nextrdelim#2{\rule[-0.101pt]{0pt}{#1}}}}} -\newcommand{\cut@reallengthmdelim}[2]{\mathrel{\cut@resizetoheight{#1}{\cut@nextmdelim#2{\rule[-0.101pt]{0pt}{#1}}}}} +\newcommand{\cut@lengthldelim}[2]{\mathopen{\cut@setcurrentcutstyle{\cut@setshortfall{\cut@nextldelim#2{\rule[-0.101pt]{0pt}{#1}}}}}} +\newcommand{\cut@lengthrdelim}[2]{\mathclose{\cut@setcurrentcutstyle{\cut@setshortfall{\cut@nextrdelim#2{\rule[-0.101pt]{0pt}{#1}}}}}} +\newcommand{\cut@lengthmdelim}[2]{\mathord{\cut@setcurrentcutstyle{\cut@setshortfall{\cut@nextmdelim#2{\rule[-0.101pt]{0pt}{#1}}}}}} + +%% like the previous one but resized to exactly match #1 (length) +\newcommand{\cut@reallengthldelim}[2]{\mathopen{\cut@setcurrentcutstyle{\cut@resizetoheight{#1}{\cut@nextldelim#2{\rule[-0.101pt]{0pt}{#1}}}}}} +\newcommand{\cut@reallengthrdelim}[2]{\mathclose{\cut@setcurrentcutstyle{\cut@resizetoheight{#1}{\cut@nextrdelim#2{\rule[-0.101pt]{0pt}{#1}}}}}} +\newcommand{\cut@reallengthmdelim}[2]{\mathord{\cut@setcurrentcutstyle{\cut@resizetoheight{#1}{\cut@nextmdelim#2{\rule[-0.101pt]{0pt}{#1}}}}}} %I don't get anything about this bug which affects the %alignment with respect to the math axis @@ -165,10 +170,10 @@ \def\cut@tempnextdelim{#3{#2}}% \cut@setshortfall{\cut@iter{#1}\cut@tempnextdelim}% } -%% \cut@nthxdelim gives the #1-th size of the delimiter #2 -\newcommand{\cut@nthldelim}[2]{\mathopen{\cut@nthdelim{#1}{#2}{\cut@nextldelim}}} -\newcommand{\cut@nthrdelim}[2]{\mathclose{\cut@nthdelim{#1}{#2}{\cut@nextrdelim}}} -\newcommand{\cut@nthmdelim}[2]{\mathrel{\cut@nthdelim{#1}{#2}{\cut@nextmdelim}}} +%% \cut@nthxdelim gives the #1-th size of the delimiter #2 +\newcommand{\cut@nthldelim}[2]{\mathopen{\cut@setcurrentcutstyle{\cut@nthdelim{#1}{#2}{\cut@nextldelim}}}} +\newcommand{\cut@nthrdelim}[2]{\mathclose{\cut@setcurrentcutstyle{\cut@nthdelim{#1}{#2}{\cut@nextrdelim}}}} +\newcommand{\cut@nthmdelim}[2]{\mathord{\cut@setcurrentcutstyle{\cut@nthdelim{#1}{#2}{\cut@nextmdelim}}}} %%%% now the main algorithm @@ -209,9 +214,9 @@ %computing recursively \setcounter{\cut@localheight}{-1}% \expandafter\sbox\csname\cut@localsavebox{0}\endcsname% - {$\m@th\currentcutstyle#2$}% + {$\m@th\cut@currentcutstyle#2$}% \expandafter\sbox\csname\cut@localsavebox{1}\endcsname% - {$\m@th\currentcutstyle#3$}% + {$\m@th\cut@currentcutstyle#3$}% \addtocounter{\cut@localheight}{#1}% %exporting values outside the local scope \setcounter{cut@finalheight}{\value{\cut@localheight}}% @@ -227,7 +232,7 @@ %% Calls to cut primitives inside #2 and #4 will have a smaller height. %% Arguments #1, #3 and #5 can access the current height in two different %% forms via \cut@n and \count0. -\newcommand{\cut@computeBinary@IncreaseHeight}[5]{% +\newcommand{\cut@computeBinary@IncreaseHeight}[5]{\cut@setcurrentcutstyle{% \cut@computeBinary@main{1}{#2}{#4}% \@ifundefined{c@\cut@localheight}{}{% if #2 and #4 did not contain any cut primitive \ifnum\value{cut@finalheight}>\value{\cut@localheight}% @@ -241,14 +246,14 @@ #3% \usebox{\cut@boxright}% #5% -} +}} %% Displays #1#2#3#4#5. Arguments #2 and #4 can contain other cut primitives. %% Does not increase the current height computed by cut primitives inside #2 %% and #4. %% Arguments #1, #3 and #5 can access the current height in two different %% forms via \cut@n and \count0. -\newcommand{\cut@computeBinary@CurrentHeight}[5]{% +\newcommand{\cut@computeBinary@CurrentHeight}[5]{\cut@setcurrentcutstyle{% \cut@computeBinary@main{0}{#2}{#4}% \ifnum\value{cut@finalheight}<0% \setcounter{cut@finalheight}{0}% @@ -265,14 +270,14 @@ #3% \usebox{\cut@boxright}% #5% -} +}} %% Displays #1#2#3#4#5. Arguments #2 and #4 can contain other cut primitives. %% Does not increase the current height computed by cut primitives inside #2 %% and #4 but the height to display is increased by 1. %% Arguments #1, #3 and #5 can access the height height in two different %% forms via \cut@n and \count0. -\newcommand{\cut@computeBinary@CurrentHeightPlusOne}[5]{% +\newcommand{\cut@computeBinary@CurrentHeightPlusOne}[5]{\cut@setcurrentcutstyle{% \cut@computeBinary@main{0}{#2}{#4} \@ifundefined{c@\cut@localheight}{}{% if #2 and #4 did not contain any cut primitive \ifnum\value{cut@finalheight}>\value{\cut@localheight}% @@ -287,7 +292,7 @@ #3% \usebox{\cut@boxright}% #5% -} +}} %%% Implementation of the particular delimiters @@ -382,9 +387,9 @@ {\nthleft{\cut@n}[% \mskip\cutangleskip}% {#1}% - {\mskip\cutbarskip% + {\mskip\cutcasebarskip% \cut@matchvert{\nthleft{\cut@n}[}% - \mskip\cutbarskip}% + \mskip\cutcasebarskip}% {#2}% {\mskip\cutangleskip% \nthright{\cut@n}]}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/perfectcut.tlpobj new/tlpkg/tlpobj/perfectcut.tlpobj --- old/tlpkg/tlpobj/perfectcut.tlpobj 2016-04-14 19:34:08.000000000 +0200 +++ new/tlpkg/tlpobj/perfectcut.tlpobj 2017-05-04 02:07:13.000000000 +0200 @@ -1,20 +1,23 @@ name perfectcut category Package -revision 35501 -shortdesc Brackets whose size adjusts to the nesting +revision 44175 +shortdesc Delimiters whose size adjusts to the nesting relocated 1 -longdesc The package defines the command \perfectcut#1#2 which displays -longdesc a bracket <#1||#2>. Its effect is to determine the size of the -longdesc bracket depending on the number of nested \perfectcut -longdesc (regardless of the contents). The command is intended for use: -longdesc In proof theory, for term notations of sequent calculus, In -longdesc computer science, for the modeling of abstract machines. The -longdesc package also offers a reimplementation of \big, \bigg, etc., -longdesc into arbitrary-size variants. -runfiles size=4 +longdesc This package defines the command \perfectcut#1#2 which displays +longdesc a bracket <#1||#2>. Various delimiters are similarly defined. +longdesc The effect of these commands is to let the delimiters grow +longdesc according to the number of nested \perfectcommands (regardless +longdesc of the size of the contents). The package is originally +longdesc intended for solving a notational issue regarding the +longdesc representation of abstract-machine-like calculi in proof theory +longdesc and computer science. For general use, the package also defines +longdesc commands for defining custom delimiters that behave in the same +longdesc way. This package also offers a sound reimplementation of \big, +longdesc \bigg, etc. +runfiles size=5 RELOC/tex/latex/perfectcut/perfectcut.sty catalogue-ctan /macros/latex/contrib/perfectcut -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-05-03 14:02:24 +0200 catalogue-license lppl1.3 -catalogue-topics comp-theory -catalogue-version 2.0 +catalogue-topics paren-mgmt comp-theory +catalogue-version 2.2 ++++++ perltex.doc.tar.xz ++++++ ++++++ perltex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/perltex.tlpobj new/tlpkg/tlpobj/perltex.tlpobj --- old/tlpkg/tlpobj/perltex.tlpobj 2016-04-14 19:34:09.000000000 +0200 +++ new/tlpkg/tlpobj/perltex.tlpobj 2017-04-14 17:53:57.000000000 +0200 @@ -18,7 +18,7 @@ texmf-dist/scripts/perltex/perltex.pl texmf-dist/tex/latex/perltex/perltex.sty catalogue-ctan /macros/latex/contrib/perltex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics callback catalogue-version 2.1 ++++++ permute.doc.tar.xz ++++++ ++++++ permute.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/permute.tlpobj new/tlpkg/tlpobj/permute.tlpobj --- old/tlpkg/tlpobj/permute.tlpobj 2016-04-14 19:34:09.000000000 +0200 +++ new/tlpkg/tlpobj/permute.tlpobj 2017-04-14 17:53:57.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=3 RELOC/tex/latex/permute/permute.sty catalogue-ctan /macros/latex/contrib/permute -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths ++++++ persian-bib.doc.tar.xz ++++++ ++++++ persian-bib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/persian-bib.tlpobj new/tlpkg/tlpobj/persian-bib.tlpobj --- old/tlpkg/tlpobj/persian-bib.tlpobj 2016-04-14 19:34:09.000000000 +0200 +++ new/tlpkg/tlpobj/persian-bib.tlpobj 2017-04-14 17:53:58.000000000 +0200 @@ -23,7 +23,7 @@ RELOC/bibtex/bst/persian-bib/unsrt-fa.bst RELOC/bibtex/csf/persian-bib/cp1256fa.csf catalogue-ctan /biblio/bibtex/contrib/persian-bib -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics persian bibtex-sty catalogue-version 0.9 ++++++ petiteannonce.doc.tar.xz ++++++ ++++++ petiteannonce.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/petiteannonce.tlpobj new/tlpkg/tlpobj/petiteannonce.tlpobj --- old/tlpkg/tlpobj/petiteannonce.tlpobj 2016-04-14 19:34:10.000000000 +0200 +++ new/tlpkg/tlpobj/petiteannonce.tlpobj 2017-04-14 17:53:58.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=3 RELOC/tex/latex/petiteannonce/petiteannonce.cls catalogue-ctan /macros/latex/contrib/petiteannonce -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics advert catalogue-version 1.0001 ++++++ petri-nets.doc.tar.xz ++++++ ++++++ petri-nets.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/petri-nets.tlpobj new/tlpkg/tlpobj/petri-nets.tlpobj --- old/tlpkg/tlpobj/petri-nets.tlpobj 2016-04-14 19:34:10.000000000 +0200 +++ new/tlpkg/tlpobj/petri-nets.tlpobj 2017-04-14 17:53:58.000000000 +0200 @@ -18,6 +18,6 @@ texmf-dist/tex/generic/petri-nets/pntext.tex texmf-dist/tex/generic/petri-nets/pnversion.tex catalogue-ctan /macros/generic/petri-nets -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics maths ++++++ pfarrei.doc.tar.xz ++++++ ++++++ pfarrei.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pfarrei.tlpobj new/tlpkg/tlpobj/pfarrei.tlpobj --- old/tlpkg/tlpobj/pfarrei.tlpobj 2016-04-14 19:34:11.000000000 +0200 +++ new/tlpkg/tlpobj/pfarrei.tlpobj 2017-04-14 17:53:58.000000000 +0200 @@ -18,7 +18,7 @@ texmf-dist/tex/latex/pfarrei/a5toa4.tex texmf-dist/tex/latex/pfarrei/pfarrei.sty catalogue-ctan /macros/latex/contrib/pfarrei -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics compact-print catalogue-version r36 ++++++ pgf-blur.doc.tar.xz ++++++ ++++++ pgf-blur.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgf-blur.tlpobj new/tlpkg/tlpobj/pgf-blur.tlpobj --- old/tlpkg/tlpobj/pgf-blur.tlpobj 2016-04-14 19:34:29.000000000 +0200 +++ new/tlpkg/tlpobj/pgf-blur.tlpobj 2017-04-14 17:54:05.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/pgf-blur/tikzlibraryshadows.blur.code.tex catalogue-ctan /graphics/pgf/contrib/pgf-blur -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-subpic pgf-tikz catalogue-version 1.01 ++++++ pgf-soroban.doc.tar.xz ++++++ ++++++ pgf-soroban.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgf-soroban.tlpobj new/tlpkg/tlpobj/pgf-soroban.tlpobj --- old/tlpkg/tlpobj/pgf-soroban.tlpobj 2016-04-14 19:34:29.000000000 +0200 +++ new/tlpkg/tlpobj/pgf-soroban.tlpobj 2017-04-14 17:54:06.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/pgf-soroban/pgf-soroban.sty catalogue-also pst-soroban catalogue-ctan /graphics/pgf/contrib/pgf-soroban -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics diagram catalogue-version 1.1 ++++++ pgf-spectra.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pgf-spectra/spectra.data.tex new/doc/latex/pgf-spectra/spectra.data.tex --- old/doc/latex/pgf-spectra/spectra.data.tex 2016-04-21 22:56:02.000000000 +0200 +++ new/doc/latex/pgf-spectra/spectra.data.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,116 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% ***************** \wl@elt@data{Chemical symbol} -% -%% Visible lines of some classical elements... thanks Larry W. % -% Data structure : list of 3 elements array -% { -% [wavelength1 intensity1 charge1], -% [wl2 I2 q2], -% [wl3 I3 q3], -% ... -% }{Imax} -% (intensity max at the end of each entry) -% Sometimes, there is no charge in the source file, so I put charge = -1 -% (see Es, Bk...) -% -\protected\def\wl@elt@data#1{\relax\ignorespaces% -\wl@elt@search{#1}{H}{[383.5384 5 0],[388.9049 6 0],[397.0072 8 0],[410.174 15 0],[434.047 30 0],[486.133 80 0],[656.272 120 0],[656.2852 180 0]}{180}% -\wl@elt@search{#1}{He}{[381.9607 10 0],[381.976 1 0],[388.865 500 0],[396.4729 20 0],[400.927 1 0],[402.6191 50 0],[402.636 5 0],[412.082 12 0],[412.099 2 0],[414.376 3 0],[438.7929 10 0],[443.755 3 0],[447.1479 200 0],[447.168 25 0],[468.54 6 1],[468.57 30 1],[471.3146 30 0],[471.338 4 0],[492.1931 20 0],[501.5678 100 0],[504.774 10 0],[541.152 5 1],[587.562 500 0],[587.597 100 0],[656.01 8 1],[667.815 100 0],[686.748 3 0],[706.519 200 0],[706.571 30 0],[728.135 50 0]}{500}% -\wl@elt@search{#1}{Li}{[391.53 20 0],[391.535 20 0],[398.548 10 0],[398.554 10 0],[413.256 40 0],[413.262 40 0],[427.307 20 0],[427.313 20 0],[432.542 5 1],[432.547 5 1],[432.554 1 1],[460.283 13 0],[460.289 13 0],[467.165 6 1],[467.17 2 1],[467.806 3 1],[467.829 1 1],[488.132 4 1],[488.139 4 1],[488.149 1 1],[497.166 8 0],[497.175 8 0],[548.355 600 1],[548.565 600 1],[610.354 320 0],[610.365 320 0],[670.776 3600 0],[670.791 3600 0]}{3600}% -\wl@elt@search{#1}{Be}{[381.345 700 0],[386.513 40 0],[386.542 80 0],[386.551 1 0],[386.572 6 0],[386.603 100 0],[425.305 100 0],[425.376 60 0],[436.066 300 1],[436.099 500 1],[440.794 400 0],[457.266 12 0],[467.333 700 1],[467.342 1000 1],[470.937 6 0],[482.816 200 1],[484.916 40 0],[485.822 2 1],[508.775 80 0],[521.812 8 1],[521.833 20 1],[525.586 3 1],[527.028 64 1],[527.081 500 1],[540.304 20 1],[541.021 20 1],[622.911 10 0],[627.943 16 1],[627.973 30 1],[647.354 30 0],[654.789 60 1],[655.836 60 1],[656.452 30 0],[663.644 2 1],[675.672 1 1],[675.713 2 1],[678.656 30 0],[688.422 1 0],[688.444 6 0],[698.275 100 0],[715.44 6 0],[715.465 40 0],[720.913 100 0],[740.12 3 1],[740.143 2 1],[755.19 10 0],[761.868 10 0],[761.888 20 0],[424.914 90 2],[448.552 2 2],[448.73 100 2],[449.509 1 2],[449.78 140 2],[614.201 140 2]}{1000}% -\wl@elt@search{#1}{B}{[412.193 285 1],[419.479 110 1],[447.21 110 1],[447.285 110 1],[478.421 70 1],[494.038 110 1],[608.044 110 1],[628.547 70 1],[703.02 70 1],[703.19 40 1],[424.298 40 2],[424.361 70 2],[448.705 220 2],[449.773 360 2]}{360}% -\wl@elt@search{#1}{C}{[387.619 350 1],[387.641 350 1],[387.666 350 1],[391.898 570 1],[392.069 800 1],[407.452 250 1],[407.585 350 1],[426.7 800 1],[426.726 1000 1],[477.175 200 0],[493.205 200 0],[505.217 200 0],[513.294 350 1],[513.328 350 1],[514.349 350 1],[514.516 570 1],[515.109 400 1],[538.034 300 0],[564.807 250 1],[566.247 350 1],[588.977 570 1],[589.159 350 1],[600.113 200 0],[600.603 250 0],[600.718 110 0],[601.068 150 0],[601.322 300 0],[601.484 250 0],[657.805 800 1],[658.288 570 1],[658.761 200 0],[678.39 250 1],[711.318 250 0],[711.519 250 0],[711.563 250 1],[711.699 200 0],[711.99 350 1],[723.132 800 1],[723.642 1000 1],[405.606 150 2],[406.794 200 2],[406.891 250 2],[407.026 250 2],[416.286 150 2],[418.69 250 2],[432.556 200 2],[464.742 600 2],[465.025 520 2],[465.147 375 2],[466.586 200 2],[569.592 450 2],[582.642 150 2],[674.438 150 2],[703.725 150 2],[761.265 150 2],[465.83 200 3],[580.133 250 3],[581.198 200 3],[772.62 90 3],[494.388 5 4],[494.456 5 4]}{1000}% -\wl@elt@search{#1}{N}{[383.837 285 1],[391.9 360 1],[395.585 450 1],[399.5 1000 1],[403.508 360 1],[404.131 550 1],[404.353 360 1],[409.994 140 0],[410.995 185 0],[417.616 285 1],[422.774 285 1],[423.691 285 1],[423.705 220 1],[424.178 450 1],[443.274 285 1],[444.703 650 1],[453.041 360 1],[460.148 550 1],[460.716 450 1],[461.387 360 1],[462.139 450 1],[463.054 870 1],[464.308 550 1],[478.813 285 1],[480.329 450 1],[484.738 180 0],[489.511 285 1],[491.494 160 0],[493.512 210 0],[495.023 160 0],[496.398 350 0],[498.737 285 1],[499.436 450 1],[500.148 650 1],[500.27 360 1],[500.515 870 1],[500.732 550 1],[501.062 450 1],[501.639 360 1],[502.566 360 1],[504.51 550 1],[528.12 185 0],[529.268 140 0],[549.567 450 1],[553.536 285 1],[566.663 650 1],[567.602 550 1],[567.956 870 1],[568.621 450 1],[571.077 450 1],[574.73 285 1],[575.25 700 0],[576.475 240 0],[582.954 265 0],[585.404 235 0],[592.781 360 1],[593.178 550 1],[594.024 285 1],[594.165 650 1],[595.239 285 1],[599.943 160 0],[600.847 210 0],[616.776 285 1],[637.962 360 1],[641.165 185 0],[642.064 210 0],[642.302 210 0],[642.832 210 0],[643.768 185 0],[644.094 235 0],[645.79 185 0],[646.844 300 0],[648.205 750 1],[648.27 360 0],[648.375 300 0],[648.171 265 0],[648.48 325 0],[649.122 160 0],[649.954 210 0],[650.631 185 0],[661.056 750 1],[662.254 185 0],[663.694 185 0],[664.496 235 0],[664.65 185 0],[665.346 235 0],[665.651 210 0],[672.262 185 0],[739.864 210 0],[740.612 160 0],[740.624 265 0],[742.364 685 0],[744.229 785 0],[746.831 900 0],[760.88 185 0],[776.224 450 1],[393.852 90 2],[399.863 150 2],[400.358 200 2],[409.733 250 2],[410.343 200 2],[419.576 120 2],[420.01 150 2],[433.291 90 2],[434.568 120 2],[437.911 300 2],[451.091 90 2],[451.486 120 2],[463.414 90 2],[464.064 120 2],[485.882 90 2],[486.715 150 2],[531.435 90 2],[532.082 200 2],[532.718 150 2],[645.411 90 2],[646.702 120 2],[405.776 150 3],[460.633 90 3],[638.077 150 3],[460.373 350 4],[461.998 250 4],[494.456 200 4],[761.846 60 4]}{1000}% -\wl@elt@search{#1}{O}{[380.314 160 1],[382.341 120 0],[391.196 450 1],[391.929 160 1],[394.729 185 0],[394.748 160 0],[394.759 140 0],[395.437 220 1],[395.461 100 0],[397.326 450 1],[398.22 220 1],[406.99 160 1],[407.216 285 1],[407.587 450 1],[408.391 80 1],[408.714 50 1],[408.927 150 1],[409.724 110 1],[410.5 220 1],[411.922 285 1],[413.281 160 1],[414.606 50 1],[415.33 220 1],[418.546 285 1],[418.979 450 1],[423.327 80 0],[425.374 50 1],[425.398 50 1],[427.547 50 1],[430.378 50 1],[431.714 285 1],[433.686 160 1],[434.556 220 1],[434.943 285 1],[436.69 220 1],[436.825 100 0],[439.595 220 1],[441.491 450 1],[441.698 285 1],[444.821 160 1],[445.238 160 1],[446.545 50 1],[446.628 50 1],[446.783 50 1],[446.941 50 1],[459.097 360 1],[459.617 285 1],[460.939 80 1],[463.885 160 1],[464.181 360 1],[464.914 450 1],[465.084 160 1],[466.164 360 1],[467.623 285 1],[469.921 220 1],[470.536 285 1],[492.46 160 1],[494.306 220 1],[532.91 135 0],[532.968 160 0],[533.074 190 0],[543.518 90 0],[543.578 110 0],[543.686 135 0],[557.734 120 0],[595.839 160 0],[595.858 190 0],[599.528 80 0],[604.623 160 0],[604.644 190 0],[604.649 110 0],[610.627 100 0],[615.598 400 0],[615.677 450 0],[615.818 490 0],[625.683 80 0],[626.155 100 0],[636.634 100 0],[637.432 100 0],[645.36 320 0],[645.444 360 0],[645.598 400 0],[660.491 80 0],[665.383 100 0],[700.192 360 0],[700.223 450 0],[715.67 210 0],[725.415 400 0],[725.445 450 0],[725.453 320 0],[747.644 210 0],[747.724 100 0],[747.908 120 0],[748.067 120 0],[770.675 100 0],[777.194 870 0],[777.417 810 0],[777.539 750 0],[396.159 200 2],[559.237 110 2],[412.399 100 4],[493.027 230 4],[559.791 130 4],[650.024 130 4]}{870}% -\wl@elt@search{#1}{F}{[380.583 140 1],[384.709 270 1],[384.999 260 1],[385.167 250 1],[389.848 5 0],[389.883 190 1],[390.193 180 1],[390.382 170 1],[393.069 8 0],[393.426 5 0],[394.856 5 0],[397.204 150 1],[397.267 160 1],[397.478 170 1],[402.473 240 1],[402.501 220 1],[402.549 230 1],[408.391 160 1],[410.307 190 1],[410.322 170 1],[410.351 200 1],[410.371 180 1],[410.387 170 1],[410.916 170 1],[411.654 160 1],[411.921 150 1],[420.715 140 1],[422.516 170 1],[424.412 150 1],[424.623 200 1],[424.639 190 1],[424.659 180 1],[424.677 170 1],[424.684 160 1],[427.536 170 1],[427.753 160 1],[427.893 160 1],[429.917 200 1],[444.653 160 1],[444.672 170 1],[444.719 180 1],[473.438 140 1],[485.939 170 1],[493.326 160 1],[496.065 6 0],[500.2 140 1],[517.325 150 1],[523.041 15 0],[527.901 12 0],[554.052 18 0],[555.243 12 0],[557.733 10 0],[558.927 160 1],[562.406 20 0],[562.693 12 0],[565.915 15 0],[566.753 40 0],[567.167 90 0],[568.914 18 0],[570.082 25 0],[570.731 25 0],[595.015 12 0],[595.919 25 0],[596.528 70 0],[599.443 50 0],[601.583 150 0],[603.804 80 0],[604.754 900 0],[608.011 100 0],[614.976 800 0],[621.087 400 0],[623.965 13000 0],[624.79 140 1],[634.851 10000 0],[641.365 8000 0],[656.969 450 0],[658.039 300 0],[665.041 400 0],[669.048 1800 0],[670.828 400 0],[677.398 7000 0],[679.553 1500 0],[683.426 9000 0],[685.603 50000 0],[687.022 8000 0],[690.248 15000 0],[690.982 6000 0],[696.635 4000 0],[703.747 45000 0],[712.789 30000 0],[717.99 130 1],[720.236 15000 0],[721.179 130 1],[730.903 1000 0],[731.102 15000 0],[731.43 700 0],[733.196 5000 0],[739.869 10000 0],[742.565 4000 0],[748.272 2200 0],[748.916 2500 0],[751.492 900 0],[755.224 5000 0],[757.338 5000 0],[760.717 7000 0],[775.47 18000 0],[442.03 140 2],[442.735 120 2],[443.232 120 2],[447.999 140 2],[501.254 150 2],[511.099 160 2],[575.317 140 2],[576.12 120 2],[609.182 150 2],[612.55 140 2],[623.357 130 2],[636.305 140 2],[733.677 120 2],[735.494 130 2]}{50000}% -\wl@elt@search{#1}{Ne}{[381.843 100 1],[382.975 120 1],[421.974 150 1],[423.385 100 1],[425.065 120 1],[436.986 120 1],[437.94 70 1],[437.955 150 1],[438.506 100 1],[439.199 200 1],[439.799 150 1],[440.93 150 1],[441.322 100 1],[442.139 100 1],[442.852 100 1],[442.863 100 1],[443.09 150 1],[443.094 150 1],[445.705 120 1],[452.272 100 1],[453.7754 10 0],[454.038 10 0],[456.906 100 1],[470.4395 15 0],[470.8862 12 0],[471.0067 10 0],[471.2066 10 0],[471.5347 15 0],[475.2732 10 0],[478.8927 12 0],[479.022 10 0],[482.7344 10 0],[488.4917 10 0],[500.5159 4 0],[503.7751 10 0],[514.4938 10 0],[533.0778 25 0],[534.1094 20 0],[534.3283 8 0],[540.0562 60 0],[556.2766 5 0],[565.6659 10 0],[571.9225 5 0],[574.8298 12 0],[576.4419 80 0],[580.445 12 0],[582.0156 40 0],[585.2488 500 0],[587.2828 100 0],[588.1895 100 0],[590.2462 60 0],[590.6429 60 0],[594.4834 100 0],[596.5471 100 0],[597.4627 100 0],[597.5534 120 0],[598.7907 80 0],[602.9997 100 0],[607.4338 100 0],[609.6163 80 0],[612.845 60 0],[614.3063 100 0],[616.3594 120 0],[618.2146 250 0],[621.7281 150 0],[626.6495 150 0],[630.4789 60 0],[633.4428 100 0],[638.2992 120 0],[640.2246 200 0],[650.6528 150 0],[653.2882 60 0],[659.8953 150 0],[665.2093 70 0],[667.8276 90 0],[671.7043 20 0],[692.9467 100 0],[702.405 90 0],[703.2413 100 0],[705.1292 50 0],[705.9107 80 0],[717.3938 100 0],[721.32 150 1],[723.519 150 1],[724.5167 100 0],[734.394 150 1],[747.2439 40 0],[748.8871 90 0],[749.21 100 1],[752.282 150 1],[753.5774 80 0],[754.4044 60 0],[772.4628 100 0],[774.074 120 1]}{500}% -\wl@elt@search{#1}{Na}{[408.137 200 1],[411.37 300 1],[412.308 250 1],[423.326 250 1],[423.899 2 0],[424.037 200 1],[424.09 250 1],[424.208 3 0],[427.364 4 0],[427.679 5 0],[428.784 2 0],[429.101 3 0],[429.248 250 1],[429.286 250 1],[430.881 250 1],[430.904 250 1],[432.091 250 1],[432.14 6 0],[432.462 7 0],[433.729 250 1],[434.149 4 0],[434.411 250 1],[434.474 5 0],[436.86 200 1],[437.522 200 1],[438.749 200 1],[439.003 8 0],[439.281 250 1],[439.334 9 0],[440.512 200 1],[441.989 6 0],[442.325 7 0],[444.67 200 1],[444.741 200 1],[445.474 200 1],[445.523 200 1],[445.721 200 1],[447.463 200 1],[447.88 200 1],[448.167 200 1],[449.015 200 1],[449.087 200 1],[449.418 10 0],[449.766 11 0],[449.962 200 1],[450.697 200 1],[451.921 200 1],[452.498 200 1],[453.332 200 1],[454.163 7 0],[454.519 8 0],[455.153 200 1],[459.092 160 1],[472.223 160 1],[473.11 160 1],[473.25 100 1],[474.167 160 1],[476.879 160 1],[478.879 100 1],[481.475 50 1],[483.526 50 1],[514.311 60 1],[519.165 100 1],[520.333 50 1],[520.855 80 1],[539.063 60 1],[540.046 70 1],[541.455 90 1],[568.2633 5 0],[568.8204 9 0],[588.995 1000 0],[589.5924 500 0],[617.525 60 1],[619.926 70 1],[623.468 70 1],[626.001 80 1],[627.474 80 1],[631.08 60 1],[635.283 60 1],[635.805 60 1],[636.115 70 1],[636.641 70 1],[637.891 60 1],[647.529 50 1],[651.421 90 1],[652.468 80 1],[653.07 130 1],[654.404 130 1],[654.575 130 1],[655.243 80 1]}{1000}% -\wl@elt@search{#1}{Mg}{[382.93 140 0],[383.23 300 0],[383.829 500 0],[384.824 8 1],[384.891 1 0],[385.04 7 1],[385.396 2 0],[385.496 1 0],[385.886 2 0],[387.831 3 0],[389.191 2 0],[389.33 2 0],[389.557 3 0],[390.386 4 0],[393.84 6 0],[398.421 1 0],[398.675 8 0],[405.469 2 0],[405.75 10 0],[407.506 3 0],[408.183 2 0],[416.51 4 0],[416.727 15 0],[435.191 20 0],[435.453 6 0],[438.038 6 0],[438.464 9 1],[439.059 10 1],[442.8 8 1],[443.399 9 1],[443.649 5 1],[443.66 4 1],[448.116 14 1],[448.133 13 1],[453.429 6 1],[457.11 28 0],[462.13 3 0],[470.299 7 0],[473.003 10 0],[473.959 6 1],[473.971 5 1],[485.11 7 1],[516.733 75 0],[517.268 220 0],[518.361 400 0],[526.421 8 1],[526.437 7 1],[534.598 1 0],[540.154 9 1],[550.96 2 0],[552.841 6 0],[571.109 30 0],[578.531 5 0],[578.556 4 0],[591.643 7 1],[591.816 6 1],[631.872 10 0],[631.924 9 0],[631.949 7 0],[634.674 10 1],[634.696 9 1],[654.597 11 1],[662.044 5 1],[662.057 6 1],[663.083 2 0],[678.145 7 1],[678.785 8 1],[681.286 7 1],[681.927 8 1],[689.49 4 0],[696.54 6 0],[706.041 8 0],[719.317 10 0],[729.106 10 0],[738.7 5 0],[738.769 12 0],[758.076 4 1],[765.76 20 0],[765.915 19 0],[765.99 17 0],[769.016 8 0],[769.155 15 0],[772.261 1 0],[774.634 1 0],[775.93 1 0],[778.65 5 1],[779.098 4 1],[491.6 10 2],[583.982 10 2],[625.675 15 2]}{500}% -\wl@elt@search{#1}{Al}{[390.068 450 1],[393.2 60 0],[394.4006 4500 0],[396.152 9000 0],[399.586 110 1],[422.681 290 1],[458.582 150 1],[458.819 110 1],[466.68 550 1],[489.876 110 1],[490.277 110 1],[528.021 150 1],[510.752 70 0],[528.377 290 1],[528.585 150 1],[531.232 110 1],[531.607 220 1],[537.184 150 1],[555.706 180 0],[555.795 110 0],[559.323 450 1],[585.362 110 1],[597.194 220 1],[600.176 290 1],[600.188 220 1],[600.642 450 1],[606.111 150 1],[606.843 290 1],[606.853 110 1],[607.323 450 1],[618.157 110 1],[618.168 150 1],[618.228 290 1],[618.245 220 1],[618.342 450 1],[620.152 450 1],[620.17 360 1],[622.618 290 1],[623.178 360 1],[624.336 450 1],[633.574 450 1],[669.602 360 0],[669.867 230 0],[708.397 60 0],[708.464 70 0],[736.157 110 0],[736.23 140 0],[760.616 60 0],[761.482 90 0],[398.014 110 2],[408.245 110 2],[408.861 150 2],[414.237 110 2],[414.992 650 2],[415.017 650 2],[436.464 110 2],[447.989 650 2],[447.997 650 2],[451.256 760 2],[452.894 550 2],[452.919 870 2],[470.115 110 2],[470.141 150 2],[490.41 110 2],[515.101 110 2],[516.389 110 2],[569.66 1200 2],[572.273 1000 2],[605.521 110 2],[763.537 220 2],[766.026 150 2],[768.197 220 2]}{9000}% -\wl@elt@search{#1}{Si}{[385.366 100 1],[385.602 500 1],[386.26 200 1],[390.5523 300 0],[395.574 10 1],[397.746 10 1],[399.177 15 1],[399.801 10 1],[407.545 20 1],[407.678 15 1],[410.2936 70 0],[412.807 300 1],[413.089 500 1],[418.335 10 1],[419.072 100 1],[419.813 50 1],[462.142 100 1],[462.172 150 1],[478.2991 50 0],[479.2212 35 0],[479.2324 80 0],[488.32 15 1],[490.699 20 1],[493.28 20 1],[494.7607 30 0],[500.6061 40 0],[504.103 1000 1],[505.598 1000 1],[518.19 100 1],[518.525 100 1],[519.286 200 1],[520.241 500 1],[529.519 30 1],[540.534 100 1],[541.724 15 1],[542.892 15 1],[543.289 15 1],[543.862 100 1],[544.726 20 1],[545.449 15 1],[545.645 100 1],[546.643 500 1],[546.687 500 1],[546.921 100 1],[549.323 40 0],[549.645 200 1],[551.7535 35 0],[554.074 100 1],[557.666 150 1],[562.2221 30 0],[563.297 100 1],[563.948 200 1],[564.5611 90 0],[566.066 150 1],[566.5554 80 0],[566.956 1000 1],[568.144 30 1],[568.4484 120 0],[568.881 300 1],[569.0425 100 0],[570.1105 90 0],[570.137 200 1],[570.637 100 1],[570.8397 160 0],[574.7667 45 0],[575.3625 45 0],[575.422 45 0],[576.2977 45 0],[577.2145 70 0],[578.0384 70 0],[578.573 30 1],[579.3071 90 0],[579.49 30 1],[579.7859 100 0],[580.047 150 1],[580.674 200 1],[582.78 30 1],[584.613 50 1],[586.748 10 1],[586.84 300 1],[587.3764 40 0],[591.522 150 1],[594.8545 200 0],[595.756 500 1],[597.893 500 1],[606.745 10 1],[608.006 20 1],[608.667 10 1],[612.5021 90 0],[613.1574 85 0],[613.185 90 0],[614.2487 100 0],[614.5015 100 0],[615.5134 160 0],[623.732 160 0],[623.8287 40 0],[624.3813 125 0],[624.4468 125 0],[625.4188 180 0],[633.1954 45 0],[634.71 1000 1],[637.136 1000 1],[652.6609 45 0],[652.7199 45 0],[655.5462 45 0],[666.052 50 1],[666.5 15 1],[667.188 100 1],[669.938 20 1],[671.704 50 1],[672.1853 100 0],[674.164 30 0],[675.028 20 1],[681.845 30 1],[682.982 50 1],[684.8568 30 0],[697.6523 80 0],[700.3567 180 0],[700.5883 180 0],[701.728 30 0],[701.7646 90 0],[703.4903 250 0],[716.469 70 0],[716.5545 200 0],[718.489 70 0],[719.358 65 0],[719.39 30 0],[722.6206 100 0],[723.5326 100 0],[723.582 60 0],[725.0625 180 0],[727.5294 160 0],[728.281 40 0],[728.9173 400 0],[729.026 55 0],[737.3 35 0],[740.5774 375 0],[740.9082 200 0],[741.535 40 0],[741.5946 275 0],[742.3497 425 0],[742.46 85 0],[768.0267 100 0],[774.271 40 0],[380.654 30 2],[384.246 7 2],[392.447 20 2],[394.749 6 2],[396.384 6 2],[398.124 5 2],[410.186 5 2],[410.242 8 2],[411.55 5 2],[433.85 9 2],[434.14 8 2],[437.763 8 2],[440.59 6 2],[440.672 8 2],[449.405 6 2],[455.262 30 2],[455.4 8 2],[456.782 25 2],[457.476 20 2],[461.966 7 2],[463.828 7 2],[466.587 8 2],[468.302 9 2],[468.38 7 2],[471.665 16 2],[473.052 7 2],[480.043 8 2],[481.333 15 2],[481.972 16 2],[482.897 18 2],[509.142 10 2],[511.376 7 2],[511.412 8 2],[519.726 5 2],[545.146 6 2],[547.305 7 2],[570.46 7 2],[571.629 8 2],[573.973 20 2],[589.879 10 2],[631.446 7 2],[652.436 6 2],[683.156 6 2],[685.165 7 2],[746.189 5 2],[746.262 8 2],[746.632 9 2],[761.236 12 2],[403.139 1 3],[403.806 2 3],[408.885 10 3],[411.61 9 3],[421.241 7 3],[431.41 3 3],[432.818 5 3],[440.373 2 3],[441.165 1 3],[461.127 1 3],[462.862 3 3],[463.124 9 3],[465.432 10 3],[465.692 3 3],[466.714 1 3],[467.33 2 3],[494.745 1 3],[495.011 3 3],[530.497 2 3],[530.949 1 3],[666.756 5 3],[670.121 7 3],[699.836 3 3],[704.794 6 3],[706.841 4 3],[763.05 2 3],[765.456 4 3],[767.875 4 3],[771.879 5 3],[772.382 6 3],[772.564 2 3],[773.047 1 3],[775.291 1 3]}{1000}% -\wl@elt@search{#1}{P}{[417.848 100 1],[428.86 200 1],[438.535 200 1],[442.071 400 1],[445.246 100 1],[446.3 150 1],[446.798 120 1],[447.526 200 1],[449.924 200 1],[453.081 120 1],[455.483 120 1],[455.807 120 1],[458.171 120 1],[458.804 500 1],[458.986 500 1],[460.208 600 1],[462.67 300 1],[465.831 300 1],[486.442 200 1],[492.72 150 1],[494.353 500 1],[495.439 300 1],[496.971 300 1],[519.141 150 1],[525.352 300 1],[529.613 400 1],[531.607 250 1],[534.475 300 1],[537.82 250 1],[538.688 300 1],[540.972 200 1],[542.591 400 1],[545.074 400 1],[545.831 100 0],[546.12 125 1],[547.775 200 0],[548.355 200 1],[549.973 200 1],[550.719 200 1],[554.114 200 1],[558.327 200 1],[558.834 250 1],[572.771 100 1],[602.418 500 1],[603.404 400 1],[604.312 500 1],[605.55 250 1],[605.786 100 1],[608.782 350 1],[609.768 150 0],[616.559 350 1],[619.901 180 0],[623.229 100 1],[636.727 200 1],[643.532 250 1],[643.631 130 1],[645.999 600 1],[650.346 600 1],[650.797 600 1],[671.328 150 1],[671.742 120 0],[716.545 100 0],[717.512 150 0],[717.666 120 0],[750.576 100 0],[390.4812 200 2],[391.4314 250 2],[395.7641 300 2],[397.8307 350 2],[405.744 200 2],[405.9312 400 2],[408.0084 300 2],[422.2195 500 2],[424.672 350 2],[442.8171 200 2],[446.3668 200 2],[447.9776 250 2],[608.3409 150 2],[640.9204 150 2],[648.444 150 2],[648.6381 150 2],[699.269 150 2],[424.9656 300 3],[454.0288 250 3],[454.1112 250 3],[454.8056 150 3],[454.8449 200 3],[523.5499 150 3],[598.9774 150 3],[614.2605 150 3],[671.3939 150 3],[671.5906 120 3],[744.3657 200 3],[408.318 150 4],[409.495 110 4],[515.672 110 4]}{600}% -\wl@elt@search{#1}{S}{[386.76 285 0],[390.2 285 0],[393.33 360 1],[412.08 450 0],[414.23 280 1],[414.51 360 1],[415.31 450 1],[416.27 450 1],[469.41 450 0],[469.54 285 0],[469.62 160 0],[471.62 280 1],[481.55 450 1],[492.41 360 1],[492.53 450 1],[499.35 285 0],[542.86 360 1],[543.28 650 1],[545.38 1000 1],[547.36 1000 1],[550.97 1000 1],[556.49 280 1],[560.61 1000 1],[564 450 1],[564.03 450 1],[564.7 280 1],[565.99 650 1],[566.47 450 1],[570.61 160 0],[581.92 450 1],[605.27 450 0],[628.64 280 1],[628.71 450 1],[630.55 450 1],[631.27 450 1],[638.49 280 1],[639.73 280 1],[639.8 280 1],[641.37 360 1],[674.36 160 0],[674.88 285 0],[675.72 450 0],[757.9 450 0],[762.98 450 0],[768.61 285 0],[769.67 450 0],[383.83 160 2],[392.86 160 2],[425.36 360 2],[428.5 110 2],[433.27 70 2]}{1000}% -\wl@elt@search{#1}{Cl}{[380.518 1900 1],[380.946 1300 1],[382.02 1700 1],[382.759 2800 1],[383.335 4500 1],[384.32 2500 1],[384.537 3100 1],[384.565 3900 1],[384.58 1500 1],[385.099 10000 1],[385.137 7900 1],[385.165 1200 1],[386.083 25000 1],[386.099 4400 1],[386.137 1000 1],[391.387 1500 1],[391.663 1100 1],[394.482 20 0],[410.479 20 0],[413.25 10000 1],[420.967 65 0],[422.642 50 0],[426.458 60 0],[436.327 100 0],[436.95 100 0],[437.293 5000 1],[437.99 100 0],[438.975 100 0],[439.04 90 0],[440.303 90 0],[443.849 100 0],[447.53 90 0],[448.991 1500 1],[452.619 100 0],[460.098 80 0],[462.3938 40 0],[465.404 50 0],[466.1208 80 0],[469.1523 45 0],[472.1255 40 0],[474.0729 45 0],[476.865 4300 1],[478.132 13000 1],[479.455 99000 1],[481.006 29000 1],[481.947 16000 1],[489.677 81000 1],[490.478 47000 1],[491.773 26000 1],[499.548 10000 1],[507.826 26000 1],[509.9789 30 0],[521.794 56000 1],[522.136 23000 1],[539.212 15000 1],[542.323 99000 1],[542.351 10000 1],[544.337 19000 1],[544.421 10000 1],[545.702 5600 1],[553.2162 40 0],[579.6305 50 0],[579.9914 45 0],[585.6742 30 0],[594.858 100 0],[601.9812 50 0],[608.261 35 0],[609.469 1900 1],[611.443 160 0],[614.0245 200 0],[619.4757 160 0],[639.866 160 0],[643.4833 150 0],[653.143 150 0],[666.167 1400 1],[667.843 150 0],[668.602 1300 1],[671.341 1200 1],[684.029 150 0],[693.2903 300 0],[698.1886 300 0],[708.6814 600 0],[725.662 7500 0],[741.411 5000 0],[746.237 550 0],[748.947 550 0],[749.2118 700 0],[754.7072 11000 0],[767.242 2300 0],[770.2828 450 0],[771.7581 7000 0],[774.497 10000 0],[776.916 2200 0],[777.109 650 0],[392.587 500 2],[399.15 700 2],[401.85 600 2],[405.907 600 2],[410.423 500 2],[410.683 500 2],[437.091 400 2],[460.821 500 2],[470.314 300 2],[486.375 100 2],[497.164 10 2]}{99000}% -\wl@elt@search{#1}{Ar}{[380.3172 25 1],[380.9456 50 1],[383.4679 7 0],[385.0581 70 1],[386.8528 35 1],[392.5719 35 1],[392.8623 50 1],[393.2547 25 1],[394.6097 70 1],[394.7505 7 0],[394.8979 35 0],[397.9356 20 1],[399.4792 35 1],[401.3857 50 1],[403.3809 50 1],[403.546 20 1],[404.2894 150 1],[404.4418 50 0],[405.2921 100 1],[407.2005 200 1],[407.2385 70 1],[407.6628 25 1],[407.9574 35 1],[408.2387 25 1],[410.3912 150 1],[413.1724 300 1],[415.6086 35 1],[415.859 400 0],[416.418 50 0],[417.9297 35 1],[418.1884 50 0],[419.0713 100 0],[419.1029 50 0],[419.8317 200 0],[420.0674 400 0],[421.8665 25 1],[422.2637 25 1],[422.6988 25 1],[422.8158 100 1],[423.722 100 1],[425.1185 25 0],[425.9362 200 0],[426.6286 100 0],[426.6527 70 1],[427.2169 150 0],[427.7528 550 1],[428.2898 20 1],[430.0101 100 0],[430.065 25 1],[430.9239 70 1],[433.12 200 1],[433.203 50 1],[433.3561 100 0],[433.5338 50 0],[434.5168 25 0],[434.8064 800 1],[435.2205 50 1],[436.2066 25 1],[436.7832 50 1],[437.0753 200 1],[437.1329 70 1],[437.5954 50 1],[437.9667 150 1],[438.5057 50 1],[440.0097 70 1],[440.0986 200 1],[442.6001 400 1],[443.0189 150 1],[443.0996 50 1],[443.3838 50 1],[443.9461 20 1],[444.8879 35 1],[447.4759 100 1],[448.1811 200 1],[451.0733 100 0],[452.2323 20 0],[453.0552 20 1],[454.5052 400 1],[456.4405 20 1],[457.935 400 1],[458.9898 400 1],[459.6097 15 0],[460.9567 550 1],[462.8441 7 0],[463.7233 35 1],[465.7901 400 1],[470.2316 15 0],[472.1591 20 1],[472.6868 550 1],[473.2053 50 1],[473.5906 300 1],[476.4865 800 1],[480.602 550 1],[484.781 150 1],[486.591 50 1],[487.9864 800 1],[488.9042 70 1],[490.4752 20 1],[493.3209 35 1],[496.508 200 1],[500.9334 50 1],[501.7163 70 1],[506.2037 70 1],[509.0495 20 1],[514.1783 100 1],[514.5308 70 1],[515.1391 5 0],[516.2285 15 0],[516.5773 25 1],[518.7746 20 0],[521.6814 20 1],[522.1271 7 0],[542.1352 5 0],[545.1652 10 0],[549.5874 25 0],[550.6113 5 0],[555.8702 25 0],[557.2541 10 0],[560.6733 35 0],[565.0704 20 0],[573.952 10 0],[583.4263 5 0],[586.031 10 0],[588.2624 15 0],[588.8584 25 0],[591.2085 50 0],[592.8813 15 0],[594.2669 5 0],[598.7302 7 0],[599.8999 5 0],[602.515 5 0],[603.2127 70 0],[604.3223 35 0],[605.2723 10 0],[605.9372 20 0],[609.8803 7 0],[610.5635 10 0],[611.4923 100 1],[614.5441 10 0],[617.0174 7 0],[617.2278 150 1],[617.3096 10 0],[621.2503 10 0],[621.5938 5 0],[624.312 25 1],[629.6872 7 0],[630.7657 15 0],[636.9575 7 0],[638.4717 20 0],[641.6307 70 0],[648.3082 25 1],[653.8112 15 0],[660.4853 15 0],[663.8221 25 1],[663.974 20 1],[664.3698 50 1],[666.0676 5 0],[666.4051 5 0],[666.6359 25 1],[667.7282 100 0],[668.4293 35 1],[675.2834 150 0],[675.6163 5 0],[676.6612 15 0],[686.1269 20 1],[687.1289 150 0],[687.9582 5 0],[688.8174 10 0],[693.7664 50 0],[695.1478 7 0],[696.025 7 0],[696.5431 10000 0],[703.0251 150 0],[706.7218 10000 0],[706.8736 100 0],[710.7478 25 0],[712.582 25 0],[714.7042 1000 0],[715.8839 15 0],[720.698 70 0],[726.5172 15 0],[727.0664 7 0],[727.2936 2000 0],[731.1716 35 0],[731.6005 25 0],[735.0814 5 0],[735.3293 70 0],[737.2118 200 0],[738.0426 20 1],[738.398 10000 0],[739.298 20 0],[741.2337 15 0],[742.5294 10 0],[743.5368 25 0],[743.6297 10 0],[750.3869 20000 0],[751.4652 15000 0],[763.5106 25000 0],[772.3761 15000 0],[772.4207 10000 0],[385.832 10 2],[390.784 7 2],[396.053 8 2],[402.36 6 2],[414.67 5 2]}{25000}% -\wl@elt@search{#1}{K}{[380.014 6 1],[381.656 6 1],[381.75 7 1],[387.374 5 1],[387.862 4 1],[389.792 8 1],[392.3 5 1],[392.636 5 1],[394.253 6 1],[395.521 6 1],[396.672 6 1],[397.258 6 1],[399.51 6 1],[400.124 7 1],[401.21 5 1],[404.259 6 1],[404.414 18 0],[404.721 17 0],[409.369 5 1],[411.499 6 1],[413.472 7 1],[414.919 7 1],[418.624 8 1],[422.297 7 1],[422.567 7 1],[426.34 7 1],[430.5 7 1],[430.91 7 1],[434.003 5 1],[438.816 7 1],[446.665 5 1],[450.533 6 1],[459.565 5 1],[460.845 8 1],[464.188 10 0],[464.237 11 0],[465.938 5 1],[474.091 4 0],[474.435 6 0],[475.393 5 0],[475.739 7 0],[478.649 5 0],[479.105 7 0],[479.975 6 0],[480.435 8 0],[482.923 9 1],[484.986 7 0],[485.609 8 0],[486.348 8 0],[486.976 9 0],[494.202 8 0],[494.329 6 1],[495.082 9 0],[495.615 9 0],[496.503 10 0],[500.56 8 1],[505.627 7 1],[508.423 10 0],[509.717 11 0],[509.92 11 0],[511.225 12 0],[531.024 5 1],[532.328 12 0],[533.969 13 0],[534.297 12 0],[535.957 14 0],[547.013 6 1],[564.273 5 1],[577.232 4 1],[578.238 16 0],[580.175 17 0],[581.215 15 0],[583.189 17 0],[596.964 2 1],[612.027 8 1],[624.659 6 1],[630.729 7 1],[642.796 5 1],[659.5 2 1],[691.108 19 0],[693.628 12 0],[693.877 20 0],[696.418 7 0],[696.467 12 0],[766.49 25 0],[769.896 24 0],[388.55 1 2]}{25}% -\wl@elt@search{#1}{Ca}{[387.048 9 0],[387.254 11 0],[387.256 11 0],[387.578 12 0],[387.58 12 0],[388.91 6 0],[392.348 6 0],[393.366 230 1],[393.529 9 0],[394.604 6 0],[394.89 15 0],[395.705 17 0],[396.847 220 1],[397.257 8 0],[397.371 18 0],[409.71 50 1],[409.853 15 0],[409.857 15 0],[410.982 60 1],[411.028 30 1],[420.618 40 1],[422.007 50 1],[422.673 50 0],[424.046 15 0],[428.301 24 0],[428.936 22 0],[429.899 22 0],[430.253 25 0],[430.774 23 0],[431.865 22 0],[435.508 20 0],[442.544 25 0],[443.496 26 0],[443.569 25 0],[445.478 30 0],[445.589 28 0],[445.661 20 0],[447.204 20 1],[447.923 10 1],[448.918 20 1],[452.694 23 0],[457.855 22 0],[458.14 23 0],[458.147 23 0],[458.587 24 0],[458.596 24 0],[468.527 20 0],[471.674 30 1],[472.103 40 1],[479.997 40 1],[487.813 25 0],[500.148 70 1],[501.997 80 1],[502.114 40 1],[504.162 23 0],[518.885 25 0],[526.171 22 0],[526.224 23 0],[526.424 22 0],[526.556 24 0],[527.027 25 0],[528.527 60 1],[530.722 70 1],[533.919 50 1],[534.947 27 0],[551.298 23 0],[558.197 25 0],[558.876 27 0],[559.012 24 0],[559.447 26 0],[559.849 25 0],[560.129 24 0],[560.285 24 0],[585.745 30 0],[592.272 10 1],[592.369 10 1],[610.272 27 0],[612.222 29 0],[616.129 22 0],[616.217 30 0],[616.376 22 0],[616.644 24 0],[616.906 26 0],[616.956 28 0],[643.907 35 0],[644.981 30 0],[645.56 22 0],[645.687 80 1],[646.257 34 0],[647.166 29 0],[649.378 32 0],[649.965 28 0],[657.278 23 0],[671.769 30 0],[714.815 33 0],[720.219 31 0],[732.615 33 0],[757.581 30 1],[758.111 60 1],[760.13 80 1],[760.232 20 1],[408.177 15 2],[415.357 15 2],[416.431 15 2],[418.42 15 2],[420.724 18 2],[423.374 17 2],[424.074 16 2],[428.439 15 2],[430.281 20 2],[432.919 15 2],[433.357 16 2],[435.838 15 2],[439.959 19 2],[440.629 17 2],[443.13 17 2],[449.988 19 2],[451.659 18 2],[457.212 18 2],[470.883 11 2],[471.627 11 2],[485.917 10 2],[500.895 10 2],[505.007 10 2],[523.182 10 2],[524.737 11 2],[527.198 13 2],[530.132 10 2],[532.129 11 2],[532.806 10 2],[557.058 11 2],[557.906 10 2],[606.998 13 2],[617.322 10 2],[621.398 12 2],[629.489 11 2],[637.011 11 2],[638.755 10 2],[642.451 12 2],[648.535 12 2],[653.878 10 2],[654.224 10 2],[730.869 10 2]}{230}% -\wl@elt@search{#1}{Sc}{[383.307 270 1],[384.303 610 1],[389.497 90 0],[390.749 20000 0],[391.181 23000 0],[392.351 45 1],[393.338 4400 0],[395.227 45 0],[398.906 45 1],[399.661 5500 0],[401.449 530 1],[402.04 20000 0],[402.369 20000 0],[403.067 220 0],[403.139 140 0],[403.423 100 0],[404.38 220 0],[404.648 200 0],[404.779 2700 0],[404.995 120 0],[405.455 5500 0],[405.659 220 0],[407.497 160 0],[407.857 160 0],[408.24 6100 0],[408.667 200 0],[408.716 400 0],[409.313 40 0],[409.485 65 0],[409.835 55 0],[410.033 65 0],[413.3 440 0],[414.03 530 0],[414.74 65 0],[415.236 720 0],[415.472 55 -1],[416.188 90 0],[416.519 1100 0],[417.156 65 0],[418.645 45 0],[418.762 65 0],[420.52 75 0],[421.234 65 0],[421.249 45 0],[421.61 75 0],[421.826 110 0],[421.973 110 0],[422.188 40 0],[422.559 90 0],[423.193 180 0],[423.361 200 0],[423.782 100 0],[423.805 400 0],[423.957 90 0],[424.612 100 0],[424.683 15000 1],[428.356 55 -1],[429.477 290 1],[430.571 350 1],[431.409 4200 1],[432.074 3300 1],[432.501 2400 1],[434.853 28 0],[435.461 180 1],[435.864 110 0],[435.908 55 0],[436.492 28 0],[437.446 2000 1],[438.481 130 1],[438.96 45 0],[440.037 1100 1],[441.556 880 1],[442.066 28 1],[443.136 45 1],[454.255 65 0],[454.468 90 0],[455.724 120 0],[457.399 160 0],[459.294 65 0],[459.845 65 0],[460.472 55 0],[460.953 45 0],[460.995 45 0],[467.04 350 1],[468.049 40 0],[469.829 50 1],[470.697 120 0],[470.934 120 0],[472.877 200 0],[472.923 490 0],[473.23 40 0],[473.41 590 0],[473.508 60 -1],[473.765 690 0],[474.102 790 0],[474.381 1200 0],[475.316 200 0],[477.935 220 0],[479.15 90 0],[482.728 100 0],[483.367 100 0],[483.944 170 0],[484.047 40 0],[484.768 80 0],[485.268 80 0],[485.779 140 -1],[490.667 80 0],[490.976 90 0],[492.284 90 0],[493.425 90 0],[493.574 45 0],[494.133 70 0],[495.406 170 0],[497.366 120 0],[498.037 150 0],[498.345 80 0],[499.192 140 0],[501.839 80 0],[502.014 70 0],[502.151 80 0],[503.102 530 1],[503.274 55 0],[506.432 250 0],[506.886 80 0],[507.023 530 0],[507.581 250 0],[508.156 2100 0],[508.372 1200 0],[508.555 1100 0],[508.695 750 0],[508.714 390 0],[508.989 270 0],[509.246 45 0],[509.673 390 0],[509.923 620 0],[510.112 370 0],[510.906 180 0],[511.286 150 0],[511.669 320 0],[513.368 70 -1],[517.106 45 -1],[521.052 390 0],[521.128 45 0],[521.967 280 0],[523.982 350 1],[525.833 280 0],[528.497 35 0],[528.576 210 0],[530.194 35 0],[531.835 22 1],[533.177 70 0],[533.423 14 1],[533.941 95 0],[534.105 120 0],[534.296 95 0],[534.93 350 0],[534.971 120 0],[535.03 60 0],[535.575 210 0],[535.61 530 0],[535.719 14 1],[537.535 270 0],[539.208 370 0],[541.612 45 0],[542.557 45 0],[542.941 45 0],[543.294 35 0],[543.323 55 0],[543.822 45 0],[543.903 55 0],[544.26 55 0],[544.62 270 0],[544.739 18 0],[545.134 120 0],[545.521 30 0],[546.52 18 0],[546.84 55 0],[547.219 60 0],[547.464 18 0],[548.199 750 0],[548.462 530 0],[551.422 570 0],[551.539 16 0],[552.05 660 0],[552.606 45 0],[552.682 660 1],[554.104 55 0],[554.64 30 0],[555.04 18 0],[555.225 5 1],[555.359 35 0],[556.11 16 0],[556.486 70 0],[557.124 18 0],[557.976 14 0],[559.133 110 0],[559.338 35 0],[560.419 22 0],[563.102 22 0],[564.098 80 1],[564.636 45 0],[564.76 16 0],[564.956 55 0],[565.788 250 1],[565.834 60 1],[566.716 55 1],[566.904 70 1],[567.181 1500 0],[568.42 95 1],[568.684 1200 0],[570.021 1100 0],[570.861 190 0],[571.175 880 0],[571.728 230 0],[572.408 180 0],[573.685 55 -1],[576.445 55 -1],[577.274 95 -1],[577.532 55 -1],[580.984 70 -1],[581.16 70 -1],[584.773 95 -1],[584.907 70 -1],[588.738 70 -1],[591.804 35 -1],[591.911 30 0],[592.81 60 -1],[596.149 35 0],[596.825 60 -1],[596.919 35 0],[598.842 90 0],[601.707 160 -1],[602.618 60 0],[603.617 620 -1],[606.431 490 -1],[607.265 440 -1],[607.93 620 -1],[610.187 320 -1],[610.993 370 -1],[611.597 370 -1],[614.87 180 -1],[615.393 150 -1],[618.809 150 -1],[619.29 150 -1],[621.068 620 0],[623.941 90 0],[623.978 320 0],[624.563 120 1],[624.996 110 0],[625.896 250 0],[626.225 60 0],[627.631 55 0],[627.976 45 1],[630.07 18 1],[630.567 750 0],[630.99 26 1],[632.085 16 1],[634.483 26 0],[637.882 60 0],[640.841 55 -1],[641.335 90 0],[643.708 26 -1],[644.624 55 -1],[645.778 26 -1],[648.54 35 -1],[649.59 26 -1],[652.562 55 -1],[653.53 22 -1],[655.784 45 -1],[656.688 35 -1],[657.585 18 -1],[660.46 60 1],[660.999 26 -1],[661.794 18 -1],[664.508 18 -1],[665.442 22 -1],[666.101 26 -1],[670.048 18 -1],[670.593 18 -1],[673.787 65 0],[673.94 35 0],[681.708 35 0],[681.952 50 0],[682.954 29 0],[683.503 50 0],[696.312 5 -1],[699.068 5 -1],[702.572 5 -1],[703.577 8 -1],[707.237 5 -1],[709.438 5 -1],[713.814 12 0],[716.913 14 0],[725.757 12 0],[727.557 8 0],[730.062 3 0],[752.413 12 0],[755.396 14 0],[757.444 15 0],[761.745 11 0],[766.572 14 0],[769.773 30 0],[772.972 18 0],[774.117 55 0],[775.037 5 0],[775.272 5 0],[777.106 6 0],[778.517 15 0],[779.468 8 0],[406.121 80 2],[406.866 100 2],[430.947 40 2],[474.095 10 2],[478.087 15 2],[499.289 50 2],[503.209 60 2],[625.601 80 2],[630.76 60 2],[744.916 90 2],[754.815 70 2],[459.442 8 3],[463.996 8 3],[550.174 8 3],[562.072 9 3],[570.682 10 3],[577.163 14 3],[654.803 9 3]}{23000}% -\wl@elt@search{#1}{Ti}{[381.822 70 0],[382.203 60 0],[382.819 240 0],[383.368 95 0],[383.678 95 0],[384.645 60 0],[385.305 130 0],[385.373 130 0],[385.814 170 0],[386.644 240 0],[386.84 170 0],[387.321 120 0],[387.526 260 0],[388.215 170 0],[388.233 170 0],[388.289 500 0],[388.802 60 0],[388.995 70 0],[389.525 200 0],[389.849 85 0],[390.054 530 1],[390.096 180 0],[390.478 2600 0],[391.119 110 0],[391.346 500 1],[391.434 500 0],[391.474 24 0],[391.982 35 0],[392.142 290 0],[392.453 1100 0],[392.632 110 0],[392.988 890 0],[393.202 35 1],[393.424 70 0],[394.778 1100 0],[394.867 4500 0],[395.634 4500 0],[395.821 5200 0],[396.285 950 0],[396.427 950 0],[398.176 4800 0],[398.248 570 0],[398.433 60 0],[398.525 35 0],[398.559 60 0],[398.976 5700 0],[399.47 35 0],[399.864 7800 0],[399.936 70 0],[400.249 70 0],[400.381 70 0],[400.597 35 0],[400.806 70 0],[400.893 950 0],[400.966 190 0],[401.239 70 1],[401.358 180 0],[401.538 70 0],[401.628 35 0],[401.777 120 0],[402.183 140 0],[402.457 1200 0],[402.514 40 1],[402.654 190 0],[402.748 40 0],[402.834 40 1],[403.051 190 0],[403.391 40 0],[403.491 30 0],[403.583 110 0],[404.032 35 0],[405.502 290 0],[405.762 85 0],[405.814 85 0],[406.026 410 0],[406.422 200 0],[406.51 200 0],[407.847 840 0],[407.972 40 0],[408.246 290 0],[409.917 85 0],[411.271 220 0],[412.217 85 0],[412.331 40 0],[412.357 85 0],[412.754 130 0],[412.917 40 0],[413.125 40 0],[413.729 140 0],[414.305 85 0],[415.096 170 0],[415.964 85 0],[416.365 70 1],[416.414 35 0],[416.632 40 0],[416.935 85 0],[417.103 120 0],[417.19 40 1],[418.33 35 0],[418.612 360 0],[418.869 40 0],[420.075 70 0],[420.346 85 0],[421.173 35 0],[422.479 40 0],[422.765 40 0],[423.789 130 0],[424.912 85 0],[425.604 130 0],[425.854 70 0],[426.16 70 0],[426.313 330 0],[426.571 35 0],[426.622 40 0],[427.014 70 0],[427.243 85 0],[427.458 240 0],[427.643 120 0],[427.823 120 0],[427.881 30 0],[428.138 110 0],[428.271 220 0],[428.499 160 0],[428.601 890 0],[428.74 840 0],[428.816 30 0],[428.907 950 0],[429.023 120 1],[429.094 840 0],[429.114 120 0],[429.412 140 1],[429.576 840 0],[429.866 2000 0],[429.923 200 0],[429.964 200 0],[430.005 200 1],[430.056 2900 0],[430.109 4100 0],[430.193 85 1],[430.592 6000 0],[430.79 180 1],[430.85 35 0],[431.165 40 0],[431.287 85 1],[431.435 85 0],[431.48 1200 0],[431.864 360 0],[432.166 180 0],[432.513 190 0],[432.636 160 0],[433.484 30 0],[433.792 160 1],[434.429 24 1],[434.611 70 0],[435.406 35 0],[436.049 95 0],[436.894 24 0],[436.968 95 0],[437.238 60 0],[438.808 30 0],[439.392 170 0],[439.504 330 1],[439.977 60 1],[440.428 240 0],[440.49 60 0],[440.568 30 0],[441.654 60 0],[441.728 220 0],[441.772 60 1],[442.176 120 0],[442.282 120 0],[442.439 24 0],[442.583 30 0],[442.606 120 0],[442.71 890 0],[443.002 21 0],[443.037 85 0],[443.128 50 0],[443.26 30 0],[443.358 24 0],[443.4 170 0],[443.659 70 0],[443.823 30 0],[444.035 130 0],[444.127 50 0],[444.38 230 1],[444.427 24 0],[444.915 840 0],[445.049 30 1],[445.09 550 0],[445.332 840 0],[445.371 290 0],[445.533 950 0],[445.743 1100 0],[446.209 21 0],[446.338 70 0],[446.354 95 0],[446.581 290 0],[446.85 240 1],[447.124 240 0],[447.485 95 0],[447.97 95 0],[448.059 50 0],[448.126 530 0],[448.269 95 0],[448.832 19 1],[448.909 260 0],[449.255 24 0],[449.501 40 0],[449.615 240 0],[449.773 24 0],[450.127 200 1],[450.378 40 0],[450.636 21 0],[451.117 50 0],[451.274 780 0],[451.562 19 0],[451.803 1000 0],[451.87 95 0],[452.28 1000 0],[452.731 780 0],[453.324 6000 0],[453.397 240 1],[453.478 3600 0],[453.558 2400 0],[453.592 1200 0],[453.605 1200 0],[453.723 24 0],[453.91 24 0],[454.469 720 0],[454.877 950 0],[454.963 240 1],[455.246 950 0],[455.508 24 0],[455.549 720 0],[455.786 19 0],[455.811 19 0],[455.992 60 0],[456.263 50 0],[456.343 35 0],[456.377 110 1],[457.091 35 0],[457.198 240 1],[458.584 19 -1],[458.995 24 1],[459.923 60 0],[460.937 21 0],[461.727 950 0],[461.952 24 0],[462.309 480 0],[462.934 190 0],[463.487 50 -1],[463.788 60 0],[463.937 240 0],[463.967 220 0],[463.995 190 0],[464.519 140 0],[465.002 120 0],[465.604 24 0],[465.647 720 0],[466.759 840 0],[467.512 70 0],[468.192 950 0],[468.692 21 0],[469.08 24 0],[469.134 190 0],[469.368 40 0],[469.694 24 0],[469.876 190 0],[471.019 120 0],[471.53 24 0],[472.262 65 0],[472.317 65 0],[473.117 55 0],[473.343 45 0],[473.468 18 0],[474.211 22 0],[474.279 170 0],[474.768 22 0],[475.812 310 0],[475.928 310 0],[476.633 45 0],[476.977 28 0],[477.826 65 0],[478.172 45 0],[479.249 110 0],[479.622 45 0],[479.798 35 0],[479.98 110 0],[480.51 28 1],[480.543 110 0],[480.853 45 0],[481.108 22 0],[481.225 40 0],[482.042 200 0],[482.546 22 0],[483.613 40 0],[484.087 470 0],[484.847 65 0],[485.601 290 0],[486.418 35 0],[486.826 200 0],[487.014 250 0],[488.091 28 0],[488.235 45 0],[488.508 400 0],[489.991 380 0],[491.362 320 0],[491.524 55 0],[491.987 130 0],[492.177 180 0],[492.541 55 0],[492.616 30 0],[492.834 150 0],[493.774 30 0],[493.829 95 0],[494.158 30 0],[494.819 21 0],[495.825 21 0],[496.475 55 0],[496.604 21 0],[496.858 65 0],[497.305 75 0],[497.535 120 0],[497.774 65 0],[497.82 120 0],[498.173 5800 0],[498.915 150 0],[499.107 4600 0],[499.508 30 0],[499.71 140 0],[499.951 4000 0],[500.101 230 0],[500.721 3600 0],[500.965 120 0],[501.33 230 0],[501.419 3200 0],[501.617 580 0],[502.003 840 0],[502.287 840 0],[502.484 580 0],[502.558 300 0],[503.591 1200 0],[503.647 840 0],[503.84 740 0],[503.995 1200 0],[504.062 75 0],[504.359 85 0],[504.427 35 0],[504.541 55 0],[504.821 26 0],[505.287 110 0],[505.408 21 0],[506.211 110 0],[506.407 35 0],[506.466 1400 0],[506.599 95 0],[506.833 35 0],[506.935 65 0],[507.148 130 0],[508.534 40 0],[508.707 130 0],[510.315 21 0],[510.944 55 0],[511.344 190 0],[512.042 270 0],[512.915 30 1],[514.547 270 0],[514.748 230 0],[515.22 210 0],[516.686 21 -1],[517.375 1100 0],[518.634 40 0],[518.87 85 1],[518.958 30 0],[519.298 1300 0],[519.404 85 0],[520.11 65 0],[520.608 120 0],[520.787 75 0],[520.842 65 -1],[521.039 1400 0],[521.229 65 0],[521.971 150 0],[522.269 95 0],[522.364 85 0],[522.432 250 0],[522.456 95 0],[522.495 190 0],[522.656 65 1],[523.858 120 0],[524.615 21 0],[524.657 55 0],[524.731 75 0],[525.095 21 0],[525.211 110 0],[525.583 75 0],[525.999 55 0],[526.35 55 0],[526.598 150 0],[528.239 40 0],[528.345 140 0],[528.439 35 0],[528.881 26 -1],[529.579 65 0],[529.726 120 0],[529.844 65 0],[533.681 26 1],[534.15 17 0],[535.108 75 0],[536.665 26 0],[536.964 55 0],[538.918 40 0],[538.999 55 0],[539.66 17 0],[539.709 85 0],[540.402 35 0],[540.961 110 0],[542.626 40 0],[542.915 75 0],[543.673 26 0],[543.832 17 0],[544.664 40 0],[544.834 11 -1],[544.89 30 0],[544.916 21 0],[545.365 35 0],[546.051 55 0],[547.121 75 0],[547.27 35 0],[547.355 40 0],[547.423 85 0],[547.446 30 0],[547.771 120 0],[548.143 110 0],[548.187 75 0],[548.82 85 0],[549.015 150 0],[549.084 26 0],[550.39 110 0],[551.178 40 0],[551.253 340 0],[551.435 270 0],[551.454 320 0],[553.049 26 -1],[556.549 110 0],[557.916 13 -1],[558.298 21 -1],[558.568 30 -1],[559.785 65 -1],[562.928 55 -1],[563.584 17 -1],[564.414 250 0],[564.858 75 0],[566.155 26 -1],[566.216 190 0],[566.291 75 0],[567.342 21 0],[567.544 130 0],[567.994 30 0],[568.947 95 0],[570.268 75 0],[570.823 35 0],[571.188 65 0],[571.392 40 0],[571.513 95 0],[571.648 55 0],[572.048 35 0],[573.951 85 0],[574.002 40 0],[574.122 19 0],[575.284 21 0],[575.686 19 0],[576.227 40 0],[576.635 55 0],[577.405 75 0],[578.078 30 0],[578.598 75 0],[580.426 65 0],[581.496 21 -1],[582.371 40 0],[584.118 21 -1],[585.234 21 -1],[586.646 400 0],[588.031 65 0],[588.868 21 -1],[589.932 230 0],[590.333 55 0],[591.855 120 0],[592.212 150 0],[593.782 75 0],[594.176 120 0],[595.317 300 0],[596.584 200 0],[597.856 270 0],[599.904 340 0],[599.968 65 0],[601.273 21 -1],[606.463 110 0],[608.523 120 0],[609.117 120 0],[609.281 40 0],[609.867 40 0],[612.101 35 0],[612.622 120 0],[613.838 19 0],[614.622 30 0],[614.974 21 0],[616.223 30 -1],[618.615 35 0],[621.528 95 0],[622.049 75 0],[622.141 65 0],[625.81 380 0],[625.87 380 0],[626.11 300 0],[630.375 65 0],[631.224 55 0],[631.803 26 0],[633.61 30 0],[636.635 35 0],[641.91 11 0],[649.769 17 0],[650.814 19 0],[654.628 55 0],[655.423 65 0],[655.483 11 -1],[655.607 75 0],[656.562 19 0],[657.518 14 0],[659.911 35 0],[665.146 18 -1],[666.655 18 0],[666.774 22 -1],[666.839 9 -1],[667.718 18 0],[669.121 22 -1],[671.668 26 0],[672.395 16 -1],[674.312 80 0],[674.552 22 0],[684.464 18 -1],[686.039 18 -1],[686.147 35 0],[687.392 9 0],[691.319 12 0],[693.315 14 0],[694.37 14 0],[699.663 23 0],[700.466 15 0],[700.835 14 0],[701.094 14 0],[703.586 14 0],[703.88 40 0],[705.065 14 0],[705.451 40 -1],[706.911 23 0],[707.205 23 -1],[708.789 45 -1],[712.49 30 -1],[712.561 40 -1],[713.891 26 0],[716.713 26 -1],[717.153 23 -1],[718.989 55 0],[720.364 26 -1],[720.944 260 0],[721.62 60 0],[724.486 130 0],[725.172 130 0],[726.34 19 -1],[726.629 19 0],[726.905 19 -1],[731.556 15 0],[731.839 26 0],[734.472 120 0],[735.216 11 0],[735.774 90 0],[736.411 60 0],[744.06 26 0],[747.494 9 0],[748.961 26 0],[749.612 19 0],[758.055 12 0],[758.962 9 -1],[761.45 15 0],[765.444 23 0],[770.521 11 -1],[387.25 12 2],[388.121 12 2],[389.363 12 2],[389.633 10 2],[391.547 15 2],[392.138 12 2],[392.161 10 2],[392.295 12 2],[392.486 10 2],[406.021 10 2],[411.914 10 2],[421.552 11 2],[426.984 11 2],[429.67 11 2],[434.804 10 2],[443.391 11 2],[454.022 10 2],[454.984 15 2],[455.546 10 2],[457.22 15 2],[464.945 10 2],[465.286 12 2],[487.4 10 2],[495.01 10 2],[497.119 10 2],[508.38 10 2],[514.731 14 2],[522.628 12 2],[524.749 11 2],[527.812 17 2],[527.87 10 2],[529.843 12 2],[530.12 16 2],[530.688 15 2],[539.569 10 2],[553.301 12 2],[581.744 10 2],[661.138 12 2],[662.158 18 2],[662.937 10 2],[664.747 14 2],[666.799 18 2],[667.419 15 2],[670.776 14 2],[672.48 12 2],[673.41 16 2],[686.226 15 2],[687.435 12 2],[689.612 10 2],[701.538 12 2],[707.193 10 2],[707.264 20 2],[708.457 18 2],[712.413 15 2],[717.179 11 2],[717.592 10 2],[721.75 10 2],[722.555 9 2],[727.067 12 2],[731.63 14 2],[731.668 10 2],[737.996 12 2],[740.813 10 2],[745.785 10 2],[750.687 15 2],[750.768 17 2],[752.385 10 2],[754.429 12 2],[756.625 9 2],[413.122 13 3],[413.378 14 3],[439.733 10 3],[440.345 9 3],[461.811 15 3],[539.893 20 3],[547.098 8 3],[549.251 18 3],[551.772 10 3],[587.779 14 3],[588.596 15 3],[589.115 7 3],[623.162 6 3],[624.665 17 3],[624.774 11 3],[629.241 15 3],[691.385 12 3],[697.851 15 3],[749.137 9 3],[749.477 8 3],[765.212 5 3],[770.685 8 3]}{7800}% -\wl@elt@search{#1}{V}{[380.347 570 0],[380.68 190 0],[380.75 300 0],[380.852 520 0],[380.96 230 0],[381.349 1000 0],[381.784 140 0],[381.824 1300 0],[381.996 230 0],[382.149 230 0],[382.201 570 0],[382.289 450 0],[382.321 300 0],[382.856 1700 0],[383.422 280 0],[383.9 160 0],[383.938 110 0],[384.044 570 0],[384.075 2600 0],[384.189 110 0],[384.444 380 0],[384.733 320 0],[384.932 110 0],[385.537 1200 0],[385.584 3000 0],[386.222 150 0],[386.387 130 0],[386.486 1300 0],[386.76 230 0],[387.108 170 0],[387.508 1500 0],[387.59 420 0],[387.609 570 0],[387.871 130 1],[389.018 700 0],[389.286 460 0],[389.802 280 0],[389.913 140 1],[390.018 140 0],[390.115 140 0],[390.225 2400 0],[390.675 100 0],[390.989 700 0],[391.079 100 0],[391.221 220 0],[391.433 140 1],[391.641 100 1],[392.049 100 0],[392.19 100 0],[392.243 230 0],[392.466 240 0],[392.524 150 0],[392.793 200 0],[393.002 260 0],[393.134 150 0],[393.401 260 0],[393.514 150 0],[393.628 100 0],[394.366 150 0],[395.023 100 0],[395.197 140 1],[397.364 100 1],[399.057 540 0],[399.28 260 0],[399.873 430 0],[400.571 170 1],[402.339 120 1],[403.183 120 0],[403.563 150 1],[404.264 120 0],[405.096 360 0],[405.135 360 0],[405.707 280 0],[405.782 130 0],[406.393 230 0],[407.154 230 0],[409.058 1100 0],[409.241 180 0],[409.269 1800 0],[409.35 120 0],[409.549 890 0],[409.98 2800 0],[410.216 590 0],[410.44 230 0],[410.478 260 0],[410.517 2800 0],[410.822 120 0],[410.979 2300 0],[411.178 8900 0],[411.233 120 0],[411.352 230 0],[411.518 4300 0],[411.647 1800 0],[411.818 180 0],[411.864 180 0],[411.946 230 0],[412.054 180 0],[412.319 180 0],[412.357 2000 0],[412.407 120 0],[412.807 3100 0],[412.886 120 0],[413.202 3100 0],[413.449 2300 0],[415.969 150 0],[417.401 100 0],[417.942 230 0],[418.259 150 0],[418.984 180 0],[419.156 180 0],[420.986 230 0],[422.662 120 0],[423.246 360 0],[423.295 180 0],[423.4 180 0],[423.576 120 0],[425.737 100 0],[425.931 120 0],[426.216 120 0],[426.864 560 0],[427.155 460 0],[427.696 460 0],[428.406 430 0],[429.182 330 0],[429.611 220 0],[429.768 170 0],[429.803 170 0],[430.621 170 0],[430.718 140 0],[430.98 170 0],[433.002 460 0],[433.282 510 0],[434.101 760 0],[435.287 1000 0],[435.498 130 0],[435.594 150 0],[436.804 150 0],[437.323 140 0],[437.53 100 0],[437.924 12000 0],[438.055 100 0],[438.472 7000 0],[438.997 4800 0],[439.523 3600 0],[440.058 1400 0],[440.664 2300 0],[440.764 2800 0],[440.82 3600 0],[440.851 4600 0],[441.214 140 0],[441.647 640 0],[441.994 120 0],[442.157 640 0],[442.6 460 0],[442.731 120 0],[442.852 310 0],[442.98 230 0],[443.614 430 0],[443.784 640 0],[444.168 830 0],[444.421 640 0],[445.201 610 0],[445.748 410 0],[445.776 120 0],[445.976 1000 0],[446.029 2000 0],[446.236 610 0],[446.801 120 0],[446.971 380 0],[447.404 120 0],[447.471 200 0],[448.889 380 0],[449.606 100 0],[450.195 120 0],[452.422 140 0],[454.539 360 0],[454.965 100 0],[456.071 280 0],[457.178 200 0],[457.717 510 0],[457.873 140 0],[458.04 640 0],[458.636 830 0],[459.122 170 0],[459.411 1300 0],[460.615 100 0],[460.965 30 0],[461.174 25 0],[461.977 230 0],[462.441 65 0],[462.648 50 0],[463.518 100 0],[464.007 65 0],[464.074 65 0],[464.64 130 0],[464.889 30 0],[466.614 30 0],[467.049 160 0],[468.445 24 0],[468.692 35 0],[470.616 55 0],[470.657 80 0],[471.056 80 0],[471.412 65 0],[471.589 35 0],[471.769 55 0],[472.151 40 0],[472.286 40 0],[472.953 40 0],[473.038 27 0],[474.263 27 0],[474.663 24 0],[474.852 40 0],[475.098 45 0],[475.156 35 0],[475.393 40 0],[475.748 65 0],[476.663 55 0],[477.636 130 0],[478.651 110 0],[479.692 130 0],[479.977 19 0],[480.753 130 0],[482.745 130 0],[483.164 150 0],[483.243 120 0],[483.302 19 0],[484.881 19 0],[485.148 320 0],[486.261 35 0],[486.474 480 0],[487.126 21 0],[487.548 620 0],[488.056 55 0],[488.156 740 0],[489.16 27 0],[489.421 21 0],[490.062 55 0],[490.429 95 0],[492.565 85 0],[493.203 35 0],[496.612 23 0],[500.233 70 0],[501.462 85 0],[505.163 28 0],[506.412 35 0],[510.514 35 0],[512.853 110 0],[513.842 110 0],[513.953 25 0],[514.872 70 0],[515.935 40 0],[516.994 23 0],[517.677 70 0],[519.201 20 0],[519.299 110 0],[519.362 23 0],[519.483 110 0],[519.536 55 0],[520.661 20 0],[521.659 40 0],[522.577 35 0],[523.375 35 0],[523.407 110 0],[524.02 20 0],[524.087 110 0],[526.098 17 0],[535.341 40 0],[538.343 35 0],[538.514 40 0],[538.83 14 0],[539.787 11 0],[540.193 100 0],[541.526 140 0],[541.809 28 0],[542.408 50 0],[543.418 40 0],[543.766 11 0],[545.812 17 0],[547.133 13 -1],[548.722 25 0],[548.792 85 0],[548.994 25 0],[550.487 28 0],[550.775 70 0],[551.118 14 0],[554.593 23 0],[554.707 70 0],[555.875 35 0],[556.166 28 0],[558.45 140 0],[558.6 23 0],[559.242 100 0],[560.138 28 0],[560.494 70 0],[562.42 13 0],[562.46 200 0],[562.489 70 0],[562.601 55 0],[562.764 400 0],[563.246 13 0],[563.39 10 0],[563.551 13 0],[564.611 85 0],[565.744 110 0],[566.836 110 0],[567.085 310 0],[568.322 20 0],[569.852 1200 0],[570.356 920 0],[570.698 570 0],[570.895 11 0],[571.621 11 0],[572.564 70 0],[572.703 850 0],[572.766 170 0],[573.125 230 0],[573.401 40 0],[573.706 230 0],[574.345 110 0],[574.77 17 0],[574.887 40 0],[575.274 17 0],[576.141 17 0],[577.242 70 0],[577.664 35 0],[578.261 11 0],[578.35 11 0],[578.438 40 0],[578.616 55 0],[578.856 23 0],[580.714 35 0],[581.706 23 0],[581.753 35 0],[583.072 55 0],[584.63 85 0],[585.032 11 0],[592.457 40 0],[597.891 28 0],[598.078 20 0],[600.231 28 0],[600.263 55 0],[601.612 28 0],[602.541 20 0],[603.973 450 0],[605.814 100 0],[606.726 20 0],[608.144 480 0],[609.022 1300 0],[610.698 28 0],[611.167 280 0],[611.952 600 0],[612.834 20 0],[613.538 280 0],[615.015 180 0],[617.036 85 0],[618.935 23 0],[619.919 450 0],[621.387 130 0],[621.637 450 0],[621.831 28 0],[622.45 130 0],[623.074 430 0],[623.32 100 0],[624.013 55 0],[624.281 170 0],[624.31 710 0],[625.182 280 0],[625.69 85 0],[625.857 85 0],[626.122 55 0],[626.632 85 0],[626.882 130 0],[627.465 170 0],[628.233 17 0],[628.516 200 0],[629.283 200 0],[629.649 170 0],[631.15 28 0],[632.466 14 0],[632.684 70 0],[633.909 55 0],[634.948 50 0],[635.558 14 0],[635.73 50 0],[635.882 25 0],[636.127 35 0],[637.936 23 0],[639.328 14 0],[643.047 35 0],[643.163 23 0],[643.318 14 0],[643.516 11 0],[645.234 70 0],[648.805 11 0],[650.417 55 0],[653.143 110 0],[654.351 28 0],[655.802 17 0],[656.588 11 0],[660.597 50 0],[660.783 15 0],[662.354 10 0],[662.485 50 0],[663.326 13 0],[664.379 13 0],[669.366 8 0],[670.807 8 0],[675.3 65 0],[676.012 10 0],[676.649 50 0],[678.498 40 0],[678.632 15 0],[681.24 26 0],[682.994 9 0],[683.244 15 0],[683.958 12 0],[684.19 12 0],[687.088 10 0],[687.156 8 0],[689.4 7 0],[697.45 12 0],[702.607 21 0],[706.369 7 0],[709.208 11 0],[710.258 6 0],[714.815 24 0],[715.136 7 0],[718.208 7 0],[726.429 14 0],[732.144 8 0],[733.892 40 0],[735.654 35 0],[735.866 11 0],[736.139 24 0],[736.249 12 0],[736.316 24 0],[738.595 9 0],[739.349 6 -1],[748.59 12 0],[748.808 12 0],[749.244 12 -1],[757.875 12 0],[759.124 9 0],[759.692 14 0],[759.828 12 0],[762.481 24 0],[770.137 5 0],[770.481 8 0],[471.489 40 2],[659.72 50 2],[498.565 50 3],[513.078 50 3],[526.216 50 3],[535.232 60 3],[594.012 40 3],[420.032 20 4],[493.053 15 4],[535.607 8 4],[662.88 7 4],[759.551 3 4]}{12000}% -\wl@elt@search{#1}{Cr}{[380.48 530 0],[380.683 110 0],[380.793 110 0],[381.543 180 0],[381.848 70 0],[381.956 180 0],[382.352 70 0],[382.642 130 0],[383.003 130 0],[384.128 380 0],[384.898 190 0],[384.936 140 0],[385.004 290 0],[385.222 140 0],[385.422 190 0],[385.529 110 0],[385.557 140 0],[385.763 260 0],[387.453 70 0],[388.329 660 0],[388.366 50 0],[388.522 570 0],[388.679 380 0],[389.193 60 0],[389.404 260 0],[389.765 40 0],[390.211 35 0],[390.292 360 0],[390.316 60 0],[390.876 960 0],[391.182 120 0],[391.584 120 0],[391.624 190 0],[391.76 35 0],[391.916 1900 0],[392.102 600 0],[392.665 30 0],[392.864 600 0],[394.149 410 0],[395.11 30 0],[395.24 40 0],[395.316 35 0],[396.369 1900 0],[396.906 120 0],[396.975 1600 0],[397.126 85 0],[397.666 1600 0],[397.868 85 0],[397.98 40 0],[398.123 85 0],[398.391 960 0],[398.434 190 0],[398.999 160 0],[399.112 960 0],[399.167 160 0],[399.284 190 0],[399.397 40 0],[400.144 160 0],[401.247 120 1],[401.467 30 0],[402.226 85 0],[402.501 70 0],[402.617 120 0],[402.71 85 0],[403.068 85 0],[403.91 190 0],[404.878 160 0],[405.877 120 0],[406.572 40 0],[406.694 85 0],[407.486 35 0],[407.606 40 0],[407.709 40 0],[407.768 40 0],[410.487 40 0],[410.958 40 0],[412.061 40 0],[412.182 40 0],[412.216 35 0],[412.339 40 0],[412.652 140 0],[412.73 35 0],[412.764 40 0],[413.136 40 0],[415.278 30 0],[415.382 120 0],[416.142 85 0],[416.362 140 0],[416.552 70 0],[416.984 40 0],[417.02 35 0],[417.277 40 0],[417.48 170 0],[417.594 30 0],[417.926 170 0],[418.49 35 0],[418.636 30 0],[419.013 35 0],[419.127 85 0],[419.21 35 0],[419.366 85 0],[419.495 70 0],[419.723 40 0],[419.852 85 0],[420.359 60 0],[420.447 40 0],[420.836 35 0],[420.937 110 0],[420.976 40 0],[421.135 40 0],[421.636 40 0],[421.763 85 0],[422.157 40 0],[422.273 40 0],[423.896 40 0],[424.07 60 0],[425.435 20000 0],[425.55 70 0],[426.135 60 0],[426.314 110 0],[427.106 30 0],[427.291 40 0],[427.48 16000 0],[428.04 85 0],[428.972 10000 0],[429.196 40 0],[429.576 85 0],[429.774 70 0],[430.051 35 0],[430.118 50 0],[430.545 30 0],[431.964 35 0],[432.508 60 0],[433.757 780 0],[433.945 1100 0],[433.972 380 0],[434.013 60 0],[434.451 1900 0],[434.683 70 0],[435.105 380 0],[435.177 2300 0],[435.963 570 0],[436.313 70 0],[437.128 530 0],[437.325 70 0],[437.416 110 0],[437.533 70 0],[438.111 50 0],[438.498 530 0],[438.75 60 0],[439.175 70 0],[440.35 60 0],[441.03 24 0],[441.109 60 0],[441.225 35 0],[441.387 50 0],[442.428 60 0],[442.85 24 0],[443.049 50 0],[443.218 50 0],[445.854 110 0],[445.974 30 0],[446.536 30 0],[448.288 30 0],[448.805 40 0],[448.947 50 0],[449.231 60 0],[449.686 660 0],[449.873 50 0],[450.03 70 0],[450.111 50 0],[450.179 22 0],[450.685 24 0],[451.19 95 0],[451.437 12 0],[451.453 35 0],[452.114 24 0],[452.611 24 0],[452.647 380 0],[452.734 70 0],[452.985 24 0],[453.074 380 0],[453.515 50 0],[453.572 240 0],[453.979 40 0],[454.05 240 0],[454.072 240 0],[454.107 35 0],[454.151 19 0],[454.262 24 0],[454.462 140 0],[454.534 24 0],[454.596 600 0],[455.617 50 0],[455.866 22 1],[456.417 19 0],[456.551 120 0],[456.964 95 0],[457.168 120 0],[457.512 22 0],[458.006 360 0],[458.614 24 0],[459.139 360 0],[459.559 70 0],[460.01 50 0],[460.075 480 0],[460.102 50 0],[461.337 240 0],[461.614 600 0],[461.955 70 0],[462.196 85 0],[462.249 70 0],[462.276 24 0],[462.619 550 0],[463.218 24 0],[463.718 40 0],[463.777 50 0],[463.952 50 0],[464.617 1600 0],[464.681 24 0],[464.813 24 0],[464.887 24 0],[464.946 35 0],[465.128 570 0],[465.216 840 0],[465.474 35 0],[465.619 19 0],[466.333 40 0],[466.383 70 0],[466.48 95 0],[466.59 35 0],[466.622 22 0],[466.651 70 0],[466.934 50 0],[468.054 40 0],[468.087 19 0],[468.937 70 0],[469.395 60 0],[469.515 24 0],[469.706 60 0],[469.846 240 0],[470.061 35 0],[470.804 190 0],[471.843 240 0],[472.31 50 0],[472.442 50 0],[472.715 50 0],[472.972 24 0],[473.071 120 0],[473.735 140 0],[474.531 19 0],[475.208 70 0],[475.611 340 0],[476.429 50 0],[476.663 22 0],[476.786 30 0],[478.932 190 0],[479.251 95 0],[480.103 120 0],[482.938 110 0],[483.686 14 0],[486.12 17 0],[486.184 70 0],[487.08 140 0],[488.578 35 0],[488.596 19 0],[488.701 130 0],[488.853 19 0],[490.324 35 0],[492.227 260 0],[493.633 110 0],[494.25 70 0],[495.481 110 0],[496.493 35 0],[501.332 60 0],[505.19 17 0],[506.591 17 0],[506.771 40 0],[507.292 40 0],[511.075 30 0],[511.313 17 0],[512.346 17 0],[513.965 50 0],[514.467 14 0],[516.623 70 0],[517.743 35 0],[518.459 70 0],[519.2 70 0],[519.349 12 0],[519.644 85 0],[520.019 35 0],[520.452 5300 0],[520.604 8400 0],[520.844 11000 0],[521.413 19 0],[522.175 30 0],[522.494 85 0],[522.689 12 0],[523.897 19 0],[524.34 30 0],[524.756 290 0],[525.492 60 0],[525.513 60 0],[526.175 19 0],[526.415 530 0],[526.516 30 0],[526.572 180 0],[527.201 35 0],[527.344 30 0],[527.517 95 0],[527.569 35 0],[527.603 70 0],[528.029 19 0],[528.719 10 0],[529.669 340 0],[529.736 70 0],[529.827 660 0],[530.075 85 0],[530.421 17 0],[531.288 24 0],[531.878 24 0],[532.834 340 0],[532.917 70 0],[532.972 17 0],[534.044 14 0],[534.476 10 0],[534.581 780 0],[534.832 380 0],[538.698 30 0],[538.757 22 0],[539.039 10 0],[540.061 40 0],[540.5 22 0],[540.979 1400 0],[544.241 12 0],[546.397 19 0],[548.05 19 0],[562.864 24 0],[564.236 7 0],[564.937 12 0],[566.404 24 0],[568.12 7 0],[568.248 7 0],[569.473 24 0],[569.833 40 0],[570.231 24 0],[571.264 12 0],[571.278 24 0],[571.982 7 0],[574.643 7 0],[575.369 7 0],[578.12 12 0],[578.181 6 0],[578.311 24 0],[578.393 30 0],[578.5 24 0],[578.582 19 0],[578.799 60 0],[579.1 180 0],[633.01 35 0],[636.287 22 0],[666.108 19 0],[666.926 11 0],[688.162 5 0],[688.238 10 0],[688.303 21 0],[692.413 27 0],[692.52 17 0],[697.848 30 0],[697.982 11 0],[718.552 7 0],[723.62 6 0],[735.59 85 0],[740.021 130 0],[746.231 150 0]}{20000}% -\wl@elt@search{#1}{Mn}{[380.055 110 0],[380.191 55 0],[380.672 3200 0],[380.959 700 0],[381.069 55 0],[381.675 90 0],[382.351 2100 0],[382.389 390 0],[382.968 200 0],[383.386 480 0],[383.436 1300 0],[383.978 350 0],[384.108 670 0],[384.398 350 0],[391.832 65 0],[392.647 120 0],[395.284 65 0],[397.589 55 0],[397.708 65 0],[398.258 130 0],[398.524 150 0],[398.683 190 0],[398.71 150 0],[401.81 1500 0],[402.644 150 0],[403.076 27000 0],[403.307 19000 0],[403.449 11000 0],[403.573 1500 0],[403.873 55 0],[404.136 5600 0],[404.513 210 0],[404.876 1100 0],[404.9 80 0],[405.173 55 0],[405.247 65 0],[405.521 150 0],[405.554 1900 0],[405.795 210 0],[405.893 1100 0],[405.939 150 0],[406.174 730 0],[406.353 730 0],[406.508 80 0],[406.8 80 0],[407.028 290 0],[407.924 730 0],[407.942 730 0],[408.294 1100 0],[408.363 1100 0],[408.994 65 0],[410.536 55 0],[411.09 200 0],[413.112 150 0],[413.504 120 0],[414.106 80 0],[414.753 55 0],[414.88 80 0],[417.66 150 0],[418.999 120 0],[420.176 65 0],[421.175 65 0],[423.514 370 0],[423.529 510 0],[423.972 190 0],[425.766 290 0],[426.592 290 0],[428.11 270 0],[428.408 65 0],[431.255 65 0],[432.363 50 1],[437.495 45 0],[438.17 45 0],[441.188 55 0],[441.488 350 0],[441.978 55 0],[443.635 210 0],[445.159 800 0],[445.3 160 0],[445.501 130 0],[445.532 160 0],[445.582 110 0],[445.704 55 0],[445.755 210 0],[445.826 270 0],[446.038 55 0],[446.108 150 0],[446.202 510 0],[446.468 290 0],[447.014 200 0],[447.279 130 0],[447.94 40 0],[449.008 170 0],[449.89 240 0],[450.222 240 0],[460.536 80 0],[462.654 80 0],[467.169 35 0],[470.116 50 0],[470.972 160 0],[472.748 180 0],[473.911 130 0],[475.404 1000 0],[476.153 180 0],[476.238 750 0],[476.586 300 0],[476.643 500 0],[478.342 940 0],[482.352 1000 0],[484.432 25 0],[496.588 35 0],[500.491 19 0],[507.479 30 0],[511.794 60 0],[515.089 50 0],[519.659 50 0],[525.532 85 0],[534.106 160 0],[534.988 19 0],[537.763 95 0],[539.467 95 0],[539.949 50 0],[540.742 95 0],[541.369 35 0],[542.036 85 0],[543.255 35 0],[545.747 12 0],[547.064 60 0],[548.14 40 0],[550.587 30 0],[551.677 50 0],[553.776 40 0],[555.198 21 0],[556.776 8 0],[557.301 7 0],[557.368 8 0],[573.829 7 0],[578.019 7 0],[581.684 7 0],[601.35 140 0],[601.664 200 0],[602.18 290 0],[638.467 7 0],[644.097 17 0],[649.171 24 0],[694.252 14 0],[698.996 12 0],[706.984 14 0],[718.425 12 0],[724.782 10 0],[728.382 24 0],[730.289 35 0],[732.651 50 0],[768.02 12 0],[771.242 10 0],[776.472 10 0],[424.617 100 2],[507.92 200 2],[510.003 150 2],[511.703 100 2],[525.223 100 2],[536.559 100 2],[545.407 150 2],[547.468 200 2],[567.112 100 2],[594.665 200 2],[621.311 100 2],[623.121 200 2],[623.864 100 2],[627.371 100 2]}{27000}% -\wl@elt@search{#1}{Fe}{[380.5345 200 0],[380.6696 80 0],[381.2964 600 0],[381.3059 60 0],[381.584 1500 0],[382.0425 2500 0],[382.1179 150 0],[382.4306 80 0],[382.4444 2500 0],[382.588 1500 0],[382.7823 1200 0],[383.4222 1000 0],[383.9257 120 0],[384.0437 500 0],[384.1047 800 0],[384.3256 120 0],[384.68 80 0],[384.996 200 0],[385.0817 120 0],[385.6372 2500 0],[385.9212 150 0],[385.9911 10000 0],[386.5523 150 0],[386.7215 60 0],[387.2501 250 0],[387.3761 150 0],[387.8018 250 0],[387.8573 2000 0],[388.6282 4000 0],[388.7048 200 0],[388.8513 300 0],[389.5656 800 0],[389.9707 1200 0],[390.2945 400 0],[390.6479 250 0],[391.6731 80 0],[392.0258 600 0],[392.2911 1200 0],[392.792 1200 0],[393.0296 2000 0],[394.8774 60 0],[394.9953 60 0],[395.1164 50 0],[395.2601 50 0],[395.6454 60 0],[395.668 250 0],[396.6614 60 0],[396.9257 100 0],[397.7741 80 0],[398.1771 40 0],[398.3956 50 0],[399.4114 60 0],[399.7392 200 0],[399.8053 40 0],[400.5241 400 0],[400.9713 60 0],[401.453 80 0],[402.1867 100 0],[404.0638 50 0],[404.5813 4000 0],[406.3594 1500 0],[406.6975 50 0],[406.7977 50 0],[407.1737 1200 0],[407.6629 40 0],[410.0737 40 0],[410.7489 40 0],[411.8544 150 0],[412.7608 40 0],[413.2058 400 0],[413.4676 80 0],[413.6997 40 0],[414.3415 200 0],[414.3869 800 0],[415.3898 40 0],[415.45 50 0],[415.6799 60 0],[417.2744 50 0],[417.4912 60 0],[417.5635 50 0],[417.7593 50 0],[418.1754 120 0],[418.4891 50 0],[418.7038 120 0],[418.7795 120 0],[419.143 80 0],[419.5329 40 0],[419.8304 150 0],[419.9095 40 0],[420.2029 300 0],[420.3984 40 0],[420.6696 80 0],[421.0343 80 0],[421.6183 400 0],[421.936 100 0],[422.2212 50 0],[422.5956 50 0],[422.7423 200 0],[423.317 11 1],[423.3602 100 0],[423.5936 250 0],[423.8809 50 0],[424.7425 50 0],[425.0118 200 0],[425.0787 300 0],[425.8315 40 0],[426.0473 800 0],[427.1153 250 0],[427.1759 1200 0],[428.2402 1200 0],[429.1462 80 0],[429.9234 250 0],[430.7901 1200 0],[431.5084 150 0],[432.5761 1500 0],[435.2734 80 0],[436.9771 80 0],[437.5929 800 0],[438.3544 3000 0],[440.475 1200 0],[441.5122 300 0],[442.7299 600 0],[446.1652 400 0],[446.6551 120 0],[447.6017 80 0],[448.2169 80 0],[448.2252 200 0],[448.9739 50 0],[452.8613 50 0],[458.383 11 1],[464.7433 30 0],[473.6771 30 0],[485.9741 50 0],[487.1317 120 0],[487.2136 60 0],[487.8208 30 0],[489.0754 100 0],[489.1492 250 0],[490.3309 30 0],[491.8992 150 0],[492.0502 500 0],[492.392 12 1],[495.7597 1500 0],[499.05 11 1],[500.1862 80 0],[500.191 18 1],[500.42 11 1],[500.5711 30 0],[500.6117 100 0],[501.2067 60 0],[501.4941 30 0],[501.843 12 1],[503.064 11 1],[503.077 25 0],[503.571 12 1],[504.1755 150 0],[504.9819 30 0],[505.1634 30 0],[507.4748 25 0],[510.073 18 1],[510.095 15 1],[511.0357 150 0],[513.369 40 0],[513.9251 40 0],[513.9462 100 0],[514.436 11 1],[514.946 12 1],[515.191 25 0],[516.227 30 0],[516.6281 80 0],[516.7487 2500 0],[516.8897 80 0],[516.903 12 1],[517.1595 500 0],[519.1454 50 0],[519.2343 80 0],[519.4941 200 0],[520.4582 30 0],[521.5179 25 0],[521.6274 150 0],[521.685 18 1],[522.6862 60 0],[522.715 1000 0],[522.749 13 1],[523.2939 250 0],[524.795 13 1],[525.123 13 1],[526.026 18 1],[526.418 11 1],[526.6555 100 0],[526.9537 1200 0],[527.0357 800 0],[528.1789 30 0],[528.3621 60 0],[530.2299 25 0],[530.618 11 1],[531.623 13 1],[532.4178 150 0],[532.8038 800 0],[532.8531 300 0],[533.2899 100 0],[533.959 14 1],[533.9928 80 0],[534.1023 500 0],[536.487 25 0],[536.747 40 0],[536.996 50 0],[537.1489 400 0],[538.337 60 0],[538.706 14 1],[539.3167 40 0],[539.586 12 1],[539.7127 300 0],[540.206 15 1],[540.412 60 0],[540.5774 250 0],[541.091 30 0],[541.52 60 0],[542.407 60 0],[542.783 30 1],[542.9695 250 0],[542.999 13 1],[543.4523 100 0],[544.6871 200 0],[545.545 25 0],[545.5609 120 0],[546.593 16 1],[546.694 20 1],[548.231 16 1],[549.383 14 1],[549.7516 25 0],[550.1464 20 0],[550.62 18 1],[550.6778 30 0],[551.078 12 1],[552.906 12 1],[554.476 13 1],[556.9618 30 0],[557.2841 60 0],[558.6755 120 0],[561.5644 200 0],[562.4541 20 0],[564.54 12 1],[566.2515 50 0],[576.299 20 0],[578.363 11 1],[586.2353 30 0],[588.502 13 1],[590.282 16 1],[591.4114 30 0],[595.57 14 1],[598.6956 30 0],[596.171 18 1],[596.24 30 1],[596.563 13 1],[606.5482 40 0],[610.2159 30 0],[613.6614 40 0],[613.7694 40 0],[614.773 30 1],[614.924 20 1],[617.516 15 1],[619.1558 40 0],[621.3429 30 0],[621.9279 30 0],[623.0726 40 0],[623.837 20 1],[624.6317 20 0],[624.756 80 1],[625.2554 30 0],[630.532 15 1],[633.197 12 1],[638.375 15 1],[639.3602 20 0],[639.9999 30 0],[641.1647 20 0],[641.69 20 1],[642.1349 20 0],[643.0844 30 0],[644.643 20 1],[645.638 200 1],[649.4981 60 0],[651.605 20 1],[654.6239 20 0],[659.2913 20 0],[667.7989 40 0],[685.518 15 0],[694.521 15 0],[706.744 20 1],[713.094 15 0],[716.4443 25 0],[718.7313 80 0],[720.7381 30 0],[722.451 12 1],[730.797 50 1],[732.07 40 1],[737.646 20 1],[744.5746 30 0],[746.238 20 1],[749.5059 40 0],[751.1045 60 0],[758.604 15 0],[771.171 15 1],[778.059 30 0],[395.433 16 2],[396.872 11 2],[396.949 9 2],[397.942 10 2],[403.542 10 2],[405.311 11 2],[408.1 12 2],[412.09 10 2],[412.202 11 2],[412.278 11 2],[413.776 15 2],[413.935 13 2],[414.048 9 2],[415.496 9 2],[416.473 18 2],[416.492 9 2],[416.684 13 2],[417.426 13 2],[421.067 9 2],[422.227 11 2],[423.556 13 2],[423.862 9 2],[424.375 12 2],[427.34 12 2],[427.972 12 2],[428.616 14 2],[429.685 16 2],[430.478 18 2],[431.036 20 2],[432.368 9 2],[437.204 9 2],[437.214 9 2],[437.231 11 2],[437.253 14 2],[437.281 18 2],[439.576 9 2],[441.96 12 2],[443.102 9 2],[511.107 9 2],[512.735 9 2],[515.612 12 2],[519.908 10 2],[523.566 10 2],[524.331 18 2],[526.034 13 2],[527.237 9 2],[527.298 14 2],[527.648 15 2],[528.23 16 2],[528.483 12 2],[529.812 11 2],[529.993 12 2],[530.26 14 2],[530.676 10 2],[531.088 9 2],[532.274 10 2],[534.688 11 2],[535.377 12 2],[536.376 12 2],[536.806 10 2],[537.547 11 2],[571.988 11 2],[574.419 9 2],[575.638 10 2],[583.393 18 2],[584.876 9 2],[585.462 10 2],[587.626 9 2],[589.191 15 2],[589.868 9 2],[591.896 9 2],[592.013 10 2],[592.969 18 2],[595.231 10 2],[595.362 14 2],[596.848 9 2],[597.932 12 2],[598.101 9 2],[598.908 12 2],[599.954 18 2],[603.102 9 2],[603.259 16 2],[603.656 13 2],[604.872 11 2],[605.418 11 2],[605.636 9 2],[614.999 9 2],[616.974 9 2],[618.526 9 2],[618.656 7 2],[619.479 7 2],[619.543 6 2],[620.137 6 2],[620.304 5 2],[625.981 5 2],[629.45 6 2],[635.781 5 2],[731.763 5 2],[732.014 6 2]}{10000}% -\wl@elt@search{#1}{Co}{[384.205 1400 0],[384.547 6900 0],[387.312 5500 0],[387.396 2800 0],[389.408 7900 0],[391.14 20 1],[393.597 1500 0],[396.31 80 1],[397.674 40 1],[398.302 10 1],[399.531 6000 0],[399.791 970 0],[402.09 350 0],[403.614 10 1],[403.737 20 1],[404.002 4 1],[404.539 370 0],[405.023 5 1],[405.24 10 1],[406.273 20 1],[406.45 2 1],[406.637 350 0],[407.434 5 1],[409.239 830 0],[409.657 1 1],[411.054 550 0],[411.877 2800 0],[412.132 4400 0],[413.088 3 1],[414.513 3 1],[416.067 3 1],[418.113 1 1],[419.071 90 0],[420.861 1 1],[424.425 30 1],[427.233 8 1],[428.825 20 1],[432.886 3 1],[438.426 2 1],[439.694 2 1],[441.391 3 1],[446.956 90 0],[448.25 10 1],[448.912 2 1],[449.744 4 1],[450.054 10 1],[453.096 690 0],[453.322 2 1],[454.966 90 0],[455.929 1 1],[456.559 140 0],[456.926 1 1],[458.16 190 0],[461.63 5 1],[462.938 120 0],[466.066 25 1],[466.341 85 0],[479.286 110 0],[483.116 10 1],[484.027 100 0],[486.788 150 0],[496.418 80 1],[497.005 10 1],[499.047 10 1],[499.598 20 1],[514.674 35 0],[521.271 50 0],[523.022 50 0],[523.521 45 0],[524.793 50 0],[526.63 26 0],[526.649 45 0],[526.852 26 0],[528.065 45 0],[530.106 26 0],[534.271 50 0],[534.339 26 0],[535.205 50 0],[535.348 26 0],[536.958 35 0],[548.334 45 0],[553.077 17 0],[564.722 17 0],[599.188 17 0],[608.244 17 0],[628.263 17 0],[645.024 45 0],[645.5 21 0],[656.342 15 0],[663.244 15 0],[681.494 14 0],[687.24 14 0],[705.289 21 0],[708.499 45 0],[741.738 8 0],[771.268 8 0]}{7900}% -\wl@elt@search{#1}{Ni}{[380.714 700 0],[383.169 110 0],[385.83 1200 0],[388.967 30 0],[397.217 35 0],[397.356 110 0],[440.155 110 0],[445.904 85 0],[446.246 18 0],[447.048 55 0],[459.253 35 0],[460.037 18 0],[460.5 65 0],[460.623 18 0],[464.866 75 0],[468.622 23 0],[471.442 110 0],[471.578 22 0],[475.652 30 0],[476.395 15 0],[478.654 45 0],[480.7 22 0],[482.903 22 0],[483.118 19 0],[485.541 45 0],[486.627 30 0],[487.344 17 0],[490.441 40 0],[491.836 22 0],[493.583 16 0],[498.016 45 0],[498.413 45 0],[499.202 500 1],[500.034 16 0],[501.246 18 0],[501.759 50 0],[503.537 100 0],[504.885 16 0],[508.052 100 0],[508.111 65 0],[508.408 26 0],[509.932 18 0],[509.995 26 0],[511.54 21 0],[512.938 18 0],[513.708 23 0],[514.277 23 0],[514.648 40 0],[515.576 40 0],[516.866 16 0],[517.656 13 0],[543.587 8 0],[547.691 180 0],[551 6 0],[557.873 6 0],[558.786 9 0],[559.228 13 0],[561.479 9 0],[562.533 5 0],[564.97 4 0],[566.402 5 0],[568.22 12 0],[569.5 8 0],[570.956 23 0],[571.19 10 0],[571.509 10 0],[575.468 16 0],[576.085 8 0],[585.776 10 0],[589.288 10 0],[610.812 10 0],[617.681 10 0],[619.118 10 0],[625.636 13 0],[631.466 10 0],[664.364 16 0],[676.777 22 0],[677.232 9 0],[691.456 10 0],[711.09 5 0],[712.22 26 0],[718.2 6 0],[719.702 5 0],[726.193 5 0],[729.145 5 0],[738.524 4 0],[739.36 16 0],[740.935 16 0],[741.451 5 0],[742.228 23 0],[752.276 13 0],[752.512 9 0],[755.56 19 0],[757.405 8 0],[761.7 23 0],[761.921 9 0],[771.432 16 0],[771.558 5 0],[772.761 19 0],[774.889 19 0],[778.894 10 0],[779.759 13 0]}{1200}% -\wl@elt@search{#1}{Cu}{[381.8879 100 1],[382.6921 140 1],[386.4137 160 1],[388.4131 280 1],[389.2924 150 1],[390.3177 170 1],[392.0654 140 1],[393.3268 120 1],[398.7024 120 1],[399.3302 150 1],[400.3476 140 1],[402.263 1250 0],[403.2647 100 1],[404.3484 600 1],[404.3751 500 1],[406.264 2000 0],[406.8106 120 1],[413.1363 500 1],[414.3017 200 1],[415.3623 300 1],[416.114 500 1],[416.4284 370 1],[417.1851 400 1],[417.9512 500 1],[421.1866 500 1],[423.0449 320 1],[425.5635 200 1],[427.511 950 0],[427.9962 300 1],[429.247 500 1],[436.537 400 1],[444.4831 100 1],[450.6002 400 1],[451.6049 150 1],[454.1032 150 1],[455.592 500 1],[459.6906 100 1],[464.9271 120 1],[465.112 2000 0],[466.1363 120 1],[467.1702 320 1],[467.3577 300 1],[468.1994 450 1],[475.8433 100 1],[481.2948 400 1],[485.1262 120 1],[485.4988 300 1],[487.3304 100 1],[490.1427 150 1],[490.9734 1000 1],[491.8376 500 1],[492.6424 200 1],[493.1698 900 1],[494.3026 120 1],[495.3724 700 1],[498.5506 500 1],[500.6801 400 1],[500.9851 350 1],[501.262 400 1],[502.1279 350 1],[503.9016 200 1],[504.7348 300 1],[505.1793 900 1],[505.891 400 1],[506.5459 500 1],[506.7094 450 1],[507.2302 350 1],[508.8277 450 1],[509.3816 420 1],[510.0067 350 1],[510.554 1500 0],[512.4476 250 1],[515.324 2000 0],[515.8093 100 1],[518.3367 100 1],[521.82 2500 0],[526.9991 100 1],[527.6525 100 1],[529.252 1650 0],[536.8383 100 1],[570.024 1500 0],[578.213 1500 0],[580.5989 150 1],[583.3515 100 1],[589.7971 200 1],[593.7577 120 1],[594.1196 400 1],[599.326 100 1],[600.012 650 1],[602.3264 100 1],[607.2218 250 1],[608.0343 150 1],[609.999 150 1],[610.7412 160 1],[611.4493 300 1],[615.0384 600 1],[615.4222 750 1],[617.2037 500 1],[618.6884 550 1],[618.8676 400 1],[619.8092 300 1],[620.4261 470 1],[620.8457 450 1],[621.6939 750 1],[621.9844 700 1],[626.1848 500 1],[627.3349 1000 1],[628.8696 350 1],[630.1009 900 1],[630.5972 550 1],[631.2492 400 1],[632.6466 120 1],[637.3268 400 1],[637.784 750 1],[640.3384 400 1],[642.3884 850 1],[644.2965 200 1],[644.8559 750 1],[646.6246 170 1],[647.0168 950 1],[648.1437 750 1],[648.4421 400 1],[651.7317 220 1],[653.0083 400 1],[655.1286 120 1],[657.708 200 1],[662.4292 750 1],[664.1396 800 1],[666.0962 450 1],[677.0362 100 1],[680.6216 300 1],[680.9647 400 1],[682.3202 320 1],[684.4157 250 1],[686.8791 320 1],[687.2231 270 1],[687.9404 270 1],[693.7553 220 1],[695.2871 150 1],[697.7572 150 1],[702.286 200 1],[719.4896 300 1],[732.6008 400 1],[733.1694 300 1],[738.2277 250 1],[740.4354 1000 1],[743.4156 270 1],[756.2015 500 1],[765.2333 700 1],[766.4648 1000 1],[768.1788 150 1],[774.4097 450 1],[777.8738 800 1],[380.413 600 2],[380.918 600 2],[388.168 300 2],[395.381 150 2],[409.049 100 2],[428.34 200 2],[435.197 500 2],[435.28 1000 2],[435.524 500 2],[437.084 500 2],[437.14 500 2],[437.343 500 2],[437.711 1000 2],[438.642 200 2],[492.741 150 2],[509.428 400 2],[516.897 200 2],[520.834 400 2],[521.921 600 2],[526.859 200 2],[531.778 400 2],[536.979 300 2],[541.848 350 2],[549.494 250 2],[557.394 50 2],[560.9 100 2],[570.212 75 2],[576.856 100 2],[585.072 100 2],[596.525 200 2],[610.087 30 2],[636.927 50 2],[651.254 20 2],[664.413 20 2],[679.32 50 2]}{2500}% -\wl@elt@search{#1}{Zn}{[380.634 50 1],[384.029 100 1],[388.334 50 0],[396.543 15 0],[411.321 10 0],[429.288 25 0],[429.833 25 0],[462.981 35 0],[468.014 300 0],[472.215 400 0],[481.053 400 0],[491.162 800 1],[492.403 500 1],[506.866 7 0],[506.958 15 0],[518.198 200 0],[530.865 8 0],[531.024 7 0],[531.102 7 0],[577.21 4 0],[577.55 4 0],[577.711 10 0],[589.433 500 1],[602.118 500 1],[610.249 500 1],[611.153 100 1],[621.461 500 1],[623.79 8 0],[623.917 8 0],[636.234 1000 0],[647.918 10 0],[692.832 15 0],[693.847 8 0],[694.32 3 0],[747.88 200 1],[758.85 300 1],[761.29 100 1],[773.25 300 1],[775.79 200 1],[779.936 10 0]}{1000}% -\wl@elt@search{#1}{Ga}{[392.439 9 1],[403.299 10 0],[417.204 10 0],[425.111 4 1],[425.116 15 1],[425.404 10 1],[425.564 4 1],[425.57 5 1],[425.577 10 1],[426.2 40 1],[521.821 3 1],[533.83 1 1],[535.349 2 0],[536.06 2 1],[536.35 1 1],[541.68 3 1],[542.16 1 1],[542.56 1 1],[633.42 10 1],[639.656 2000 0],[641.344 1000 0],[641.94 5 1],[645.63 3 1],[700 1 1],[705.124 3 0],[710.682 5 0],[711.63 1 0],[717.29 2 0],[719.36 5 0],[719.87 7 1],[725.14 10 0],[728.96 3 0],[734.93 5 0],[740.3 20 0],[746.4 30 0],[755.66 6 0],[762.05 10 0],[773.477 50 0],[779.3 2 1],[380.66 10 2],[438.069 100 2],[438.176 150 2],[486.3 100 2],[499.378 150 2],[580.828 10 2],[584.825 20 2],[599.351 15 2]}{2000}% -\wl@elt@search{#1}{Ge}{[384.511 30 1],[422.6562 70 0],[468.5829 10 0],[468.987 75 1],[469.002 50 1],[474.1806 1000 1],[481.4608 1000 1],[482.4097 50 1],[513.1752 100 1],[517.8648 200 1],[519.4583 3 0],[526.5892 6 0],[551.3263 6 0],[556.4741 8 0],[560.701 8 0],[561.6135 6 0],[562.1426 7 0],[565.596 8 0],[566.4226 6 0],[566.4842 5 0],[569.1954 9 0],[570.1776 6 0],[571.7877 5 0],[580.1029 6 0],[580.2093 9 0],[589.3389 1000 1],[602.1041 500 1],[607.839 150 1],[626.714 50 1],[626.807 150 1],[626.834 100 1],[628.3452 75 1],[633.6377 100 1],[648.4181 100 1],[655.7488 6 0],[678.051 50 1],[704.9369 50 1],[713.012 6 0],[714.539 30 1],[733.038 7 0],[735.3334 5 0],[738.4208 7 0],[740.264 6 0],[751.157 7 0],[777.62 5 0],[388.478 15 2],[417.896 200 2],[424.541 12 2],[426.085 200 2],[429.171 150 2],[467.436 10 2],[501.688 10 2],[513.475 18 2],[522.937 5 2],[525.661 3 2]}{1000}% -\wl@elt@search{#1}{As}{[384.26 340 1],[419.0082 715 1],[419.74 615 1],[424.2982 615 1],[431.5657 500 1],[432.3867 500 1],[433.664 500 1],[435.2145 500 1],[435.2864 425 1],[437.117 375 1],[442.7106 615 1],[443.1562 615 1],[445.8469 715 1],[446.1075 340 1],[446.6348 715 1],[447.446 500 1],[449.423 800 1],[450.7659 850 1],[453.974 615 1],[454.3483 715 1],[460.2427 615 1],[462.9787 340 1],[470.7586 340 1],[473.067 340 1],[488.8557 340 1],[506.898 100 0],[510.558 340 1],[510.755 500 1],[512.134 100 0],[514.163 100 0],[523.138 425 1],[533.123 500 1],[540.813 100 0],[545.132 135 0],[549.7727 340 1],[555.809 425 1],[565.132 425 1],[611.007 425 1],[617.027 500 1],[651.174 300 1],[709.227 300 1],[710.272 300 1],[392.26 325 2],[403.72 185 2]}{850}% -\wl@elt@search{#1}{Se}{[407.02 285 1],[417.53 360 1],[418.09 450 1],[432.87 120 0],[433.03 100 0],[438.29 285 1],[444.6 285 1],[444.92 220 1],[446.76 285 1],[473.08 500 0],[473.9 400 0],[474.22 300 0],[484.06 285 1],[484.5 360 1],[522.75 450 1],[530.54 360 1],[536.55 100 0],[536.99 120 0],[537.41 110 0],[552.24 285 1],[556.69 285 1],[586.63 285 1],[605.6 450 1],[632.56 200 0],[644.42 360 1],[649.05 285 1],[653.5 285 1],[683.13 150 0],[699.069 120 0],[699.1792 100 0],[701.0809 200 0],[701.3875 150 0],[706.2065 300 0],[757.51 200 0],[758.34 250 0],[759.22 150 0],[760.68 120 0],[380.09 450 2],[404.67 360 2],[408.32 220 2],[416.91 450 2],[463.79 220 2],[630.38 285 2]}{500}% -\wl@elt@search{#1}{Br}{[381.565 1200 0],[383.469 350 1],[387.121 300 1],[389.163 400 1],[390.124 300 1],[391.42 300 1],[391.438 500 1],[391.951 350 1],[392.409 400 1],[392.955 300 1],[393.969 350 1],[395.061 350 1],[398.038 500 1],[399.236 1500 0],[402.404 300 1],[413.566 300 1],[414.02 300 1],[417.963 400 1],[419.345 300 1],[422.389 1000 1],[423.689 300 1],[429.139 300 1],[436.514 2000 0],[436.56 1000 1],[442.514 1500 0],[444.174 10000 0],[447.261 10000 0],[447.772 20000 0],[449.042 1000 0],[451.344 3000 0],[452.559 15000 0],[452.96 300 1],[454.292 500 1],[457.574 3000 0],[460.136 300 1],[461.458 2500 0],[462.27 350 1],[464.202 300 1],[465.198 300 1],[467.87 500 1],[469.317 400 1],[470.485 500 1],[471.976 350 1],[472.036 400 1],[472.82 300 1],[473.541 300 1],[474.264 400 1],[475.228 2500 0],[476.6 350 1],[477.94 400 1],[478.031 4000 0],[478.519 1600 0],[478.55 500 1],[480.233 300 1],[481.67 500 1],[481.846 300 1],[484.481 350 1],[484.875 350 1],[492.112 400 1],[492.879 400 1],[493.066 450 1],[494.551 300 1],[497.976 4000 0],[503.874 300 1],[505.464 300 1],[516.438 400 1],[518.001 300 1],[518.235 500 1],[519.39 300 1],[523.823 500 1],[527.268 300 1],[530.41 350 1],[533.057 400 1],[533.205 500 1],[539.548 1200 0],[542.278 400 1],[542.499 350 1],[543.507 300 1],[546.622 1200 0],[547.847 350 1],[548.879 300 1],[549.506 300 1],[550.669 500 1],[558.994 350 1],[571.871 300 1],[583.078 300 1],[585.208 1800 0],[594.048 1600 0],[612.214 2400 0],[614.86 40000 0],[616.174 300 1],[617.739 2000 0],[633.548 1500 0],[635.073 60000 0],[635.294 400 1],[641.032 2500 0],[648.356 1800 0],[651.462 1000 0],[654.457 20000 0],[654.809 1500 0],[655.98 50000 0],[657.131 1000 0],[657.914 1800 0],[658.217 20000 0],[662.047 1500 0],[663.162 50000 0],[668.228 20000 0],[669.213 10000 0],[672.828 8000 0],[676.006 2000 0],[677.948 2000 0],[678.674 2200 0],[679.004 6500 0],[679.148 1600 0],[686.115 1800 0],[700.519 10000 0],[726.045 2000 0],[734.851 10000 0],[751.296 40000 0],[759.161 1600 0],[759.507 1800 0],[761.641 2000 0],[382.026 450 2],[390.395 200 2],[450.655 350 2],[451.974 200 2],[517.587 150 2],[544.68 100 2],[719.28 100 2],[767.31 100 2]}{60000}% -\wl@elt@search{#1}{Kr}{[387.544 150 1],[390.6177 150 1],[392.0081 200 1],[399.484 100 1],[399.7793 100 1],[405.7037 300 1],[406.5128 300 1],[408.8337 500 1],[409.8729 250 1],[410.9248 100 1],[414.5122 250 1],[425.058 150 1],[427.3969 1000 0],[428.2967 100 0],[429.2923 600 1],[430.049 200 1],[431.781 500 1],[431.8551 400 0],[431.9579 1000 0],[432.298 150 1],[435.1359 100 0],[435.5477 3000 1],[436.2641 500 0],[436.969 200 1],[437.6121 800 0],[438.654 300 1],[439.9965 200 0],[442.5189 100 0],[443.1685 500 1],[443.6812 600 1],[445.3917 600 0],[446.3689 800 0],[447.5014 800 1],[448.988 400 1],[450.2353 600 0],[452.314 400 1],[455.661 200 1],[457.7209 800 1],[458.2978 300 1],[459.28 150 1],[461.5292 500 1],[461.9166 1000 1],[463.3885 800 1],[465.8876 2000 1],[468.0406 500 1],[469.1301 100 1],[469.436 200 1],[473.9002 3000 1],[476.2435 300 1],[476.5744 1000 1],[481.176 300 1],[482.518 300 1],[483.2077 800 1],[484.6612 700 1],[485.72 150 1],[494.559 300 1],[502.24 200 1],[508.652 250 1],[512.573 400 1],[520.832 500 1],[530.866 200 1],[533.341 500 1],[546.817 200 1],[556.2224 500 0],[557.0288 2000 0],[558.0386 80 0],[564.9561 100 0],[568.189 400 1],[569.035 200 1],[583.2855 100 0],[587.0914 3000 0],[599.222 200 1],[599.3849 60 0],[605.6125 60 0],[642.018 300 1],[642.1026 100 0],[645.6288 200 0],[657.007 150 1],[669.9228 60 0],[690.4678 100 0],[721.313 250 1],[722.4104 100 0],[728.7258 80 0],[728.978 400 1],[740.702 400 1],[742.5541 60 0],[743.578 200 1],[748.6862 100 0],[752.446 300 1],[758.7411 1000 0],[760.1544 2000 0],[764.116 150 1],[768.5244 1000 0],[769.4538 1200 0],[773.569 250 1],[774.6827 150 0],[386.87 40 2],[406.737 50 2],[413.133 40 2],[415.446 40 2],[501.645 20 2],[550.143 10 2],[603.717 10 2],[607.838 10 2],[631.022 10 2],[380.93 3 3],[386.058 5 3],[393.429 5 3]}{3000}% -\wl@elt@search{#1}{Rb}{[380.19 2500 1],[382.666 1000 1],[386.074 450 1],[390.729 250 1],[392.22 500 1],[392.644 2500 1],[394.051 25000 1],[397.815 1000 1],[402.949 1700 1],[408.388 2500 1],[410.428 2000 1],[413.611 1700 1],[419.308 3500 1],[420.18 1000 0],[421.553 500 0],[424.44 90000 1],[426.658 500 1],[427.025 250 1],[427.314 15000 1],[428.797 2500 1],[429.397 1500 1],[430.626 500 1],[434.696 1000 1],[437.712 2500 1],[444.01 300 1],[446.947 1000 1],[449.392 400 1],[451.904 700 1],[453.034 3000 1],[453.379 500 1],[454.074 400 1],[457.177 20000 1],[462.242 3000 1],[463.189 350 1],[464.857 10000 1],[465.928 500 1],[473.045 1000 1],[475.53 1000 1],[475.782 400 1],[477.595 30000 1],[478.283 5000 1],[485.534 300 1],[488.559 1500 1],[508.7987 2 0],[513.2471 2 0],[515.0134 10 0],[515.208 10000 1],[516.458 300 1],[516.5023 1 0],[516.5142 2 0],[516.965 1 0],[519.5278 15 0],[523.3968 2 0],[526.0034 20 0],[526.0228 1 0],[527.051 200 1],[532.238 3 0],[536.2601 40 0],[539.0568 4 0],[543.1532 75 0],[543.183 3 0],[551.255 500 1],[552.278 5000 1],[557.8788 6 0],[563.599 5000 1],[564.7774 40 0],[565.375 20 0],[569.915 3000 1],[572.4121 60 0],[572.4614 3 0],[573.964 200 1],[607.0755 75 0],[613.527 200 1],[615.9626 30 0],[619.908 1000 1],[620.6309 75 0],[626.94 300 1],[629.8325 120 0],[629.9224 5 0],[645.833 10000 1],[655.562 1000 1],[656.081 5000 1],[677.507 3000 1],[727.9997 100 0],[731.652 300 1],[740.8173 150 0],[761.8933 200 0],[775.7651 300 0],[775.9436 60 0]}{90000}% -\wl@elt@search{#1}{Sr}{[394.08 300 0],[396.926 600 0],[397.004 300 0],[403.038 1300 0],[403.238 300 0],[407.771 46000 1],[416.18 200 1],[421.552 32000 1],[430.545 340 1],[443.804 350 0],[460.733 65000 0],[472.228 3200 0],[474.192 2200 0],[478.432 1400 0],[481.188 4800 0],[483.208 3600 0],[485.504 500 0],[486.87 600 0],[487.249 3000 0],[487.606 600 0],[487.632 2000 0],[489.198 1000 0],[496.226 8000 0],[496.794 1300 0],[515.607 800 0],[522.22 1400 0],[522.511 2000 0],[522.927 2000 0],[523.855 2800 0],[525.69 4800 0],[532.982 350 0],[545.084 1500 0],[548.084 7000 0],[548.612 1100 0],[550.417 3500 0],[552.183 2600 0],[553.481 2000 0],[554.005 2000 0],[554.336 250 0],[597.01 200 0],[634.575 250 0],[636.394 250 0],[636.996 350 0],[638.075 1000 0],[638.65 900 0],[638.824 600 0],[640.847 9000 0],[644.668 250 0],[646.579 250 0],[650.4 5500 0],[654.679 1000 0],[655.026 1700 0],[661.726 3000 0],[664.354 800 0],[679.105 1800 0],[687.838 4800 0],[689.259 1200 0],[707.01 5500 0],[715.309 60 0],[716.724 250 0],[723.227 200 0],[730.941 2500 0],[762.15 500 0],[767.306 400 0],[387.426 30 2],[393.64 30 2],[393.672 30 2],[395.875 30 2],[409.403 30 2],[409.702 30 2],[410.563 30 2],[433.58 35 2],[507.109 30 2],[513.034 30 2],[515.826 35 2],[525.771 40 2],[526.221 30 2],[528.832 30 2],[539.103 30 2],[544.348 40 2],[546.39 30 2],[566.466 30 2],[568.972 30 2],[429.857 9 3],[468.508 9 3]}{65000}% -\wl@elt@search{#1}{Y}{[381.835 1300 1],[383.288 4000 1],[384.787 70 1],[387.682 80 0],[387.828 480 1],[388.777 30 0],[390.459 60 0],[391.825 50 0],[393.011 60 0],[393.066 240 1],[395.036 4400 1],[395.16 150 1],[395.509 60 0],[398.26 3600 1],[398.75 40 0],[403.983 940 0],[404.764 2400 0],[407.738 9400 0],[408.122 90 0],[408.371 2000 0],[410.238 9900 0],[410.639 60 0],[411.081 80 0],[412.492 320 1],[412.831 8900 0],[414.285 7500 0],[415.763 100 0],[416.752 2400 0],[417.414 2000 0],[417.754 8000 1],[419.928 120 1],[420.47 380 1],[421.302 80 0],[421.354 40 0],[421.78 160 0],[422.063 280 0],[422.425 80 0],[423.573 600 1],[423.594 2200 0],[425.12 300 0],[430.23 360 0],[430.963 2800 1],[431.63 50 0],[433.078 110 0],[433.729 30 0],[434.465 60 0],[434.879 440 0],[435.233 60 0],[435.27 60 0],[435.773 120 0],[435.873 800 1],[436.603 120 0],[437.494 12000 1],[437.561 150 0],[437.933 80 0],[438.548 30 0],[438.774 100 0],[439.401 30 0],[439.467 30 0],[439.802 1800 1],[442.259 890 1],[443.734 80 0],[444.366 100 0],[444.663 130 0],[446.527 20 0],[447.389 40 0],[447.572 170 0],[447.696 180 0],[447.745 160 0],[448.728 110 0],[448.747 300 0],[449.175 30 0],[449.242 25 0],[450.595 500 0],[451.358 50 0],[451.401 80 0],[452.205 40 0],[452.725 890 0],[452.78 440 0],[454.432 100 0],[455.937 100 0],[456.439 30 0],[457.356 60 0],[458.132 35 0],[458.177 30 0],[459.655 130 0],[460.48 95 0],[461.3 40 0],[464.37 2000 0],[465.832 200 0],[465.889 70 0],[466.747 85 0],[467.082 60 0],[467.484 2000 0],[467.835 60 0],[468.232 260 1],[468.977 85 0],[469.681 180 0],[470.885 35 0],[472.585 60 0],[472.853 170 0],[473.237 60 0],[474.14 85 0],[475.279 160 0],[476.098 410 0],[478.018 17 0],[478.104 120 0],[478.658 160 1],[478.689 170 0],[479.93 180 0],[480.431 50 0],[480.481 70 0],[481.738 85 -1],[481.82 140 -1],[481.964 140 0],[482.213 120 0],[482.331 190 1],[483.915 60 0],[483.987 770 0],[484.568 550 0],[485.269 410 0],[485.425 120 0],[485.487 890 1],[485.67 50 0],[485.984 330 0],[487.965 50 0],[488.369 1900 1],[488.628 50 0],[488.665 40 0],[489.344 95 0],[490.012 1100 1],[490.611 100 0],[490.9 45 0],[492.187 150 0],[493.093 35 0],[495.066 45 0],[497.43 120 0],[498.213 120 1],[500.697 100 0],[507.021 75 0],[507.219 75 0],[508.742 1100 1],[508.818 30 0],[511.911 210 1],[512.321 450 1],[513.52 180 0],[519.643 120 1],[520.041 960 1],[520.572 1500 1],[524.081 180 0],[528.982 60 1],[532.078 45 1],[538.062 75 0],[540.278 220 1],[541.703 24 0],[542.437 90 0],[543.824 190 0],[546.646 710 0],[546.847 100 0],[547.339 90 1],[548.074 90 1],[549.317 60 0],[549.559 35 0],[549.741 240 1],[550.345 300 0],[550.99 250 1],[551.364 60 0],[552.163 120 0],[552.676 24 0],[552.754 740 0],[554.163 35 0],[554.45 120 0],[554.602 90 1],[555.643 75 0],[556.775 60 0],[557.742 180 0],[558.108 24 0],[558.187 620 0],[559.096 21 0],[559.412 21 0],[560.633 120 0],[562.391 15 0],[563.013 560 0],[563.225 24 0],[563.289 21 0],[564.469 120 0],[564.847 120 0],[566.294 740 1],[567.527 90 0],[569.363 18 0],[570.673 160 0],[572.061 24 0],[572.889 75 1],[573.012 150 -1],[573.209 21 0],[574.385 90 0],[574.693 18 -1],[576.422 24 -1],[576.564 75 0],[577.395 35 0],[578.169 100 1],[580 15 -1],[581.858 15 -1],[582.187 30 0],[583.227 21 0],[583.807 9 -1],[585.883 15 -1],[587.183 15 0],[587.614 24 -1],[587.996 24 0],[589.394 24 -1],[590.296 35 0],[591.219 24 -1],[593.11 24 -1],[593.908 90 -1],[594.572 45 0],[595.002 24 0],[595.641 75 -1],[597.204 1300 -1],[598.186 50 0],[598.764 1000 -1],[600.36 740 -1],[600.465 120 -1],[600.919 120 0],[601.987 620 -1],[602.341 120 0],[603.66 500 -1],[605.381 420 -1],[607.278 130 -1],[608.8 50 0],[608.935 210 -1],[609.678 160 -1],[610.782 130 -1],[611.473 130 -1],[612.738 75 -1],[613.206 1400 -1],[613.504 120 0],[613.843 150 0],[614.836 1100 -1],[615.172 120 -1],[616.508 820 -1],[618.223 560 -1],[619.173 1200 0],[619.982 590 -1],[621.796 450 -1],[622.259 300 0],[623.672 270 -1],[625.105 45 0],[627.501 120 -1],[629.546 60 -1],[631.62 24 -1],[633.81 24 -1],[635.948 15 -1],[636.987 15 -1],[640.201 75 0],[643.5 1000 0],[643.718 24 0],[650.123 18 -1],[651.833 18 -1],[653.584 18 -1],[653.86 90 0],[655.384 12 -1],[655.739 70 0],[657.258 12 -1],[657.685 35 0],[658.487 23 0],[661.375 95 1],[662.249 14 0],[663.649 19 0],[665.061 40 0],[666.44 21 0],[668.758 150 0],[669.183 14 0],[669.475 7 0],[669.926 16 0],[670.071 70 0],[671.32 35 0],[673.599 40 0],[679.371 190 0],[679.541 70 1],[680.315 12 0],[681.516 21 0],[683.249 14 1],[684.524 45 0],[685.824 14 1],[688.722 29 0],[689.6 21 1],[690.826 9 0],[693.352 14 0],[695.031 24 0],[695.168 10 1],[695.804 10 0],[697.988 24 0],[700.897 13 0],[700.993 10 0],[703.518 19 0],[705.294 29 0],[705.428 13 0],[707.513 9 0],[712.792 11 0],[719.166 35 0],[719.593 10 0],[726.417 35 1],[729.308 9 0],[733.062 9 0],[733.296 5 1],[734.646 50 0],[739.877 11 0],[745.03 29 1],[749.488 17 0],[753.671 7 0],[756.313 35 0],[761.772 8 0],[762.294 19 0],[765.289 7 0],[768.949 5 0],[769.8 8 0],[771.989 19 0],[772.408 19 0],[778.842 13 0],[779.632 13 0],[386.696 500 2],[390.074 3000 2],[391.458 4000 2],[403.96 3800 2],[404.011 3000 2],[412.161 120 2],[473.762 2000 2],[510.288 7500 2],[512.04 1300 2],[523.81 10000 2],[526.358 3000 2],[538.364 4000 2],[556.281 6000 2],[556.727 600 2],[557.224 4000 2],[559.548 400 2],[560.208 3000 2],[725.458 2000 2],[755.871 9000 2]}{12000}% -\wl@elt@search{#1}{Zr}{[381.758 210 1],[382.241 560 0],[383.596 2200 0],[383.676 1300 1],[384.302 550 1],[384.701 550 0],[384.925 550 0],[386.387 2900 0],[386.434 770 0],[387.76 990 0],[387.905 200 0],[388.542 1500 0],[389.032 2900 0],[389.138 2000 0],[390.052 400 0],[391.594 310 1],[392.179 610 0],[392.953 1200 0],[393.412 200 1],[393.479 200 1],[395.822 940 1],[396.666 490 0],[396.826 990 0],[397.35 660 0],[397.529 200 0],[398.16 200 0],[399.113 770 1],[399.897 770 1],[400.76 200 0],[401.225 200 0],[402.398 400 0],[402.492 770 0],[402.72 990 0],[402.895 240 0],[402.968 400 1],[403.004 490 0],[403.589 400 0],[404.222 240 0],[404.358 610 0],[404.456 490 0],[404.561 400 1],[404.867 610 1],[405.033 200 1],[405.048 200 0],[405.503 770 0],[405.571 600 0],[406.153 330 0],[406.416 1500 0],[407.27 2000 0],[407.493 310 0],[407.653 200 0],[407.831 240 0],[408.122 2000 0],[410.84 200 0],[412.146 400 0],[414.92 1200 1],[415.264 200 0],[415.624 290 1],[416.121 400 1],[416.636 400 0],[418.332 200 0],[418.756 660 0],[419.476 400 0],[419.909 610 0],[420.146 610 0],[420.898 610 1],[421.188 200 1],[421.386 400 0],[422.776 2000 0],[423.606 200 0],[423.931 2000 0],[424.034 770 0],[424.12 770 0],[424.169 1200 0],[426.802 310 0],[428.22 550 0],[429.479 550 0],[430.289 310 0],[434.113 550 0],[434.789 1000 0],[435.974 290 1],[436.081 310 0],[436.645 350 0],[437.978 240 1],[441.304 190 0],[442.046 240 0],[442.724 120 0],[443.149 160 0],[444.3 140 1],[445.743 110 0],[446.691 110 0],[447.031 110 0],[447.056 190 0],[449.697 200 1],[450.712 550 0],[453.575 610 0],[454.222 490 0],[455.301 200 0],[455.513 200 0],[455.552 140 0],[457.552 490 0],[458.229 100 0],[459.055 140 0],[460.257 350 0],[460.442 140 0],[462.641 210 0],[463.398 700 0],[464.483 210 0],[468.342 260 0],[468.78 2300 0],[468.845 510 0],[470.779 110 0],[471.008 1900 0],[471.192 160 0],[471.762 120 0],[471.912 210 0],[473.233 300 0],[473.948 1400 0],[476.278 190 0],[477.231 870 0],[478.492 210 0],[478.867 160 0],[480.587 260 0],[480.947 140 0],[481.504 190 0],[481.563 700 0],[482.429 280 0],[482.804 190 0],[483.878 110 0],[485.136 210 0],[486.606 160 0],[488.124 110 0],[488.36 110 0],[499.476 100 0],[501.146 30 0],[504.658 250 0],[506.039 85 0],[506.491 360 0],[506.522 110 0],[507.026 100 0],[507.398 75 0],[507.825 470 0],[508.526 85 0],[511.227 50 1],[511.524 140 0],[512.042 50 0],[513.34 85 0],[515.545 300 0],[515.8 200 0],[515.867 35 0],[516.099 75 0],[516.596 85 0],[517.899 17 0],[518.37 100 0],[518.703 30 0],[519.16 100 1],[520.115 100 0],[520.93 85 0],[522.493 85 0],[524.347 30 0],[527.741 120 0],[528.005 75 0],[529.482 60 0],[529.679 120 0],[530.197 60 0],[531.14 110 0],[532.126 25 0],[533.084 22 0],[533.843 12 0],[535.009 30 1],[535.035 30 1],[535.09 25 0],[535.192 25 0],[536.256 75 0],[536.335 12 0],[536.939 17 0],[538.237 20 0],[538.514 270 0],[538.665 30 0],[539.118 17 0],[539.588 17 0],[540.513 25 0],[540.762 85 0],[541.393 17 0],[542.186 20 0],[542.636 15 0],[542.842 25 0],[543.776 25 0],[544.041 15 0],[544.857 35 0],[547.492 10 0],[547.74 10 0],[547.833 35 0],[548.083 35 0],[548.116 10 0],[548.609 30 0],[550.212 140 0],[550.787 25 0],[551.711 30 0],[551.805 10 0],[552.841 75 0],[553.23 20 0],[553.746 45 0],[554.532 50 0],[555.175 22 -1],[555.317 25 -1],[561.211 12 0],[562.014 120 0],[562.353 35 0],[562.902 25 -1],[562.958 25 -1],[566.451 160 0],[566.628 20 0],[568.09 120 0],[568.542 15 0],[570.889 30 0],[571.821 75 -1],[573.57 120 0],[574.817 35 -1],[577.857 17 -1],[579.774 160 0],[584.732 30 0],[586.827 50 0],[586.95 110 0],[587.98 340 0],[588.562 85 0],[590.109 50 0],[590.861 30 -1],[592.513 140 0],[593.52 100 0],[595.535 110 0],[597.78 30 -1],[598.423 100 0],[599.537 17 0],[600.105 50 0],[602.536 30 0],[603.261 85 0],[604.585 170 0],[604.924 100 0],[606.284 140 0],[612.083 50 0],[612.191 170 0],[612.484 85 0],[612.744 680 0],[613.455 340 0],[614.046 100 0],[614.32 440 0],[615.561 30 0],[615.771 75 0],[616.02 25 0],[618.94 35 0],[619.296 60 0],[621.305 85 0],[621.469 100 0],[622.651 170 -1],[625.726 100 0],[626.105 50 -1],[626.706 35 0],[629.284 45 -1],[629.966 120 0],[630.434 15 0],[631.302 300 0],[631.471 30 0],[632.135 50 0],[634.036 22 0],[634.51 50 -1],[634.522 75 0],[637.856 75 -1],[640.7 35 0],[641.239 50 -1],[642.617 12 0],[643.433 35 0],[644.574 60 0],[645.162 20 0],[645.763 20 0],[647.021 110 0],[647.379 60 -1],[648.435 11 0],[648.964 110 0],[649.31 22 0],[650.326 50 0],[650.636 50 0],[650.815 50 -1],[654.29 30 -1],[655.054 35 0],[656.943 30 0],[657.656 20 0],[657.806 30 -1],[659.199 50 0],[659.671 10 0],[659.884 10 0],[660.327 50 0],[662.056 15 0],[667.801 11 1],[668.818 22 0],[670.212 11 0],[670.961 17 0],[671.788 27 0],[675.273 40 0],[676.238 75 0],[676.916 85 0],[677.289 27 0],[678.715 15 1],[679.085 35 0],[682.878 45 0],[683.289 45 0],[684.533 13 0],[684.634 17 0],[684.697 100 0],[684.926 27 0],[685.256 13 0],[688.829 120 0],[690.059 29 0],[690.436 20 0],[690.737 29 0],[691.687 20 0],[693.238 16 0],[694.846 29 0],[695.384 150 0],[696.644 60 0],[697.591 10 0],[699.084 150 0],[699.432 80 0],[700.546 10 0],[702.74 100 0],[705.736 25 0],[705.796 14 0],[708.73 140 0],[708.943 25 0],[709.446 35 0],[709.559 50 0],[709.77 540 0],[710.291 280 0],[710.372 170 0],[711.168 140 0],[711.282 40 0],[711.352 18 0],[713.295 12 0],[714.074 16 0],[714.447 12 0],[716.909 590 0],[720.162 50 0],[725.817 12 0],[726.476 35 0],[730.621 20 0],[731.162 25 0],[731.372 35 0],[731.808 90 0],[732.782 10 0],[733.597 50 0],[734.396 50 0],[737.35 20 0],[738.363 25 0],[740.09 14 0],[741.139 10 0],[742.275 10 0],[743.31 10 0],[743.986 110 0],[746.757 18 0],[747.958 16 0],[751.57 14 0],[751.795 12 0],[754.062 20 0],[754.459 20 0],[755.146 29 0],[755.47 40 0],[755.845 25 0],[756.009 12 0],[756.212 12 0],[760.715 80 0],[761.208 14 0],[762.117 20 0],[765.86 29 0],[769.083 18 0],[770.427 14 0],[770.842 10 0],[776.655 10 0]}{2900}% -\wl@elt@search{#1}{Nb}{[380.13 270 0],[380.292 2700 0],[380.388 670 0],[380.474 530 0],[381.049 670 0],[381.103 530 0],[381.551 530 0],[381.886 210 1],[381.915 210 0],[382.488 670 0],[383.518 350 0],[383.645 250 0],[384.59 210 0],[385.895 290 0],[386.338 350 0],[386.792 270 0],[387.756 530 0],[387.882 870 0],[388.314 670 0],[388.544 1100 0],[388.568 670 0],[388.607 210 0],[389.13 580 0],[390.897 210 0],[391.47 670 0],[392.02 530 0],[393.744 670 0],[394.367 520 0],[396.569 250 0],[396.609 910 0],[397.185 210 0],[403.252 1100 0],[403.953 250 0],[405.894 16000 0],[405.951 210 0],[406.079 350 0],[406.826 210 0],[407.973 12000 0],[408.486 270 0],[410.04 440 0],[410.092 6700 0],[411.69 310 0],[412.381 5300 0],[412.943 670 0],[412.993 770 0],[413.71 2300 0],[413.944 440 0],[413.971 2700 0],[414.321 350 0],[415.012 870 0],[415.258 4400 0],[416.347 870 0],[416.366 4400 0],[416.466 4000 0],[416.813 3500 0],[418.444 310 0],[419.088 1200 0],[419.207 870 0],[419.509 870 0],[419.566 1300 0],[419.851 310 0],[420.152 350 0],[420.531 870 0],[421.473 350 0],[421.794 420 0],[422.915 420 0],[425.544 250 0],[426.205 770 0],[426.602 420 0],[427.069 290 0],[428.699 400 0],[429.96 580 0],[430.099 580 0],[430.956 120 0],[431.127 390 0],[431.245 120 0],[432.633 350 0],[432.738 120 0],[433.137 390 0],[434.282 140 0],[434.865 140 0],[434.903 110 0],[435.157 290 0],[436.843 210 0],[437.796 140 0],[438.836 130 0],[439.269 160 0],[441.021 330 0],[441.944 190 0],[443.722 230 0],[444.718 290 0],[445.68 140 0],[445.742 140 0],[446.971 140 0],[447.129 140 0],[447.253 140 0],[450.304 150 0],[452.341 530 0],[454.682 480 0],[456.453 370 0],[457.308 720 0],[458.162 480 0],[460.677 1200 0],[461.617 170 0],[463.011 450 0],[464.895 450 0],[464.927 110 0],[466.383 450 0],[466.624 340 0],[466.722 240 0],[467.209 580 0],[467.537 530 0],[467.848 110 0],[468.514 320 0],[470.614 130 0],[470.829 260 0],[471.35 150 0],[473.389 110 0],[474.97 220 0],[481.638 110 0],[484.837 110 0],[496.778 130 0],[497.314 110 0],[498.897 190 0],[500.095 85 0],[500.225 65 0],[501.327 40 0],[501.775 230 0],[501.951 40 0],[502.636 150 0],[503.013 40 0],[503.904 210 0],[504.796 40 0],[505.801 170 0],[505.935 65 0],[506.525 130 0],[507.74 40 0],[507.896 750 0],[509.441 40 0],[509.53 420 0],[510.016 170 0],[512.03 170 0],[512.18 85 0],[512.766 85 0],[513.334 40 0],[513.475 210 0],[514.058 75 0],[514.754 75 0],[515.064 40 0],[515.263 75 0],[516.033 250 0],[516.438 250 0],[518.031 230 0],[518.698 110 0],[518.92 190 0],[519.308 170 0],[519.584 150 0],[520.322 65 0],[520.513 35 0],[521.91 85 0],[522.516 65 0],[523.281 150 0],[523.743 85 0],[524.039 29 0],[525.162 150 0],[525.303 75 0],[525.393 85 0],[526.992 50 0],[527.153 270 0],[527.248 25 0],[527.62 130 0],[527.943 29 0],[528.526 50 0],[529.634 35 0],[531.555 50 0],[531.701 17 0],[531.86 250 0],[531.949 50 0],[533.487 75 0],[533.681 25 0],[534.08 50 0],[534.358 25 0],[534.417 460 0],[535.074 340 0],[535.328 40 0],[535.531 25 0],[535.57 40 0],[535.919 29 0],[536.201 17 0],[537.527 40 0],[538.134 40 0],[538.83 17 0],[539.586 21 0],[539.633 29 0],[541.124 29 0],[541.63 21 0],[542.244 65 0],[543.126 21 0],[543.727 110 0],[544.831 19 0],[545.619 19 0],[545.804 40 0],[546.81 19 0],[548.1 40 0],[548.309 13 0],[548.349 19 0],[549.106 13 0],[549.953 17 0],[550.458 40 0],[550.912 17 0],[551.282 35 0],[551.739 17 0],[552.357 50 0],[554.147 25 0],[555.135 85 0],[556.3 29 0],[557.144 17 0],[557.616 35 0],[557.829 35 0],[558.697 50 0],[559.095 17 0],[559.489 13 0],[559.959 17 0],[560.352 40 0],[560.393 13 0],[562.826 25 0],[562.917 65 0],[563.542 35 0],[564.211 170 0],[564.53 35 0],[565.414 17 0],[566.471 130 0],[566.563 170 0],[566.686 17 0],[567.102 65 0],[567.191 85 0],[567.747 25 0],[569.309 25 0],[569.79 35 0],[570.616 40 0],[570.648 85 0],[570.933 29 0],[571.559 17 0],[571.635 65 0],[572.566 25 0],[572.919 130 0],[573.736 21 0],[573.82 13 0],[575.144 85 0],[576.034 110 0],[576.499 65 0],[577.108 29 0],[577.607 50 0],[578.034 17 0],[578.754 85 0],[578.979 17 0],[579.424 50 0],[580.403 50 0],[581.533 29 0],[581.943 110 0],[582.062 35 0],[583.49 75 0],[583.815 25 0],[583.864 130 0],[584.247 50 0],[584.609 17 0],[586.647 65 0],[587.47 35 0],[587.779 17 0],[589.344 40 0],[590.062 190 0],[590.38 40 0],[592.741 29 0],[593.416 40 0],[595.77 40 0],[598.322 150 0],[598.608 65 0],[599.793 85 0],[602.975 50 0],[603.184 50 0],[604.55 50 0],[604.872 25 0],[605.665 29 0],[610.771 29 0],[614.251 40 0],[614.813 50 0],[616.432 50 0],[621.306 29 0],[622.196 75 0],[625.176 40 0],[626.077 21 0],[643.046 85 0],[643.322 50 0],[649.784 17 0],[654.461 65 0],[657.473 15 0],[659.1 19 0],[660.616 19 0],[660.728 19 0],[661.415 35 0],[662.698 19 0],[666.084 210 0],[667.733 150 0],[670.12 65 0],[672.362 130 0],[673.988 75 0],[679.531 25 0],[682.811 85 0],[684.935 25 0],[687.092 19 0],[687.636 40 0],[690.289 25 0],[690.807 35 0],[691.832 40 0],[694.607 17 0],[697.249 17 0],[698.609 25 0],[699.032 85 0],[699.611 17 0],[702.348 21 0],[703.804 17 0],[704.681 190 0],[706.641 8 0],[707.523 8 0],[709.894 40 0],[710.201 17 0],[711.931 19 0],[712.295 15 0],[712.617 35 0],[713.006 17 0],[715.943 130 0],[719.137 17 0],[720.894 19 0],[725.235 50 0],[727.481 15 0],[731.703 13 0],[732.392 17 0],[732.838 29 0],[735.316 65 0],[737.25 190 0],[741.983 13 0],[743.602 15 0],[747.82 19 0],[751.593 65 0],[751.977 29 0],[757.458 170 0],[758.321 17 0],[763.981 13 0],[764.771 13 0],[770.333 25 0],[772.668 75 0],[775.731 25 0],[778.711 6 0]}{16000}% -\wl@elt@search{#1}{Mo}{[380.184 290 0],[382.67 520 0],[382.887 940 0],[383.375 1700 0],[384.725 380 0],[386.411 29000 0],[386.908 580 0],[388.682 580 0],[390.177 380 0],[390.296 19000 0],[394.148 65 1],[394.304 230 0],[405.601 270 0],[406.208 1400 0],[406.988 2300 0],[408.144 1300 0],[408.438 940 0],[410.215 250 0],[410.747 730 0],[412.01 630 0],[414.355 2900 0],[414.894 230 0],[415.528 250 0],[415.74 200 0],[417.827 200 0],[418.582 480 0],[418.832 2500 0],[419.456 250 0],[423.259 1500 0],[426.928 270 0],[427.691 890 0],[427.724 1200 0],[428.864 1400 0],[429.213 680 0],[429.321 890 0],[429.388 360 0],[432.614 840 0],[432.674 250 0],[435.034 230 0],[436.904 230 0],[438.164 1900 0],[441.157 2500 0],[442.362 210 0],[443.495 990 0],[444.22 200 0],[444.974 340 0],[445.736 480 0],[447.456 630 0],[449.128 230 0],[450.49 120 0],[451.215 140 0],[451.713 230 0],[452.434 230 0],[452.94 120 0],[453.68 400 0],[455.811 110 0],[457.65 210 0],[459.516 170 0],[460.988 360 0],[462.138 100 0],[462.647 460 0],[462.748 100 0],[466.276 220 0],[467.19 130 0],[468.822 130 0],[470.726 640 0],[470.822 150 0],[471.792 220 0],[472.914 100 0],[473.144 700 0],[475.039 100 0],[476.019 770 0],[477.634 150 0],[479.652 100 0],[481.925 410 0],[483.051 410 0],[486.8 360 0],[495.062 110 0],[495.754 150 0],[497.912 210 0],[499.991 110 0],[501.081 20 0],[501.46 180 0],[501.678 26 0],[501.985 20 0],[502.9 80 0],[503.078 65 0],[503.891 23 0],[504.652 26 0],[504.771 100 0],[505.5 50 0],[505.807 35 0],[505.988 200 0],[506.252 35 0],[506.464 29 0],[507.987 35 0],[508.002 100 0],[508.126 35 0],[509.097 40 0],[509.134 35 0],[509.216 35 0],[509.589 40 0],[509.665 100 0],[509.752 130 0],[509.803 35 0],[510.971 130 0],[511.497 80 0],[511.697 35 0],[512.383 29 0],[514.538 150 0],[514.739 110 0],[516.319 80 0],[516.776 100 0],[517.108 160 0],[517.294 230 0],[517.418 160 0],[519.144 40 0],[520.017 110 0],[520.074 50 0],[521.044 26 0],[521.186 50 0],[521.94 80 0],[523.106 65 0],[523.236 26 0],[523.426 100 0],[523.82 460 0],[524.088 230 0],[524.281 110 0],[524.551 100 0],[525.904 150 0],[526.017 16 0],[526.114 65 0],[526.895 20 0],[527.18 35 0],[527.628 35 0],[527.965 65 0],[528.086 210 0],[528.384 20 0],[529.208 55 0],[529.346 35 0],[529.547 55 0],[530.626 20 0],[531.389 55 0],[531.504 35 0],[531.989 20 0],[532.447 20 0],[532.706 35 0],[535.235 20 0],[535.488 80 0],[535.551 35 0],[535.648 65 0],[536.056 560 0],[536.428 110 0],[536.711 35 0],[537.24 35 0],[538.869 26 0],[539.452 65 0],[539.738 35 0],[540.047 50 0],[540.579 35 0],[540.639 35 0],[541.738 40 0],[542.689 23 0],[543.568 55 0],[543.775 65 0],[545.051 40 0],[545.646 35 0],[546.053 26 0],[546.557 23 0],[547.59 35 0],[549.028 35 0],[549.217 20 0],[549.38 26 0],[549.849 26 0],[550.154 50 0],[550.187 23 0],[550.354 26 0],[550.649 7800 0],[552.004 23 0],[552.064 26 0],[552.652 40 0],[552.697 40 0],[553.305 5200 0],[553.941 40 0],[554.312 50 0],[554.449 40 0],[555.628 55 0],[555.672 26 0],[556.405 20 0],[556.862 40 0],[556.948 26 0],[557.045 2500 0],[557.519 35 0],[559.158 20 0],[560.276 40 0],[560.862 23 0],[560.923 23 0],[561.093 100 0],[561.307 23 0],[561.845 20 0],[561.938 23 0],[563.247 330 0],[563.486 50 0],[565.013 230 0],[567.363 23 0],[567.447 55 0],[567.789 40 0],[568.289 35 0],[568.914 460 0],[569.928 23 0],[570.572 80 0],[571.18 23 0],[572.274 210 0],[572.877 23 0],[572.945 26 0],[575.14 620 0],[577.455 23 0],[577.936 40 0],[578.333 23 0],[579.185 520 0],[579.577 23 0],[580.046 26 0],[580.267 35 0],[582.52 23 0],[583.559 23 0],[583.999 20 0],[584.886 20 0],[584.973 55 0],[585.152 50 0],[585.827 520 0],[586.138 20 0],[586.933 50 0],[587.659 26 0],[588.833 820 0],[589.229 23 0],[589.338 50 0],[589.878 20 0],[590.147 40 0],[592.636 40 0],[592.888 160 0],[598.817 40 0],[602.549 35 0],[602.727 16 0],[603.066 1300 0],[604.783 20 0],[605.481 20 0],[607.958 20 0],[608.127 10 0],[610.187 40 0],[613.063 10 0],[619.766 10 0],[621.789 20 0],[626.427 10 0],[626.588 16 0],[629.074 15 0],[630.175 13 0],[632.354 11 0],[635.722 40 0],[638.911 16 0],[639.112 11 0],[640.107 35 0],[640.911 26 0],[641.239 10 0],[642.437 100 0],[644.634 20 0],[647.12 20 0],[647.399 20 0],[649.313 10 0],[651.984 23 0],[661.12 15 0],[661.913 230 0],[662.457 10 0],[665.038 50 0],[665.968 13 0],[669.047 18 0],[673.398 110 0],[674.608 21 0],[674.627 50 0],[675.397 35 0],[676.35 13 0],[679.988 10 0],[680.262 10 0],[681.203 10 0],[682.563 13 0],[682.887 18 0],[683.888 40 0],[684.892 16 0],[688.628 21 0],[689.236 16 0],[689.801 10 0],[689.898 10 0],[690.82 13 0],[691.401 35 0],[693.41 13 0],[694.739 10 0],[696.064 10 0],[697.871 16 0],[698.894 26 0],[699.913 12 0],[700.16 16 0],[703.798 22 0],[706.021 22 0],[706.334 13 0],[708.122 13 0],[710.987 110 0],[713.408 27 0],[724.25 150 0],[724.585 40 0],[726.762 22 0],[730.019 17 0],[734.849 13 0],[736.165 13 0],[736.441 10 0],[739.136 40 0],[743.41 10 0],[744.734 13 0],[745.285 13 0],[748.574 140 0],[750.447 13 0],[757.264 11 0],[759.516 11 0],[760.184 11 0],[765.676 17 0],[767.949 13 0],[772.077 27 0]}{29000}% -\wl@elt@search{#1}{Tc}{[381.467 200 0],[381.689 300 0],[382.447 300 0],[382.854 500 0],[383.035 200 0],[383.245 200 0],[383.282 600 0],[383.756 1500 0],[384.131 800 0],[384.597 800 0],[384.76 500 0],[385.122 300 0],[385.673 500 0],[386.307 200 0],[386.411 400 0],[386.824 1000 0],[387.566 200 0],[387.916 500 0],[388.072 600 0],[389.212 300 0],[389.322 200 0],[389.983 600 0],[391.938 300 0],[392.366 300 0],[392.757 200 0],[393.37 200 0],[394.657 4000 0],[394.709 2000 0],[395.573 200 0],[397.964 300 0],[398.035 500 0],[398.497 10000 0],[398.778 400 0],[399.404 300 0],[399.451 2000 0],[399.697 200 0],[400.469 300 0],[400.714 500 0],[401.2 1000 0],[401.668 400 0],[401.722 600 0],[402.076 2000 0],[403.163 20000 0],[403.925 1000 0],[404.178 200 0],[404.911 10000 0],[405.195 500 0],[405.318 200 0],[405.608 200 0],[408.354 400 0],[408.871 10000 0],[409.369 200 0],[409.567 15000 0],[411.022 1000 0],[411.508 10000 0],[411.927 600 0],[412.422 8000 0],[412.827 1000 0],[413.481 300 0],[413.912 300 0],[413.985 800 0],[414.127 400 0],[414.495 6000 0],[414.508 3000 0],[414.762 200 0],[416.561 10000 0],[416.742 500 0],[416.968 1000 0],[417.027 4000 0],[417.253 5000 0],[417.628 1000 0],[418.651 800 0],[421.861 300 0],[423.819 10000 0],[426.227 20000 0],[426.269 1000 0],[427.497 800 1],[427.89 800 0],[429.706 30000 0],[433.686 400 0],[435.849 400 0],[435.926 200 0],[442.959 1000 0],[448.153 1000 0],[448.706 3000 0],[449.503 400 0],[451.598 1000 0],[452.284 10000 0],[453.953 2000 0],[454.209 400 0],[455.22 400 0],[455.285 800 0],[455.705 1000 0],[456.454 2000 0],[457.845 1000 0],[459.335 1000 0],[460.916 300 0],[461.686 1000 0],[462.269 200 0],[462.496 300 0],[463.057 1000 0],[463.315 200 0],[463.75 3000 0],[464.328 500 0],[464.833 2000 0],[466.021 2000 0],[466.93 2000 0],[467.217 400 0],[467.89 200 0],[468.936 400 0],[469.428 300 0],[470.692 1000 0],[471.422 200 0],[471.777 2000 0],[471.902 500 0],[471.928 4000 0],[473.651 200 0],[474.061 10000 0],[474.961 500 0],[475.272 1000 0],[476.236 200 0],[477.154 4000 0],[477.389 200 0],[478.392 200 0],[478.56 500 0],[479.048 200 0],[479.162 250 0],[479.998 300 0],[480.569 100 0],[480.942 100 0],[481.679 500 0],[482.074 10000 0],[483.135 300 0],[483.437 1000 0],[483.539 1000 0],[484.136 100 0],[485.359 20000 0],[485.721 100 0],[486.219 100 0],[486.673 10000 0],[487.077 200 0],[488.87 100 0],[489.088 150 0],[489.192 8000 0],[489.249 150 0],[490.851 1000 0],[490.957 2000 0],[491.302 500 0],[491.47 150 0],[492.067 200 0],[492.36 300 0],[494.806 400 0],[497.634 5000 0],[499.5 400 0],[500.267 200 0],[500.574 100 0],[501.452 200 0],[502.624 500 0],[502.679 300 0],[502.789 150 0],[503.245 80 0],[505.527 300 0],[505.833 60 0],[506.069 500 0],[509.074 80 0],[509.628 5000 0],[510.324 200 0],[510.432 500 0],[510.981 200 0],[512.06 100 0],[513.926 500 0],[515.063 500 0],[516.181 2000 0],[517.481 2000 0],[520.656 100 0],[522.555 200 0],[526.022 200 0],[526.144 200 0],[527.551 1000 0],[528.507 800 0],[530.531 100 0],[531.496 400 0],[532.02 600 0],[533.479 200 0],[535.348 500 0],[535.663 200 0],[535.865 300 0],[536.014 200 0],[537.52 500 0],[542.305 150 0],[544.74 200 0],[545.19 500 0],[545.595 100 0],[547.196 300 0],[548.301 70 0],[548.537 60 0],[550.689 80 0],[552.411 150 0],[552.823 100 0],[554.194 200 0],[554.363 80 0],[555.053 100 0],[558.902 3000 0],[560.223 200 0],[562.045 2000 0],[562.994 300 0],[564.213 1500 0],[564.494 800 0],[565.6 100 0],[567.215 60 0],[568.73 200 0],[568.905 200 0],[572.531 700 0],[577.147 500 0],[579.465 100 0],[579.985 80 0],[581.424 100 0],[583.148 200 0],[583.633 150 0],[592.336 150 0],[592.447 1000 0],[592.629 200 0],[593.193 600 0],[603.236 60 0],[604.799 60 0],[606.509 200 0],[608.523 800 0],[609.939 300 0],[610.296 500 0],[612.068 1000 0],[613.08 1000 0],[613.223 150 0],[618.47 100 0],[619.266 800 0],[624.418 600 0],[631.218 100 0],[635.486 100 0],[635.673 100 0],[638.987 80 0],[640.883 100 0],[645.59 1000 0],[646.193 600 0],[647.027 100 0],[649.168 200 0],[652.682 200 0],[657.924 150 0],[662.557 500 0],[667.366 300 0],[668.71 100 0],[678.6 80 0],[679.863 70 0],[685.69 60 0],[700.237 150 0],[701.657 100 0],[708.618 500 0],[709.312 60 0],[714.128 200 0],[715.762 200 0],[725.608 70 0],[732.238 100 0],[732.914 80 0],[739.68 100 0],[740.261 100 0],[740.536 200 0],[742.715 60 0],[743.412 150 0],[745.249 600 0],[746.159 60 0],[753.495 80 0],[754.026 800 0],[754.339 80 0],[757.402 200 0],[757.926 500 0],[762.453 90 0],[768.445 100 0],[769.737 500 0],[769.819 80 0],[779.304 800 0],[779.828 60 0]}{30000}% -\wl@elt@search{#1}{Ru}{[380.026 310 0],[380.868 310 0],[381.272 600 0],[381.727 760 0],[381.903 760 0],[382.209 650 0],[382.493 550 0],[383.18 760 0],[383.505 220 0],[383.807 310 0],[383.97 930 0],[384.668 480 0],[385.043 760 0],[385.646 480 0],[385.755 1300 0],[386.072 220 0],[386.269 650 0],[386.784 1300 0],[387.352 260 0],[389.221 650 0],[390.908 760 0],[392.092 260 0],[392.347 1500 0],[392.592 3300 0],[393.176 600 0],[393.355 310 0],[394.557 760 0],[395.021 460 0],[395.268 310 0],[396.49 460 0],[397.844 600 0],[397.942 600 0],[398.486 870 0],[399.598 280 0],[402.216 1500 0],[402.383 600 0],[403.921 310 0],[405.14 1400 0],[405.405 710 0],[406.446 370 0],[406.761 200 0],[406.837 760 0],[407.3 200 0],[407.673 980 0],[408.06 6000 0],[408.543 310 0],[409.779 930 0],[410.174 350 0],[411.274 1900 0],[414.416 2000 0],[414.574 650 0],[414.677 260 0],[416.751 870 0],[419.758 550 0],[419.888 550 0],[419.99 7600 0],[420.602 1500 0],[421.206 5400 0],[421.444 760 0],[421.727 930 0],[422.068 370 0],[423.031 550 0],[424.105 760 0],[424.306 760 0],[424.673 370 0],[425.899 310 0],[428.433 760 0],[429.328 220 0],[429.479 260 0],[429.593 550 0],[429.771 3700 0],[430.76 930 0],[431.843 370 0],[431.987 550 0],[434.207 550 0],[434.97 350 0],[435.413 710 0],[436.121 870 0],[437.221 2400 0],[438.539 870 0],[438.565 1300 0],[439.044 1700 0],[441.003 1600 0],[442.146 160 0],[442.846 330 0],[443.976 460 0],[444.934 440 0],[446.004 1100 0],[447.393 190 0],[448.045 150 0],[449.814 350 0],[451.01 120 0],[451.689 220 0],[451.782 220 0],[452.095 110 0],[454.733 170 0],[454.785 110 0],[455.451 5400 0],[455.998 110 0],[458.444 1700 0],[459.11 110 0],[459.252 150 0],[459.908 330 0],[463.569 170 0],[464.509 200 0],[464.761 720 0],[465.432 290 0],[468.179 290 0],[468.402 190 0],[469.011 290 0],[470.948 1400 0],[473.133 140 0],[473.352 120 0],[475.784 500 0],[481.552 260 0],[484.456 120 0],[486.915 550 0],[489.56 160 0],[490.305 470 0],[490.789 120 0],[492.107 260 0],[493.843 180 0],[496.89 160 0],[498.035 160 0],[499.274 120 0],[501.123 160 0],[501.495 90 0],[502.618 90 0],[502.816 65 0],[504.035 35 0],[504.074 35 0],[504.731 65 0],[505.733 450 0],[506.264 21 0],[507.297 90 0],[507.632 120 0],[509.383 200 0],[510.707 80 0],[512.373 24 0],[512.726 55 0],[513.389 65 0],[513.655 530 0],[514.276 170 0],[514.724 250 0],[515.107 110 0],[515.32 55 0],[515.514 500 0],[516 55 0],[517.103 920 0],[519.502 180 0],[519.987 80 0],[520.212 45 0],[521.343 45 0],[522.355 65 0],[524.238 40 0],[525.167 55 0],[525.707 40 0],[526.647 40 0],[526.683 40 0],[528.082 40 0],[528.408 130 0],[529.116 40 0],[530.486 80 0],[530.927 260 0],[531.533 13 0],[533.293 40 0],[533.47 45 0],[533.593 110 0],[536.177 130 0],[537.784 65 0],[538.588 65 0],[540.104 110 0],[540.139 40 0],[541.886 40 0],[542.759 55 0],[543.921 26 0],[545.271 13 0],[545.482 80 0],[545.613 90 0],[547.518 13 0],[547.94 55 0],[548.03 26 0],[548.432 80 0],[548.464 18 0],[549.669 26 0],[550.102 13 0],[551.071 130 0],[551.237 20 0],[551.786 8 0],[552.178 12 0],[553.099 12 0],[554.066 24 0],[555.652 12 0],[555.975 90 0],[556.903 11 0],[557.84 21 0],[560.314 21 0],[560.355 8 0],[560.673 13 0],[562.979 11 0],[563.624 290 0],[564.166 11 0],[564.956 7 0],[565.33 7 0],[566.52 11 0],[567.963 16 0],[569.905 180 0],[572.482 13 0],[572.573 13 0],[574.599 16 0],[574.747 16 0],[575.202 11 0],[575.683 11 0],[576.792 11 0],[580.439 16 0],[581.498 65 0],[582.806 8 0],[583.321 16 0],[591.934 55 0],[592.145 80 0],[592.687 21 0],[593.238 26 0],[593.665 8 0],[595.115 8 0],[597.338 21 0],[597.417 8 0],[598.867 16 0],[599.365 35 0],[611.677 18 0],[619.942 26 0],[622.52 26 0],[628.449 9 0],[629.522 18 0],[633.062 13 0],[633.612 9 0],[636.341 9 0],[637.645 9 0],[639.023 16 0],[641.757 8 0],[644.484 26 0],[649.644 8 0],[652.874 11 0],[656.045 4 0],[659.374 4 0],[661.82 9 0],[666.314 21 0],[669 55 0],[670.752 11 0],[671.83 15 0],[673.045 15 0],[675.654 7 0],[676.695 21 0],[677.502 30 0],[678.723 13 0],[681.351 8 0],[682.388 15 0],[682.417 21 0],[683.152 7 0],[691.148 26 0],[692.323 110 0],[698.201 26 0],[702.798 26 0],[708.606 9 0],[708.735 12 0],[714.172 4 0],[721.926 6 0],[723.892 35 0],[726.696 7 0],[732.356 8 0],[739.393 16 0],[746.891 18 0],[747.54 12 0],[748.579 26 0],[749.975 70 0],[753.207 7 0],[755.961 26 0],[761.294 5 0],[762.15 18 0],[772.287 18 0],[772.991 5 0],[779.186 22 0],[779.789 4 0]}{7600}% -\wl@elt@search{#1}{Rh}{[380.592 760 0],[380.676 1300 0],[380.95 45 0],[381.245 95 0],[381.501 470 0],[381.647 760 0],[381.819 1300 0],[382.226 3800 0],[382.848 2300 0],[383.389 2000 0],[383.475 45 0],[385.652 5900 0],[387.001 490 0],[387.239 70 0],[387.734 380 0],[388.834 70 0],[390.422 29 0],[391.283 23 0],[391.351 120 0],[392.219 240 0],[393.423 2000 0],[393.498 45 0],[393.584 50 0],[394.272 590 0],[395.824 95 0],[395.886 3800 0],[396.454 45 1],[397.531 380 0],[398.44 240 0],[399.561 240 0],[399.615 380 0],[402.314 120 0],[404.841 60 0],[404.904 23 0],[405.344 40 0],[405.634 23 0],[407.757 70 0],[408.278 560 0],[408.428 19 0],[408.779 45 0],[408.85 60 0],[409.752 140 0],[410.749 45 0],[411.633 70 0],[411.968 120 0],[412.168 1100 0],[412.887 1500 0],[413.527 2100 0],[415.437 240 0],[419.65 330 0],[420.662 70 0],[421.114 3300 0],[423.02 29 0],[424.444 40 0],[427.343 60 0],[427.86 60 0],[428.871 820 0],[429.677 70 0],[434.244 23 0],[437.304 45 0],[437.48 4200 0],[437.992 95 0],[443.332 23 0],[449.247 35 0],[450.378 29 0],[452.872 23 0],[454.427 16 0],[454.873 35 0],[455.164 40 0],[456.089 19 0],[456.519 16 0],[456.9 130 0],[457.131 14 0],[460.812 29 0],[461.991 14 0],[464.318 23 0],[467.503 150 0],[472.1 19 0],[474.511 70 0],[475.558 12 0],[481.049 23 0],[484.243 21 0],[484.399 45 0],[485.163 60 0],[496.371 60 0],[497.775 60 0],[497.918 40 0],[508.552 14 0],[509.063 70 0],[512.069 23 0],[513.076 19 0],[515.554 60 0],[515.709 14 0],[515.869 40 0],[517.597 60 0],[517.727 12 0],[518.419 35 0],[519.314 95 0],[520.695 16 0],[521.152 16 0],[521.273 19 0],[521.479 16 0],[522.266 19 0],[523.062 19 0],[523.716 45 0],[523.78 9 0],[526.927 14 0],[528.012 11 0],[529.214 14 0],[531.479 14 0],[532.974 40 0],[533.108 14 0],[534.931 9 0],[535.44 130 0],[535.647 23 0],[537.91 45 0],[539.044 95 0],[540.473 23 0],[542.407 60 0],[542.472 19 0],[542.545 19 0],[543.958 12 0],[544.136 12 0],[544.432 9 0],[544.523 35 0],[546.811 23 0],[547.085 35 0],[547.612 12 0],[548.142 12 0],[548.423 16 0],[550.465 9 0],[553.504 29 0],[554.458 21 0],[559.942 160 0],[560.771 7 0],[560.835 16 0],[563.277 5 0],[565.962 9 0],[568.638 40 0],[570.247 9 0],[572.73 6 0],[579.266 29 0],[579.579 9 0],[580.334 9 0],[580.691 40 0],[582.184 6 0],[583.158 35 0],[590.731 7 0],[591.854 9 0],[594.146 7 0],[598.36 130 0],[599.119 9 0],[610.272 35 0],[611.615 6 0],[612.806 8 0],[618.689 8 0],[619.999 14 0],[625.372 16 0],[627.666 5 0],[627.746 8 0],[629.338 6 0],[631.953 29 0],[641.472 12 0],[651.041 16 0],[651.97 19 0],[662.78 9 0],[663.016 19 0],[675.235 40 0],[679.665 9 0],[682.733 13 0],[685.768 11 0],[687.994 20 0],[696.567 65 0],[697.291 8 0],[697.915 16 0],[700.158 16 0],[703.876 11 0],[710.164 18 0],[710.445 15 0],[714.255 6 0],[721.906 9 0],[726.818 18 0],[727.082 35 0],[727.194 12 0],[727.303 5 0],[737.557 9 0],[738.664 5 0],[743.08 9 0],[744.239 18 0],[744.677 7 0],[747.574 12 0],[749.524 12 0],[754.202 8 0],[755.767 11 0],[757.722 8 0],[769.005 11 0],[777.29 18 0],[779.161 29 0],[385.298 1 2]}{5900}% -\wl@elt@search{#1}{Pd}{[383.229 1500 0],[389.42 2200 0],[395.864 1500 0],[408.734 290 0],[416.984 90 0],[421.295 2500 0],[447.359 180 0],[478.818 55 0],[481.751 45 0],[487.543 35 0],[511.081 55 0],[511.702 75 0],[516.384 160 0],[523.486 55 0],[529.563 120 0],[531.257 18 0],[534.51 15 0],[539.524 35 0],[554.28 55 0],[554.702 35 0],[561.944 27 0],[564.269 15 0],[565.542 14 0],[567.007 75 0],[569.014 11 0],[569.509 55 0],[573.661 18 0],[677.454 23 0],[678.452 65 0],[683.342 4 0],[701.644 11 0],[731.006 13 0],[736.812 75 0],[739.192 27 0],[748.69 16 0],[776.403 120 0],[778.667 27 0]}{2500}% -\wl@elt@search{#1}{Ag}{[381.094 200 0],[381.178 50 0],[384.074 100 0],[384.785 15 0],[390.741 50 0],[390.931 50 1],[391.44 50 0],[392.01 70 1],[392.801 10 0],[394.043 10 0],[394.297 10 0],[394.943 60 1],[398.158 100 0],[398.519 70 1],[399.215 10 0],[405.548 100 0],[408.343 10 0],[408.591 80 1],[418.548 100 1],[421.096 90 0],[421.282 100 0],[431.107 50 0],[439.623 20 0],[447.604 50 0],[455.6 20 0],[461.569 30 0],[462.004 80 1],[462.046 50 1],[466.848 60 0],[467.76 30 0],[478.84 100 1],[479.62 20 0],[484.782 30 0],[487.41 100 0],[488.821 20 0],[491.75 10 0],[493.575 10 0],[499.289 20 0],[502.735 80 1],[512.35 15 0],[520.908 1000 0],[533.362 10 0],[546.55 1000 0],[547.155 100 0],[547.538 20 0],[554.567 20 0],[555.958 10 0],[566.734 100 0],[608.378 10 0],[626.85 10 0],[662.108 20 0],[735.996 20 0],[768.778 320 0]}{1000}% -\wl@elt@search{#1}{Cd}{[398.1926 10 0],[402.912 100 1],[413.477 200 1],[414.149 50 1],[428.508 100 1],[430.6672 8 0],[441.241 100 1],[441.2989 3 0],[441.563 1000 1],[444.045 30 1],[466.2352 8 0],[467.8149 200 0],[474.469 30 1],[479.9912 300 0],[488.172 50 1],[502.55 50 1],[508.5822 1000 0],[515.466 6 0],[526.801 100 1],[527.16 100 1],[533.748 1000 1],[537.813 1000 1],[538.189 200 1],[584.33 40 1],[588.022 50 1],[609.9142 300 0],[611.149 100 0],[632.5166 100 0],[633.0013 30 0],[635.472 400 1],[635.998 500 1],[643.847 2000 0],[646.494 400 1],[656.765 25 1],[672.578 500 1],[675.919 100 1],[677.8116 30 0],[723.701 50 1],[728.438 100 1],[734.567 1000 0]}{2000}% -\wl@elt@search{#1}{In}{[383.465 250 1],[384.218 200 1],[388.978 100 1],[390.207 100 1],[392.212 60 1],[393.44 65 1],[396.235 250 1],[400.466 120 1],[401.392 140 1],[405.694 410 1],[410.176 17000 0],[420.514 140 1],[421.304 100 1],[421.966 110 1],[437.287 150 1],[450.078 150 1],[451.131 18000 0],[454.901 110 1],[457.085 140 1],[457.802 180 1],[457.84 180 1],[461.608 140 1],[461.717 170 1],[462.014 250 1],[462.07 150 1],[462.73 170 1],[463.704 140 1],[463.816 380 1],[464.458 220 1],[465.562 360 1],[465.674 320 1],[468.111 190 1],[468.48 450 1],[487.837 3 0],[490.706 90 1],[492.493 70 1],[497.377 150 1],[510.936 80 1],[511.514 100 1],[511.74 140 1],[512.08 270 1],[512.175 200 1],[512.985 80 1],[517.542 240 1],[518.444 140 1],[525.432 30 0],[526.274 12 0],[530.945 150 1],[541.141 80 1],[541.845 140 1],[543.67 220 1],[549.75 130 1],[550.708 140 1],[551.3 320 1],[552.328 250 1],[553.65 130 1],[555.545 190 1],[557.69 240 1],[563.67 200 1],[570.85 160 1],[570.991 50 0],[572.18 100 1],[572.768 50 0],[585.315 210 1],[590.34 490 1],[591.54 260 1],[591.878 120 1],[606.29 130 1],[609.595 250 1],[610.866 210 1],[611.59 180 1],[612.87 230 1],[612.94 240 1],[613.21 320 1],[614 150 1],[614.323 90 1],[614.81 140 1],[614.95 190 1],[616.115 80 1],[616.245 180 1],[622.428 100 1],[622.83 280 1],[623.11 140 1],[630.48 270 1],[636.23 290 1],[646.9 300 1],[654.12 210 1],[675.188 190 1],[676.59 180 1],[678.372 100 1],[684.744 8 0],[689.15 320 1],[690.013 4 0],[718.29 380 1],[725.5 180 1],[727.65 210 1],[730.34 180 1],[735.06 320 1],[763.27 100 1],[768.29 100 1],[774.07 210 1],[777.696 100 1],[778.9 180 1],[385.282 100 2],[402.377 100 2],[403.232 150 2],[406.23 50 2],[407.157 100 2],[407.293 100 2],[425.268 100 2],[450.958 40 2],[524.877 200 2],[564.515 100 2],[572.317 40 2],[581.95 100 2],[619.772 200 2]}{18000}% -\wl@elt@search{#1}{Sn}{[380.102 280 0],[384.144 4 1],[429.465 1 1],[452.474 40 0],[457.913 1 1],[458.029 1 1],[487.722 2 1],[494.431 3 1],[497.973 20 0],[507.114 2 1],[507.267 2 1],[517.454 20 0],[533.236 10 1],[556.195 20 1],[558.892 25 1],[559.62 2 1],[563.171 500 0],[575.359 15 0],[579.72 1 1],[579.918 15 1],[592.544 50 0],[597.03 100 0],[603.77 150 0],[605.486 200 -1],[606.9 250 0],[607.346 100 0],[607.748 6 1],[607.97 5 1],[614.971 400 0],[615.46 200 0],[617.15 150 0],[631.078 100 0],[635.435 40 0],[645.35 70 1],[676.145 8 1],[684.405 25 1],[719.14 20 1],[738.779 10 1],[739.86 20 0],[740.862 1 1],[768.53 30 0],[774.18 13 1],[775.497 100 0]}{500}% -\wl@elt@search{#1}{Sb}{[385.022 20 1],[403.355 200 0],[403.356 20 1],[413.363 20 1],[414.054 15 1],[419.517 15 1],[421.907 20 1],[431.432 20 1],[434.483 12 1],[441.142 12 1],[444.648 12 1],[450.692 12 1],[451.45 15 1],[459.69 30 1],[459.909 20 1],[460.477 15 1],[464.732 30 1],[467.574 20 1],[471.126 40 1],[473.544 12 1],[475.781 20 1],[476.536 20 1],[476.691 12 1],[478.403 30 1],[480.201 20 1],[483.282 20 1],[487.724 20 1],[494.74 15 1],[504.456 15 1],[516.632 12 1],[517.655 15 1],[523.894 20 1],[535.424 20 1],[546.408 15 1],[549.032 30 0],[555.61 40 0],[556.813 15 1],[560.219 30 0],[563.202 100 0],[563.975 30 1],[583.034 60 0],[589.509 15 1],[600.521 100 1],[605.341 20 1],[607.98 30 1],[613.004 50 1],[615.494 20 1],[630.276 12 1],[661.149 20 0],[664.744 30 1],[668.801 15 1],[680.667 6 1],[764.828 30 0],[426.509 40 2],[435.216 50 2],[459.189 30 2],[469.291 30 2],[524.771 1 2],[569.08 1 2],[571.73 1 2],[584.55 3 2],[624.67 5 2],[628.76 3 2]}{200}% -\wl@elt@search{#1}{Te}{[380.092 20 1],[390.567 20 1],[391.854 20 1],[393.149 30 1],[394.798 20 1],[396.922 40 1],[397.594 25 1],[398.177 20 1],[400.652 50 1],[401.169 20 1],[402.973 30 1],[404.717 40 1],[404.888 30 1],[407.348 15 1],[410.104 30 1],[412.732 70 1],[416.355 30 1],[416.977 100 1],[417.929 30 1],[421.131 25 1],[422.573 80 1],[424.647 30 1],[425.115 20 1],[426.111 100 1],[426.436 30 1],[427.343 60 1],[428.585 80 1],[432.09 40 1],[436.128 30 1],[436.4 150 1],[437.712 30 1],[438.51 75 1],[439.6 60 1],[447.863 170 1],[453.707 80 1],[455.778 100 1],[463.062 70 1],[464.112 100 1],[465.437 180 1],[468.691 200 1],[469.638 100 1],[470.653 100 1],[476.605 100 1],[477.156 70 1],[478.487 100 1],[482.714 100 1],[483.128 150 1],[484.29 150 1],[486.512 130 1],[486.624 200 1],[488.522 80 1],[490.444 80 1],[496.188 60 1],[500.082 60 1],[508.3 8 0],[514.87 7 0],[544.984 50 1],[548.795 50 1],[557.635 150 1],[564.926 150 1],[566.62 100 1],[570.812 200 1],[573.35 7 0],[575.585 150 1],[578.91 8 0],[593.615 50 1],[597.468 100 1],[627.35 8 0],[634.97 8 0],[636.713 50 1],[640.59 8 0],[645.67 7 0],[661.34 8 0],[664.858 10 1],[666.02 8 0],[669 8 0],[679 10 0],[683.76 20 0],[685.47 20 0],[701.606 10 1],[703.913 10 1],[719.11 15 0],[723.662 10 1],[726.35 20 0],[728.09 8 0],[728.926 10 1],[744.539 10 1],[746.098 12 1],[746.875 15 1],[748.126 10 1],[755.68 10 0],[768.861 6 1],[775.91 15 0]}{200}% -\wl@elt@search{#1}{I}{[410.223 200 0],[412.921 200 0],[413.415 100 0],[432.184 500 0],[445.286 300 1],[459.977 200 1],[463.245 300 1],[466.648 500 1],[467.553 1000 1],[476.331 250 0],[486.232 1000 0],[491.694 200 0],[498.692 1000 1],[506.537 400 1],[511.929 10000 0],[514.973 200 1],[516.12 3000 1],[517.619 300 1],[521.627 600 1],[522.897 500 1],[523.457 1000 0],[524.571 3000 1],[526.936 500 1],[529.978 400 1],[532.28 400 1],[533.822 10000 1],[534.515 5000 1],[536.986 1000 1],[540.542 800 1],[540.736 800 1],[542.706 600 0],[543.583 3000 1],[543.8 1000 1],[546.462 2000 1],[549.15 800 1],[549.694 1000 1],[550.472 1000 1],[552.206 600 1],[559.852 600 1],[560.032 1000 1],[561.289 1500 1],[562.569 10000 1],[567.808 1000 1],[569.091 2000 1],[570.205 500 1],[571.053 4000 1],[573.827 1000 1],[576.072 1000 1],[576.433 1000 0],[577.483 500 1],[578.702 500 1],[589.403 2000 0],[595.025 5000 1],[598.486 300 0],[602.408 2000 0],[606.893 500 1],[607.498 2000 1],[608.243 1000 0],[612.749 2000 1],[619.188 800 0],[620.486 1000 1],[621.31 500 0],[624.448 800 0],[625.749 900 1],[629.398 1000 0],[631.313 500 0],[633.037 800 0],[633.35 400 0],[633.785 2000 0],[633.944 1000 0],[635.916 500 0],[656.649 1000 0],[658.375 2000 0],[658.527 1000 0],[661.966 5000 0],[666.111 500 0],[666.596 600 1],[669.729 500 0],[671.883 300 1],[673.203 400 0],[681.257 4000 1],[695.878 1000 1],[698.978 500 0],[708.521 200 1],[712.005 500 0],[712.205 1200 0],[714.206 2000 0],[716.479 1000 0],[719.166 400 0],[722.73 700 0],[723.678 1000 0],[723.784 500 0],[735.135 500 1],[740.206 5000 0],[741.05 1000 0],[741.648 500 0],[746.899 5000 0],[749.052 500 0],[755.418 2000 0],[755.665 500 0],[770.02 2000 0],[779.898 500 1],[396.316 3 2],[407.714 3 2]}{10000}% -\wl@elt@search{#1}{Xe}{[390.791 100 1],[403.759 100 1],[405.746 200 1],[409.889 100 1],[415.804 200 1],[418.01 1000 1],[419.315 500 1],[420.848 300 1],[420.947 100 1],[421.372 300 1],[421.56 100 1],[422.3 300 1],[423.825 400 1],[424.538 500 1],[425.157 100 1],[429.64 500 1],[431.051 500 1],[433.052 1000 1],[436.92 200 1],[437.378 100 1],[439.32 500 1],[439.577 500 1],[440.688 200 1],[441.607 150 1],[444.813 500 1],[446.219 1000 1],[448.086 500 1],[452.186 100 1],[473.4152 600 0],[479.2619 150 0],[480.702 500 0],[482.971 400 0],[484.329 300 0],[491.651 500 0],[492.3152 500 0],[497.171 200 1],[497.271 400 1],[498.877 300 1],[499.117 100 1],[502.828 200 0],[504.492 200 1],[508.062 1000 1],[512.242 300 1],[512.57 100 1],[517.882 100 1],[518.804 300 1],[519.137 400 1],[519.21 100 1],[526.044 500 1],[526.195 500 1],[529.222 2000 1],[530.927 300 1],[531.387 1000 1],[533.933 2000 1],[536.32 200 1],[536.807 200 1],[537.239 500 1],[539.28 100 0],[541.915 3000 1],[543.896 800 1],[544.545 300 1],[545.045 200 1],[546.039 400 1],[547.261 1000 1],[549.486 100 1],[552.553 200 1],[553.107 600 1],[556.662 100 0],[561.667 300 1],[565.938 300 1],[566.756 600 1],[567.091 150 1],[569.575 100 0],[569.961 200 1],[571.61 200 1],[572.691 500 1],[575.103 500 1],[575.865 300 1],[577.639 300 1],[581.596 100 1],[582.389 300 0],[582.48 150 0],[587.502 100 0],[589.329 300 1],[589.499 100 0],[590.513 200 1],[593.417 100 0],[594.553 500 1],[597.113 300 1],[597.646 2000 1],[600.892 200 1],[603.62 1000 1],[605.115 2000 1],[609.35 600 1],[609.759 1500 1],[610.143 400 1],[611.508 100 1],[614.645 100 1],[617.83 150 0],[617.966 120 0],[618.242 300 0],[619.407 500 1],[619.826 100 0],[622.002 100 1],[627.082 500 1],[627.754 400 1],[628.441 100 1],[628.601 100 0],[630.086 250 1],[631.806 500 0],[634.396 400 1],[635.635 600 1],[637.528 200 1],[639.799 100 1],[646.97 300 0],[647.284 150 0],[648.776 120 0],[649.872 100 0],[650.418 200 0],[651.283 300 1],[652.865 200 1],[653.316 100 0],[659.501 1000 1],[659.556 100 0],[659.725 400 1],[659.884 100 1],[666.892 150 0],[669.432 300 1],[672.801 200 0],[678.871 150 1],[679.037 100 1],[680.574 1000 1],[682.732 200 0],[687.211 100 0],[688.216 300 0],[691.022 80 1],[692.553 100 0],[694.211 800 1],[697.618 100 0],[699.088 2000 1],[708.215 150 1],[711.96 500 0],[714.75 50 1],[714.903 200 1],[716.483 500 1],[728.434 100 1],[730.18 200 1],[733.93 200 1],[738.6 100 0],[739.379 150 0],[754.845 300 1],[758.468 200 0],[761.857 80 1],[764.202 500 0],[764.391 100 0],[767.066 200 1],[778.704 60 1],[384.15 100 2],[387.78 200 2],[388.05 60 2],[392.255 500 2],[395.059 300 2],[405.007 200 2],[406.04 60 2],[410.91 100 2],[414.57 100 2],[428.59 30 2],[443.42 50 2],[446.21 100 2],[456.91 100 2],[457.01 100 2],[464.14 100 2],[467.37 30 2],[468.357 60 2],[472.36 30 2],[475.73 100 2],[486.95 40 2],[523.9 60 2],[536.71 30 2],[540.1 50 2],[552.44 40 2],[620.597 60 2],[622.17 25 2],[623.82 60 2],[625.905 60 2]}{3000}% -\wl@elt@search{#1}{Cs}{[380.51 500 1],[387.016 15 1],[387.6143 150 0],[388.8608 80 0],[389.698 1000 1],[390.693 350 1],[392.558 500 1],[395.95 350 1],[396.519 500 1],[397.8 150 1],[404.718 350 1],[405.396 200 1],[406.796 500 1],[406.877 500 1],[407.336 70 1],[411.929 60 1],[412.121 500 1],[413.2 100 1],[415.127 350 1],[415.861 350 1],[419.32 60 1],[421.313 500 1],[422.112 200 1],[423.219 500 1],[423.441 350 1],[424.197 100 1],[427.174 100 1],[427.71 2000 1],[428.835 1000 1],[429.2 200 1],[430.064 500 1],[430.794 50 1],[432.758 50 1],[433.024 350 1],[436.328 2000 1],[437.302 500 1],[438.443 400 1],[438.876 100 1],[439.691 200 1],[439.95 350 1],[440.385 350 1],[440.525 1000 1],[441.021 350 1],[442.405 100 1],[443.571 350 1],[444.4 100 1],[445.344 200 1],[445.768 200 1],[445.918 200 1],[449.366 100 1],[450.152 1000 1],[450.671 200 1],[450.683 100 1],[451.55 100 1],[452.285 150 1],[452.672 1000 1],[453.894 800 1],[455.5276 400 0],[456.698 150 1],[457.179 150 1],[459.3169 200 0],[460.376 2500 1],[460.999 100 1],[461.613 150 1],[462.309 350 1],[464.651 500 1],[465.654 150 1],[467.028 350 1],[469.561 100 1],[470.179 500 1],[473.298 350 1],[473.966 350 1],[474.913 100 1],[476.362 500 1],[478.636 200 1],[483.016 800 1],[487.002 800 1],[495.284 800 1],[497.259 500 1],[504.38 800 1],[505.27 500 1],[505.987 500 1],[508.177 100 1],[509.66 400 1],[522.7 1500 1],[524.937 800 1],[527.404 400 1],[530.661 350 1],[534.916 350 1],[537.097 800 1],[541.969 500 1],[546.5944 5 0],[550.2884 5 0],[556.302 1000 1],[563.5212 11 0],[566.4018 30 0],[574.5724 8 0],[581.418 350 1],[583.116 500 1],[583.8835 5 0],[584.5141 30 0],[592.565 500 1],[601.049 80 0],[603.4089 30 0],[612.862 400 1],[621.31 120 0],[621.7599 15 0],[635.4555 50 0],[641.954 100 1],[643.1969 15 0],[647.2623 15 0],[649.553 200 1],[653.644 200 1],[658.602 30 0],[658.651 200 0],[662.866 35 0],[672.3284 200 0],[682.4652 100 0],[687.0455 100 0],[695.552 400 1],[697.3297 200 0],[698.3491 35 0],[722.8536 200 0],[727.99 60 0],[727.9957 200 0],[760.8903 150 0]}{2500}% -\wl@elt@search{#1}{Ba}{[381.669 200 1],[384.28 200 1],[385.476 100 1],[388.933 20 0],[389.178 1400 1],[389.265 20 0],[390.991 40 0],[391.473 500 1],[393.572 50 0],[393.787 20 0],[393.967 200 1],[394.951 500 1],[399.34 80 0],[399.566 30 0],[403.626 300 1],[408.377 200 1],[408.486 30 0],[413.066 1500 1],[413.243 20 0],[416.6 200 1],[421.604 500 1],[426.795 800 1],[428.31 100 0],[428.78 300 1],[429.76 200 1],[430.932 800 1],[432.3 20 0],[432.573 600 1],[432.674 200 1],[432.962 300 1],[435.033 80 0],[440.254 60 0],[440.523 400 1],[443.189 40 0],[448.898 60 0],[449.364 50 0],[450.592 40 0],[450.963 200 1],[452.317 60 0],[452.493 130 1],[455.403 65000 1],[457.385 40 0],[457.964 80 0],[459.975 30 0],[461.992 20 0],[462.833 25 0],[464.41 300 1],[467.362 30 0],[469.162 35 0],[470.043 20 0],[470.894 800 1],[472.644 40 0],[484.346 800 1],[484.714 300 1],[485.084 200 1],[487.765 30 0],[489.997 400 1],[490.29 15 0],[493.409 20000 1],[494.735 8 0],[495.715 1000 1],[499.781 300 1],[501.3 1000 1],[515.994 20 0],[526.703 20 0],[536.135 800 1],[539.16 1000 1],[542.105 200 1],[542.455 100 0],[542.879 200 1],[548.03 300 1],[551.905 200 0],[553.548 1000 0],[562.04 20 0],[568.018 10 0],[577.762 400 0],[578.418 800 1],[580.023 100 0],[580.569 20 0],[582.628 150 0],[585.368 2800 1],[590.764 15 0],[597.17 100 0],[598.125 800 1],[599.709 100 0],[599.985 300 1],[601.947 100 0],[606.312 200 0],[611.078 300 0],[613.583 400 1],[614.172 20000 1],[634.168 150 0],[637.891 500 1],[645.085 90 0],[648.291 150 0],[649.69 12000 1],[649.876 300 0],[652.731 150 0],[659.533 3000 0],[665.41 150 0],[667.527 1500 0],[669.384 1800 0],[676.962 1000 1],[686.569 600 0],[686.785 300 0],[687.409 1000 1],[705.994 6000 0],[712.033 2400 0],[719.524 600 0],[722.884 600 0],[728.03 3000 0],[739.241 1200 0],[741.753 300 0],[745.978 900 0],[748.808 600 0],[763.69 450 0],[764.291 600 0],[767.209 1800 0],[778.048 1200 0],[392.685 25 2],[399.306 25 2],[405.371 18 2],[469.744 15 2],[504.955 10 2],[509.754 10 2],[510.225 12 2],[513.454 10 2],[599.8 10 2],[610.199 13 2],[637.711 10 2],[638.376 10 2],[652.617 8 2],[709.549 8 2]}{65000}% -\wl@elt@search{#1}{La}{[383.508 190 1],[384.072 600 1],[384.6 120 1],[384.902 1600 1],[385.491 130 1],[387.164 3400 1],[388.637 1700 1],[391.605 1300 1],[392.154 1100 1],[392.756 160 0],[392.922 2200 1],[393.622 180 1],[394.91 9000 1],[398.852 4400 1],[399.575 3600 1],[401.539 180 0],[402.588 250 1],[403.169 2800 1],[403.721 140 0],[404.291 3000 1],[405.008 320 1],[406.033 220 0],[406.479 160 0],[406.739 850 1],[407.671 110 1],[407.735 2800 1],[407.918 120 0],[408.672 5500 1],[408.961 180 0],[409.954 280 1],[410.487 110 0],[412.323 4400 1],[413.704 110 0],[414.174 550 1],[415.197 1100 1],[415.278 220 1],[416.026 100 0],[418.732 280 0],[419.236 280 1],[419.655 1500 1],[420.404 240 1],[421.756 300 1],[423.095 200 1],[423.838 1600 1],[424.999 140 1],[426.359 320 1],[426.95 480 1],[427.564 240 1],[428.027 300 0],[428.697 600 1],[429.605 600 1],[430.044 120 1],[432.251 440 1],[433.374 4600 1],[435.44 550 1],[436.467 110 1],[437.197 110 -1],[437.584 110 -1],[437.81 110 1],[438.344 280 1],[438.52 100 1],[441.824 220 -1],[442.317 160 -1],[442.39 160 0],[442.755 260 1],[442.81 100 -1],[442.99 2000 1],[443.298 160 -1],[443.801 100 -1],[445.215 100 0],[445.58 100 1],[452.237 850 1],[452.531 170 1],[452.612 420 1],[455.846 400 1],[455.929 110 1],[456.791 160 0],[457.002 200 0],[457.488 400 1],[458.006 200 1],[460.578 160 1],[461.339 410 1],[461.988 410 1],[464.528 110 1],[465.55 540 1],[466.251 360 1],[466.376 230 1],[466.891 200 1],[467.183 160 1],[469.25 230 1],[470.328 140 1],[471.644 170 1],[471.994 140 1],[472.842 230 1],[474.028 500 1],[474.309 390 1],[474.873 320 1],[476.689 160 0],[480.404 160 1],[480.901 160 1],[482.406 200 1],[486.091 320 1],[489.992 850 1],[492.098 1000 1],[492.179 1000 1],[493.483 140 1],[494.647 110 1],[494.977 370 0],[497.039 340 1],[498.683 370 1],[499.128 140 1],[499.947 720 1],[504.688 140 0],[505.057 210 0],[505.646 170 0],[510.623 200 0],[511.456 470 1],[512.299 470 1],[514.542 450 0],[515.674 180 1],[515.743 180 1],[515.869 290 0],[516.362 120 1],[517.731 580 0],[518.342 850 1],[518.822 260 1],[520.415 170 1],[521.186 720 0],[523.427 520 0],[525.346 340 0],[525.939 110 1],[527.119 370 0],[529.084 140 1],[530.198 370 1],[530.262 140 1],[530.355 180 1],[534.067 110 1],[535.786 110 0],[537.709 130 1],[538.099 140 1],[545.515 500 0],[550.134 470 0],[560.25 110 -1],[563.122 160 0],[564.825 240 0],[565.772 130 0],[574.066 180 0],[574.441 160 0],[576.184 160 0],[576.907 160 1],[576.934 370 0],[578.924 320 0],[579.134 450 0],[579.758 220 1],[580.578 160 1],[582.199 140 0],[593.062 320 0],[624.993 720 0],[626.23 260 1],[629.609 180 1],[632.039 160 1],[632.591 110 0],[639.048 170 1],[639.423 450 0],[641.099 210 0],[645.599 250 0],[652.699 110 1],[654.316 130 0],[657.851 140 0],[670.95 180 0],[677.426 120 1],[701.122 13 -1],[702.367 75 0],[703.205 26 0],[704.084 26 -1],[704.596 110 0],[705.48 13 -1],[706.623 160 1],[706.837 65 0],[707.079 21 -1],[707.638 13 0],[708.54 21 -1],[710.102 26 -1],[711.68 10 1],[713.158 19 -1],[714.977 10 0],[715.808 40 0],[716.125 50 0],[716.26 10 -1],[721.991 21 0],[725.716 10 -1],[727.009 26 0],[727.03 10 0],[728.234 110 1],[732.091 10 0],[733.418 110 0],[734.534 65 0],[737.971 50 -1],[738.008 85 -1],[738.273 35 0],[740.352 110 -1],[740.375 210 -1],[741.134 50 -1],[743.428 65 -1],[743.436 110 -1],[744.292 30 -1],[746.308 50 0],[746.525 50 -1],[746.548 95 -1],[748.35 75 1],[749.65 40 -1],[749.678 95 -1],[749.883 50 0],[750.679 30 -1],[752.821 19 -1],[752.839 50 -1],[753.359 30 0],[753.923 85 0],[756.009 35 -1],[759.226 35 -1],[761.294 19 1],[762.499 19 -1],[766.434 21 0],[412.924 3 2],[413.743 5 2],[448.297 200 2],[449.905 300 2],[514.573 5 2],[515.841 8 2],[546.781 6 2],[549.19 55 2],[551.172 2 2],[551.819 1 2],[552.954 45 2],[574.409 1 2],[577.814 200 2],[581.345 2 2],[587.563 3 2],[588.862 55 2],[593.271 3 2],[601.711 2 2],[605.584 20 2],[611.925 35 2],[614.199 120 2],[622 55 2],[634.821 60 2],[427.076 2000 3],[454.98 1500 3],[483.689 500 3]}{9000}% -\wl@elt@search{#1}{Ce}{[380.152 2500 1],[380.309 800 1],[380.811 1000 1],[380.921 490 1],[381.22 250 1],[381.585 490 1],[381.746 470 1],[381.902 300 1],[382.39 470 1],[383.055 470 1],[383.108 490 1],[383.455 490 1],[383.61 270 1],[383.854 1100 1],[384.376 200 1],[384.652 220 1],[384.81 250 1],[384.859 860 1],[385.315 860 1],[385.418 1200 1],[385.431 1200 1],[385.529 620 1],[385.702 390 1],[385.764 370 1],[386.246 200 1],[386.813 200 1],[387.468 270 1],[387.697 620 1],[387.836 1100 1],[388.245 1500 1],[388.998 1000 1],[389.075 210 1],[389.098 210 1],[389.511 620 1],[389.68 590 1],[389.827 490 1],[389.894 270 1],[390.334 200 1],[390.434 250 1],[390.692 200 1],[390.729 770 1],[390.841 560 1],[390.854 390 1],[390.931 270 1],[391.219 230 1],[391.244 980 1],[391.552 390 1],[391.614 390 1],[391.764 230 1],[391.828 770 1],[391.981 480 1],[392.173 590 1],[392.311 560 1],[392.464 450 1],[393.109 770 1],[393.137 310 1],[393.183 230 1],[393.373 310 1],[393.809 560 1],[394.034 770 1],[394.097 310 1],[394.215 2000 1],[394.275 2700 1],[394.389 770 1],[394.797 310 1],[395.254 3100 1],[395.366 340 1],[395.536 310 1],[395.606 230 1],[395.628 980 1],[395.827 230 1],[395.887 230 1],[396.091 770 1],[396.45 390 1],[396.705 770 1],[397.168 450 1],[397.207 270 1],[397.507 270 1],[397.865 770 1],[398.088 560 1],[398.289 560 1],[398.329 310 1],[398.468 770 1],[398.944 370 1],[399.239 700 1],[399.291 370 1],[399.382 910 1],[399.924 2800 1],[400.156 230 1],[400.377 910 1],[400.564 370 1],[400.759 210 1],[401.239 2700 1],[401.49 910 1],[401.588 250 1],[401.904 200 1],[402.227 240 1],[402.449 840 1],[402.515 240 1],[402.841 840 1],[403.034 250 1],[403.134 840 1],[403.767 340 1],[404.076 2100 1],[404.258 910 1],[404.521 230 1],[404.634 620 1],[405.143 210 1],[405.199 210 1],[405.351 700 1],[405.499 450 1],[406.222 280 1],[406.294 230 1],[406.728 280 1],[406.884 420 1],[407.181 1100 1],[407.292 270 1],[407.348 1800 1],[407.374 210 1],[407.571 1500 1],[407.585 1500 1],[407.624 210 1],[407.747 420 1],[407.832 530 1],[407.852 270 1],[408.044 270 1],[408.122 670 1],[408.323 910 1],[408.523 450 1],[408.736 250 1],[408.885 230 1],[410.177 450 1],[410.5 250 1],[410.742 510 1],[411.038 200 1],[411.139 250 1],[411.537 420 1],[411.701 250 1],[411.729 200 1],[411.759 200 1],[411.814 770 1],[411.902 250 1],[411.979 310 1],[411.988 310 1],[412.083 450 1],[412.324 510 1],[412.349 510 1],[412.387 980 1],[412.479 510 1],[412.737 980 1],[412.774 250 1],[412.807 200 1],[413.071 530 1],[413.11 480 1],[413.38 2700 1],[413.544 270 1],[413.747 270 1],[413.765 2000 1],[413.81 270 1],[413.835 210 1],[414.24 770 1],[414.449 390 1],[414.5 670 1],[414.623 480 1],[414.89 280 1],[414.979 420 1],[414.994 980 1],[415.091 420 1],[415.197 1400 1],[415.313 230 1],[415.903 450 1],[416.352 310 1],[416.561 1300 1],[416.688 620 1],[416.78 250 1],[416.977 320 1],[416.988 320 1],[417.67 340 1],[418.108 340 1],[418.533 340 1],[418.66 3500 1],[418.732 530 1],[419.309 560 1],[419.328 370 1],[419.387 370 1],[419.634 630 1],[419.8 280 1],[419.867 280 1],[419.872 840 1],[420.124 240 1],[420.294 910 1],[420.941 270 1],[421.404 370 1],[421.759 310 1],[422.26 1500 1],[422.775 770 1],[423.174 390 1],[423.421 240 1],[423.602 200 1],[423.992 980 1],[424.272 390 1],[424.589 310 1],[424.598 310 1],[424.672 390 1],[424.868 1100 1],[425.337 390 1],[425.579 620 1],[426.343 200 1],[427.019 620 1],[427.072 390 1],[427.886 200 1],[428.537 280 1],[428.866 200 1],[428.944 200 1],[428.994 2000 1],[429.607 200 1],[429.667 1500 1],[429.678 420 1],[429.936 590 1],[430.033 770 1],[430.514 420 1],[430.672 770 1],[430.974 390 1],[432.072 560 1],[433.045 310 1],[433.271 310 1],[433.623 240 1],[433.777 980 1],[433.931 340 1],[434.979 700 1],[435.271 560 1],[436.466 910 1],[437.382 350 1],[437.592 530 1],[438.217 910 1],[438.684 700 1],[438.801 310 1],[439.166 1700 1],[439.879 200 1],[439.92 510 1],[441.064 350 1],[441.076 350 1],[441.69 310 1],[441.878 980 1],[442.368 200 1],[442.707 310 1],[442.792 480 1],[442.844 310 1],[442.927 650 1],[444.439 480 1],[444.47 450 1],[444.934 770 1],[445.073 620 1],[446.021 2400 1],[446.114 450 1],[446.341 420 1],[446.754 280 1],[447.124 1400 1],[447.272 450 1],[447.936 700 1],[448.39 700 1],[448.691 840 1],[449.785 250 1],[450.641 100 0],[451.586 110 1],[451.959 100 1],[452.308 770 1],[452.735 840 1],[452.847 840 1],[453.249 110 1],[453.907 110 1],[453.975 840 1],[454.496 210 1],[455.13 250 1],[456.028 650 1],[456.096 310 1],[456.236 2100 1],[456.584 420 1],[457.228 1100 1],[458.25 420 1],[459.112 130 1],[459.393 840 1],[460.64 420 1],[462.49 420 1],[462.816 1700 1],[463.232 170 0],[465.051 110 0],[465.429 130 1],[466.95 110 1],[468.013 150 1],[468.461 270 1],[471.4 200 1],[471.481 100 1],[472.509 110 1],[473.352 100 1],[473.728 310 1],[473.953 100 1],[474.717 160 1],[475.784 110 1],[476.877 100 1],[477.394 230 1],[482.255 110 0],[484.777 140 0],[488.246 180 1],[494.344 110 0],[497.15 130 1],[499.463 130 0],[500.91 210 0],[501.177 100 1],[502.287 120 1],[503.778 120 1],[504.085 120 0],[504.402 180 1],[507.178 120 0],[507.535 240 1],[507.968 470 1],[511.27 130 0],[511.717 160 1],[512.957 170 0],[514.757 110 1],[514.999 100 0],[515.969 280 0],[516.148 280 0],[517.455 190 0],[518.746 370 1],[519.166 210 1],[521.192 190 0],[522.346 260 0],[522.975 180 0],[523.292 140 1],[524.592 260 0],[526.571 130 1],[527.423 340 1],[529.656 130 0],[532.808 130 0],[533.054 190 1],[535.353 450 1],[539.34 300 1],[539.764 150 0],[540.923 280 1],[542.038 110 0],[544.924 140 0],[546.837 140 1],[547.229 140 1],[551.208 260 1],[555.625 110 0],[556.497 170 0],[556.597 130 0],[559.588 100 0],[560.128 240 0],[565.514 190 0],[566.996 240 0],[567.775 120 0],[569.294 120 0],[569.699 300 0],[569.923 370 0],[571.903 240 0],[577.312 140 0],[578.815 120 0],[581.292 120 0],[594.086 230 0],[600.018 11 0],[600.19 55 0],[600.586 55 0],[600.62 15 0],[600.682 55 0],[600.737 19 0],[601.342 75 0],[601.659 23 0],[602.42 110 0],[602.716 15 0],[603.126 11 0],[603.358 23 1],[603.42 35 1],[603.441 23 0],[603.549 35 1],[604.339 110 1],[604.542 28 0],[604.74 55 0],[605.18 19 1],[605.75 23 0],[605.8 35 0],[606.675 23 0],[606.946 19 0],[606.948 35 0],[607.2 35 0],[607.661 35 0],[607.716 17 0],[608.037 17 0],[608.128 17 0],[608.886 19 0],[608.896 19 0],[609.319 35 0],[609.834 45 1],[609.98 11 0],[610.874 28 1],[611.856 15 0],[611.89 17 0],[612.367 45 0],[613.2 19 1],[613.218 19 0],[613.545 11 0],[613.903 23 0],[614.292 15 0],[614.336 35 1],[614.643 23 0],[614.784 19 0],[615.172 23 0],[615.982 19 0],[616.214 19 0],[616.545 19 0],[617.528 19 0],[618.617 35 0],[618.797 15 0],[619.523 15 0],[619.553 19 0],[619.805 19 0],[620.898 35 0],[621.682 11 0],[622.894 35 0],[622.913 19 0],[623.245 23 1],[623.745 28 0],[623.871 13 0],[624.187 11 0],[624.291 13 0],[625.365 15 0],[625.799 13 0],[626.427 15 0],[627.205 45 1],[627.647 15 0],[629.558 35 0],[629.951 28 1],[630.021 23 0],[630.664 13 0],[631.001 35 0],[633.54 15 0],[633.721 11 0],[634.07 13 0],[634.395 35 1],[637.111 35 1],[638.684 28 0],[639.302 23 1],[639.516 11 0],[642.529 11 1],[643.007 35 0],[643.439 19 0],[643.64 23 0],[644.612 19 0],[645.803 35 0],[646.688 19 1],[646.739 28 0],[647.372 35 0],[649.097 17 0],[650.327 11 1],[650.716 11 1],[651.359 23 1],[651.731 19 0],[655.17 19 0],[655.565 45 0],[657.91 23 0],[660.635 15 0],[660.686 15 1],[661.206 22 0],[662.3 10 0],[662.893 30 0],[665.089 13 0],[665.272 22 1],[666.141 10 0],[666.559 13 0],[667.554 10 1],[668.66 15 0],[670.066 26 0],[670.427 35 0],[670.452 13 1],[670.604 10 1],[672.871 15 0],[672.957 15 0],[674.47 15 1],[674.69 10 0],[677.428 30 1],[677.559 35 0],[677.828 10 0],[680.781 18 0],[680.882 10 0],[681.823 15 0],[682.973 10 1],[684.725 13 0],[685.655 12 0],[689.366 10 0],[689.845 10 1],[692.481 30 0],[693.945 10 0],[697.35 19 1],[698.382 10 1],[698.602 30 0],[705.451 12 0],[705.868 11 1],[706 11 0],[706.175 35 1],[706.449 11 0],[708.635 35 1],[710.504 11 1],[711.508 11 1],[712.473 10 0],[714.142 16 0],[715.023 19 1],[715.167 10 0],[715.525 16 0],[715.699 16 1],[718.94 16 1],[719.172 10 0],[720.156 11 1],[720.189 16 0],[720.355 10 0],[721.067 12 0],[721.736 19 0],[723.571 16 1],[723.836 22 1],[724.173 12 0],[725.275 25 0],[726.264 12 0],[727.79 11 0],[729.617 11 0],[730.142 19 1],[731.345 19 1],[732.991 25 0],[733.468 16 1],[734.344 12 0],[739.777 25 0],[740.127 11 0],[741.794 12 1],[742.47 11 -1],[743.308 12 0],[743.856 11 0],[744.444 12 0],[747.241 10 0],[748.657 16 1],[752.746 11 0],[752.768 11 0],[753.373 10 0],[755.125 10 0],[756.244 12 0],[756.286 10 0],[756.36 10 0],[760.31 10 0],[761.611 25 1],[764.608 12 0],[764.788 10 0],[768.247 12 0],[768.917 25 1],[773.233 10 0],[774.835 16 0],[779.77 10 0],[393.68 800 2],[395.71 300 2],[416.942 500 2],[419.17 300 2],[419.483 500 2],[421.326 300 2],[421.713 300 2],[428.477 400 2],[430.471 300 2],[434.635 600 2],[438.997 400 2],[444.832 600 2],[448.527 500 2],[452.192 1000 2],[453.573 1000 2],[457.69 300 2],[462.76 500 2],[476.607 300 2],[497.645 500 2],[565.097 500 2],[566.42 1000 2],[569.108 500 2],[571.059 300 2],[574.947 500 2],[594.983 500 2],[596.222 2000 2],[596.271 500 2],[597.956 400 2],[598.34 1000 2],[600.263 3000 2],[603.254 10000 2],[606.091 10000 2],[606.179 500 2],[609.735 500 2],[609.887 500 2],[613.51 500 2],[628.779 300 2],[630.816 500 2],[634.175 300 2],[694.494 1000 2],[773.904 700 2],[775.827 300 2]}{10000}% -\wl@elt@search{#1}{Pr}{[380.03 680 1],[380.484 290 1],[380.918 140 1],[381.184 390 1],[381.602 1300 1],[381.766 120 1],[381.828 680 1],[381.914 120 1],[382.18 310 1],[382.318 150 1],[382.667 120 1],[383.072 960 1],[383.493 140 1],[384.099 480 1],[384.234 270 1],[384.454 150 1],[384.659 580 1],[385.079 1200 1],[385.155 720 1],[385.28 960 1],[385.825 120 1],[385.914 110 1],[386.545 480 1],[386.752 210 1],[387.072 210 1],[387.619 480 1],[387.718 1700 1],[387.92 270 1],[388.047 680 1],[388.519 440 1],[388.934 440 1],[389.171 120 1],[389.725 190 1],[389.884 210 1],[390.245 250 1],[390.805 770 1],[391.29 630 1],[391.355 310 1],[391.476 210 1],[391.885 1300 1],[391.963 420 1],[392.053 250 1],[392.547 960 1],[392.746 480 1],[392.929 370 1],[393.582 370 1],[393.83 250 1],[394.763 730 1],[394.943 900 1],[395.351 900 1],[395.675 380 1],[395.944 190 0],[396.245 470 1],[396.426 560 1],[396.481 1600 1],[396.657 560 1],[397.116 500 1],[397.167 320 1],[397.214 620 1],[397.485 320 1],[398.968 1300 1],[399.191 230 1],[399.216 340 1],[399.479 1600 1],[399.583 270 1],[399.704 560 1],[399.796 230 1],[399.912 320 1],[400.017 620 1],[400.47 730 1],[400.869 1900 1],[401.06 620 1],[401.539 730 1],[402.096 620 1],[402.271 470 1],[402.554 360 1],[402.683 230 1],[402.9 230 1],[402.972 360 1],[403.175 730 1],[403.247 230 1],[403.383 960 1],[403.433 230 1],[403.822 230 1],[403.845 730 1],[403.934 470 1],[404.481 1300 1],[404.57 230 1],[404.663 230 1],[404.708 340 1],[405.113 450 1],[405.488 2200 1],[405.654 2200 1],[405.88 450 1],[406.222 230 1],[406.281 3400 1],[406.88 210 1],[407.977 500 1],[408.098 500 1],[408.185 790 1],[408.334 500 1],[408.721 200 1],[409.682 560 1],[409.84 380 1],[410.072 2900 1],[411.389 270 1],[411.846 1700 1],[412.915 250 1],[413.077 340 1],[413.361 200 1],[414.122 1500 1],[414.311 2700 1],[414.65 270 1],[414.844 270 1],[415.65 200 1],[416.416 1700 1],[416.804 270 1],[416.945 230 1],[417.182 620 1],[417.225 730 1],[417.532 250 1],[417.562 250 1],[417.863 200 1],[417.939 5200 1],[418.948 2500 1],[419.16 560 1],[420.117 290 1],[420.672 2500 1],[420.832 500 1],[421.186 320 1],[421.781 320 1],[422.293 3800 1],[422.535 3800 1],[423.311 320 1],[423.615 320 1],[424.002 270 1],[424.101 960 1],[424.351 340 1],[424.763 840 1],[425.44 500 1],[426.378 270 1],[426.909 320 1],[427.227 790 1],[428.007 470 1],[428.242 790 1],[429.898 450 1],[430.361 290 1],[430.576 1500 1],[432.355 210 1],[432.941 270 1],[433.397 1300 1],[433.574 200 1],[433.87 360 1],[434.43 620 1],[434.749 470 1],[435.04 340 1],[435.491 450 1],[435.979 410 1],[436.833 1200 1],[437.162 320 1],[439.608 270 1],[440.36 170 1],[440.512 100 1],[440.583 430 1],[440.882 1700 1],[441.377 410 1],[441.904 160 1],[441.965 190 1],[442.122 160 1],[442.458 160 1],[442.913 1200 1],[443.228 110 1],[444.983 730 1],[445.19 140 1],[445.468 140 1],[446.597 100 1],[446.866 960 1],[447.726 140 1],[449.646 1100 1],[451.015 790 1],[451.758 200 1],[453.415 340 1],[453.592 340 1],[456.312 200 1],[461.208 140 1],[462.874 270 1],[463.228 140 0],[463.568 140 0],[463.955 200 0],[464.349 110 1],[464.605 140 1],[465.15 200 1],[466.465 140 1],[467.209 270 1],[468.78 180 0],[469.577 290 0],[470.807 140 1],[470.952 140 0],[473.067 180 0],[473.669 250 0],[474.416 100 0],[474.692 150 1],[476.272 100 1],[478.335 110 1],[490.699 110 0],[491.402 140 0],[492.46 200 0],[493.6 140 0],[493.974 320 0],[494.03 160 0],[495.137 380 0],[497.575 110 0],[501.859 120 0],[501.976 200 0],[502.696 200 0],[503.338 100 0],[503.441 270 1],[504.383 110 0],[504.552 320 0],[505.34 160 0],[508.712 180 0],[511.038 360 1],[511.076 560 1],[512.952 410 1],[513.344 270 0],[513.514 270 1],[513.981 100 0],[515.23 100 1],[516.174 200 1],[517.39 620 1],[519.132 200 1],[519.443 120 0],[519.511 150 1],[519.531 200 1],[520.655 360 1],[520.79 150 1],[521.905 360 1],[522.011 560 1],[522.797 110 0],[525.973 680 1],[526.388 180 1],[529.202 340 1],[529.262 340 1],[529.809 230 1],[532.276 430 1],[535.24 200 1],[550.15 16 0],[550.879 40 1],[550.915 65 1],[551.163 16 1],[551.358 55 1],[551.512 28 1],[551.938 13 1],[552.031 20 1],[552.279 45 1],[552.415 28 0],[552.591 28 1],[552.793 16 0],[553.021 13 0],[553.116 45 0],[553.517 150 1],[553.837 28 0],[553.878 20 1],[554.501 55 1],[554.833 20 1],[555.342 11 1],[556.146 22 1],[556.206 45 0],[556.552 13 0],[556.691 13 1],[557.183 45 1],[557.461 11 1],[557.881 11 0],[558.235 13 1],[558.402 11 1],[559.492 22 0],[559.729 22 1],[560.13 13 1],[560.565 90 1],[560.668 13 0],[560.893 28 1],[561.022 55 1],[562.006 11 1],[562.026 20 0],[562.189 45 1],[562.305 110 1],[562.445 90 1],[563.303 11 0],[563.646 22 1],[563.879 55 1],[564.037 16 1],[564.316 16 0],[564.541 22 1],[565.423 35 1],[565.984 55 1],[566.157 35 0],[566.219 16 1],[566.846 65 0],[566.955 45 1],[566.999 35 1],[567.414 16 1],[567.703 16 1],[568.189 55 1],[568.56 13 1],[568.652 16 0],[568.717 22 1],[568.844 65 1],[568.921 22 1],[569.097 55 1],[569.59 22 1],[570.438 22 0],[570.761 65 0],[571.163 40 1],[571.383 22 1],[571.608 16 1],[571.908 45 1],[571.963 45 1],[572.838 11 0],[573.188 40 1],[574.713 20 1],[574.774 11 0],[574.795 11 1],[575.302 22 1],[575.617 90 1],[575.94 16 1],[576.02 22 0],[576.916 22 1],[576.979 16 1],[577.316 45 1],[577.591 11 1],[577.729 16 1],[577.928 90 0],[578.528 65 1],[578.617 65 1],[578.829 16 1],[578.892 16 1],[579.086 16 1],[579.136 45 1],[579.295 22 0],[581.058 40 1],[581.355 16 1],[581.517 160 1],[581.857 55 1],[582.062 40 1],[582.136 16 0],[582.259 55 1],[582.372 90 1],[583.094 45 1],[583.513 40 0],[584.465 35 1],[584.498 40 1],[584.713 65 1],[585.064 65 1],[585.263 45 1],[585.444 11 0],[585.607 45 1],[585.69 55 1],[585.968 90 1],[586.883 80 1],[587.383 22 1],[587.472 35 0],[587.81 35 0],[587.904 35 0],[587.925 80 1],[588.472 35 0],[589.223 55 1],[589.422 22 1],[590.311 40 1],[590.445 45 1],[590.867 40 1],[591.531 11 0],[591.597 11 0],[592.076 40 0],[593.066 40 1],[593.633 16 1],[593.99 160 1],[594.072 65 1],[594.165 22 0],[594.716 35 1],[594.976 22 0],[595.127 55 1],[595.176 20 1],[595.66 90 1],[595.925 13 0],[596.218 20 0],[596.3 28 0],[596.782 110 1],[597.695 13 0],[597.888 13 0],[598.119 65 1],[598.614 40 0],[598.714 45 0],[599.127 13 0],[599.489 13 0],[599.606 11 0],[600.244 29 1],[600.633 90 1],[600.854 13 0],[601.648 55 1],[601.78 150 1],[601.985 28 0],[602.572 150 1],[604.287 35 1],[604.666 55 1],[604.926 35 0],[605.004 28 1],[605.088 11 0],[605.513 140 0],[606.727 13 1],[608.581 13 0],[608.616 28 1],[608.752 65 1],[609.038 20 1],[609.309 28 1],[609.628 18 0],[610.672 22 1],[610.908 18 0],[611.438 65 1],[611.802 22 0],[612.215 22 0],[614.151 35 1],[614.823 65 0],[615.782 22 1],[615.91 13 1],[616.118 190 1],[616.538 18 0],[616.594 270 1],[618.234 55 1],[618.796 13 0],[619.745 35 1],[620.081 35 1],[620.563 13 1],[621.059 13 0],[621.273 22 0],[621.806 18 0],[623.68 20 0],[624.105 20 0],[624.435 45 1],[625.51 35 1],[626.255 40 1],[626.454 18 1],[627.466 22 1],[627.868 40 1],[628.128 110 1],[628.902 18 0],[629.801 11 0],[630.205 11 0],[630.235 35 1],[630.405 16 0],[630.523 35 1],[631.813 11 1],[632.236 45 0],[634.388 22 0],[634.711 28 1],[635.098 18 0],[635.72 22 0],[635.903 55 0],[636.362 11 1],[637.761 16 0],[637.859 16 0],[638.957 11 0],[639.199 18 0],[639.318 40 0],[639.796 45 1],[641.069 10 0],[641.123 55 0],[641.368 40 1],[641.543 10 0],[642.963 45 1],[643.184 45 1],[644.278 7 1],[644.391 9 1],[645.344 16 0],[645.484 9 1],[645.618 9 0],[646.019 9 0],[646.772 18 1],[647.526 9 1],[647.802 35 1],[648.655 45 0],[648.697 9 1],[649.175 40 0],[649.349 9 0],[649.489 11 0],[649.711 22 0],[649.894 18 1],[650.072 22 0],[650.409 9 0],[651.714 8 0],[651.879 16 1],[653.452 8 0],[654.047 16 0],[655.33 7 0],[656.462 22 1],[656.677 45 1],[657.103 7 0],[657.8 6 0],[658.456 6 1],[659.374 9 1],[659.548 11 0],[660.986 15 0],[661.667 55 0],[661.834 11 1],[663.1 7 0],[663.206 13 0],[664.712 14 0],[665.683 75 1],[667.341 55 1],[667.378 75 1],[668.751 5 1],[669.925 4 0],[673.679 13 0],[674.709 35 0],[674.919 19 0],[678.499 7 1],[679.86 55 0],[681.176 11 1],[681.287 17 1],[681.404 13 1],[681.761 9 0],[682.76 35 1],[683.05 19 1],[684.439 9 0],[684.547 9 1],[684.659 9 1],[685.046 17 1],[685.277 11 0],[687.044 11 0],[688.466 7 0],[689.271 8 0],[697.038 8 -1],[698.012 8 0],[702.151 40 1],[702.453 10 0],[704.24 13 0],[704.445 8 1],[705.107 7 0],[707.999 10 0],[709.518 11 0],[711.455 20 0],[711.69 10 0],[711.824 11 1],[713.733 7 1],[715.988 10 0],[716.777 7 1],[718.995 7 0],[720.885 10 1],[722.77 24 1],[723.153 13 0],[724.326 7 0],[725.921 7 0],[728.761 7 0],[728.919 7 0],[732.442 7 0],[732.847 7 0],[734.486 7 -1],[740.756 16 1],[745.174 20 1],[749.559 11 0],[749.942 6 0],[754.102 14 1],[757.486 6 0],[764.566 20 1],[770.498 7 1],[772.184 16 0],[778.616 6 1],[381.725 60 2],[386.18 60 2],[398.051 150 2],[400.02 200 2],[401.836 90 2],[402.96 180 2],[414.246 90 2],[414.448 120 2],[414.785 90 2],[417.215 90 2],[417.977 150 2],[418.418 180 2],[419.701 240 2],[421.945 120 2],[423.145 180 2],[427.507 180 2],[428.632 120 2],[429.827 90 2],[430.173 90 2],[431.634 90 2],[435.428 60 2],[437.982 90 2],[438.147 90 2],[440.471 120 2],[442.11 120 2],[443.185 120 2],[444.793 150 2],[445.014 180 2],[445.1 120 2],[446.102 120 2],[446.181 200 2],[450.031 300 2],[461.202 450 2],[462.518 600 2],[465.416 120 2],[471.37 600 2],[472.555 300 2],[472.821 270 2],[474.711 300 2],[477.183 300 2],[477.53 450 2],[485.739 600 2],[520.851 150 2],[526.168 150 2],[526.444 1000 2],[528.47 1500 2],[529.999 1500 2],[534.002 1500 2],[542.77 100 2],[558.174 100 2],[564.68 150 2],[576.527 600 2],[584.441 1500 2],[594.798 200 2],[595.605 7000 2],[599.894 900 2],[605.301 1500 2],[607.109 900 2],[609.002 9000 2],[616.024 5000 2],[616.122 1500 2],[619.505 100 2],[619.563 2000 2],[631.036 200 2],[636.165 100 2],[642.926 300 2],[644.474 300 2],[650.004 600 2],[650.149 300 2],[657.89 200 2],[661.646 100 2],[670.67 600 2],[672.763 100 2],[682.796 200 2],[685.463 100 2],[685.73 200 2],[686.68 1000 2],[689.906 1000 2],[690.352 500 2],[691.014 7000 2],[693.455 150 2],[697.096 500 2],[697.983 100 2],[703.039 5000 2],[707.521 100 2],[707.662 4500 2],[708.399 100 2],[711.253 500 2],[716.564 100 2],[723.162 250 2],[723.826 100 2],[724.021 250 2],[726.232 100 2],[734.069 150 2],[734.37 350 2],[734.975 200 2],[735.061 300 2],[735.552 100 2],[742.648 2000 2],[742.905 4000 2],[746.396 100 2],[748.74 250 2],[749.32 200 2],[751.117 100 2],[752.911 500 2],[754.92 100 2],[758.864 150 2],[759.641 300 2],[762.563 100 2],[764.834 100 2],[767.065 100 2],[767.465 200 2],[774.234 500 2],[774.559 250 2],[775.431 500 2],[775.548 100 2],[778.198 3000 2]}{9000}% -\wl@elt@search{#1}{Nd}{[380.112 370 1],[380.138 200 1],[380.23 340 1],[380.347 1200 1],[380.41 200 1],[380.536 2500 1],[380.555 340 1],[380.723 470 1],[380.877 540 1],[380.906 440 1],[381.049 580 1],[381.106 240 1],[381.177 270 1],[381.253 200 1],[381.473 710 1],[381.97 240 1],[382.247 410 1],[382.642 1200 1],[382.8 240 1],[382.885 540 1],[382.916 440 1],[383.047 510 1],[383.654 740 1],[383.791 340 1],[383.898 1700 1],[383.951 340 1],[384.182 410 1],[384.824 1700 1],[384.852 1500 1],[385.022 470 1],[385.166 2400 1],[385.855 340 1],[386.094 270 1],[386.252 300 1],[386.333 3700 1],[386.652 240 1],[386.681 220 1],[386.907 850 1],[387.574 240 1],[387.587 470 1],[387.858 1100 1],[387.955 1000 1],[388.038 780 1],[388.078 1200 1],[388.159 200 -1],[388.787 540 1],[388.966 370 1],[388.993 1300 1],[389.058 1300 1],[389.094 1300 1],[389.151 580 1],[389.206 470 1],[389.463 810 1],[389.613 270 1],[389.763 440 1],[390.021 2000 1],[390.184 1300 1],[390.589 1700 1],[390.77 200 1],[390.784 510 1],[391.116 2000 1],[391.223 850 1],[391.369 340 1],[391.513 440 1],[391.595 610 1],[391.765 340 1],[391.992 220 1],[392.096 1100 1],[392.71 510 1],[392.926 200 1],[393.482 610 1],[393.611 410 1],[393.886 510 1],[394.151 2000 1],[395.116 2000 1],[395.22 810 1],[395.287 320 1],[395.352 320 1],[395.745 240 1],[395.8 590 1],[396.221 510 1],[396.312 1400 1],[396.39 270 1],[397.33 1100 1],[397.369 740 1],[397.685 740 1],[397.949 740 1],[398.236 320 1],[398.625 470 1],[399.01 1400 1],[399.174 1000 1],[399.468 1100 1],[400.05 410 1],[400.402 540 1],[400.743 410 1],[401.225 3700 1],[401.27 540 1],[401.881 370 1],[402.087 1000 1],[402.134 1000 1],[402.178 1000 1],[402.3 1200 1],[402.478 340 1],[403.047 410 1],[403.182 1200 1],[403.812 270 1],[404.08 3000 1],[404.106 200 1],[404.359 410 1],[404.881 410 1],[405.115 850 1],[405.996 850 1],[406.109 4700 1],[406.928 1100 1],[407.512 710 1],[407.528 470 1],[407.762 240 1],[408.023 470 1],[408.582 240 1],[409.613 270 1],[409.818 220 1],[410.659 200 1],[410.908 1400 1],[410.946 2500 1],[411.048 510 1],[411.383 300 1],[412.388 410 1],[413.336 470 1],[413.533 510 1],[415.608 3000 1],[415.626 510 1],[416.057 340 1],[416.8 410 1],[417.561 810 1],[417.732 2400 1],[417.864 200 1],[417.959 640 1],[418.498 250 1],[420.56 470 1],[421.129 470 1],[422.025 290 1],[422.773 440 1],[423.238 1300 1],[423.419 250 1],[423.524 290 1],[423.984 290 1],[424.738 2000 1],[425.244 850 1],[425.429 290 -1],[426.184 410 1],[426.671 340 1],[427.056 240 1],[427.279 340 1],[427.509 340 1],[428.244 470 1],[428.257 240 1],[428.452 710 1],[429.78 270 1],[430.358 5400 1],[430.445 340 1],[430.778 200 1],[431.452 470 1],[432.576 1100 1],[432.793 510 1],[433.87 540 1],[435.129 680 1],[435.817 850 1],[436.638 240 1],[436.864 340 1],[437.493 470 1],[438.566 710 1],[439.066 250 1],[440.083 540 1],[441.106 510 1],[444.639 580 1],[445.157 1400 1],[445.199 200 1],[445.64 300 1],[446.299 740 1],[450.182 410 1],[450.659 200 1],[451.334 170 1],[451.636 250 1],[452.725 120 0],[454.127 340 1],[454.261 340 1],[455.614 100 1],[455.967 170 0],[456.322 340 1],[457.889 200 1],[457.932 200 1],[458.662 100 0],[459.702 200 1],[460.382 100 0],[460.987 100 0],[462.194 300 0],[462.798 100 0],[463.424 510 0],[464.11 340 0],[464.577 250 1],[464.64 200 0],[464.967 300 0],[465.473 200 0],[467.056 130 1],[468.074 170 1],[468.345 310 0],[468.404 110 0],[469.035 110 0],[469.644 190 0],[470.357 130 1],[470.654 470 1],[470.696 140 0],[470.971 190 1],[471.559 190 1],[471.902 240 0],[472.435 190 1],[473.177 140 0],[477.946 120 0],[478.941 170 1],[479.715 120 1],[481.134 240 1],[482.034 140 1],[482.548 350 1],[483.228 130 1],[484.906 110 1],[485.902 280 1],[486.674 190 0],[488.381 350 0],[488.91 140 1],[489.07 220 1],[489.107 240 0],[489.693 280 0],[490.153 120 0],[490.184 210 0],[490.203 110 1],[491.341 190 0],[491.437 170 1],[492.068 330 1],[492.453 470 0],[494.483 260 0],[495.478 290 0],[495.913 290 1],[496.139 150 1],[498.994 250 1],[503.352 150 1],[506.373 110 1],[507.659 360 1],[508.984 150 1],[509.28 360 1],[510.239 180 1],[510.521 150 1],[510.759 360 1],[512.379 340 1],[513.06 680 1],[513.233 170 1],[516.514 170 1],[518.117 130 1],[518.26 120 1],[519.145 500 1],[519.262 630 1],[520.012 330 1],[521.237 310 1],[521.323 150 0],[522.505 130 1],[522.843 130 1],[523.42 450 1],[523.979 250 1],[524.959 720 1],[525.082 200 1],[525.551 360 1],[526.948 120 1],[527.343 590 1],[527.688 150 1],[529.167 110 0],[529.317 680 1],[530.228 160 1],[530.647 110 1],[531.146 220 1],[531.982 500 1],[535.698 180 1],[536.147 290 1],[537.194 150 1],[538.59 110 1],[543.153 160 1],[545.112 110 1],[548.57 170 1],[550.147 35 0],[552.572 45 0],[553.382 90 0],[553.527 55 1],[554.324 55 0],[554.847 55 1],[556.117 55 0],[557.55 27 0],[557.67 27 0],[557.77 27 0],[558.761 27 0],[559.443 240 1],[560.143 55 0],[560.192 45 0],[562.054 220 0],[563.576 65 0],[563.954 45 0],[565.357 35 0],[566.887 70 1],[566.977 65 0],[567.597 140 0],[567.633 55 0],[568.853 220 1],[568.951 23 0],[570.157 30 0],[570.224 130 1],[570.621 80 1],[570.828 160 1],[571.812 80 1],[572.683 65 1],[572.929 100 0],[573.455 23 -1],[574.086 70 1],[574.919 55 0],[574.966 27 0],[576.733 23 0],[577.612 45 0],[578.496 45 0],[578.822 45 0],[580.009 45 0],[580.402 160 1],[581.157 80 1],[581.389 45 0],[582.037 27 0],[582.587 70 1],[582.674 30 0],[584.239 80 1],[584.466 30 0],[584.595 23 0],[585.891 55 0],[586.708 35 0],[586.89 30 0],[587.104 27 0],[588.329 30 0],[588.624 23 0],[588.791 30 0],[592.122 27 0],[595.587 27 0],[599.476 30 0],[599.647 27 0],[600.767 45 0],[603.127 35 1],[603.329 27 0],[603.424 45 1],[606.603 55 0],[607.17 27 0],[607.397 30 0],[613.347 23 1],[614.928 27 0],[615.506 27 0],[615.783 35 1],[616.667 23 1],[617.049 35 1],[617.859 45 0],[618.391 27 1],[620.824 27 0],[622.339 45 0],[622.65 27 0],[623.85 23 1],[624.408 35 0],[625.749 23 0],[625.873 27 1],[627.729 23 1],[628.579 27 0],[629.284 23 1],[629.707 23 0],[631.049 55 0],[634.151 27 1],[638.207 23 1],[638.52 65 1],[648.569 35 0],[663.014 45 0],[663.796 35 1],[665.057 45 1],[665.567 30 0],[673.779 25 1],[674.011 40 1],[674.254 25 0],[679.037 30 1],[680.4 30 1],[684.672 25 1],[690.043 40 1],[694.139 24 1],[701.08 17 1],[701.885 8 1],[702.092 17 1],[702.458 17 1],[703.321 10 -1],[703.73 35 1],[705.214 7 1],[705.474 7 1],[706.147 7 1],[706.689 40 1],[708.293 8 1],[708.971 12 1],[709.209 12 -1],[709.274 12 1],[709.294 12 -1],[709.398 17 0],[709.542 20 0],[712.935 29 1],[714.204 12 1],[714.372 10 -1],[715.103 8 1],[715.309 6 0],[718.501 6 -1],[718.909 10 1],[718.942 24 1],[719.201 20 1],[719.9 10 1],[722.701 8 0],[723.654 15 1],[726.164 7 1],[728.529 9 1],[728.856 9 1],[729.138 6 1],[729.872 7 1],[731.681 12 1],[732.143 7 0],[732.312 7 1],[733.454 6 0],[735.71 6 0],[737.404 6 1],[738.179 7 1],[740.131 9 0],[740.662 10 1],[741.12 6 1],[741.818 10 1],[742.741 9 1],[744.871 9 1],[748.128 5 1],[751.116 12 1],[751.373 17 1],[751.444 7 1],[751.602 7 1],[752.645 9 1],[752.899 12 1],[753.826 10 1],[754.097 5 1],[754.7 7 1],[757.754 5 1],[758.765 7 1],[759.075 6 1],[760.373 6 1],[760.592 5 1],[761.472 5 0],[763.979 9 1],[764.6 8 1],[766.352 6 1],[769.656 12 1],[771.82 6 1],[774.39 4 1],[774.892 4 1],[775.095 10 1],[777.306 6 1],[779.222 7 1],[779.64 6 1],[779.732 8 1],[779.832 5 1]}{5400}% -\wl@elt@search{#1}{Pm}{[380.606 250 1],[380.92 300 0],[381.093 400 0],[381.926 200 1],[382.053 300 1],[383.952 300 0],[384.288 200 1],[384.298 300 1],[384.538 250 1],[387.403 300 0],[387.762 800 1],[388.579 300 0],[389.097 250 0],[389.215 1000 1],[389.873 300 0],[389.978 400 1],[390.95 250 1],[391.026 1000 1],[391.91 1000 1],[393.648 800 1],[394.421 300 1],[395.476 300 0],[395.774 1000 1],[398.074 500 1],[399.505 300 1],[399.896 1000 1],[400.996 500 1],[401.272 200 1],[401.42 250 1],[401.934 200 1],[402.82 250 1],[404.536 200 1],[405.154 300 1],[405.52 600 1],[405.656 200 0],[407.584 600 1],[408.531 200 0],[408.61 500 1],[414.046 250 1],[418.574 200 1],[419.292 300 1],[419.47 200 1],[422.215 200 1],[426.432 300 0],[428.437 300 0],[429.778 600 1],[430.389 200 1],[430.564 200 0],[431.88 400 0],[432.592 250 1],[433.205 200 1],[433.654 300 1],[433.748 200 1],[434.212 300 1],[434.772 200 0],[436.392 350 0],[436.964 300 0],[438.188 200 1],[438.849 400 0],[438.876 200 1],[440.942 400 0],[441.247 500 0],[441.796 1000 1],[443.251 400 1],[443.586 250 0],[443.655 300 0],[443.868 300 0],[444.541 500 1],[444.69 600 1],[445.395 800 1],[445.997 200 1],[446.816 250 0],[447.148 200 1],[447.323 300 1],[447.746 200 1],[447.858 350 0],[448.16 300 0],[448.505 300 0],[449.05 300 0],[449.205 250 1],[450.015 600 1],[450.033 350 0],[450.684 250 0],[450.938 100 1],[451.356 100 1],[451.731 200 0],[452.332 200 0],[452.52 600 1],[452.612 250 0],[452.676 250 0],[452.77 400 0],[452.921 800 1],[454.006 300 0],[454.142 300 0],[454.175 450 0],[454.408 500 0],[454.517 200 0],[454.978 400 0],[455.403 300 0],[455.463 200 0],[455.534 500 0],[455.606 200 0],[455.703 300 0],[455.921 300 0],[456.483 100 1],[456.814 300 0],[457.037 200 0],[457.215 300 0],[457.527 400 0],[457.828 300 0],[457.841 200 0],[457.948 300 0],[458.114 300 0],[458.549 300 0],[459.382 200 0],[459.582 400 0],[459.755 800 0],[460.025 500 0],[460.296 400 0],[460.459 400 0],[460.566 600 0],[460.985 500 0],[461.587 100 1],[461.702 600 0],[461.84 200 0],[461.849 400 0],[461.975 500 0],[462.157 500 0],[462.331 500 0],[462.368 700 0],[462.441 900 0],[462.529 500 0],[462.76 400 0],[463.093 200 0],[463.345 600 0],[464.096 400 0],[464.336 700 0],[464.376 700 0],[464.594 400 0],[464.703 600 0],[465.042 600 0],[465.052 500 0],[465.341 400 0],[465.45 400 0],[465.505 500 0],[465.938 300 0],[466.079 500 0],[466.326 300 0],[466.346 600 0],[466.519 400 0],[467.123 500 0],[467.176 400 0],[467.442 500 0],[467.746 200 0],[467.792 500 0],[467.809 400 0],[468.292 700 0],[469.68 500 0],[469.951 200 0],[472.206 250 1],[472.706 300 0],[472.836 900 0],[472.868 400 0],[473.427 800 0],[473.799 200 0],[473.908 100 1],[473.978 200 0],[474.513 350 0],[475.773 500 0],[475.9 800 0],[476.257 700 0],[477.346 700 0],[478.129 900 0],[479.459 250 0],[479.543 200 0],[479.898 700 0],[480.136 900 0],[480.954 700 0],[481.196 900 0],[481.712 400 0],[482.772 400 0],[483.766 800 0],[483.892 400 0],[483.962 300 0],[484.401 200 0],[485.273 350 0],[486.062 400 0],[486.074 700 0],[486.53 300 0],[486.572 500 0],[486.98 400 0],[487.242 700 0],[488.702 500 0],[489.252 700 0],[490.03 400 0],[490.428 300 0],[491.828 400 0],[493.299 600 0],[495.946 700 0],[497.14 100 1],[499.71 500 0],[503.08 200 0],[505.831 300 0],[506.735 100 1],[508.052 150 1],[508.935 150 1],[509.242 200 0],[509.483 400 0],[509.618 200 0],[509.73 150 1],[510.077 400 0],[512.147 250 1],[512.734 400 0],[512.975 200 0],[514.513 400 0],[514.63 500 0],[515.386 400 1],[516.971 300 1],[517.158 500 1],[519.405 300 1],[520.809 500 1],[521.596 150 1],[522.512 250 1],[523.626 500 1],[523.666 300 1],[524.633 400 1],[526.242 150 1],[527.064 500 1],[529.392 200 1],[530.886 100 1],[531.858 150 1],[541.045 200 1],[542.454 200 1],[542.479 180 1],[542.904 150 1],[546.764 100 1],[549.545 150 1],[551.642 100 1],[553.496 180 1],[553.738 200 0],[554.608 800 1],[555.688 120 1],[555.839 150 1],[556.173 200 1],[557.602 800 1],[564.129 200 1],[573.081 200 0],[576.816 200 1],[577.699 200 0],[582.393 500 1],[586.879 300 1],[587.531 200 1],[587.876 100 1],[589.976 150 1],[590.471 250 0],[590.59 100 0],[591.496 125 0],[592.717 250 1],[593.966 150 0],[594.649 400 1],[595.642 800 0],[595.669 200 0],[596.008 100 1],[596.3 150 1],[596.789 400 0],[597.973 200 0],[598.482 200 0],[598.713 100 1],[599.712 400 0],[602.711 200 1],[603.006 300 0],[603.132 400 0],[604.339 500 0],[605.257 150 1],[606.7 100 1],[606.906 500 0],[607.64 100 1],[608.541 200 1],[610.021 900 0],[610.64 400 0],[611.49 100 1],[615.176 400 0],[615.953 100 1],[616.316 400 0],[618.452 100 1],[620.891 200 1],[622.964 500 0],[623.779 400 0],[626.325 100 1],[627.269 400 0],[628.606 400 0],[630.829 500 0],[631.42 100 1],[632.384 700 0],[639.031 500 0],[642.964 100 1],[643.193 500 0],[643.657 100 1],[648.761 400 0],[651.034 400 0],[651.725 500 0],[651.943 200 1],[652.045 1000 0],[654.22 500 0],[655.848 100 1],[658.639 100 1],[659.229 100 1],[659.815 900 0],[659.866 800 0],[660.637 700 0],[662.523 800 0],[662.554 100 1],[664.981 700 0],[665.905 400 1],[666.125 100 1],[666.168 500 0],[666.376 400 0],[666.751 800 0],[667.747 700 0],[668.089 200 1],[668.555 500 0],[668.568 500 0],[669.009 150 1],[670.033 600 0],[670.627 100 1],[671.467 700 0],[671.726 500 0],[672.071 500 0],[672.75 700 0],[674.371 600 0],[674.991 900 0],[675.048 900 0],[675.645 200 1],[677.229 300 1],[677.878 400 0],[678.309 100 1],[679.687 100 1],[681.168 200 1],[683.33 800 0],[684.837 400 0],[685.858 50 1]}{1000}% -\wl@elt@search{#1}{Sm}{[380.089 800 1],[380.563 320 1],[380.846 420 1],[380.975 320 1],[380.988 320 1],[381.043 420 1],[381.207 500 1],[381.363 480 1],[381.463 420 1],[382.082 930 -1],[382.418 530 1],[382.62 1600 1],[383.029 530 1],[383.15 1100 1],[383.383 530 1],[383.448 560 0],[383.46 560 1],[383.572 370 1],[383.894 500 1],[384.045 400 1],[384.35 1600 1],[384.751 530 1],[384.878 640 1],[385.188 420 1],[385.33 530 0],[385.421 2700 1],[385.456 480 0],[385.59 800 1],[385.791 480 1],[385.874 400 0],[386.205 660 1],[386.223 350 1],[386.524 320 1],[387.178 800 1],[387.519 400 1],[387.554 560 1],[388.077 800 1],[388.138 450 1],[388.179 450 1],[388.25 320 1],[388.529 3700 1],[388.916 660 1],[389.008 610 1],[389.121 320 1],[389.405 400 1],[389.698 1600 1],[390.342 1300 1],[391.744 620 1],[392.24 2500 1],[392.828 1900 1],[393.576 470 1],[394.187 1300 1],[394.324 620 1],[394.651 500 1],[394.811 740 1],[395.189 470 0],[395.953 370 1],[396.3 1500 1],[396.604 620 1],[396.768 470 1],[397.053 740 1],[397.14 1500 1],[397.466 620 0],[397.627 960 1],[397.643 1000 1],[397.92 960 1],[398.314 740 1],[398.668 740 1],[398.743 370 1],[399 1500 1],[399.331 740 1],[400.346 280 1],[400.748 470 1],[401.998 280 1],[402.323 880 1],[403.511 740 1],[404.168 590 1],[404.272 740 1],[404.29 880 1],[404.411 240 1],[404.505 560 1],[404.616 440 1],[404.716 740 1],[404.862 210 1],[404.981 590 1],[405.887 440 1],[406.354 560 1],[406.432 280 1],[406.458 1400 1],[406.674 810 1],[406.833 710 1],[407.584 810 1],[407.665 280 1],[408.056 240 1],[408.26 410 1],[408.358 280 1],[408.44 220 1],[409.227 1000 1],[409.405 290 1],[410.413 240 1],[410.728 810 1],[410.94 410 1],[411.019 280 1],[411.39 410 1],[411.855 1900 1],[412.136 410 1],[412.251 280 1],[412.396 710 1],[412.923 280 1],[413.514 250 1],[414.771 320 1],[414.983 810 1],[415.221 1200 1],[415.333 530 1],[415.522 560 1],[416.948 810 1],[417.157 410 1],[417.802 440 1],[418.11 530 1],[418.333 210 0],[418.376 530 1],[418.813 1000 1],[419.193 410 1],[419.945 270 1],[420.292 650 1],[420.305 1100 1],[420.613 660 1],[420.662 270 1],[421.035 660 1],[422.066 740 1],[422.533 1000 1],[422.97 740 1],[423.457 620 1],[423.674 1200 1],[423.766 500 1],[424.47 620 1],[424.955 210 1],[425.178 250 1],[425.639 2100 1],[425.858 210 1],[426.268 1300 1],[426.508 500 1],[427.968 1200 1],[427.994 240 1],[428.079 2200 1],[428.221 710 0],[428.283 470 0],[428.35 240 0],[428.664 350 1],[429.218 350 1],[429.674 1600 0],[430.494 320 1],[430.901 880 1],[431.285 240 0],[431.894 1900 1],[431.953 470 0],[432.328 590 1],[432.446 240 0],[432.902 1800 1],[433.002 440 0],[433.415 1300 1],[433.614 880 0],[434.586 560 1],[434.78 1100 1],[435.046 560 1],[435.21 560 1],[436.072 560 1],[436.107 220 1],[436.204 810 1],[436.291 440 0],[436.345 220 1],[436.803 500 1],[436.992 210 1],[437.346 440 1],[437.498 320 1],[437.824 880 1],[438.042 530 0],[438.429 290 1],[439.086 1600 1],[439.335 210 0],[439.734 290 0],[440.117 410 0],[440.306 810 1],[440.336 410 1],[440.933 520 1],[441.158 290 0],[441.758 380 1],[441.933 470 0],[442.053 1500 1],[442.114 960 1],[442.434 2900 1],[442.966 470 0],[443.388 1600 1],[443.432 1800 1],[444.181 530 0],[444.228 440 0],[444.426 710 1],[444.515 710 0],[445.273 1300 1],[445.295 250 0],[445.463 1200 1],[445.852 1000 1],[445.929 250 0],[446.734 2200 1],[447.089 810 0],[447.243 470 1],[447.302 620 1],[447.866 740 1],[449.911 370 0],[449.948 370 1],[450.338 240 0],[450.505 180 1],[451.133 120 0],[451.183 560 1],[451.509 440 1],[451.963 880 1],[452.304 440 1],[452.391 650 1],[453.38 290 0],[453.651 270 1],[453.795 710 1],[453.853 150 1],[454.019 290 1],[454.206 380 1],[454.395 810 1],[454.483 100 1],[455.266 410 1],[455.445 270 1],[456.043 240 1],[456.621 470 1],[457.769 590 1],[458.158 290 0],[458.173 440 0],[458.483 560 1],[459.182 290 1],[459.354 380 1],[459.529 560 1],[459.674 240 0],[460.418 220 1],[460.651 290 1],[461.544 290 1],[461.569 470 1],[463.021 150 1],[464.224 880 1],[464.54 290 0],[464.668 290 1],[464.816 240 1],[464.949 380 0],[465.513 150 1],[466.356 290 0],[466.94 740 1],[466.965 620 1],[467.075 470 0],[467.46 1100 1],[467.691 680 1],[468.155 210 0],[468.718 370 1],[468.873 370 0],[469.363 130 1],[469.934 120 1],[470.44 530 1],[471.306 270 1],[471.526 130 1],[471.61 730 0],[471.707 270 0],[471.772 210 1],[471.833 190 1],[471.984 270 1],[472.602 130 1],[472.842 770 0],[474.568 470 1],[475.072 150 0],[476.027 730 0],[477.02 110 0],[477.415 110 1],[477.785 190 1],[478.31 580 0],[478.586 350 0],[478.996 160 0],[479.158 230 1],[481.581 430 1],[482.957 130 1],[484.17 970 0],[484.421 310 1],[484.776 140 1],[484.832 270 0],[485.436 120 1],[488.377 210 0],[488.397 730 0],[490.497 170 0],[491.04 630 0],[491.325 350 1],[491.899 430 0],[492.404 110 0],[493.81 120 1],[494.863 170 1],[495.237 120 1],[496.194 170 1],[497.598 170 0],[502.844 140 1],[504.428 400 0],[505.276 200 1],[506.946 170 1],[507.12 540 0],[510.022 170 1],[510.309 260 1],[510.448 140 1],[511.67 140 1],[511.716 510 0],[512.214 350 0],[515.503 360 1],[517.274 250 0],[517.542 470 0],[520.059 250 0],[525.192 260 0],[527.14 400 0],[528.291 250 0],[532.06 190 0],[534.129 110 0],[536.836 140 0],[540.523 130 0],[545.3 220 0],[546.672 140 0],[549.372 230 0],[551.21 80 0],[551.609 230 0],[554.895 50 0],[555.04 140 0],[557.342 45 0],[558.82 35 0],[560.086 50 1],[562.179 50 0],[562.601 70 0],[564.41 85 0],[565.986 140 0],[569.673 120 0],[570.62 85 0],[571.093 35 0],[573.295 50 0],[574.335 50 1],[575.952 45 1],[577.377 70 0],[577.833 60 0],[577.924 45 0],[578.193 45 1],[578.698 70 1],[578.838 60 0],[580.052 60 0],[580.284 65 0],[581.489 45 0],[583.102 45 1],[583.637 45 1],[586.078 35 0],[586.779 65 0],[586.861 45 0],[587.106 35 0],[587.421 50 0],[589.739 45 1],[589.896 50 0],[593.89 35 1],[596.571 65 1],[596.882 35 1],[598.429 35 0],[604.5 50 0],[604.539 45 0],[607.006 50 0],[608.412 45 0],[609.14 35 0],[611.066 45 1],[615.956 45 0],[624.676 45 1],[625.654 45 0],[625.666 45 1],[626.728 100 1],[629.182 50 1],[630.706 35 1],[632.747 70 1],[642.664 45 1],[647.234 45 1],[648.452 35 1],[649.867 35 1],[654.276 50 1],[656.931 140 1],[657.067 35 1],[658.521 40 1],[658.972 110 1],[660.183 40 1],[660.456 95 1],[663.228 40 1],[667.151 50 0],[667.921 70 1],[669.355 70 1],[672.307 40 0],[673.184 120 1],[673.406 70 1],[673.481 40 1],[674.147 55 1],[677.861 40 1],[679 60 1],[679.42 95 1],[684.471 55 1],[685.603 75 1],[686.093 120 0],[686.282 40 1],[695.051 30 1],[695.529 120 1],[702.044 90 1],[703.673 13 1],[703.922 90 1],[704.224 90 1],[704.915 13 1],[705.152 90 1],[705.497 16 1],[707.467 19 0],[708.237 90 1],[708.552 40 1],[708.83 26 0],[709.116 16 0],[709.55 30 0],[709.633 16 0],[710.454 30 0],[710.623 19 0],[711.596 26 0],[711.751 23 1],[711.981 26 1],[712.24 12 1],[712.511 23 1],[713.18 13 0],[713.601 10 0],[713.939 12 1],[714.398 40 1],[714.96 85 1],[717.267 10 0],[718.957 10 1],[721.095 9 0],[721.382 23 0],[721.809 26 1],[722.007 13 0],[723.702 13 1],[724.09 60 1],[725.711 9 1],[726.152 9 1],[727.925 13 0],[728.147 26 1],[728.221 8 0],[728.333 19 1],[728.892 16 1],[729.023 13 0],[730.072 26 1],[732.708 13 1],[733.265 13 0],[733.804 8 0],[734.73 26 0],[737.669 26 1],[739.398 13 1],[744.456 30 0],[744.541 26 0],[745.303 26 1],[747.076 13 0],[748.199 26 1],[750.239 23 1],[751.7 10 1],[754.142 23 1],[754.474 9 0],[754.657 10 0],[756.003 12 1],[756.294 19 1],[757.095 23 1],[757.229 23 1],[757.809 19 1],[758.585 30 1],[758.831 23 1],[759.801 10 0],[760.748 23 1],[761.394 12 1],[763.177 10 1],[763.794 23 1],[764.509 45 1],[764.582 12 0],[764.802 19 1],[765.578 10 1],[766.72 19 1],[767.249 8 1],[767.879 10 1],[769.578 10 0],[771.204 23 1],[772.856 30 1],[773.626 30 1],[774.93 30 1],[775.52 23 1],[779.45 10 0]}{3700}% -\wl@elt@search{#1}{Eu}{[380.136 70 -1],[380.754 95 1],[381.133 120 0],[381.55 120 1],[381.967 39000 1],[382.668 120 1],[384.423 140 1],[386.557 190 0],[387.272 45 0],[387.727 70 1],[388.475 150 0],[389.678 23 0],[390.018 23 0],[390.051 70 0],[390.71 28000 1],[391.524 45 1],[391.6 45 0],[391.729 230 0],[391.77 23 1],[391.852 40 0],[391.909 100 1],[392.887 40 1],[393.048 32000 1],[394.156 55 1],[394.221 30 1],[394.294 60 1],[394.308 120 1],[394.459 30 1],[394.567 30 1],[394.913 30 1],[394.96 60 0],[395.076 45 1],[395.133 55 1],[395.575 60 0],[395.792 40 1],[396.361 30 0],[396.49 120 1],[396.659 150 1],[396.718 45 0],[397.196 30000 1],[397.842 60 0],[397.963 30 1],[398.66 55 0],[398.824 40 1],[399.393 30 1],[399.598 55 1],[400.371 60 1],[401.169 180 1],[401.758 150 1],[403.919 120 0],[407.824 45 0],[408.538 120 1],[409.68 75 1],[410.688 60 0],[411.204 90 1],[411.93 45 1],[412.728 75 0],[412.97 33000 1],[413.659 30 1],[413.707 40 0],[414.102 30 1],[414.172 60 1],[415.152 30 1],[415.164 45 1],[415.772 30 0],[417.28 110 1],[417.516 30 1],[418.222 110 0],[419.536 40 1],[419.618 40 1],[420.505 60000 1],[422.108 45 1],[422.388 40 1],[422.74 90 1],[422.933 75 1],[423.245 75 1],[423.751 90 1],[423.869 45 1],[424.474 45 0],[424.706 45 1],[425.38 45 1],[427.024 30 1],[429.873 150 0],[432.936 90 0],[432.997 75 0],[433.061 60 1],[433.118 40 0],[433.768 90 0],[435.509 240 1],[436.157 27 1],[436.947 55 1],[437.22 45 1],[438.317 75 1],[438.788 90 0],[440.527 21 1],[440.707 55 1],[441.966 18 1],[443.481 120 1],[443.556 14000 1],[446.497 75 1],[448.515 24 1],[452.257 3000 1],[453.559 45 0],[459.403 11000 0],[460.263 21 0],[462.722 9800 0],[466.188 8300 0],[471.359 30 0],[474.05 27 0],[479.259 45 0],[482.93 40 0],[483.033 60 0],[484.047 40 0],[484.964 60 0],[486.762 110 0],[488.405 40 0],[489.468 90 0],[490.086 60 0],[490.718 150 0],[491.14 180 0],[495.352 55 0],[496.021 55 0],[496.255 55 0],[497.576 45 0],[501.317 180 0],[502.291 170 0],[502.954 110 0],[503.355 90 0],[506.795 75 0],[509.269 75 0],[509.644 90 0],[511.437 170 0],[512.477 90 0],[512.91 170 0],[513.008 90 0],[513.352 210 0],[516.007 270 0],[516.67 210 0],[519.374 60 0],[519.985 200 0],[520.096 110 0],[520.644 120 0],[521.51 750 0],[522.349 300 0],[523.924 120 0],[526.64 200 0],[527.196 390 0],[527.248 110 0],[528.282 150 0],[528.725 55 0],[528.925 60 0],[529.126 120 0],[529.368 60 0],[529.464 120 0],[530.385 90 0],[535.041 30 0],[535.169 75 0],[535.284 40 0],[535.51 90 0],[535.761 540 0],[536.083 60 0],[536.161 120 0],[537.694 110 0],[539.294 120 0],[540.277 450 0],[540.533 45 0],[541.186 45 0],[542.107 55 0],[542.694 90 0],[544.356 40 0],[545.151 380 0],[545.294 260 0],[545.762 40 0],[547.232 90 0],[548.865 120 0],[549.52 45 0],[550.083 15 0],[551.052 120 0],[552.663 30 0],[553.325 30 0],[554.254 30 0],[554.744 200 0],[557.033 150 0],[557.714 200 0],[557.963 75 0],[558.003 120 0],[558.624 90 0],[558.683 75 0],[559.225 18 0],[559.98 18 0],[560.586 18 0],[561.881 40 0],[562.244 60 0],[563.254 75 0],[564.58 210 0],[565.111 15 0],[567.385 60 0],[568.11 27 0],[568.424 27 0],[573.087 60 0],[573.9 60 0],[576.52 330 0],[578.369 180 0],[579.272 15 0],[580.027 60 0],[581.874 170 1],[583.098 600 0],[584.577 27 0],[586.097 27 0],[586.477 15 0],[587.298 90 1],[589.531 15 0],[590.297 27 0],[590.994 12 0],[591.574 75 0],[592.53 12 0],[592.652 27 0],[594.272 45 0],[595.349 27 0],[595.384 27 1],[595.428 30 0],[596.376 90 0],[596.607 330 1],[596.71 480 0],[596.843 15 0],[597.169 30 0],[597.275 170 0],[598.047 15 0],[598.314 27 0],[598.378 27 0],[599.283 240 0],[600.436 60 0],[600.561 15 0],[601.22 60 0],[601.256 110 0],[601.558 60 0],[601.815 420 0],[602.315 60 0],[602.9 170 0],[604.466 60 0],[604.951 420 1],[605.736 140 0],[607.558 90 0],[607.738 30 0],[608.384 240 0],[609.935 240 0],[610.815 60 0],[611.878 120 0],[612.467 60 0],[617.305 330 1],[617.876 110 0],[618.813 260 0],[619.507 140 0],[620.76 15 0],[623.051 15 0],[623.373 90 0],[625.047 55 0],[626.225 240 0],[626.695 55 0],[628.595 15 0],[629.134 60 0],[629.977 170 0],[630.341 230 1],[631.378 24 0],[631.858 15 0],[633.582 75 0],[635.004 120 0],[635.589 60 0],[636.925 60 0],[638.273 55 0],[638.386 75 0],[640.093 120 0],[640.611 40 0],[641.004 180 0],[641.132 140 0],[642.829 55 0],[643.764 830 1],[643.993 18 0],[645.796 120 0],[647.07 12 0],[648.302 18 0],[650.155 45 0],[651.959 60 0],[652.272 15 0],[654.912 8 0],[656.787 75 0],[659.379 45 0],[660.355 18 0],[664.511 1400 1],[668.521 26 0],[669.396 95 0],[670.106 7 0],[671.045 12 0],[674.488 30 0],[678.254 30 0],[678.748 14 0],[680.272 140 0],[681.606 35 0],[683.43 11 0],[684.093 17 0],[684.483 17 0],[684.704 14 0],[686.454 360 0],[689.821 21 0],[690.367 60 0],[691.017 14 0],[691.482 30 0],[704.02 120 0],[707.454 12 0],[707.71 330 1],[710.648 100 0],[716.466 6 0],[717.555 30 0],[719.481 570 1],[721.755 570 1],[722.468 11 0],[725.872 15 0],[726.277 30 0],[728.153 11 0],[729.756 6 0],[730.117 540 1],[731.046 11 0],[731.363 12 0],[733.618 55 0],[734.625 4 0],[735.665 4 0],[736.225 11 0],[736.96 55 0],[737.022 720 1],[738.736 4 0],[738.916 12 0],[740.441 11 0],[742.657 300 1],[743.659 21 0],[747.053 8 0],[749.1 5 0],[752.87 50 0],[753.302 5 0],[754.732 6 0],[758.391 160 0],[774.257 60 0],[774.619 70 0],[483.798 10 2],[666.635 50 2],[722.184 30 2],[769.044 20 2]}{60000}% -\wl@elt@search{#1}{Gd}{[380.129 720 1],[380.439 210 0],[380.509 210 1],[380.552 560 1],[381.397 3700 1],[381.474 430 1],[381.664 770 1],[381.875 430 1],[382.605 350 1],[382.733 230 1],[382.946 230 1],[383.18 370 1],[383.297 210 0],[383.499 330 1],[383.691 970 1],[383.964 1000 1],[384.22 1200 1],[384.328 1400 0],[384.458 1400 1],[385.069 3300 1],[385.097 5100 1],[385.245 4300 1],[385.556 470 1],[386.305 250 1],[386.699 1600 0],[387.357 250 0],[387.546 220 1],[389.47 1500 1],[389.579 450 1],[390.24 750 1],[390.271 300 0],[390.429 240 0],[390.565 450 0],[391.651 2200 1],[392.325 450 1],[393.479 1200 0],[393.538 220 0],[394.18 450 0],[394.263 590 0],[394.324 270 0],[394.362 220 0],[394.554 1400 0],[395.2 300 1],[395.337 590 0],[395.767 1200 1],[395.944 750 1],[396.366 220 1],[396.628 590 0],[396.826 590 1],[396.9 750 0],[396.929 270 1],[397.175 450 1],[397.271 390 0],[397.398 590 1],[397.481 300 0],[397.933 750 0],[398.721 450 1],[398.784 470 0],[399.269 320 0],[399.321 220 1],[399.416 650 1],[399.632 700 1],[399.776 320 1],[400.126 470 1],[400.494 260 1],[400.833 320 0],[400.891 300 1],[401.38 300 1],[401.558 200 0],[401.725 300 0],[401.771 430 0],[401.973 300 0],[402.233 300 1],[402.314 1100 0],[402.335 810 0],[402.761 220 0],[402.815 1100 0],[403.088 860 0],[403.349 700 0],[403.54 340 0],[403.684 260 0],[403.733 1400 1],[403.79 700 1],[404.371 410 0],[404.501 1600 0],[404.684 270 1],[404.709 270 0],[404.92 270 0],[404.943 1300 1],[404.986 2200 1],[405.037 270 0],[405.329 810 1],[405.364 2600 0],[405.472 810 0],[405.822 2600 0],[405.988 650 0],[406.13 270 1],[406.259 650 1],[406.339 1900 1],[406.359 540 1],[406.604 260 0],[406.835 520 0],[406.874 260 0],[407.029 750 1],[407.32 650 1],[407.376 300 1],[407.844 1300 1],[407.87 2800 0],[408.37 520 0],[408.556 1500 1],[408.769 260 1],[409.041 650 0],[409.271 1100 0],[409.372 260 0],[409.448 260 1],[409.861 2600 1],[409.89 520 1],[410.026 650 0],[411.144 390 1],[413.037 2200 1],[413.148 270 1],[413.228 1100 1],[413.416 750 0],[413.71 410 1],[414.886 280 0],[416.273 540 1],[416.309 280 1],[416.716 280 1],[417.554 2400 0],[418.425 2400 1],[419.078 2200 0],[419.107 750 1],[419.163 750 0],[419.768 450 1],[420.486 590 1],[421.2 1300 1],[421.502 970 1],[421.72 650 1],[422.503 320 0],[422.585 4800 0],[422.714 220 1],[422.98 220 1],[423.878 650 1],[424.657 200 1],[425.173 1700 1],[425.337 860 1],[425.361 650 1],[426.012 810 0],[426.209 1600 0],[426.66 650 0],[426.7 470 0],[427.417 300 0],[428.049 910 1],[428.582 430 0],[428.612 300 0],[429.608 540 1],[429.717 220 1],[429.929 430 0],[430.634 1100 0],[430.929 260 0],[431.384 1800 0],[431.44 520 0],[431.605 520 1],[432.052 370 0],[432.111 750 1],[432.557 2600 1],[432.712 1900 0],[432.958 370 0],[433.061 340 1],[433.138 240 0],[434.128 450 1],[434.218 910 1],[434.43 1000 1],[434.646 2200 0],[434.662 910 0],[434.731 220 1],[436.977 300 1],[437.383 970 0],[439.206 280 0],[440.186 1400 0],[440.314 520 0],[440.667 260 1],[440.825 260 1],[440.925 220 0],[441.116 520 0],[441.416 860 0],[441.473 700 0],[441.903 340 1],[442.241 1400 0],[443.063 1100 0],[443.61 240 0],[446.474 300 0],[446.655 300 1],[446.708 520 0],[447.413 700 0],[447.612 860 0],[447.88 220 1],[448.106 280 1],[448.333 220 1],[448.47 220 0],[448.69 280 0],[449.713 500 0],[449.732 220 0],[450.621 430 0],[450.633 140 1],[451.45 140 1],[451.966 1100 0],[452.282 300 1],[452.412 150 0],[453.781 910 0],[454.002 220 1],[454.203 300 0],[454.8 240 0],[455.808 120 1],[457.381 130 0],[457.591 260 0],[457.959 280 0],[458.129 410 0],[458.253 130 1],[458.307 410 0],[458.699 160 0],[459.698 220 1],[459.791 320 1],[459.89 410 0],[460.105 340 1],[460.293 240 0],[461.45 520 0],[462.442 140 0],[463.664 430 0],[463.9 110 1],[464.004 170 0],[464.6 170 0],[464.764 170 0],[464.859 170 0],[465.354 430 0],[467.087 140 0],[467.918 170 0],[468.004 260 0],[468.333 430 0],[468.812 140 0],[469.433 700 0],[469.549 170 0],[469.742 430 0],[470.313 170 0],[470.978 200 0],[472.146 110 0],[472.847 150 1],[473.26 220 1],[473.575 260 0],[474.365 410 0],[474.582 110 0],[475.87 320 0],[476.074 110 0],[476.382 130 0],[476.724 470 0],[478.192 180 0],[478.462 300 0],[478.675 110 0],[480.105 140 1],[480.745 220 0],[482.169 320 0],[483.526 130 0],[484.81 110 0],[486.259 110 0],[486.502 170 1],[487.15 120 0],[493.412 280 0],[493.861 220 0],[495.247 110 0],[495.879 130 0],[501.082 65 1],[501.174 55 0],[501.504 750 0],[502.313 55 1],[503.129 65 1],[503.909 75 0],[505.088 65 1],[507.374 55 0],[508.28 55 0],[509.225 95 1],[509.606 65 1],[509.838 130 1],[510.094 55 1],[510.345 910 0],[510.891 180 1],[512.556 120 1],[513.028 65 1],[513.559 65 0],[513.604 75 0],[514.084 85 1],[514.15 75 0],[514.268 75 0],[515.584 860 0],[515.676 55 1],[515.848 75 0],[516.37 75 0],[516.454 55 1],[517.628 190 1],[518.724 55 1],[518.788 55 0],[519.108 55 1],[519.777 410 0],[521.049 55 1],[521.748 85 0],[521.94 280 0],[522.03 75 1],[523.393 130 0],[524.687 65 0],[525.118 320 0],[525.214 120 1],[525.475 85 0],[525.58 140 0],[526.878 65 0],[527.291 55 0],[528.248 55 0],[528.308 280 0],[530.167 280 0],[530.276 220 0],[530.67 55 0],[530.73 280 0],[532.15 130 0],[532.178 280 0],[532.732 110 0],[532.83 65 0],[533.33 170 0],[533.753 55 0],[534.3 300 0],[534.513 85 0],[534.568 75 0],[534.867 200 0],[535.038 300 0],[535.326 240 0],[536.166 55 0],[536.538 95 0],[536.992 95 0],[537.063 150 0],[538.95 85 0],[541.32 85 0],[541.569 85 0],[545.346 65 0],[558.368 55 1],[559.185 55 0],[561.791 190 0],[562.955 65 0],[563.225 110 0],[564.324 260 0],[568.089 55 -1],[569.622 390 0],[570.135 95 0],[570.942 65 0],[573.386 120 1],[574.636 85 0],[575.417 85 0],[577.602 75 0],[579.138 240 0],[579.68 65 0],[580.292 55 0],[580.772 55 0],[580.922 55 0],[581.585 55 1],[581.951 65 -1],[584.047 55 1],[585.163 220 0],[585.524 55 1],[585.622 280 0],[586.073 55 1],[587.726 65 1],[588.646 55 0],[590.407 55 1],[590.456 110 0],[591.145 170 1],[591.355 65 1],[591.677 55 0],[593.029 85 0],[593.684 85 0],[593.771 65 0],[594.095 55 -1],[594.278 55 -1],[595.16 55 1],[595.648 55 1],[597.725 85 0],[598.802 110 0],[599.908 85 0],[600.096 65 -1],[600.187 75 -1],[600.457 55 1],[600.871 55 0],[602.113 55 0],[608.065 55 1],[611.407 430 0],[618.042 55 1],[618.268 110 -1],[620.086 110 -1],[621.171 110 -1],[622.093 110 -1],[623.162 55 -1],[624.166 75 -1],[625.212 55 -1],[626.264 55 -1],[627.3 45 -1],[628.973 85 1],[629.287 30 0],[630.515 75 1],[630.911 30 1],[631.719 27 0],[633.135 40 0],[633.375 17 0],[633.634 17 0],[634.665 27 1],[635.172 27 0],[636.323 17 0],[638.095 40 1],[638.219 17 1],[640.855 22 0],[642.242 22 1],[642.452 17 0],[647.029 19 0],[648.011 15 1],[653.815 40 0],[654.925 22 0],[656.478 55 0],[656.8 10 1],[657.38 10 0],[659.16 30 0],[659.342 15 0],[661.004 10 1],[663.436 50 1],[664.008 35 0],[664.276 10 0],[664.398 30 0],[664.685 10 0],[665.355 10 0],[667.956 10 1],[668.123 35 1],[669.286 10 0],[670.418 10 1],[671.814 14 1],[672.783 17 1],[673.073 85 0],[675.267 50 1],[675.391 14 1],[678.339 14 0],[678.633 26 1],[678.718 10 0],[681.456 12 0],[681.649 26 0],[682.09 17 0],[682.825 100 0],[684.66 35 1],[685.713 30 1],[686.425 15 0],[688.763 21 1],[690.073 14 1],[691.657 100 0],[692.062 21 1],[692.499 15 1],[692.649 21 0],[694.598 17 1],[695.774 15 1],[695.924 15 1],[696.433 14 0],[697.166 15 1],[697.635 12 1],[697.827 10 1],[698.086 26 0],[698.589 50 1],[698.875 10 1],[699.192 75 0],[699.318 21 0],[699.676 60 1],[700.075 17 1],[700.616 45 1],[701.66 10 0],[703.726 21 1],[705.1 14 1],[705.462 13 1],[705.802 10 1],[706.809 10 1],[707.1 18 0],[707.363 18 0],[709.811 14 0],[709.873 14 0],[711.677 10 1],[711.886 21 1],[712.257 35 0],[713.573 13 1],[714.731 18 1],[715.828 13 0],[716.837 170 0],[717.226 21 1],[718.957 28 1],[719.708 13 1],[720.141 13 1],[722.802 10 0],[723.345 25 0],[725.27 14 1],[726.266 28 0],[729.135 14 0],[731.328 21 0],[732.489 18 1],[737.381 14 0],[737.641 14 0],[737.727 13 1],[738.028 13 0],[739.49 13 1],[743.019 13 0],[744.185 35 0],[746.436 40 0],[756.297 55 0],[756.319 10 1],[758.82 10 0],[761.178 10 0],[762.196 21 0],[765.032 21 0],[767.256 25 0],[767.606 10 0],[769.445 13 0],[773.35 80 0],[774.93 35 0],[775.597 10 0],[776.648 10 1],[383.173 300 2],[391.024 300 2],[401.691 300 2],[417.726 600 2],[427.996 400 2],[431.428 300 2],[444.591 300 2],[468.425 600 2],[471.506 600 2],[478.279 600 2],[497.672 250 2],[509.17 5000 2],[512.406 300 2],[534.795 1800 2],[536.596 3000 2],[541.262 1100 2],[555.33 4000 2],[558.788 3000 2],[565.898 3000 2],[578.696 1800 2],[586.209 1500 2],[598.785 1500 2]}{5100}% -\wl@elt@search{#1}{Tb}{[380.18 330 1],[380.685 760 1],[383.026 1500 0],[383.342 540 0],[384.25 920 1],[384.561 370 1],[384.873 3700 1],[386.975 450 1],[387.417 3500 1],[388.334 330 0],[388.822 480 0],[389.464 490 0],[389.599 330 0],[389.658 330 1],[389.789 330 0],[389.92 2400 1],[390.133 1600 0],[390.806 480 0],[390.914 380 0],[390.955 330 0],[391.543 650 0],[391.952 480 1],[392.21 300 1],[392.274 480 1],[392.545 760 1],[393.524 650 1],[393.952 810 1],[394.689 650 1],[395.836 350 1],[397.684 2200 1],[398.187 1800 1],[398.385 300 1],[399.94 350 1],[400.219 350 1],[400.259 970 1],[400.547 1900 1],[401.004 300 0],[401.275 760 1],[401.326 330 0],[401.914 370 1],[402.047 540 1],[402.288 220 0],[402.477 370 0],[403.166 520 1],[403.228 870 0],[403.303 2100 1],[403.622 350 0],[403.886 210 0],[405.186 300 1],[405.287 300 1],[405.412 430 0],[406.037 410 0],[406.087 220 1],[406.158 1300 0],[406.389 220 1],[406.622 390 1],[407.522 260 0],[408.124 390 0],[408.66 210 0],[409.219 210 0],[409.437 260 1],[409.449 260 0],[410.39 260 1],[410.537 650 0],[411.25 300 0],[411.992 260 0],[414.351 280 0],[414.441 1100 1],[415.853 350 0],[416.909 240 0],[416.932 240 0],[417.105 240 0],[417.26 240 0],[417.282 240 0],[417.347 260 0],[418.621 240 0],[418.716 300 0],[419.674 390 0],[420.1 450 1],[420.374 650 0],[420.649 600 0],[421.35 300 0],[421.442 300 1],[421.509 480 0],[421.756 300 0],[421.916 260 0],[422.428 260 0],[422.645 480 1],[423.189 260 0],[423.282 480 0],[423.535 300 0],[425.524 370 0],[425.823 480 1],[426.366 260 0],[426.634 650 0],[426.969 330 0],[427.521 220 0],[427.852 760 1],[428.513 300 1],[428.97 300 0],[429.836 370 0],[429.99 300 0],[430.295 240 0],[430.718 240 0],[431.042 450 0],[431.156 300 0],[431.325 370 0],[431.883 2200 0],[432.223 600 0],[432.583 600 1],[432.643 3000 0],[432.89 240 0],[433.212 600 0],[433.643 870 0],[433.764 600 0],[433.841 1700 0],[434.062 700 0],[434.253 430 0],[435.32 430 1],[435.609 280 0],[435.681 870 0],[436.016 280 0],[436.73 220 1],[437.202 220 0],[438.245 330 0],[438.823 300 0],[439.091 260 0],[441.627 200 1],[442.019 140 0],[442.31 350 0],[443.272 110 0],[443.612 240 0],[443.938 110 0],[444.804 240 0],[446.769 110 0],[449.307 430 0],[450.904 45 1],[451.152 150 0],[451.296 45 1],[451.431 75 1],[451.972 45 1],[452.501 45 1],[452.976 45 -1],[453.183 45 1],[453.413 45 0],[453.714 45 0],[453.723 45 0],[454.907 110 0],[454.972 45 1],[455.045 110 0],[455.646 110 0],[456.224 55 1],[456.369 110 1],[456.485 30 1],[457.319 55 1],[457.869 210 1],[458.484 65 1],[459.156 65 1],[459.238 45 0],[460.41 45 1],[461.196 30 0],[461.592 45 1],[461.749 27 0],[461.936 30 1],[462.632 75 1],[462.694 95 1],[463.207 65 0],[463.659 65 0],[463.699 30 1],[464.1 85 1],[464.198 210 1],[464.531 260 1],[464.723 80 0],[465.838 60 0],[465.873 20 -1],[466.279 80 0],[466.545 50 0],[466.94 40 0],[467.69 80 0],[468.187 70 0],[468.252 50 0],[468.279 25 1],[468.863 80 1],[469.311 80 1],[469.339 30 1],[470.241 200 1],[470.794 110 1],[471.607 40 1],[472.816 40 1],[473.42 60 0],[473.993 80 0],[474.78 70 0],[475.253 410 1],[475.844 40 1],[476.019 40 1],[476.237 30 1],[476.447 25 1],[477.836 35 1],[477.88 35 1],[478.678 180 0],[478.991 40 1],[480.187 30 1],[481.377 100 0],[483.759 60 1],[484.039 25 0],[484.269 30 1],[484.489 30 1],[485.481 30 0],[485.654 20 1],[485.887 30 1],[487.557 80 1],[487.612 25 1],[488.115 80 1],[489.433 29 -1],[491.59 95 0],[492.409 35 0],[492.683 35 0],[492.893 50 0],[493.179 65 0],[497.099 29 1],[497.142 29 0],[497.304 29 0],[498.016 29 1],[498.056 29 0],[499.382 85 1],[499.584 50 1],[499.795 55 0],[500.61 29 1],[502.216 50 0],[502.424 29 1],[502.465 29 0],[503.312 50 0],[504.206 50 1],[505.43 55 0],[506.579 55 0],[507.825 110 0],[508.005 24 1],[508.111 24 0],[508.912 75 1],[508.966 24 0],[510.109 24 0],[510.856 24 0],[511.839 35 0],[512.018 24 0],[513.169 50 0],[514.108 50 1],[514.758 50 0],[516.427 24 0],[517.013 29 0],[517.061 24 0],[517.651 50 0],[517.997 50 0],[518.459 50 0],[518.613 85 0],[518.848 50 0],[519.886 50 0],[520.277 35 0],[520.455 40 0],[520.797 40 0],[521.428 40 0],[522.199 40 0],[522.812 120 0],[523.511 40 0],[524.871 75 0],[526.211 75 1],[527.503 24 0],[528.105 75 0],[530.472 65 0],[530.819 29 0],[530.946 29 0],[531.923 110 0],[533.104 35 0],[533.79 65 0],[533.859 35 0],[534.783 24 1],[535.488 160 0],[536.972 75 0],[537.598 75 0],[540.206 29 1],[541.365 29 0],[541.62 29 0],[542.41 50 1],[542.643 29 0],[544.338 35 0],[545.7 29 0],[545.981 55 0],[547.034 29 1],[548.145 24 0],[550.961 55 0],[551.454 50 0],[552.412 65 0],[552.562 24 0],[556.593 35 0],[563.88 29 0],[568.574 29 1],[568.648 40 0],[574.758 85 0],[576.266 24 0],[578.518 24 1],[579.564 75 0],[580.313 75 1],[581.536 65 0],[584.297 29 0],[585.107 65 0],[587.062 65 0],[589.884 35 0],[590.24 24 0],[590.471 35 0],[592.078 65 0],[593.938 50 0],[594.017 35 0],[595.117 24 0],[596.734 75 1],[603.897 29 0],[603.938 29 0],[610.429 24 1],[629.243 24 0],[633.168 35 1],[633.491 24 1],[644.687 24 1],[651.868 35 0],[657.404 24 1],[658.182 35 0],[660.717 30 1],[667.794 90 1],[670.261 40 0],[670.679 20 1],[678.512 30 1],[679.458 130 1],[687.418 40 1],[689.637 55 1],[689.995 45 0],[690.198 40 0],[700.599 9 1],[708.285 17 1],[708.922 11 1],[711.269 11 0],[718.748 10 0],[719.589 10 1],[720.428 65 0],[723.498 19 0],[725.773 40 0],[731.157 17 0],[734.888 45 1],[739.827 10 1],[742.424 15 1],[742.962 10 1],[747.215 9 0],[748.454 22 0],[749.545 9 0],[749.612 45 0],[749.969 17 1],[751.14 27 0],[751.977 9 1],[755.759 6 1],[758.203 27 1],[758.749 27 0],[759.024 45 0],[759.644 65 0],[760.118 17 1],[761.601 17 1],[762.405 22 0],[762.781 30 0],[763.905 9 1],[767.272 8 1],[769.474 8 1],[770.616 22 1],[772.697 22 1],[773.763 30 0],[779.32 22 0]}{3700}% -\wl@elt@search{#1}{Dy}{[380.414 510 1],[380.627 580 1],[381.227 470 0],[381.367 470 1],[381.676 1400 1],[382.568 700 1],[383.65 2300 1],[384.089 370 0],[384.131 1400 1],[384.2 330 1],[384.436 330 0],[384.634 420 1],[384.702 420 0],[384.939 330 1],[385.303 1200 1],[385.84 420 0],[386.658 370 1],[386.845 560 1],[386.881 1600 0],[386.942 300 1],[386.986 820 1],[387.211 7000 1],[387.399 1200 1],[387.911 470 1],[388.199 300 1],[389.853 5800 1],[391.487 540 1],[391.559 540 1],[391.729 540 0],[392.338 320 1],[392.786 420 0],[393.014 540 0],[393.152 2100 1],[393.222 320 1],[393.3 370 1],[393.421 320 1],[393.67 420 0],[394.253 540 1],[394.468 10000 1],[394.693 420 1],[395.039 540 1],[395.455 420 1],[395.779 800 1],[396.259 370 0],[396.751 320 0],[396.839 14000 1],[397.857 2700 1],[398.192 1400 1],[398.365 1600 1],[398.421 800 1],[399.132 540 1],[399.669 1600 1],[400.045 8000 1],[400.584 420 0],[400.607 320 0],[401.129 540 1],[401.382 540 0],[401.47 540 1],[402.371 370 0],[402.778 420 1],[402.832 520 1],[403.247 520 1],[403.365 420 1],[403.632 420 1],[404.198 320 1],[404.597 12000 0],[405.056 1600 1],[405.514 520 1],[407.312 2500 1],[407.796 7400 1],[408.534 370 0],[409.61 390 0],[410.33 3900 1],[410.387 860 0],[411.134 1500 1],[412.463 490 1],[412.824 390 1],[412.912 350 0],[412.942 990 1],[413.035 350 0],[413.385 390 0],[414.15 470 1],[414.31 1200 1],[414.606 990 0],[416.797 5700 0],[417.193 370 0],[418.372 930 0],[418.682 12000 0],[419.094 320 0],[419.164 2200 0],[419.484 6800 0],[419.519 320 1],[419.802 800 0],[420.13 680 0],[420.224 680 0],[420.506 230 0],[420.654 370 1],[421.124 440 0],[421.172 16000 0],[421.318 1800 0],[421.516 3700 0],[421.809 4400 0],[422.111 4400 0],[422.221 540 0],[422.516 2700 0],[423.202 680 0],[423.985 680 0],[424.591 440 0],[425.633 440 1],[427.669 250 0],[429.493 370 1],[430.863 1000 1],[432.586 320 0],[435.844 200 1],[437.424 320 1],[437.476 320 1],[440.938 540 1],[444.458 150 0],[444.97 740 1],[445.56 110 1],[446.814 250 1],[452.758 100 0],[454.166 100 1],[456.509 140 0],[457.778 420 0],[458.936 2100 0],[461.226 990 0],[461.383 50 0],[461.482 50 0],[461.726 60 1],[462.003 140 1],[466.272 50 0],[466.466 110 1],[467.36 85 1],[468.203 50 1],[468.975 50 1],[469.868 95 1],[472.122 85 0],[472.713 70 1],[473.184 170 1],[474.573 40 1],[475.499 60 1],[476.004 50 1],[477.194 60 0],[477.48 50 0],[477.579 120 0],[478.692 75 1],[479.129 95 0],[480.064 29 0],[480.794 50 0],[481.028 40 0],[481.28 50 0],[481.904 75 0],[482.496 85 0],[482.888 75 0],[482.968 50 1],[483.238 70 0],[483.375 35 1],[484.175 75 0],[485.624 40 1],[486.805 40 1],[487.593 40 0],[488.016 85 0],[488.455 40 0],[488.808 95 0],[488.933 40 1],[489.01 75 1],[489.368 50 0],[489.924 24 0],[491.641 55 0],[492.222 50 1],[492.316 65 1],[495.734 480 1],[495.959 24 0],[497.357 28 0],[498.552 40 0],[500.387 50 0],[500.428 55 1],[501.06 24 0],[501.798 24 1],[502.212 70 0],[502.403 30 0],[502.454 24 0],[502.787 40 0],[503.3 50 0],[504.263 160 0],[504.725 24 0],[505.021 50 0],[505.335 30 0],[505.546 24 0],[507.068 95 0],[507.767 120 0],[509.038 80 1],[511.032 80 0],[512.004 130 0],[513.502 30 0],[513.96 190 1],[516.103 40 1],[516.412 40 1],[516.534 50 0],[516.969 110 1],[517.29 20 1],[518.53 80 0],[518.845 40 1],[519.286 290 1],[519.766 95 1],[524.694 50 1],[525.988 70 0],[526.056 130 0],[526.33 55 -1],[526.711 65 0],[527.225 50 1],[527.529 50 1],[527.97 50 1],[528.207 55 0],[528.499 28 1],[529.782 40 1],[530.158 160 0],[530.902 40 1],[532.469 50 0],[533.743 24 1],[534.03 65 0],[535.211 30 0],[536.82 30 1],[538.563 20 1],[538.958 85 1],[539.557 40 0],[539.826 20 -1],[539.993 24 1],[540.419 50 0],[541.913 80 0],[542.332 70 0],[542.427 30 0],[542.67 40 1],[544.334 30 1],[545.111 95 0],[545.547 30 1],[546.91 24 1],[549.683 28 0],[550.279 24 0],[550.652 28 0],[551.541 24 1],[552.801 30 0],[554.727 65 0],[560.065 40 1],[560.553 24 0],[561.323 30 0],[562.749 20 0],[563.95 100 0],[564.599 55 0],[565.201 80 0],[568.558 24 0],[569.367 28 -1],[569.41 24 -1],[569.454 28 -1],[569.872 28 1],[570.291 24 0],[571.846 70 0],[572.584 28 -1],[572.864 55 -1],[573.873 24 -1],[574.02 50 0],[574.553 55 0],[575.048 24 0],[575.879 24 0],[583.201 80 -1],[583.385 55 -1],[583.486 40 -1],[584.441 28 -1],[584.565 24 -1],[584.805 40 -1],[585.556 40 -1],[586.811 55 1],[591.516 40 1],[592.456 20 1],[594.58 70 0],[596.446 50 0],[597.449 120 0],[598.486 24 0],[598.856 140 0],[600.575 24 -1],[600.654 24 -1],[600.697 24 -1],[600.894 30 0],[601.082 65 0],[601.726 24 0],[603.098 24 0],[604.249 24 -1],[605.818 24 0],[608.506 30 0],[608.826 140 0],[612.715 24 0],[613.364 24 0],[615.828 24 0],[616.843 100 0],[619.623 20 1],[625.909 270 0],[626.036 30 0],[634.332 14 0],[638.68 40 0],[639.66 24 1],[642.192 50 0],[643.655 13 0],[646.083 8 0],[646.858 10 1],[647.491 11 0],[648.359 20 1],[648.659 28 0],[655.802 20 0],[657.937 160 0],[659.414 14 1],[664.337 15 0],[665.836 22 0],[666.164 29 0],[666.786 75 0],[670.064 10 1],[674.793 29 0],[675.762 10 0],[676.589 45 0],[681.82 12 0],[683.542 180 0],[685.296 80 0],[685.646 22 0],[688.883 22 0],[689.797 15 1],[689.932 65 1],[690.653 22 1],[692.955 15 0],[695.028 29 1],[695.142 11 0],[695.808 40 0],[698.244 13 0],[699.13 13 0],[699.81 45 0],[701.742 20 0],[705.595 35 1],[707.514 24 1],[710.926 17 1],[712.081 11 1],[717.511 13 1],[721.327 11 0],[723.004 17 0],[725.001 13 0],[734.513 17 1],[737.023 11 1],[737.604 20 0],[740.759 11 0],[741.237 24 0],[742.686 55 1],[745.705 20 1],[751.661 17 1],[754.373 55 0],[755.3 17 0],[755.978 27 0],[756.296 40 1],[757.746 20 1],[759.13 27 0],[761.155 13 0],[761.77 11 0],[764.109 35 0],[764.586 17 0],[764.664 13 0],[766.236 80 0],[766.678 11 1],[771.533 35 0],[772.976 45 1],[775.162 20 1]}{16000}% -\wl@elt@search{#1}{Ho}{[381.073 8900 1],[381.186 490 0],[381.325 900 1],[382.173 300 1],[382.927 390 0],[383.19 320 1],[383.535 410 1],[383.751 1300 1],[384.205 410 1],[384.386 1100 1],[384.673 490 1],[384.988 300 0],[385.24 320 1],[385.407 1800 1],[385.694 390 1],[385.772 720 1],[386.168 2700 1],[386.262 540 0],[387.205 360 1],[387.409 320 1],[387.468 630 1],[388.161 540 1],[388.896 3000 1],[389.042 490 0],[389.102 13000 1],[389.676 540 1],[390.223 290 1],[390.444 320 0],[390.568 1300 1],[391.18 320 0],[391.945 320 0],[393.644 320 1],[393.885 220 0],[394.053 320 1],[395.056 220 0],[395.573 580 0],[395.951 230 1],[395.968 490 0],[397.588 220 0],[397.693 390 0],[398.571 220 1],[399.373 220 1],[399.958 380 0],[400.259 160 1],[400.339 220 0],[401.35 110 0],[401.42 320 1],[401.809 160 1],[402.276 160 1],[402.394 160 1],[402.539 110 0],[402.721 320 0],[402.886 270 0],[403.18 180 0],[403.762 220 0],[403.887 220 1],[404.081 2700 0],[404.544 5400 1],[404.752 220 0],[405.393 8100 0],[405.448 540 1],[405.755 270 0],[406.031 220 0],[406.509 1700 1],[406.757 170 0],[406.805 720 0],[407.183 270 0],[407.313 270 0],[407.351 290 0],[408.023 120 1],[408.367 230 0],[408.509 140 0],[408.735 170 0],[408.759 200 0],[409.164 140 0],[409.478 120 0],[410.022 230 0],[410.384 8900 0],[410.504 120 0],[410.65 270 0],[410.736 100 0],[410.862 2900 0],[411.2 300 0],[411.272 100 0],[411.673 270 0],[412.02 1500 0],[412.565 1300 0],[412.716 4300 0],[413.454 300 0],[413.622 1500 0],[413.934 130 0],[414.219 230 0],[414.897 290 0],[415.261 980 1],[416.303 8100 0],[417.223 160 0],[417.323 2500 0],[419.435 540 0],[419.808 100 0],[420.321 130 0],[421.13 100 1],[422.229 290 0],[422.347 290 0],[422.704 2000 0],[422.952 390 1],[423.124 130 0],[424.378 290 0],[425.443 1300 0],[425.861 130 1],[426.405 490 0],[426.604 300 0],[427.363 100 1],[431.104 200 0],[433.064 250 1],[433.713 300 1],[434.684 100 1],[435.073 1300 0],[435.673 290 1],[436.393 140 1],[437.914 170 1],[438.483 180 1],[440.055 150 1],[440.124 120 1],[440.327 180 0],[442.056 200 1],[444.463 130 0],[447.359 100 1],[447.764 300 1],[448.457 120 1],[451.082 140 0],[452.614 100 1],[453.008 170 1],[453.128 170 0],[453.165 130 1],[453.458 170 0],[456.252 200 0],[460.932 120 1],[461.337 130 0],[461.884 100 0],[462.822 100 0],[462.91 290 1],[464.977 200 1],[466.133 130 1],[467.462 140 1],[470.117 70 1],[470.169 80 1],[470.984 130 1],[471.139 65 0],[471.752 130 0],[472.872 35 1],[473.8 35 1],[474.204 290 1],[474.909 35 1],[475.14 35 0],[475.701 100 0],[476.239 35 1],[476.357 35 1],[477.748 55 1],[477.942 30 0],[478.119 70 0],[478.292 65 0],[478.629 55 0],[479.148 35 1],[479.592 35 1],[479.887 45 0],[481.292 27 1],[483.231 55 1],[483.332 30 0],[485.554 30 1],[486.039 45 0],[488.967 27 1],[489.235 30 0],[489.644 35 1],[490.699 55 1],[492.273 45 0],[493.489 55 0],[493.901 290 0],[494.68 27 0],[494.818 45 1],[495.942 65 1],[496.103 35 1],[496.673 55 1],[496.721 250 1],[497.997 220 0],[498.896 35 0],[499.505 90 0],[501.242 35 0],[501.328 55 1],[502.653 65 0],[502.817 30 0],[503.295 55 1],[503.76 65 0],[504.237 130 0],[504.473 35 0],[505.144 30 1],[505.492 30 1],[506.075 35 0],[507.434 65 0],[509.307 80 0],[512.781 140 0],[512.927 55 1],[514.259 130 1],[514.322 110 1],[514.959 160 1],[516.788 90 0],[518.211 130 0],[518.785 55 0],[519.011 90 1],[519.523 18 0],[522.154 45 0],[524.447 35 0],[525.182 65 0],[527.548 55 0],[530.125 90 0],[531.924 35 0],[531.965 35 0],[533.011 80 0],[535.999 90 0],[538.14 55 0],[538.456 30 0],[538.497 30 0],[539.385 18 0],[540.317 70 0],[540.708 100 0],[541.362 14 1],[543.439 16 1],[543.587 18 0],[544.539 30 0],[544.98 18 1],[545.19 30 0],[545.4 14 1],[549.857 30 0],[550.451 30 0],[551.556 27 1],[551.645 18 1],[553.433 30 0],[555.314 27 0],[556.094 35 0],[556.36 35 -1],[556.652 70 0],[557.396 18 1],[558.47 35 -1],[559.11 55 -1],[559.23 55 -1],[560.71 30 -1],[561.364 27 0],[562.64 45 -1],[562.76 65 0],[562.824 30 1],[564.062 55 0],[565.59 70 -1],[565.89 65 -1],[565.958 140 0],[567.184 70 -1],[567.47 65 0],[569.147 140 0],[569.63 70 -1],[569.657 140 0],[573.402 27 0],[573.64 45 -1],[573.924 55 0],[574.958 22 0],[576.664 30 -1],[580.38 27 -1],[581.92 45 -1],[582.19 27 0],[583.947 22 0],[584.94 45 -1],[586.028 140 0],[586.442 27 0],[587.085 45 0],[587.96 27 -1],[588.299 70 0],[589.256 35 0],[590.429 22 0],[592.176 70 0],[593.371 30 0],[594.803 70 0],[595.598 45 0],[597.276 70 0],[597.352 90 0],[598.143 22 0],[598.29 230 0],[600.204 55 0],[600.533 27 0],[602.143 35 0],[603.897 16 0],[605.071 27 0],[606.031 45 0],[608.179 120 0],[613.36 70 0],[615.638 35 0],[615.658 27 0],[619.168 55 0],[620.865 70 0],[623.417 18 0],[625.575 45 0],[630.536 70 0],[630.668 22 0],[632.194 30 -1],[635.435 30 0],[637.259 30 0],[637.386 14 0],[641.341 22 0],[647.177 27 0],[647.917 13 0],[651.53 11 0],[653.899 11 0],[655.097 70 0],[656.008 15 0],[660.058 35 0],[660.494 260 0],[660.747 55 0],[662.835 13 0],[662.899 120 0],[663.224 15 0],[665.298 9 0],[666.252 15 0],[668.046 19 0],[668.162 24 0],[668.202 15 -1],[669.432 55 0],[672.234 15 0],[674.505 40 0],[676.674 13 0],[677.468 28 0],[678.543 55 0],[679.37 13 0],[681.104 13 0],[682.038 15 0],[682.164 24 0],[682.572 17 0],[682.662 8 -1],[685.297 8 -1],[686.585 17 0],[688.336 9 0],[688.85 13 0],[689.296 15 0],[689.795 17 0],[690.38 15 0],[691.347 15 0],[691.67 9 0],[693.949 40 0],[695.039 45 0],[695.53 13 0],[697.67 19 1],[698.511 10 -1],[699.438 9 -1],[700.071 14 -1],[707.907 10 -1],[709.858 12 -1],[724.208 9 0],[725.06 9 0],[730.855 14 -1],[734.143 25 -1],[738.94 18 -1],[749.62 5 0],[751.074 10 0],[755.509 140 0],[758.92 18 0],[759.187 25 0],[759.364 9 0],[759.435 7 0],[760.231 12 1],[760.535 16 0],[761.705 12 0],[762.798 14 0],[762.842 40 0],[764.114 9 0],[764.816 4 0],[765.38 14 0],[766.73 12 0],[769.043 20 0],[769.315 50 0],[771.506 40 0],[771.905 16 0],[773.898 16 0],[775.201 8 0]}{13000}% -\wl@elt@search{#1}{Er}{[381.033 1600 0],[383.048 3600 1],[384.991 540 0],[385.16 320 1],[385.59 680 0],[385.839 540 1],[386.285 7500 0],[388.061 1500 1],[388.289 1200 1],[389.061 400 1],[389.268 4200 0],[389.623 5200 1],[390.276 810 1],[390.398 250 0],[390.456 250 1],[390.54 1200 0],[390.631 11000 1],[391.805 280 0],[391.835 210 1],[392.188 280 1],[393.225 810 1],[393.701 3200 0],[393.863 2100 1],[394.442 3200 0],[394.806 550 0],[395.148 250 0],[395.642 320 0],[396.635 280 0],[397.304 2700 0],[397.358 3200 0],[397.472 1400 1],[397.673 280 0],[397.702 810 0],[398.233 1100 0],[398.753 280 0],[398.766 810 0],[399.115 230 0],[400.405 230 0],[400.796 14000 0],[400.818 230 1],[400.916 280 1],[401.258 1100 0],[401.557 350 1],[402.051 3000 0],[402.155 450 0],[404.301 230 1],[404.696 1000 0],[404.834 280 1],[404.949 200 1],[405.547 940 1],[405.951 550 0],[405.978 690 1],[407.788 420 0],[408.124 550 1],[408.763 3500 0],[409.29 210 0],[409.81 1100 0],[410.056 350 1],[411.636 320 0],[411.855 320 0],[413.15 600 0],[414.291 550 1],[415.111 6900 0],[418.998 280 1],[419.07 1000 0],[420.532 130 0],[421.843 1400 0],[422.099 200 0],[423.02 320 1],[423.478 140 1],[425.194 200 1],[427.648 140 1],[428.656 690 0],[429.891 320 0],[430.16 320 1],[430.381 140 1],[431.994 110 1],[432.881 130 0],[433.136 110 0],[434.092 140 0],[434.834 190 0],[436.939 110 1],[438.217 160 0],[438.47 300 1],[438.64 300 0],[440.317 100 1],[440.934 810 0],[441.87 180 0],[441.961 570 1],[442.251 110 1],[442.457 320 0],[442.677 370 0],[443.766 110 0],[445.924 100 1],[447.35 100 1],[449.639 130 0],[450.075 200 1],[452.274 130 0],[456.326 160 1],[460.661 1000 0],[463.088 160 1],[464.06 110 1],[466.544 110 1],[467.316 310 0],[467.562 570 1],[467.906 150 1],[472.269 230 0],[472.905 150 0],[475.152 130 1],[475.965 170 1],[482.035 190 1],[485.744 140 0],[487.209 150 1],[490.008 210 1],[493.411 210 1],[494.436 130 0],[495.174 180 1],[497.642 130 0],[500.725 250 0],[502.833 140 0],[502.891 120 1],[503.594 200 0],[504.205 210 1],[504.386 130 0],[504.489 130 0],[507.759 130 1],[512.456 120 0],[512.741 130 1],[513.153 120 0],[513.383 130 1],[516.477 170 1],[517.278 130 0],[518.89 160 1],[520.652 150 0],[521.291 60 1],[521.513 30 1],[521.826 30 1],[522.934 45 1],[525.593 140 1],[525.647 22 1],[525.702 27 1],[526.477 35 1],[527.291 80 0],[527.771 55 0],[527.934 27 1],[530.23 45 1],[533.306 55 0],[533.333 27 1],[533.423 27 1],[534.394 22 1],[534.45 30 1],[534.806 90 0],[535.047 45 0],[536.885 35 0],[539.587 35 1],[541.463 60 1],[542.281 18 1],[545.13 18 0],[545.427 35 1],[545.662 180 0],[546.243 35 1],[546.832 90 0],[547.747 18 1],[548.597 80 1],[549.744 27 1],[551.602 27 0],[559.346 80 0],[560.114 45 0],[560.994 45 0],[561.182 60 0],[562.201 70 0],[562.653 80 1],[563.62 30 0],[564.036 90 0],[564.142 22 0],[565.863 22 1],[566.495 70 0],[566.544 45 1],[567.548 55 0],[569.553 14 1],[571.087 27 1],[571.748 55 0],[571.955 70 0],[572.697 55 0],[573.343 22 1],[573.656 22 0],[573.694 22 0],[573.919 100 0],[574.061 35 0],[574.865 60 0],[575.253 55 0],[575.763 70 1],[576.28 290 0],[576.992 70 0],[578.282 45 0],[578.466 70 0],[579.115 22 1],[580.079 70 0],[580.61 22 0],[582.679 430 0],[583.584 45 0],[585.007 100 0],[585.531 120 0],[587.235 140 0],[588.114 120 0],[588.63 27 1],[590.208 27 1],[590.606 55 0],[590.924 45 0],[593.35 35 0],[594.637 22 0],[596.868 55 0],[597.549 27 0],[600.679 35 1],[600.875 22 1],[601.483 55 0],[601.574 35 1],[602.256 70 0],[603.212 22 1],[604.563 22 1],[604.814 22 1],[605.485 45 0],[606.125 70 0],[607.645 60 1],[611.601 35 0],[612.532 35 0],[617.006 30 1],[618.321 27 1],[622.102 360 0],[623.09 35 0],[626.256 55 0],[626.793 45 0],[626.887 60 0],[627.494 35 0],[628.686 30 0],[629.942 45 0],[630.877 130 0],[632.613 55 0],[634.716 22 1],[638.819 45 0],[643.253 22 0],[648.587 27 0],[649.235 55 0],[654.157 22 0],[658.348 60 0],[660.111 70 0],[672.191 27 0],[675.987 70 0],[676.292 22 0],[677.337 27 0],[679.092 35 0],[682.544 22 0],[682.598 22 0],[684.81 70 0],[686.513 55 0],[687.998 27 0],[700.14 22 0],[705.855 12 0],[706.504 12 0],[707.099 11 1],[710.127 18 0],[710.967 8 0],[715.54 11 1],[716.191 5 0],[719.7 14 0],[726.482 7 1],[728.395 7 0],[732.973 14 1],[735.537 18 0],[735.634 11 0],[742.867 18 0],[745.955 55 0],[746.042 9 0],[746.951 120 0],[753.234 22 0],[753.918 6 0],[755.626 27 0],[757.421 6 0],[759.051 5 0],[759.733 11 0],[760.723 6 0],[761.352 11 0],[762.348 6 0],[764.567 16 0],[765.063 8 0],[765.445 22 1],[765.805 12 0],[765.925 22 0],[766.564 4 0],[768.001 35 0],[772.214 9 0],[772.619 8 1],[774.744 11 0],[775.463 22 0],[776.216 4 0],[779.669 9 0],[779.747 35 0],[381.678 4000 2],[396.287 600 2],[400.97 40 2],[408.858 2 2],[428.818 1000 2],[429.006 40000 2],[433.824 300 2],[438.686 20000 2],[461.293 30 2],[473.556 15000 2],[478.312 2000 2],[487.607 8 2],[590.33 8000 2]}{40000}% -\wl@elt@search{#1}{Tm}{[380.772 600 0],[381.072 380 1],[381.739 550 1],[382.639 290 0],[383.82 1300 1],[384.087 290 0],[384.802 8900 1],[385.784 140 1],[388.313 6800 0],[388.344 1800 1],[388.735 5400 0],[389.053 440 1],[389.662 440 0],[390.079 680 1],[391.648 3500 0],[392.866 120 1],[392.958 570 1],[394.927 1500 0],[395.81 1500 1],[399.558 440 1],[399.652 1800 1],[402.423 220 0],[404.447 380 0],[409.419 10000 0],[410.584 9500 0],[413.269 120 1],[413.833 1100 0],[414.914 120 0],[415.86 120 0],[418.762 8800 0],[419.992 520 1],[420.373 6000 0],[420.6 220 1],[422.267 380 0],[424.215 3000 1],[427.171 270 0],[429.836 150 0],[435.993 2700 0],[438.643 1400 0],[439.442 200 0],[439.596 120 0],[439.65 140 0],[443.74 55 1],[444.274 80 0],[444.758 50 0],[445.403 120 0],[445.999 80 0],[446.798 50 0],[448.126 540 1],[448.97 80 1],[451.96 150 0],[452.257 260 1],[452.938 180 1],[453.215 80 0],[454.86 110 0],[455.668 40 1],[456.186 40 1],[456.468 80 0],[456.711 40 1],[459.663 95 0],[459.902 270 0],[460.129 35 1],[460.343 55 1],[460.485 40 0],[461.397 50 0],[461.447 40 1],[461.594 300 1],[461.906 35 1],[462.172 40 0],[462.633 80 1],[462.656 95 1],[462.697 40 0],[463.426 110 1],[464.296 40 1],[464.312 95 0],[464.458 35 0],[465.509 120 0],[466.67 35 1],[467.199 35 1],[467.51 35 0],[467.531 80 0],[467.786 40 1],[468.192 160 0],[468.511 70 0],[469.111 120 0],[472.426 110 0],[473.334 680 0],[475.075 35 1],[475.99 70 0],[478.992 27 1],[480.748 27 0],[480.868 35 0],[481.35 35 0],[482.699 27 1],[482.897 27 0],[483.12 80 1],[483.575 35 0],[485.176 27 0],[487.228 19 1],[487.919 27 0],[489.164 27 0],[490.974 24 0],[492.383 55 0],[495.718 140 0],[497.087 40 1],[497.126 27 0],[497.512 40 1],[497.89 50 0],[498.068 40 1],[498.932 55 1],[499.379 27 1],[499.472 19 1],[500.102 35 0],[500.159 27 0],[500.977 160 1],[501.456 35 1],[501.787 27 1],[503.422 160 1],[504.1 27 1],[504.35 22 0],[504.541 35 0],[506.042 27 1],[506.09 150 0],[506.225 27 0],[506.588 27 0],[506.667 80 0],[507.242 27 0],[507.636 27 0],[507.718 27 0],[508.509 35 0],[510.753 40 0],[511.397 95 0],[511.455 50 1],[512.067 22 0],[514.028 22 1],[514.94 40 1],[518.268 19 0],[518.525 40 0],[520.451 14 1],[521.338 80 0],[522.823 22 1],[526.093 14 1],[526.734 24 1],[529.114 40 0],[529.432 40 0],[530.021 35 0],[530.269 35 0],[530.587 55 1],[530.712 650 0],[532.299 16 1],[533.89 35 0],[534.649 80 1],[537.298 27 1],[539.196 14 1],[540.046 27 1],[540.223 27 0],[540.598 14 1],[546.195 14 1],[546.414 14 0],[546.554 14 1],[550.03 16 1],[552.682 14 1],[552.834 24 0],[553.903 14 1],[556.6 27 0],[558.137 22 0],[558.665 14 1],[558.994 14 1],[560.664 14 0],[563.141 270 0],[564.26 40 0],[564.54 27 0],[565.83 70 0],[567.584 520 0],[568.359 14 0],[568.476 40 1],[569.642 14 1],[570.997 35 1],[571.579 22 0],[573.381 14 1],[573.72 11 1],[573.892 14 1],[575.802 27 0],[576.02 55 0],[576.429 190 0],[577.882 5 1],[578.236 19 1],[578.446 22 1],[579.997 11 1],[581.119 14 1],[581.646 14 0],[583.876 35 1],[589.563 240 0],[589.947 35 0],[590.157 24 0],[591.258 8 0],[593.17 11 0],[593.59 27 0],[597.126 140 0],[597.502 27 0],[598.487 11 0],[602.544 19 0],[606.778 11 1],[613.153 16 0],[617.529 14 0],[618.141 14 1],[629.946 14 1],[635.266 27 0],[640.144 22 0],[643.094 8 1],[644.054 14 0],[646.026 200 0],[649.07 14 0],[651.978 14 0],[657.554 8 0],[660.496 95 0],[662.725 8 0],[665.772 35 0],[665.864 11 0],[669.293 11 0],[672.136 30 0],[672.634 9 0],[672.794 9 1],[673.922 18 0],[676.748 9 0],[677.793 9 0],[677.977 110 0],[678.2 14 0],[678.852 18 0],[682.027 13 0],[682.695 14 0],[682.912 14 1],[683.109 23 0],[684.426 120 0],[684.576 80 0],[685.412 18 0],[689.856 6 0],[691.586 6 0],[693.737 10 0],[694.954 5 0],[697.669 5 1],[701.079 5 0],[701.431 6 1],[701.79 10 0],[702.94 6 0],[703.434 12 0],[705.643 10 1],[706.097 5 0],[707.978 6 1],[710.614 10 0],[723.133 5 0],[723.374 5 1],[725.772 4 0],[727.262 17 0],[728.43 8 0],[728.616 11 0],[731.051 14 0],[733.663 11 1],[743.218 14 0],[743.451 5 1],[743.995 5 1],[748.108 75 0],[749.02 75 0],[750.728 10 0],[754.578 14 0],[755.833 140 0],[758.061 17 0],[759.374 20 0],[759.507 17 1],[762.985 5 0],[764.876 5 1],[765.5 17 0],[766.032 4 0],[766.624 7 0],[767.604 8 1],[770.146 8 0],[773.153 80 0],[777.827 4 0],[778.235 12 0],[778.551 8 0],[399.884 300 2],[402.192 200 2],[402.603 200 2],[403.213 700 2],[407.615 100 2],[433.547 200 2],[438.541 500 2]}{10000}% -\wl@elt@search{#1}{Yb}{[383.991 170 0],[387.285 340 0],[390.085 340 0],[390.481 50 1],[391.127 140 0],[398.799 32000 0],[399.088 930 0],[400.736 50 0],[405.228 70 0],[407.728 85 1],[408.968 440 0],[411.925 120 1],[413.509 70 1],[414.907 470 0],[417.456 120 0],[418.081 340 1],[421.856 150 1],[423.197 120 0],[427.774 70 0],[430.597 120 0],[431.695 70 1],[439.369 60 0],[443.021 60 0],[443.919 440 0],[448.242 85 0],[451.516 85 1],[455.358 35 1],[456.395 85 0],[457.621 640 0],[458.236 200 0],[458.921 70 0],[459.083 140 0],[459.836 40 1],[468.381 35 1],[468.427 40 0],[472.608 190 1],[478.187 170 0],[478.661 170 1],[481.643 35 0],[482.024 40 1],[483.696 35 1],[483.746 40 0],[485.115 17 1],[489.46 40 0],[491.236 27 0],[493.55 710 0],[493.722 24 1],[496.69 140 0],[500.952 24 1],[506.73 17 1],[506.78 30 0],[506.914 70 0],[507.434 220 0],[507.674 50 0],[513.598 20 1],[514.702 14 1],[518.415 20 1],[519.608 60 0],[521.16 85 0],[524.051 35 1],[524.411 100 0],[525.749 40 1],[527.704 150 0],[527.953 35 1],[530.094 17 1],[533.515 170 1],[534.566 30 1],[534.722 60 1],[535.129 30 0],[535.295 150 1],[535.864 30 1],[536.366 30 0],[538.984 17 1],[543.271 14 1],[544.927 40 1],[547.85 14 1],[548.192 60 0],[550.549 40 0],[552.454 17 0],[553.905 85 0],[555.647 2400 0],[556.209 35 0],[556.811 20 0],[558.636 20 0],[558.845 40 1],[565.198 60 1],[568.653 7 1],[571.999 220 0],[574.991 10 1],[575.589 10 0],[577.166 27 1],[580.344 10 0],[581.941 10 1],[583.399 35 1],[583.714 35 1],[585.451 27 0],[589.721 8 1],[590.836 20 1],[598.933 17 0],[599.151 40 1],[605.288 10 1],[605.457 10 0],[615.257 60 1],[624.697 30 1],[627.478 60 1],[630.815 14 1],[640.035 35 0],[641.791 35 0],[643.273 20 1],[646.315 17 1],[648.906 340 0],[664.355 20 0],[666.782 180 0],[667.817 15 0],[672.761 25 1],[676.87 25 0],[679.96 690 0],[693.405 18 1],[699.988 20 1],[704.378 10 1],[724.441 9 0],[730.522 8 0],[731.305 10 0],[735.004 16 0],[744.828 25 0],[752.746 30 0],[769.948 750 0],[387.998 20 2],[388.258 10 2],[388.717 20 2],[389.655 150 2],[391.275 15 2],[391.323 20 2],[393.123 500 2],[398.556 100 2],[399.174 10 2],[399.767 10 2],[402.814 2000 2],[403.303 10 2],[407.453 20 2],[409.067 20 2],[409.823 20 2],[412.106 15 2],[415.004 10 2],[415.311 15 2],[416.272 100 2],[417.295 60 2],[419.434 30 2],[419.495 100 2],[419.874 10 2],[421.364 300 2],[422.083 10 2],[423.107 15 2],[428.964 20 2],[430.114 40 2],[430.401 20 2],[435.08 15 2],[438.007 10 2],[451.758 100 2],[463.914 40 2],[483.493 10 2],[505.494 15 2],[525.685 20 2],[533.154 20 2],[574.083 15 2],[594.902 10 2],[597.305 20 2],[605.585 40 2],[621.422 100 2],[632.852 200 2],[636.588 10 2],[637.833 150 2],[646.633 25 2],[698.515 20 2],[703.704 10 2],[715.772 15 2],[731.102 10 2],[739.998 10 2],[741.001 80 2],[745.686 15 2],[766.441 70 2]}{32000}% -\wl@elt@search{#1}{Lu}{[380.067 150 0],[382.907 75 0],[384.118 2700 0],[384.361 75 0],[385.329 95 0],[387.461 40 0],[387.665 530 1],[391.177 29 0],[391.886 50 0],[392.662 35 0],[396.846 480 0],[399.138 50 0],[405.445 670 0],[409.613 75 -1],[410.744 35 0],[411.267 95 0],[412.249 310 0],[412.473 3100 0],[413.179 150 0],[415.408 460 0],[415.898 24 0],[418.425 1600 1],[427.75 150 0],[428.103 250 0],[429.597 330 0],[430.957 150 0],[433.272 75 0],[434.198 29 1],[442.096 65 0],[443.048 190 0],[443.879 35 0],[445.081 190 0],[447.155 50 0],[449.885 60 0],[451.857 3300 0],[456.095 24 -1],[457.531 24 -1],[460.539 85 0],[464.547 95 0],[464.821 100 0],[464.885 95 0],[465.403 65 -1],[465.802 1000 0],[465.903 85 0],[466.175 630 -1],[467.231 310 -1],[468.416 420 -1],[469.546 270 -1],[470.8 190 -1],[471.67 30 0],[472.086 65 -1],[472.62 65 0],[473.5 100 -1],[474.911 75 -1],[476.422 40 -1],[478.542 150 1],[481.505 85 0],[483.962 50 1],[486.536 18 1],[490.488 460 0],[494.234 180 0],[499.413 800 1],[500.114 800 0],[505.76 55 0],[513.405 140 0],[513.509 2700 0],[517.011 130 -1],[519.661 170 0],[520.647 90 0],[530.44 40 0],[534.912 80 0],[540.257 500 0],[542.19 140 0],[543.788 100 0],[545.357 35 0],[547.669 2100 1],[566.489 9 1],[571.349 14 1],[573.655 550 0],[577.54 55 0],[580.059 80 0],[586.079 40 0],[586.63 9 0],[598.39 690 1],[599.713 140 0],[600.452 1400 0],[604.166 35 0],[605.503 440 0],[614.071 11 0],[615.994 150 1],[619.966 160 1],[622.187 2100 1],[622.814 35 1],[623.536 80 1],[624.234 160 1],[624.88 16 0],[634.535 70 0],[635.485 18 0],[636.579 9 0],[636.6 16 0],[644.114 22 0],[644.489 11 1],[646.312 1100 1],[647.767 29 0],[652.318 55 0],[661.128 35 1],[661.915 11 1],[667.714 23 0],[673.576 9 0],[679.377 30 0],[682.659 11 1],[691.731 45 0],[694.396 8 1],[703.124 23 0],[709.634 14 0],[712.584 45 1],[714.279 9 0],[714.31 7 0],[716.594 8 1],[723.798 14 0],[740.97 5 1],[744.152 11 0],[745.696 8 1],[764.008 7 0],[775.83 7 0],[425.144 200 2],[427.191 300 2],[449 200 2],[495.643 400 2],[504.612 10 2],[514.586 150 2],[541.942 70 2],[551.988 60 2],[552.68 5 2],[574.871 5 2],[578.646 70 2],[586.971 80 2],[588.976 60 2],[619.796 300 2],[619.813 600 2],[730.995 100 2],[731.025 200 2],[753.427 50 2]}{3300}% -\wl@elt@search{#1}{Hf}{[380.038 850 0],[380.607 140 1],[381.178 320 0],[381.72 100 1],[381.938 100 0],[382.073 1300 0],[382.967 140 0],[383.002 280 0],[384.918 800 0],[384.952 140 1],[385.831 600 0],[386.091 230 0],[387.255 200 1],[387.71 160 1],[388.082 380 1],[388.252 200 0],[388.377 150 1],[388.923 200 0],[388.933 200 0],[389.994 620 0],[391.809 620 1],[392.39 200 1],[392.642 120 0],[392.757 150 0],[392.954 110 1],[393.138 320 0],[393.565 120 1],[393.904 120 0],[395.183 410 0],[396.801 160 0],[397.005 150 -1],[397.348 200 0],[403.227 180 0],[404.796 100 1],[406.284 230 0],[406.621 140 0],[408.335 180 0],[409.316 540 1],[410.423 110 0],[410.658 140 0],[411.353 110 1],[411.86 110 0],[412.78 150 1],[414.576 140 0],[416.236 150 1],[416.269 110 0],[417.434 1100 0],[419.095 120 0],[420.658 160 1],[420.97 190 0],[422.808 170 0],[423.244 170 1],[425.208 120 -1],[426.098 170 0],[426.339 200 0],[427.285 170 1],[429.479 320 0],[431.814 120 0],[433.027 160 0],[433.666 180 1],[435.051 150 1],[435.633 250 0],[436.79 110 1],[437.097 180 1],[441.735 120 1],[441.791 160 0],[443.804 200 0],[445.734 140 0],[446.118 140 0],[454.093 140 0],[456.594 250 0],[459.88 500 0],[462.086 230 0],[465.519 210 0],[469.901 120 0],[478.274 160 0],[480.05 310 0],[485.924 130 0],[497.525 120 0],[501.82 95 0],[502.175 15 0],[504.082 55 1],[504.745 95 0],[507.474 55 -1],[507.965 30 1],[509.388 55 -1],[511.213 15 0],[512.853 19 1],[515.796 30 0],[516.742 55 0],[517.018 75 0],[518.186 230 0],[518.684 30 0],[518.775 30 1],[524.399 110 0],[524.71 55 1],[526.044 25 1],[526.495 30 1],[527.504 55 0],[528.609 22 0],[529.487 120 0],[529.806 45 1],[530.782 30 0],[530.968 45 0],[531.16 55 1],[532.426 12 1],[534.63 9 1],[535.473 110 0],[537.386 110 0],[538.934 40 0],[539.136 19 1],[540.447 19 0],[542.402 28 0],[543.578 12 0],[543.874 40 0],[544.407 14 1],[545.292 75 0],[546.338 30 1],[549.73 15 0],[551.012 15 0],[551.045 15 0],[552.435 19 1],[553.802 45 0],[553.826 28 0],[555.06 230 0],[555.212 230 0],[557.586 55 0],[560.077 14 0],[561.327 95 0],[561.401 25 0],[562.827 8 0],[565.083 19 0],[569.803 40 -1],[571.328 25 0],[571.918 160 0],[572.016 25 -1],[574.872 12 0],[576.718 14 1],[580.95 12 1],[581.747 19 0],[584.223 25 1],[584.587 25 0],[584.777 19 0],[588.366 22 0],[592.647 15 0],[593.369 60 0],[597.428 75 0],[597.472 25 0],[597.866 60 0],[599.296 25 0],[601.679 45 0],[602.112 28 -1],[604.319 25 -1],[605.417 25 0],[609.867 95 0],[618.513 95 0],[621.07 55 0],[621.682 28 0],[623.858 45 0],[624.895 60 1],[629.954 22 0],[631.185 25 0],[631.833 19 0],[633.81 30 0],[638.019 19 0],[638.623 60 0],[640.952 19 0],[655.65 15 0],[658.723 28 0],[664.46 45 1],[664.706 19 1],[665.94 11 0],[671.348 30 0],[675.461 17 1],[676.995 11 0],[678.927 85 0],[681.894 160 0],[682.656 15 0],[685.007 13 0],[685.87 35 0],[691.14 45 0],[692.619 10 0],[697.959 19 0],[698.091 21 1],[701.925 7 0],[703.033 7 1],[703.513 7 0],[706.19 11 0],[706.287 15 0],[706.383 160 0],[709.44 11 0],[710.054 15 0],[711.952 55 0],[713.181 570 0],[723.71 650 0],[724.087 410 0],[726.262 6 0],[732.005 75 0],[732.176 16 0],[735.61 6 0],[736.528 6 0],[739.07 20 0],[742.369 6 0],[743.756 25 0],[746.386 13 0],[748.456 7 0],[755.637 15 0],[756.293 75 0],[756.422 15 0],[757.695 11 0],[759.296 11 0],[760.859 13 0],[762.44 360 0],[764.564 20 0],[774.017 110 0],[774.357 8 0],[775.789 5 1],[779.09 40 0],[779.681 7 0],[775.129 20 3],[726.758 10 3]}{1300}% -\wl@elt@search{#1}{Ta}{[383.374 210 1],[384.805 100 0],[388.52 100 0],[391.851 210 0],[392.278 140 0],[392.292 140 0],[397.01 210 0],[399.617 210 0],[399.928 100 0],[400.684 190 0],[402.694 190 0],[402.994 140 0],[404.087 120 0],[406.14 410 0],[406.463 210 0],[406.724 100 0],[406.791 310 0],[410.502 120 0],[412.938 210 0],[413.62 230 0],[414.789 230 0],[417.521 210 0],[417.792 100 0],[418.115 130 0],[420.588 300 0],[420.64 120 0],[424.535 130 0],[426.826 130 0],[430.298 160 0],[435.514 110 0],[437.882 100 0],[438.607 150 0],[439.845 110 0],[440.25 180 0],[441.574 130 0],[451.098 360 0],[453.085 190 0],[455.195 130 0],[456.585 170 0],[457.431 340 0],[461.951 260 0],[466.914 130 0],[468.188 450 0],[469.19 130 0],[474.016 150 0],[475.651 220 0],[476.898 120 0],[481.275 220 0],[492.011 110 0],[492.127 100 0],[492.6 110 0],[493.642 150 0],[503.737 200 0],[506.787 100 0],[511.584 110 0],[514.162 100 0],[514.369 100 0],[515.656 330 0],[521.274 110 0],[521.845 110 0],[534.105 140 0],[540.251 200 0],[541.919 130 0],[550.068 18 0],[550.566 20 0],[551.627 15 0],[551.891 90 0],[552.115 9 0],[552.398 10 0],[552.836 13 0],[554.52 10 0],[554.832 20 0],[558.402 30 0],[559.875 15 0],[559.952 30 0],[560.55 9 0],[561.771 9 0],[562.068 40 0],[562.82 13 0],[563.571 20 0],[564.018 40 0],[564.591 150 0],[566.49 130 0],[568.825 30 0],[569.924 40 0],[570.431 15 0],[570.628 25 0],[571.524 30 0],[571.653 8 0],[574.671 23 0],[575.581 30 0],[576.161 15 0],[576.656 25 0],[576.791 30 0],[577.193 10 0],[577.677 130 0],[578.002 25 0],[578.071 90 0],[581.11 130 0],[581.651 25 0],[584.394 45 0],[584.968 13 0],[586.661 15 0],[587.736 240 0],[588.23 130 0],[590.191 90 0],[591.651 30 0],[591.895 90 0],[592.59 15 0],[593.062 15 0],[593.105 23 0],[593.168 20 0],[593.554 18 0],[593.976 130 0],[594.402 240 0],[595.178 25 0],[596.013 18 0],[599.723 190 0],[600.989 25 0],[601.59 25 0],[602.072 100 0],[604.539 250 0],[604.725 100 0],[605.37 25 0],[609.082 30 0],[609.206 18 0],[610.158 100 0],[614.007 25 0],[614.456 65 0],[615.254 30 0],[615.45 130 0],[615.884 40 0],[617.046 15 0],[618.966 15 0],[619.311 15 0],[620.837 25 0],[624.979 40 0],[625.668 150 0],[626.87 150 0],[627.834 50 0],[628.133 65 0],[628.736 15 0],[628.791 40 0],[628.934 40 0],[630.906 50 0],[630.958 150 0],[631.222 25 0],[632.508 75 0],[633.291 50 0],[634.117 65 0],[634.602 30 0],[635.616 75 0],[636.084 65 0],[637.306 40 0],[637.907 15 0],[638.945 90 0],[639.221 23 0],[642.86 65 0],[643.079 250 0],[643.736 13 0],[644.461 40 0],[644.587 30 0],[645.036 200 0],[645.583 20 0],[645.992 30 0],[648.537 380 0],[650.243 18 0],[650.552 65 0],[651.439 100 0],[651.61 100 0],[656.16 25 0],[656.426 25 0],[657.484 100 0],[658.513 10 0],[658.716 15 0],[661.195 110 0],[662.13 75 0],[666.224 15 0],[667.373 100 0],[667.553 180 0],[668.4 30 0],[669.361 15 0],[670.646 15 0],[670.939 25 0],[671.444 10 0],[672.361 15 0],[674.073 75 0],[675.491 40 0],[675.585 13 0],[677.037 13 0],[677.174 75 0],[677.425 40 0],[678.899 40 0],[679.006 13 0],[679.927 13 0],[681.046 40 0],[681.325 160 0],[681.936 20 0],[682.496 18 0],[683.2 13 0],[685.083 15 0],[686.513 15 0],[686.623 210 0],[687.527 180 0],[687.749 40 0],[689.677 15 0],[690.055 40 0],[690.21 150 0],[692.738 140 0],[692.854 140 0],[693.933 8 0],[694.687 20 0],[695.126 65 0],[695.388 45 0],[696.613 180 0],[696.949 8 0],[697.131 8 0],[697.153 9 0],[698.352 23 0],[699.522 110 0],[700.021 20 0],[700.507 40 0],[700.696 75 0],[702.503 50 0],[703.151 13 0],[703.907 40 0],[708.13 15 0],[708.54 20 0],[709.302 23 0],[710.805 8 0],[711.752 15 0],[712.127 20 0],[712.572 40 0],[714.863 150 0],[717.29 110 0],[717.491 13 0],[719.135 13 0],[723.345 8 0],[725.027 30 0],[726.482 11 0],[727.229 6 0],[727.696 30 0],[727.754 5 0],[728.636 9 0],[729.632 13 0],[730.174 140 0],[731.984 20 0],[732.272 11 0],[732.595 13 0],[734.019 11 0],[734.641 160 0],[735.286 140 0],[735.696 100 0],[736.909 90 0],[740.789 160 0],[743.519 11 0],[744.017 23 0],[746.775 30 0],[748.601 23 0],[752.056 30 0],[756.923 6 0],[759.022 9 0],[764.962 6 0],[772.202 11 0],[776.311 11 0],[777.967 9 0]}{450}% -\wl@elt@search{#1}{W}{[380.922 290 0],[381.038 190 0],[381.079 260 0],[381.748 1400 0],[382.913 110 0],[383.506 1100 0],[383.851 290 0],[384.622 730 0],[384.749 250 0],[385.157 27 1],[385.555 150 0],[385.93 150 0],[386.434 180 0],[386.799 1800 0],[387.284 250 0],[387.441 110 0],[388.141 730 0],[389.272 110 0],[389.791 140 0],[393.503 150 0],[393.697 120 0],[394.798 120 0],[395.252 120 0],[395.29 120 0],[395.315 160 0],[395.53 200 0],[396.514 160 0],[396.859 130 0],[397.08 150 0],[397.929 130 0],[398.064 130 0],[398.329 250 0],[400.875 8600 0],[401.522 540 0],[401.652 170 0],[401.923 220 0],[402.212 130 0],[402.879 180 0],[403.686 180 0],[403.985 140 0],[404.428 140 0],[404.559 910 0],[406.479 180 0],[406.979 150 0],[406.995 730 0],[407.061 340 0],[407.193 100 0],[407.436 5000 0],[408.296 150 0],[408.833 130 0],[409.569 100 0],[410.27 1000 0],[410.975 150 0],[411.182 100 0],[411.805 150 0],[411.819 100 0],[412.085 100 0],[412.516 100 0],[412.68 150 0],[413.348 100 0],[413.746 540 0],[413.802 150 0],[414.225 110 0],[414.516 140 0],[414.595 110 0],[415.466 160 0],[417.053 160 0],[417.117 450 0],[420.44 160 0],[420.705 220 0],[421.538 110 0],[421.937 250 0],[422.204 110 0],[423.434 150 0],[424.144 290 0],[424.436 540 0],[425.935 290 0],[426.029 200 0],[426.33 200 0],[426.938 1400 0],[426.977 110 0],[427.455 220 0],[427.549 160 0],[427.674 160 0],[428.234 110 0],[428.601 110 0],[429.41 110 0],[429.461 4100 0],[430.211 2200 0],[430.687 160 0],[430.764 110 0],[433.213 110 0],[434.7 100 0],[435.517 150 0],[436.181 100 0],[436.478 150 0],[436.595 100 0],[437.252 150 0],[437.848 200 0],[438.485 180 0],[440.395 100 0],[440.828 200 0],[441.219 130 0],[443.69 160 0],[446.049 140 0],[446.634 140 0],[446.674 140 0],[448.419 640 0],[450.484 160 0],[451.288 130 0],[451.325 120 0],[454.354 150 0],[454.647 150 0],[455.182 150 0],[457.064 140 0],[458.873 170 0],[459.994 140 0],[460.989 140 0],[461.33 160 0],[464.253 100 0],[465.742 130 0],[465.987 640 0],[468.051 640 0],[469.372 100 0],[475.754 140 0],[484.381 790 0],[488.69 380 0],[498.259 220 0],[500.615 330 0],[501.53 220 0],[505.328 820 0],[505.46 210 0],[506.912 210 0],[507.174 120 0],[522.466 770 0],[550.049 27 0],[550.344 27 0],[550.861 10 0],[551.468 220 0],[553.138 15 0],[553.772 15 0],[556.809 13 0],[560.431 13 0],[563.127 11 0],[563.194 27 0],[564.837 65 0],[566.072 35 0],[567.439 27 0],[567.66 13 0],[567.69 15 0],[569.779 15 0],[573.509 55 0],[574.924 13 0],[575.61 11 0],[579.306 13 0],[579.649 13 0],[580.485 45 0],[580.605 13 0],[583.361 13 0],[583.897 13 0],[584.527 17 0],[585.158 28 0],[585.661 11 0],[586.463 22 0],[587.422 11 0],[588.021 13 0],[589.161 13 0],[590.12 13 0],[590.264 40 0],[592.858 13 0],[594.757 55 0],[595.396 13 0],[595.619 13 0],[596.083 27 0],[596.586 55 0],[597.251 27 0],[597.886 20 0],[598.382 20 0],[600.901 13 0],[601.278 55 0],[602.152 40 0],[602.832 20 0],[604.331 20 0],[604.992 13 0],[606.508 13 0],[608.144 22 0],[611.166 13 0],[611.552 13 0],[612.825 22 0],[614.394 13 0],[615.372 20 0],[615.487 20 0],[620.351 20 0],[625.428 20 0],[628.588 27 0],[629.202 45 0],[630.321 20 0],[638.647 13 0],[640.421 35 0],[644.512 40 0],[650.805 11 0],[653.239 15 0],[653.811 13 0],[656.32 13 0],[657.393 20 0],[660.713 11 0],[660.905 11 0],[661.162 17 0],[662.174 11 0],[667.842 13 0],[669.308 15 0],[674.656 5 0],[676.445 5 0],[680.531 7 0],[681.492 9 0],[682.027 9 0],[682.843 8 0],[685.374 4 0],[687.601 4 0],[690.829 5 0],[693.423 9 0],[696.412 8 0],[698.427 13 0],[699.327 8 0],[699.406 4 0],[701.788 8 0],[702.868 3 0],[709.822 3 0],[711.118 4 0],[714.052 15 0],[716.264 9 0],[719.133 5 0],[719.862 5 0],[720.016 11 0],[721.635 5 0],[722.606 4 0],[723.712 8 0],[727.447 5 0],[727.824 10 0],[728.581 15 0],[729.655 15 0],[729.825 3 0],[738.508 7 0],[745.139 4 0],[745.637 3 0],[748.335 8 0],[750.413 7 0],[750.9 10 0],[752.066 3 0],[753.745 9 0],[755.048 9 0],[756.992 17 0],[758.288 5 0],[761.218 3 0],[761.415 17 0],[763.129 3 0],[765.481 3 0],[768.897 13 0],[770.101 4 0],[776.116 5 0],[777.673 3 0],[778.415 11 0]}{8600}% -\wl@elt@search{#1}{Re}{[380.774 190 0],[381.566 120 0],[383.63 120 0],[386.994 240 0],[387.526 240 0],[387.686 240 0],[390.821 100 0],[391.392 130 0],[391.727 380 0],[392.985 550 0],[393.69 140 0],[394.472 110 0],[394.591 180 0],[396.104 280 0],[396.248 350 0],[400.493 100 0],[402.296 140 0],[402.331 100 0],[402.963 110 0],[403.331 220 0],[403.749 110 0],[404.899 200 0],[408.143 240 0],[410.442 140 0],[411.089 240 0],[412.164 190 0],[413.342 240 0],[413.645 1800 0],[414.436 700 0],[414.996 140 0],[417.04 160 0],[418.29 220 0],[418.306 220 0],[422.108 650 0],[422.746 3600 0],[424.139 150 0],[425.76 260 0],[429.117 120 0],[430.44 200 0],[433.225 200 0],[435.798 40 1],[435.869 380 0],[436.758 190 0],[439.134 140 0],[439.438 360 0],[440.64 110 0],[441.582 180 0],[447.508 150 0],[447.839 120 0],[450.704 120 0],[451.331 2600 0],[451.664 260 0],[452.273 500 0],[452.388 120 0],[452.995 120 0],[454.517 100 0],[458.068 120 0],[460.573 120 0],[462.138 100 0],[479.142 190 0],[488.914 2200 0],[492.39 220 0],[505.856 40 0],[509.65 70 0],[512.032 20 0],[516.165 25 0],[517.889 40 0],[518.174 20 0],[523.431 35 0],[524.886 50 0],[527.095 1300 0],[527.556 1600 0],[527.824 100 0],[530.556 30 0],[531.728 20 0],[532.128 35 0],[532.746 50 0],[533.19 20 0],[533.276 20 0],[533.385 20 0],[536.948 35 0],[536.98 50 0],[537.71 100 0],[543.19 25 0],[543.703 14 0],[544.792 14 0],[546.064 25 0],[552.005 14 0],[552.11 25 0],[553.268 50 0],[556.324 50 0],[557.347 25 0],[558.472 25 0],[560.721 10 0],[561.227 12 0],[566.788 100 0],[571.143 25 0],[571.695 18 0],[575.293 110 0],[577.683 110 0],[579.16 18 0],[581.592 10 0],[583.431 550 0],[591.986 10 0],[594.324 60 0],[595.021 10 0],[596.977 18 0],[598.999 10 0],[599.573 18 0],[611.422 30 0],[614.581 35 0],[614.682 50 0],[620.324 18 0],[621.797 25 0],[622.942 30 0],[624.324 35 0],[626.002 35 0],[627.137 18 0],[627.876 18 0],[628.641 10 0],[630.342 10 0],[630.77 200 0],[632.19 200 0],[635.075 80 0],[638.294 16 0],[641.147 14 0],[651.147 50 0],[651.525 14 0],[654.491 12 0],[657.711 35 0],[659.252 40 0],[660.519 100 0],[662.391 30 0],[663.725 10 0],[665.239 27 0],[668.328 15 0],[671.13 9 0],[675.122 30 0],[676.119 5 0],[681.341 180 0],[682.99 260 0],[697.153 85 0],[700.663 35 0],[702.415 65 0],[724.667 65 0],[729.272 13 0],[757.873 40 0],[761.189 13 0],[762.025 7 0],[764.094 50 0]}{3600}% -\wl@elt@search{#1}{Os}{[383.606 250 0],[384.03 150 0],[384.129 150 0],[384.994 190 0],[385.709 230 0],[386.547 230 0],[387.677 730 0],[388.186 250 0],[390.039 140 0],[390.171 190 0],[393 100 0],[393.859 250 0],[394.978 100 0],[396.102 200 0],[396.363 1000 0],[396.496 100 0],[396.967 150 0],[397.544 110 0],[397.723 730 0],[398.818 100 0],[400.348 150 0],[400.402 100 0],[400.516 150 0],[401.826 160 0],[403.784 100 0],[404.192 280 0],[404.805 160 0],[406.669 960 0],[407.086 250 0],[407.156 190 0],[407.468 230 0],[409.182 490 0],[410.03 120 0],[411.202 1200 0],[412.46 180 0],[412.896 180 0],[413.578 2500 0],[413.784 150 0],[417.257 180 0],[417.323 1200 0],[417.563 620 0],[418.413 120 0],[418.991 320 0],[420.145 180 0],[420.206 250 0],[421.186 1200 0],[421.386 120 0],[421.516 100 0],[423.346 170 0],[426.085 4900 0],[426.475 100 0],[426.961 120 0],[428.59 100 0],[429.395 560 0],[431.14 560 0],[432.625 110 0],[432.868 340 0],[433.875 100 0],[435.153 100 0],[436.567 210 0],[437.066 110 0],[439.486 520 0],[439.726 160 0],[440.274 160 0],[442.047 4900 0],[443.241 100 0],[443.632 290 0],[443.964 100 0],[444.735 230 0],[448.476 120 0],[454.866 110 0],[455.041 540 0],[455.13 140 0],[461.678 170 0],[463.183 170 0],[466.382 140 0],[479.399 670 0],[486.56 110 0],[503.183 55 0],[503.912 45 0],[507.288 35 0],[507.477 35 0],[507.909 35 0],[510.35 90 0],[511.081 55 0],[512.223 22 0],[514.554 22 0],[514.974 140 0],[515.201 28 0],[516.898 28 0],[519.352 40 0],[520.263 270 0],[520.323 35 0],[525.046 20 -1],[525.582 45 0],[526.515 55 0],[528.389 20 0],[529.565 20 0],[529.878 40 0],[530.258 13 0],[533.623 18 0],[534.603 11 0],[535.225 13 0],[537.679 110 0],[540.343 16 0],[541.214 13 0],[541.634 120 0],[541.669 45 0],[541.751 28 0],[544.182 16 0],[544.331 55 0],[544.693 22 0],[544.776 11 0],[544.937 20 0],[545.34 20 0],[545.73 22 0],[547 28 0],[547.458 13 0],[547.513 13 0],[547.727 9 0],[548.185 16 0],[550.933 22 0],[551.601 9 0],[552.353 270 0],[554.682 22 0],[554.979 9 0],[555.288 13 0],[556.062 11 0],[558.066 16 0],[558.444 80 0],[560.05 8 0],[562.008 35 0],[563.741 9 0],[564.256 22 0],[564.525 28 0],[564.898 7 0],[566.021 9 0],[567.438 7 0],[568.088 28 0],[570.937 11 0],[572.193 170 0],[573.789 8 0],[573.972 8 0],[576.505 22 0],[578.082 170 0],[580.06 40 0],[584.249 8 0],[585.776 110 0],[586.064 28 0],[588.292 11 0],[590.398 11 0],[590.684 11 0],[590.895 7 0],[598.136 7 0],[598.322 11 0],[599.6 65 0],[601.579 20 0],[605.463 7 0],[614.453 20 0],[615.803 11 0],[622.77 35 0],[624.17 7 0],[626.941 22 0],[627.494 11 0],[628.683 11 0],[639.886 9 0],[640.315 22 0],[644.813 9 0],[652.085 6 0],[652.887 7 0],[653.314 7 0],[653.83 11 0],[657.683 11 0],[661.456 8 0],[661.543 4 0],[666.181 7 0],[672.956 27 0],[679.153 18 0],[680.661 14 0],[687.87 5 0],[690.158 4 0],[695.602 11 0],[698.495 6 0],[706.067 15 0],[714.554 22 0],[714.989 10 0],[718.41 4 0],[720.633 10 0],[720.996 5 0],[725.116 9 0],[725.349 6 0],[737.507 6 0],[740.795 9 0],[760.295 26 0],[770.146 4 0],[778.996 7 0]}{4900}% -\wl@elt@search{#1}{Ir}{[380.012 3100 0],[381.724 230 0],[386.564 170 0],[390.251 480 0],[391.538 480 0],[393.484 400 0],[394.627 120 0],[397.631 590 0],[399.212 460 0],[402.003 180 0],[403.376 350 0],[404.008 130 0],[406.992 370 0],[407.068 150 0],[409.261 100 0],[411.578 140 0],[412.792 23 0],[415.57 27 0],[416.604 15 0],[417.256 90 0],[418.247 35 0],[418.321 15 0],[418.566 18 0],[419.754 23 0],[421.776 27 0],[422.08 13 0],[425.911 75 0],[426.53 27 0],[426.81 260 0],[428.662 23 0],[430.16 75 0],[431.059 55 0],[431.15 220 0],[435.13 18 0],[435.256 18 0],[439.259 18 0],[439.947 160 0],[440.378 65 0],[442.627 110 0],[445.018 15 0],[447.848 55 0],[449.535 16 0],[449.603 11 0],[454.568 55 0],[454.848 30 0],[455.078 13 0],[456.809 35 0],[457.002 18 0],[460.448 18 0],[461.639 75 0],[465.618 26 0],[466.899 17 0],[470.888 21 0],[472.886 50 0],[473.186 21 0],[475.646 26 0],[475.796 13 0],[477.816 65 0],[479.567 30 0],[480.714 10 0],[480.947 21 0],[484.077 10 0],[484.538 17 0],[493.809 50 0],[497.048 26 0],[499.974 25 0],[500.274 25 0],[500.917 17 0],[501.498 30 0],[504.606 17 0],[512.366 30 0],[517.795 20 0],[523.892 22 0],[534.074 12 0],[536.432 35 0],[544.95 75 0],[545.45 30 0],[546.94 7 0],[562.004 10 0],[562.555 45 0],[582.855 10 0],[588.23 10 0],[588.736 7 0],[589.406 35 0],[602.61 7 0],[606.783 12 0],[611.067 20 0],[628.828 12 0],[633.444 7 0],[662.473 5 0],[668.608 10 0],[683.001 5 0],[692.988 5 0],[718.371 4 0]}{3100}% -\wl@elt@search{#1}{Pt}{[380.105 20 -1],[381.869 80 0],[390.073 40 0],[392.296 110 0],[394.84 35 0],[396.636 100 0],[399.657 20 0],[411.869 110 0],[416.456 80 0],[419.243 40 0],[432.706 18 0],[439.183 18 0],[444.255 80 0],[444.555 14 0],[449.876 25 0],[452.09 12 0],[455.242 35 0],[487.953 12 0],[504.404 14 0],[505.948 30 0],[522.766 35 0],[530.102 40 0],[536.899 12 0],[539.079 12 0],[547.577 14 0],[547.85 14 0],[576.357 6 0],[584.012 20 0],[584.484 8 0],[602.604 6 0],[631.837 7 0],[632.658 8 0],[652.345 9 0],[671.042 10 0],[676.002 20 0],[684.26 60 0],[711.373 20 0]}{110}% -\wl@elt@search{#1}{Au}{[380.192 30 0],[380.401 30 1],[382.185 10 0],[382.57 10 0],[387.473 100 0],[388.025 30 0],[388.948 30 0],[389.226 100 0],[389.786 400 0],[390.109 30 0],[390.938 300 0],[392.769 100 0],[395.91 10 0],[396.623 30 0],[397.665 30 0],[397.968 30 0],[399.137 30 0],[401.257 3 0],[401.607 10 1],[404.093 400 0],[405.279 30 1],[406.507 700 0],[407.635 10 1],[408.328 3 1],[408.41 100 0],[410.17 30 0],[412.859 30 0],[420.113 30 0],[422.788 30 0],[424.18 100 0],[431.511 200 0],[436.104 30 1],[442.061 10 1],[443.727 120 0],[448.825 250 0],[460.751 900 0],[462.056 100 0],[466.392 1 0],[466.397 3 0],[469.469 10 0],[476.017 3 1],[479.258 500 0],[481.16 100 0],[482.296 10 0],[495.082 30 0],[506.459 30 0],[510.884 30 0],[514.744 100 0],[523.026 300 0],[526.176 100 0],[565.577 100 0],[572.136 100 0],[583.737 300 0],[586.293 100 0],[595.696 300 0],[596.268 30 0],[627.817 600 0],[656.268 100 0],[665.289 30 0],[751.073 600 0]}{900}% -\wl@elt@search{#1}{Hg}{[380.166 30 0],[390.1867 20 0],[390.6372 60 0],[398.3839 200 1],[404.6572 1800 0],[407.7838 150 0],[410.8057 40 0],[433.9224 250 0],[434.7496 400 0],[435.8337 4000 0],[491.6068 80 0],[546.0753 1100 0],[567.5922 160 0],[576.9598 240 0],[579.0663 280 0],[607.2713 20 0],[623.4402 30 0],[671.6429 160 0],[690.7461 250 0],[380.166 30 0],[380.638 100 1],[390.187 20 0],[390.637 60 0],[391.892 100 1],[398.396 200 1],[404.656 1800 0],[407.783 150 0],[410.805 40 0],[433.922 250 0],[434.749 400 0],[435.833 4000 0],[439.862 100 1],[466.028 90 1],[485.572 80 1],[488.3 5 0],[488.991 5 0],[491.607 80 0],[497.037 5 0],[498.064 5 0],[510.27 20 0],[512.064 40 0],[512.845 100 1],[513.794 20 0],[529.074 20 0],[531.678 5 0],[535.405 60 0],[538.463 30 0],[546.074 1100 0],[554.963 30 0],[567.586 160 0],[576.96 240 0],[578.966 100 0],[579.066 280 0],[580.378 140 0],[585.925 60 0],[587.173 60 1],[587.198 20 0],[607.272 20 0],[614.95 1000 1],[623.44 30 0],[652.113 80 1],[671.643 160 0],[690.752 250 0],[708.19 250 0],[709.186 200 0],[734.637 40 1],[748.587 100 1],[772.882 20 0],[380.351 15 2],[412.207 70 2],[414.034 10 2],[421.674 100 2],[447.058 15 2],[455.284 12 2],[479.701 50 2],[486.985 10 2],[497.357 80 2],[521.082 30 2],[569.571 6 2],[622.035 25 2],[641.898 35 2],[650.138 40 2],[658.426 10 2],[661.012 6 2],[670.929 30 2],[751.746 12 2]}{4000}% -\wl@elt@search{#1}{Tl}{[383.23 10 1],[386.915 6 1],[388.715 10 1],[422.305 8 1],[427.498 20 1],[430.68 40 1],[435.99 2 0],[449.077 8 1],[473.705 20 1],[498.135 15 1],[507.854 25 1],[515.214 25 1],[518.195 6 1],[518.31 6 1],[535.046 18000 0],[538.485 15 1],[540.992 7 1],[541.097 10 1],[594.948 25 1],[617.998 10 1],[623.903 8 1],[637.832 10 1],[654.984 16 0],[671.38 6 0],[696.65 10 1],[749.36 3 0],[767.893 2 0],[393.305 6 2],[394.602 2 2],[410.985 7 2],[415.575 4 2],[426.981 6 2],[438.057 2 2],[508.699 4 2],[536.24 4 2],[549.94 2 2],[592.78 5 2]}{18000}% -\wl@elt@search{#1}{Pb}{[401.9632 15000 0],[405.7807 95000 0],[406.2136 14000 0],[411.076 5 1],[411.335 4 1],[415.282 10 1],[415.7814 10 0],[416.8033 10000 0],[424.214 9 1],[424.492 20 1],[429.382 7 1],[429.665 6 1],[434.0413 200 0],[435.274 10 1],[438.646 20 1],[457.9051 10 1],[458.227 10 1],[500.5416 1000 0],[500.6572 100 0],[504.258 50 1],[507.058 10 1],[507.453 10 1],[507.635 10 0],[508.9484 50 0],[509.001 20 0],[510.7242 10 0],[511.164 10 1],[520.1437 2000 0],[536.764 10 1],[537.2099 10 1],[554.425 10 1],[560.885 20 1],[569.2346 40 0],[589.5624 200 0],[600.1862 2000 0],[600.958 9 1],[601.1667 500 0],[604.117 8 1],[605.9356 500 0],[607.574 40 1],[608.1409 40 1],[611.052 50 0],[615.989 10 1],[623.5266 100 0],[666.02 50 1],[689.211 10 0],[712.894 5 0],[719.36 20 1],[722.8965 20000 0],[730.468 5 0],[733.015 8 0],[734.6676 10 0],[755.897 10 1],[763.256 10 1],[773.296 4 1],[385.408 12 2],[395.192 8 2],[403.116 3 2],[409.454 3 2],[412.811 2 2],[427.266 8 2],[449.934 6 2],[457.121 7 2],[459.645 1 2],[476.112 6 2],[479.859 4 2],[482.686 1 2],[485.506 2 2],[506.512 3 2],[519.156 4 2],[552.397 5 2],[577.941 3 2],[585.796 6 2],[396.248 4 3],[404.98 4 3],[449.615 10 3],[453.46 16 3],[460.54 8 3],[591.454 2 3],[480.936 4 4],[665.099 5 4],[675.32 4 4]}{95000}% -\wl@elt@search{#1}{Bi}{[381.11 12 1],[381.58 20 1],[384.58 10 1],[386.39 30 1],[407.91 40 1],[409.72 10 1],[412.153 140 0],[412.186 140 0],[425.94 75 1],[427.2 25 1],[430.17 70 1],[433.98 12 1],[434.05 25 1],[437.94 12 1],[447.68 25 1],[470.53 60 1],[472.252 600 0],[473.03 30 1],[474.97 20 1],[490.82 12 1],[491.66 10 1],[496.97 12 1],[499.36 20 1],[509.16 10 1],[512.43 50 1],[514.43 60 1],[520.15 20 1],[520.92 75 1],[527.03 40 1],[539.78 10 1],[555.235 10 0],[559.941 3 0],[565.52 20 1],[571.92 40 1],[574.255 6 0],[581.83 12 1],[586.02 20 1],[597.3 20 1],[605.91 15 1],[612.8 15 1],[613.482 6 0],[647.573 3 0],[647.624 3 0],[649.77 15 1],[657.72 10 1],[660.02 40 1],[680.86 50 1],[699.112 4 0],[703.3 12 1],[703.615 2 0],[738.1 10 1],[750.233 2 0],[763.7 10 1],[775 10 1],[422.46 12 2],[432.78 25 2],[456.084 30 2],[456.154 30 2],[479.74 40 2],[507.93 45 2],[662.34 12 2],[738.1 10 2],[755.1 12 2],[759.8 25 2],[763.7 10 2],[386.8 100 3],[434.2 30 3],[534.7 30 3]}{600}% -\wl@elt@search{#1}{Po}{[386.193 500 0],[405.198 200 -1],[417.052 1200 0],[423.613 250 -1],[441.558 200 -1],[449.321 800 0],[461.144 350 0],[486.712 200 -1],[487.624 400 0],[494.681 450 -1],[532.323 350 0],[574.485 300 0]}{1200}% -\wl@elt@search{#1}{Rn}{[391.72 10 0],[394.172 10 0],[395.236 10 0],[422.606 10 0],[430.776 80 0],[433.578 7 0],[434.96 100 0],[443.505 40 0],[445.925 50 0],[450.848 50 0],[457.772 50 0],[460.938 50 0],[472.176 30 0],[572.258 6 0],[606.192 10 0],[620.075 6 0],[638.045 6 0],[655.749 10 0],[660.643 10 0],[662.723 15 0],[666.96 6 0],[670.428 8 0],[675.181 20 0],[680.679 6 0],[683.695 8 0],[683.757 8 0],[689.116 10 0],[699.89 10 0],[705.542 200 0],[726.811 100 0],[729.1 20 0],[732.098 6 0],[741.904 10 0],[745 300 0],[747.089 8 0],[748.313 8 0],[751.413 8 0],[751.692 8 0],[752.393 6 0],[759.755 6 0],[760.128 8 0],[765.748 10 0],[773.843 10 0],[774.664 20 0]}{300}% -\wl@elt@search{#1}{Ra}{[381.442 200 1],[419.409 8 1],[424.472 8 1],[434.064 100 1],[443.627 20 1],[453.311 30 1],[464.129 8 0],[468.228 100 1],[469.928 8 0],[482.591 100 0],[485.607 10 0],[485.941 10 1],[492.753 10 1],[509.756 10 0],[520.593 10 0],[528.328 10 0],[532.029 10 0],[539.98 10 0],[540.023 20 0],[540.681 20 0],[548.213 8 0],[550.198 10 0],[555.357 10 0],[555.585 20 0],[561.666 10 0],[566.081 50 0],[581.363 20 1],[620.03 30 0],[633.69 10 0],[644.62 20 0],[648.732 20 0],[659.334 10 1],[671.932 10 1],[698.022 20 0],[711.85 20 0],[714.121 50 0],[722.516 20 0],[731.027 10 0]}{200}% -\wl@elt@search{#1}{Ac}{[386.312 2000 1],[391.447 100 1],[406.16 400 1],[408.844 3000 1],[416.84 3000 1],[417.998 100 0],[418.312 20 0],[419.44 20 0],[420.969 300 1],[435.913 300 1],[438.453 20 0],[438.641 1000 1],[439.671 20 0],[446.273 20 0],[450.72 1000 1],[460.545 500 1],[471.658 10 0],[472.016 400 1],[481.222 300 1],[494.518 100 1],[495.823 100 1],[496.087 100 1],[544.638 150 1],[573.205 300 1],[575.897 400 1],[591.085 1000 1],[616.475 600 1],[616.783 200 1],[624.283 400 1],[635.986 20 0],[669.127 20 0],[729.04 6 0],[441.309 2000 2],[456.987 3000 2],[519.321 8 2]}{3000}% -\wl@elt@search{#1}{Th}{[380.0197 50 0],[380.3075 590 0],[380.7273 50 0],[381.3068 340 1],[381.8685 50 0],[382.5133 75 0],[382.8384 450 0],[383.6584 70 0],[383.9746 840 1],[384.196 280 1],[384.6887 100 0],[385.2135 85 0],[385.4511 390 1],[385.984 140 1],[386.3405 450 1],[386.9663 100 0],[387.5374 210 0],[387.9644 140 0],[388.6915 100 0],[389.5419 340 0],[390.1661 50 0],[390.3102 110 0],[390.5186 170 1],[390.875 50 0],[391.1909 85 0],[391.6417 50 0],[391.9023 110 0],[392.5093 140 0],[392.9669 590 1],[393.2911 200 0],[393.704 140 1],[394.2072 50 0],[394.803 50 0],[394.8964 200 1],[395.276 50 0],[395.93 110 0],[396.7392 390 0],[397.2155 200 0],[398.0089 150 0],[399.173 110 0],[399.4549 530 1],[399.8061 50 0],[400.3309 240 1],[400.7021 250 1],[400.821 220 0],[400.9056 220 0],[401.2495 280 0],[401.9129 4200 1],[402.5656 210 1],[402.7009 140 0],[403.0842 250 0],[403.6047 250 0],[403.6565 240 1],[404.1204 240 1],[404.8287 55 0],[405.0887 110 0],[405.9253 140 0],[406.3407 250 0],[406.9201 300 1],[406.9461 100 0],[407.5503 55 0],[408.1368 110 0],[408.5434 85 0],[408.652 700 1],[408.8726 70 0],[409.4747 700 1],[410.0341 150 0],[410.533 270 1],[410.8421 840 1],[411.2754 240 0],[411.5758 280 0],[411.6713 1100 1],[412.36 30 0],[412.7411 200 0],[413.1002 110 0],[413.2753 340 1],[413.4067 200 0],[414.0235 220 1],[414.2701 250 1],[414.8182 200 1],[414.9986 450 1],[415.8535 110 0],[416.5766 140 0],[417.806 620 1],[417.9714 250 1],[418.4138 30 0],[419.3017 130 0],[420.889 620 1],[421.0923 130 0],[421.4828 28 0],[422.0065 55 0],[422.7387 55 0],[423.0824 30 0],[423.5463 85 0],[424.1094 20 0],[424.7989 30 1],[425.3538 110 0],[425.6254 70 0],[426.0333 110 0],[426.9942 28 0],[427.3357 280 1],[427.7313 480 1],[428.2042 700 1],[428.8669 28 0],[429.7306 55 0],[429.9839 85 0],[430.7176 100 0],[430.9991 200 1],[431.5254 55 0],[431.8416 110 0],[432.5274 30 0],[433.0844 28 0],[433.7277 130 0],[434.2256 85 1],[434.4326 130 1],[434.9072 55 0],[435.4484 55 0],[435.9372 85 0],[436.593 85 0],[437.4123 85 0],[438.186 1300 1],[439.111 1100 1],[439.2974 55 0],[440.158 55 0],[440.8882 85 0],[441.2741 210 1],[441.6845 28 0],[442.2048 50 0],[443.2963 250 1],[444.0866 140 1],[445.2565 25 0],[445.8002 85 0],[446.5341 220 1],[447.5221 30 0],[448.2169 75 0],[448.9664 50 0],[449.894 110 0],[450.5216 55 0],[451.0527 280 1],[452.1194 70 0],[453.0319 22 0],[453.5255 40 0],[454.5915 30 1],[455.5812 70 0],[456.366 40 0],[457.0972 65 0],[458.8426 50 0],[459.5421 75 0],[461.2554 26 1],[462.1163 30 0],[463.1761 140 1],[463.1761 140 1],[464.1254 30 0],[465.1558 140 1],[466.3202 23 0],[466.9984 50 0],[467.6056 65 0],[468.6195 50 0],[469.4091 140 1],[470.399 50 0],[471.2841 20 0],[472.3438 90 0],[472.9128 30 0],[474.0529 190 1],[475.2414 140 1],[476.66 13 0],[477.8294 50 0],[478.6531 20 0],[478.9387 40 0],[480.8134 45 0],[481.9193 20 0],[482.2855 26 0],[482.67 40 0],[483.1121 45 0],[484.0843 50 0],[484.8362 30 0],[485.2868 15 0],[485.8333 40 1],[486.3163 280 1],[487.2917 40 0],[487.8733 26 0],[489.4955 45 0],[490.7209 20 0],[491.9816 240 1],[492.778 18 0],[493.9642 40 0],[494.7575 60 1],[495.4659 50 1],[496.5731 30 0],[497.595 35 1],[498.5372 24 0],[500.2097 50 0],[500.2097 50 0],[501.5889 50 1],[501.7255 260 1],[502.9892 20 0],[503.923 24 0],[504.4719 50 0],[504.9796 240 1],[505.5347 85 1],[505.8562 70 1],[506.7974 110 0],[508.1446 30 0],[509.0051 50 0],[509.8043 50 1],[510.113 40 0],[511.0867 50 1],[511.5044 30 0],[512.595 10 0],[513.4746 20 0],[514.3267 95 1],[514.8211 120 1],[515.1612 50 0],[515.4243 50 0],[515.8604 85 0],[516.073 70 0],[516.8922 20 0],[517.6961 50 0],[518.399 35 1],[519.0871 50 1],[519.5814 50 0],[519.88 50 0],[519.9164 95 0],[521.123 50 0],[521.6596 95 1],[521.8528 50 1],[521.911 35 0],[523.116 110 0],[523.3225 85 1],[523.3229 85 1],[524.7654 95 1],[525.5573 10 0],[525.836 35 0],[526.671 12 0],[527.7501 70 1],[528.1069 15 0],[529.4397 10 0],[529.7743 30 0],[530.7466 30 1],[531.2002 35 0],[531.7494 20 0],[532.5145 60 1],[532.6976 50 0],[533.008 20 0],[534.3581 60 0],[535.1126 14 0],[535.8707 30 0],[536.9281 20 0],[537.8836 30 0],[539.0466 70 1],[539.2572 50 0],[539.9175 20 0],[541.7486 24 0],[542.5678 60 1],[543.5893 50 1],[544.9479 40 1],[546.2615 30 1],[547.0759 15 0],[548.4147 24 1],[549.6137 10 0],[550.4302 19 0],[550.9994 35 0],[552.4584 12 0],[553.9262 50 0],[553.9911 70 1],[554.8176 35 0],[555.8342 50 0],[556.4203 60 1],[557.3354 40 0],[558.7026 60 0],[559.5064 24 0],[560.4515 50 1],[561.532 35 0],[563.0297 7 0],[563.9746 70 1],[564.8991 7 0],[565.7925 12 0],[566.7128 15 0],[567.7053 20 0],[568.5192 10 0],[570.0918 65 1],[570.7103 95 1],[572.0183 50 0],[573.2975 30 1],[574.2084 24 1],[574.9388 30 1],[576.0551 70 0],[577.3946 15 0],[578.9645 20 0],[580.4141 35 0],[581.5422 19 1],[583.237 10 0],[584.5919 10 0],[585.4121 15 0],[586.8373 15 0],[587.8933 10 0],[589.1451 8 0],[589.9844 15 0],[591.4387 20 1],[592.5893 19 1],[593.7162 10 0],[594.4648 10 0],[595.7587 8 0],[597.3665 30 0],[598.9044 85 1],[599.4129 24 0],[600.7072 21 0],[601.5426 30 1],[602.1036 17 0],[603.7698 17 0],[604.4431 24 1],[605.3381 10 0],[606.1536 5 0],[607.7106 30 0],[608.7262 30 1],[609.9083 24 0],[610.458 30 0],[611.2837 40 0],[612.0557 30 1],[612.448 10 0],[615.1993 14 0],[616.1354 10 0],[616.9822 60 0],[618.2622 50 0],[619.1906 12 0],[619.3858 24 1],[620.3493 12 0],[622.4528 12 0],[623.4856 24 0],[624.0954 8 0],[625.7424 10 0],[626.1063 21 0],[626.1418 21 0],[627.4116 50 1],[627.4117 50 1],[627.9172 30 1],[629.1192 8 0],[630.3251 10 1],[631.7185 8 0],[632.7278 21 0],[634.286 35 0],[635.5911 50 1],[636.914 14 0],[637.6931 40 0],[641.1899 30 0],[641.3615 24 0],[643.7762 15 0],[645.0005 15 0],[645.7283 60 0],[646.2614 50 0],[646.6717 5 0],[649.0738 14 0],[650.1992 5 0],[651.2364 20 0],[652.2044 5 0],[653.1342 50 0],[655.416 6 0],[655.8876 5 0],[656.507 3 0],[657.7215 5 0],[658.3907 24 0],[658.854 24 0],[659.394 24 0],[660.5416 24 1],[661.9946 24 1],[661.9947 24 1],[664.465 21 1],[665.8678 6 1],[666.2269 30 0],[667.4697 6 0],[668.3367 3 0],[669.2724 8 1],[669.7712 5 0],[672.7459 16 0],[673.5126 3 0],[674.2884 5 0],[675.6453 20 0],[676.5677 6 0],[677.8313 15 0],[678.0413 15 0],[679.1236 6 0],[679.8747 3 0],[680.9511 3 0],[682.3509 5 0],[682.9036 11 0],[683.4925 14 0],[686.2873 4 0],[686.6367 5 0],[687.4754 8 0],[688.9303 20 1],[690.8988 3 0],[691.1227 24 0],[691.6129 5 0],[693.6652 5 0],[694.3611 35 0],[695.4657 5 0],[696.5947 15 0],[698.1086 3 0],[698.9656 55 0],[699.3038 24 1],[700.0806 18 0],[700.0806 18 0],[701.5319 3 0],[701.8569 10 0],[702.6462 3 0],[703.6281 7 0],[704.5795 30 1],[705.3619 15 1],[706.0654 6 0],[707.5333 24 1],[708.4171 30 0],[708.9339 24 1],[710.0512 10 1],[710.9861 3 0],[712.4562 11 0],[713.2613 3 0],[714.856 5 0],[715.4954 10 0],[716.8896 30 0],[717.3373 15 0],[719.1132 40 1],[720.0046 7 0],[720.8006 35 0],[721.269 11 0],[721.7755 10 1],[721.8054 11 0],[724.2355 3 0],[725.5354 5 0],[727.0558 3 0],[728.4904 7 0],[729.8143 5 0],[730.5405 11 1],[731.5067 5 0],[732.4808 7 0],[733.9606 5 0],[734.1152 8 0],[736.1349 5 0],[738.4175 5 0],[738.5501 18 0],[739.3431 3 1],[740.2252 5 0],[741.855 3 0],[742.894 21 0],[743.0254 10 0],[744.4749 3 0],[746.2993 2 0],[748.1355 10 0],[749.3427 2 0],[752.5508 50 1],[754.9314 7 0],[756.774 18 0],[758.569 12 0],[758.5792 12 0],[759.8204 4 0],[760.7824 2 0],[762.7176 5 0],[763.6176 3 0],[764.738 30 0],[765.8324 4 0],[767.6219 7 0],[768.5305 21 0],[771.0269 4 0],[772.8951 4 0],[773.172 10 1],[777.1948 4 0],[778.779 15 1],[778.8937 15 0],[779.836 5 0],[455.573 100 2],[458.928 50 2],[537.613 100 2],[544.718 50 2],[624.295 50 2],[659.939 50 2],[746.159 50 2],[493.709 2 3],[495.252 4 3],[542.038 3 3],[671.187 2 3],[674.037 3 3],[690.116 50 3]}{4200}% -\wl@elt@search{#1}{Pa}{[387.335 3000 0],[393.183 3000 0],[395.262 3000 1],[395.785 10000 1],[397.007 3000 1],[398.182 3000 0],[398.223 10000 0],[401.296 3000 1],[401.821 3000 1],[403.016 3000 1],[404.693 3000 1],[405.62 10000 1],[407.04 10000 1],[411.762 3000 -1],[417.618 3000 1],[421.723 10000 1],[424.808 10000 1],[429.134 3000 1],[440.077 3000 -1],[443.613 3000 -1],[460.143 3000 1],[462.819 3000 -1],[482.034 3000 -1],[486.149 3000 -1],[603.578 3000 0],[616.256 3000 0],[621.635 3000 -1],[635.861 3000 0],[637.925 3000 0],[643.897 3000 0],[679.275 3000 0],[694.572 10000 0],[696.009 3000 0],[696.178 3000 0],[699.273 3000 0],[707.627 3000 0],[710.094 3000 0],[711.489 10000 0],[717.155 3000 0],[722.713 3000 0],[731.879 3000 0],[736.825 10000 0],[747.189 3000 0],[749.315 10000 0],[755.826 3000 0],[760.82 10000 0],[762.679 10000 0],[763.518 10000 0],[766.934 10000 0],[767.92 3000 0],[774.919 10000 0]}{10000}% -\wl@elt@search{#1}{U}{[380.892 380 0],[380.922 380 1],[381.199 1900 0],[381.379 380 1],[381.406 380 1],[382.651 750 1],[383.146 2000 1],[383.963 1200 0],[384.86 490 1],[385.422 620 0],[385.464 2400 1],[385.957 4900 1],[386.117 490 1],[386.592 1900 1],[386.68 380 1],[387.103 1500 0],[387.404 620 1],[387.808 620 1],[388.145 1000 1],[388.236 490 1],[388.328 380 1],[389.036 2200 1],[389.268 620 1],[389.412 490 0],[389.677 490 1],[389.978 620 1],[390.255 410 1],[390.43 460 1],[390.645 380 0],[391.167 330 1],[391.588 380 1],[392.621 330 0],[392.672 330 0],[393.098 430 1],[393.202 2000 1],[393.538 490 1],[394.048 330 1],[394.382 1200 0],[394.844 300 0],[395.358 300 1],[395.467 360 1],[396.421 350 0],[396.652 600 1],[398.579 1200 1],[399.042 460 1],[399.253 380 1],[399.824 350 1],[400.406 350 1],[400.521 430 0],[401.772 570 1],[401.899 300 1],[404.275 1000 0],[404.441 520 1],[404.761 410 0],[405.004 1600 1],[405.191 540 1],[405.43 300 1],[405.819 430 1],[406.254 880 1],[406.775 520 1],[407.112 410 1],[407.448 300 1],[407.669 330 1],[408.06 330 1],[409.013 2200 1],[409.303 460 1],[410.638 380 1],[411.61 810 1],[412.473 410 1],[412.834 410 1],[414.122 460 1],[415.397 880 0],[415.665 380 0],[416.368 350 1],[417.159 1400 1],[418.927 300 1],[422.237 350 0],[424.167 1000 1],[424.437 520 1],[434.169 680 1],[435.574 430 0],[436.205 430 0],[439.359 330 0],[447.233 600 1],[451.528 240 1],[454.363 620 1],[462.021 300 0],[462.707 240 1],[463.162 210 0],[464.66 220 1],[466.685 140 1],[467.14 100 1],[468.907 170 1],[470.251 100 1],[472.272 160 1],[473.159 120 1],[475.574 100 1],[475.681 150 0],[477.27 100 1],[486.099 100 1],[500.821 110 1],[502.738 170 0],[511.724 70 1],[516.032 80 1],[516.414 55 0],[518.457 55 1],[520.431 45 1],[524.775 45 1],[525.704 45 1],[528.038 70 0],[538.619 55 1],[547.57 80 1],[548.026 70 1],[548.12 70 1],[548.253 45 1],[549.295 160 1],[552.782 70 1],[556.417 70 0],[558.159 45 1],[562.078 55 0],[578.059 70 0],[579.853 70 1],[583.602 45 0],[583.768 55 1],[591.539 230 0],[597.15 55 0],[597.632 100 0],[599.731 45 0],[601.738 28 1],[605.174 55 1],[606.722 45 1],[607.729 90 0],[608.734 28 1],[617.186 40 0],[617.539 35 0],[628.018 28 1],[635.929 28 0],[637.246 55 0],[637.852 28 1],[639.277 28 0],[639.542 90 0],[644.916 110 0],[646.498 35 0],[682.692 90 0],[687.674 35 1],[707.479 23 0],[710.161 27 0],[712.89 30 0],[714.789 16 0],[725.445 16 0],[742.55 23 0],[753.393 45 0],[761.935 16 0]}{4900}% -\wl@elt@search{#1}{Np}{[398.689 300 0],[504.466 300 0],[560.17 300 0],[565.275 300 0],[578.439 300 0],[587.804 300 0],[601.122 300 0],[605.609 300 0],[607.39 300 0],[608.005 300 0],[612.049 300 0],[618.859 300 0],[620 300 0],[621.59 300 0],[631.784 300 0],[634.138 300 0],[656.611 300 0],[672.068 300 0],[675.132 300 0],[679.521 300 0],[680.262 300 0],[680.581 300 0],[681.644 300 0],[686.545 300 0],[690.713 300 0],[691.291 300 0],[693.031 1000 0],[696.363 300 0],[697.209 3000 0],[701.402 300 0],[701.891 300 0],[703.914 300 0],[708.001 300 0],[717.483 300 0],[718.493 300 0],[728.428 300 0],[729.229 300 0],[733.252 300 0],[737.06 300 0],[738.103 300 0],[738.165 300 0],[740.27 300 0],[751.222 300 0],[751.515 300 0],[754.605 300 0],[762.483 300 0],[762.685 300 0],[768.101 300 0],[768.525 300 0],[773.514 1000 0],[776.161 300 0],[776.575 1000 0],[777.607 300 0],[778.746 300 0],[779.138 1000 0]}{3000}% -\wl@elt@search{#1}{Pu}{[380.593 10000 0],[381.14 10000 0],[381.23 10000 1],[382.757 10000 0],[383.552 10000 0],[383.696 10000 0],[383.892 10000 0],[384.21 10000 0],[385.101 10000 0],[385.185 10000 0],[387.854 10000 0],[389.589 10000 0],[392.853 10000 0],[397.543 10000 1],[409.712 10000 0],[410.196 10000 0],[410.595 10000 1],[411.107 10000 0],[411.491 10000 0],[412.812 10000 0],[412.993 10000 1],[413.301 10000 0],[413.597 10000 0],[414.004 10000 0],[414.12 10000 1],[415.109 10000 0],[415.145 10000 0],[415.546 10000 0],[415.939 10000 1],[416.777 10000 0],[417.095 10000 0],[417.828 10000 1],[418.99 10000 1],[419.006 10000 1],[419.62 10000 1],[420.648 10000 0],[420.823 10000 0],[422.187 10000 0],[422.42 10000 0],[422.977 10000 1],[425.476 10000 1],[426.188 10000 0],[426.977 10000 0],[427.334 10000 1],[428.117 10000 0],[428.908 10000 1],[433.718 10000 1],[435.271 10000 1],[436.741 10000 0],[437.991 10000 1],[438.535 10000 1],[439.393 10000 1],[440.49 10000 0],[444.165 10000 1],[446.854 10000 1],[447.279 10000 1],[449.378 10000 1],[450.491 10000 1],[453.615 10000 1],[473.54 10000 0],[498.934 10000 0],[526.986 10000 0],[538.102 10000 0],[549.85 10000 0],[551.072 10000 0],[553.759 10000 0],[554.962 10000 0],[559.054 10000 0],[559.233 10000 0],[571.239 10000 0],[577.026 10000 0],[583.905 10000 0],[598.335 10000 0],[601.278 10000 0],[619.28 10000 0],[630.466 10000 0],[644.975 10000 0],[648.671 10000 0],[648.886 10000 0],[648.889 10000 -1],[653.527 10000 0],[654.421 10000 0],[660.895 10000 0],[667.272 10000 0],[678.466 10000 0],[688.016 10000 0],[689.138 10000 0],[705.923 10000 0],[706.89 10000 0],[709.246 10000 0],[711.688 10000 0],[714.166 10000 0],[717.714 10000 0],[723.109 10000 0],[725.806 10000 0],[732.223 10000 0],[732.597 10000 0],[733.181 10000 0],[743.118 10000 0],[744.799 10000 0],[750.78 10000 0],[752.693 10000 0],[754.745 10000 0],[756.45 10000 0],[757.187 10000 0],[757.293 10000 0],[760.977 10000 0],[768.94 10000 0],[775.82 10000 0],[779.854 10000 0]}{10000}% -\wl@elt@search{#1}{Am}{[392.625 5000 1],[395.258 1000 1],[402.025 100 0],[403.581 100 0],[403.637 500 1],[408.929 5000 1],[408.932 100 1],[414.096 100 0],[418.812 1000 1],[426.555 1000 0],[428.926 5000 0],[430.965 200 1],[432.457 2000 1],[444.136 2000 1],[450.945 5000 1],[457.559 5000 1],[459.331 1000 1],[464.912 100 0],[465.345 100 0],[466.279 5000 0],[468.165 2000 0],[469.97 2000 1],[470.68 1000 0],[487.222 2000 1],[499.079 200 0],[500.021 100 0],[502.096 1000 1],[521.599 200 1],[540.262 1000 0],[542.47 1000 0],[558.421 1000 1],[559.813 1000 0],[605.464 10000 0],[640.511 1000 0],[654.416 500 0],[695.558 500 0]}{10000}% -\wl@elt@search{#1}{Cm}{[381.63 10000 0],[382.514 10000 0],[383.332 10000 0],[383.759 10000 0],[384.2 10000 0],[384.992 10000 0],[385.411 10000 0],[390.025 10000 0],[390.406 10000 1],[390.824 10000 1],[393.667 10000 0],[394.203 10000 0],[394.415 10000 0],[394.868 10000 0],[395.336 10000 0],[396.483 10000 0],[399.51 10000 0],[401.617 10000 0],[403.176 10000 0],[404.829 10000 0],[404.965 10000 0],[411.329 10000 0],[412.971 10000 0],[420.766 10000 1],[421.162 10000 0],[426.645 10000 0],[429.3 10000 0],[433.082 10000 0],[434.569 10000 0],[444.777 10000 0],[445.916 10000 0],[460.84 10000 0],[584.607 10000 0],[595.241 10000 0],[605.89 10000 0],[624.335 10000 0],[637.671 10000 0],[651.016 10000 0],[655.441 10000 0],[664.017 10000 0],[666.325 10000 0],[668.687 10000 0],[670.685 10000 0],[672.668 10000 0],[679.315 10000 0],[716.269 10000 0],[757.78 10000 0],[767.379 10000 0],[772.047 10000 0]}{10000}% -\wl@elt@search{#1}{Bk}{[380.108 10000 1],[380.235 10000 0],[380.247 10000 0],[381.529 10000 0],[382.31 10000 1],[382.408 10000 1],[382.519 10000 0],[382.584 10000 1],[382.741 10000 0],[383.055 10000 0],[383.157 10000 1],[383.348 10000 -1],[383.597 10000 1],[384.219 10000 0],[384.662 10000 0],[384.763 10000 0],[385.503 10000 0],[385.989 10000 1],[387.794 10000 1],[388.011 10000 0],[388.26 10000 0],[389.455 10000 1],[390.609 10000 1],[391.216 10000 1],[391.637 10000 1],[392.142 10000 0],[392.805 10000 1],[414.713 10000 1],[418.969 10000 1],[419.744 10000 1],[432.958 10000 0],[435.15 10000 0],[436.364 10000 0],[442.301 10000 0],[446.646 10000 0],[468.57 10000 -1],[476.54 10000 -1],[505.673 10000 0],[511.824 10000 0],[513.553 10000 1],[517.061 10000 0],[519.755 10000 0],[521.253 10000 0],[527.195 10000 0],[539.203 10000 0],[539.424 10000 0],[540.462 10000 0],[544.963 10000 0],[546.747 10000 0],[548.458 10000 0],[551.222 10000 1],[553.793 10000 0],[555.68 10000 0],[555.709 10000 0],[558.121 10000 0],[565.654 10000 0],[565.903 10000 0],[570.224 10000 0],[591.071 10000 0],[704.085 10000 0],[710.785 10000 0],[717.622 10000 0],[724.926 10000 -1],[725.25 10000 0],[725.721 10000 0],[730.694 10000 0],[739.426 10000 -1],[751.126 10000 0],[755.112 10000 0],[757.977 10000 0],[772.993 10000 0]}{10000}% -\wl@elt@search{#1}{Cf}{[389.323 10000 1],[399.357 10000 1],[403.545 10000 -1],[409.912 10000 0],[424.238 10000 0],[432.903 10000 0],[433.522 10000 0],[517.396 10000 0],[517.908 10000 0],[521.924 10000 0],[527.901 10000 -1],[532.009 10000 -1],[533.913 10000 -1],[540.888 10000 0],[572.605 10000 0],[662.283 10000 0],[663.126 10000 0],[667.79 10000 0],[689.459 10000 0],[692.71 10000 1],[707.452 10000 0],[730.79 10000 0]}{10000}% -\wl@elt@search{#1}{Es}{[380.149 10000 -1],[392.91 300 -1],[393.077 3000 -1],[395.719 100 -1],[399.535 100 -1],[407.771 300 -1],[408.224 10000 -1],[410.759 3000 -1],[417.694 1000 -1],[449.625 100 -1],[463.166 100 -1],[465.086 300 -1],[478.993 1000 -1],[480.217 300 -1],[480.221 1000 -1],[495.829 3000 -1],[505.208 10000 -1],[510.293 1000 -1],[515.582 100 -1],[516.174 10000 0],[520.44 10000 0],[561.551 3000 0],[653.971 100 -1]}{10000}% -}% -\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgf-spectra.doc.tlpobj new/tlpkg/tlpobj/pgf-spectra.doc.tlpobj --- old/tlpkg/tlpobj/pgf-spectra.doc.tlpobj 2016-04-22 01:25:22.000000000 +0200 +++ new/tlpkg/tlpobj/pgf-spectra.doc.tlpobj 2017-04-14 17:54:06.000000000 +0200 @@ -1,10 +1,9 @@ name pgf-spectra.doc category Package -revision 40656 +revision 42986 shortdesc doc files of pgf-spectra relocated 1 -docfiles size=216 +docfiles size=151 RELOC/doc/latex/pgf-spectra/README RELOC/doc/latex/pgf-spectra/pgf-spectraManual.pdf RELOC/doc/latex/pgf-spectra/pgf-spectraManual.tex - RELOC/doc/latex/pgf-spectra/spectra.data.tex ++++++ pgf-spectra.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pgf-spectra/spectra.data.tex new/tex/latex/pgf-spectra/spectra.data.tex --- old/tex/latex/pgf-spectra/spectra.data.tex 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/pgf-spectra/spectra.data.tex 2017-01-19 00:01:03.000000000 +0100 @@ -0,0 +1,116 @@ +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% ***************** \wl@elt@data{Chemical symbol} +% +%% Visible lines of some classical elements... thanks Larry W. % +% Data structure : list of 3 elements array +% { +% [wavelength1 intensity1 charge1], +% [wl2 I2 q2], +% [wl3 I3 q3], +% ... +% }{Imax} +% (intensity max at the end of each entry) +% Sometimes, there is no charge in the source file, so I put charge = -1 +% (see Es, Bk...) +% +\protected\def\wl@elt@data#1{\relax\ignorespaces% +\wl@elt@search{#1}{H}{[383.5384 5 0],[388.9049 6 0],[397.0072 8 0],[410.174 15 0],[434.047 30 0],[486.133 80 0],[656.272 120 0],[656.2852 180 0]}{180}% +\wl@elt@search{#1}{He}{[381.9607 10 0],[381.976 1 0],[388.865 500 0],[396.4729 20 0],[400.927 1 0],[402.6191 50 0],[402.636 5 0],[412.082 12 0],[412.099 2 0],[414.376 3 0],[438.7929 10 0],[443.755 3 0],[447.1479 200 0],[447.168 25 0],[468.54 6 1],[468.57 30 1],[471.3146 30 0],[471.338 4 0],[492.1931 20 0],[501.5678 100 0],[504.774 10 0],[541.152 5 1],[587.562 500 0],[587.597 100 0],[656.01 8 1],[667.815 100 0],[686.748 3 0],[706.519 200 0],[706.571 30 0],[728.135 50 0]}{500}% +\wl@elt@search{#1}{Li}{[391.53 20 0],[391.535 20 0],[398.548 10 0],[398.554 10 0],[413.256 40 0],[413.262 40 0],[427.307 20 0],[427.313 20 0],[432.542 5 1],[432.547 5 1],[432.554 1 1],[460.283 13 0],[460.289 13 0],[467.165 6 1],[467.17 2 1],[467.806 3 1],[467.829 1 1],[488.132 4 1],[488.139 4 1],[488.149 1 1],[497.166 8 0],[497.175 8 0],[548.355 600 1],[548.565 600 1],[610.354 320 0],[610.365 320 0],[670.776 3600 0],[670.791 3600 0]}{3600}% +\wl@elt@search{#1}{Be}{[381.345 700 0],[386.513 40 0],[386.542 80 0],[386.551 1 0],[386.572 6 0],[386.603 100 0],[425.305 100 0],[425.376 60 0],[436.066 300 1],[436.099 500 1],[440.794 400 0],[457.266 12 0],[467.333 700 1],[467.342 1000 1],[470.937 6 0],[482.816 200 1],[484.916 40 0],[485.822 2 1],[508.775 80 0],[521.812 8 1],[521.833 20 1],[525.586 3 1],[527.028 64 1],[527.081 500 1],[540.304 20 1],[541.021 20 1],[622.911 10 0],[627.943 16 1],[627.973 30 1],[647.354 30 0],[654.789 60 1],[655.836 60 1],[656.452 30 0],[663.644 2 1],[675.672 1 1],[675.713 2 1],[678.656 30 0],[688.422 1 0],[688.444 6 0],[698.275 100 0],[715.44 6 0],[715.465 40 0],[720.913 100 0],[740.12 3 1],[740.143 2 1],[755.19 10 0],[761.868 10 0],[761.888 20 0],[424.914 90 2],[448.552 2 2],[448.73 100 2],[449.509 1 2],[449.78 140 2],[614.201 140 2]}{1000}% +\wl@elt@search{#1}{B}{[412.193 285 1],[419.479 110 1],[447.21 110 1],[447.285 110 1],[478.421 70 1],[494.038 110 1],[608.044 110 1],[628.547 70 1],[703.02 70 1],[703.19 40 1],[424.298 40 2],[424.361 70 2],[448.705 220 2],[449.773 360 2]}{360}% +\wl@elt@search{#1}{C}{[387.619 350 1],[387.641 350 1],[387.666 350 1],[391.898 570 1],[392.069 800 1],[407.452 250 1],[407.585 350 1],[426.7 800 1],[426.726 1000 1],[477.175 200 0],[493.205 200 0],[505.217 200 0],[513.294 350 1],[513.328 350 1],[514.349 350 1],[514.516 570 1],[515.109 400 1],[538.034 300 0],[564.807 250 1],[566.247 350 1],[588.977 570 1],[589.159 350 1],[600.113 200 0],[600.603 250 0],[600.718 110 0],[601.068 150 0],[601.322 300 0],[601.484 250 0],[657.805 800 1],[658.288 570 1],[658.761 200 0],[678.39 250 1],[711.318 250 0],[711.519 250 0],[711.563 250 1],[711.699 200 0],[711.99 350 1],[723.132 800 1],[723.642 1000 1],[405.606 150 2],[406.794 200 2],[406.891 250 2],[407.026 250 2],[416.286 150 2],[418.69 250 2],[432.556 200 2],[464.742 600 2],[465.025 520 2],[465.147 375 2],[466.586 200 2],[569.592 450 2],[582.642 150 2],[674.438 150 2],[703.725 150 2],[761.265 150 2],[465.83 200 3],[580.133 250 3],[581.198 200 3],[772.62 90 3],[494.388 5 4],[494.456 5 4]}{1000}% +\wl@elt@search{#1}{N}{[383.837 285 1],[391.9 360 1],[395.585 450 1],[399.5 1000 1],[403.508 360 1],[404.131 550 1],[404.353 360 1],[409.994 140 0],[410.995 185 0],[417.616 285 1],[422.774 285 1],[423.691 285 1],[423.705 220 1],[424.178 450 1],[443.274 285 1],[444.703 650 1],[453.041 360 1],[460.148 550 1],[460.716 450 1],[461.387 360 1],[462.139 450 1],[463.054 870 1],[464.308 550 1],[478.813 285 1],[480.329 450 1],[484.738 180 0],[489.511 285 1],[491.494 160 0],[493.512 210 0],[495.023 160 0],[496.398 350 0],[498.737 285 1],[499.436 450 1],[500.148 650 1],[500.27 360 1],[500.515 870 1],[500.732 550 1],[501.062 450 1],[501.639 360 1],[502.566 360 1],[504.51 550 1],[528.12 185 0],[529.268 140 0],[549.567 450 1],[553.536 285 1],[566.663 650 1],[567.602 550 1],[567.956 870 1],[568.621 450 1],[571.077 450 1],[574.73 285 1],[575.25 700 0],[576.475 240 0],[582.954 265 0],[585.404 235 0],[592.781 360 1],[593.178 550 1],[594.024 285 1],[594.165 650 1],[595.239 285 1],[599.943 160 0],[600.847 210 0],[616.776 285 1],[637.962 360 1],[641.165 185 0],[642.064 210 0],[642.302 210 0],[642.832 210 0],[643.768 185 0],[644.094 235 0],[645.79 185 0],[646.844 300 0],[648.205 750 1],[648.27 360 0],[648.375 300 0],[648.171 265 0],[648.48 325 0],[649.122 160 0],[649.954 210 0],[650.631 185 0],[661.056 750 1],[662.254 185 0],[663.694 185 0],[664.496 235 0],[664.65 185 0],[665.346 235 0],[665.651 210 0],[672.262 185 0],[739.864 210 0],[740.612 160 0],[740.624 265 0],[742.364 685 0],[744.229 785 0],[746.831 900 0],[760.88 185 0],[776.224 450 1],[393.852 90 2],[399.863 150 2],[400.358 200 2],[409.733 250 2],[410.343 200 2],[419.576 120 2],[420.01 150 2],[433.291 90 2],[434.568 120 2],[437.911 300 2],[451.091 90 2],[451.486 120 2],[463.414 90 2],[464.064 120 2],[485.882 90 2],[486.715 150 2],[531.435 90 2],[532.082 200 2],[532.718 150 2],[645.411 90 2],[646.702 120 2],[405.776 150 3],[460.633 90 3],[638.077 150 3],[460.373 350 4],[461.998 250 4],[494.456 200 4],[761.846 60 4]}{1000}% +\wl@elt@search{#1}{O}{[380.314 160 1],[382.341 120 0],[391.196 450 1],[391.929 160 1],[394.729 185 0],[394.748 160 0],[394.759 140 0],[395.437 220 1],[395.461 100 0],[397.326 450 1],[398.22 220 1],[406.99 160 1],[407.216 285 1],[407.587 450 1],[408.391 80 1],[408.714 50 1],[408.927 150 1],[409.724 110 1],[410.5 220 1],[411.922 285 1],[413.281 160 1],[414.606 50 1],[415.33 220 1],[418.546 285 1],[418.979 450 1],[423.327 80 0],[425.374 50 1],[425.398 50 1],[427.547 50 1],[430.378 50 1],[431.714 285 1],[433.686 160 1],[434.556 220 1],[434.943 285 1],[436.69 220 1],[436.825 100 0],[439.595 220 1],[441.491 450 1],[441.698 285 1],[444.821 160 1],[445.238 160 1],[446.545 50 1],[446.628 50 1],[446.783 50 1],[446.941 50 1],[459.097 360 1],[459.617 285 1],[460.939 80 1],[463.885 160 1],[464.181 360 1],[464.914 450 1],[465.084 160 1],[466.164 360 1],[467.623 285 1],[469.921 220 1],[470.536 285 1],[492.46 160 1],[494.306 220 1],[532.91 135 0],[532.968 160 0],[533.074 190 0],[543.518 90 0],[543.578 110 0],[543.686 135 0],[557.734 120 0],[595.839 160 0],[595.858 190 0],[599.528 80 0],[604.623 160 0],[604.644 190 0],[604.649 110 0],[610.627 100 0],[615.598 400 0],[615.677 450 0],[615.818 490 0],[625.683 80 0],[626.155 100 0],[636.634 100 0],[637.432 100 0],[645.36 320 0],[645.444 360 0],[645.598 400 0],[660.491 80 0],[665.383 100 0],[700.192 360 0],[700.223 450 0],[715.67 210 0],[725.415 400 0],[725.445 450 0],[725.453 320 0],[747.644 210 0],[747.724 100 0],[747.908 120 0],[748.067 120 0],[770.675 100 0],[777.194 870 0],[777.417 810 0],[777.539 750 0],[396.159 200 2],[559.237 110 2],[412.399 100 4],[493.027 230 4],[559.791 130 4],[650.024 130 4]}{870}% +\wl@elt@search{#1}{F}{[380.583 140 1],[384.709 270 1],[384.999 260 1],[385.167 250 1],[389.848 5 0],[389.883 190 1],[390.193 180 1],[390.382 170 1],[393.069 8 0],[393.426 5 0],[394.856 5 0],[397.204 150 1],[397.267 160 1],[397.478 170 1],[402.473 240 1],[402.501 220 1],[402.549 230 1],[408.391 160 1],[410.307 190 1],[410.322 170 1],[410.351 200 1],[410.371 180 1],[410.387 170 1],[410.916 170 1],[411.654 160 1],[411.921 150 1],[420.715 140 1],[422.516 170 1],[424.412 150 1],[424.623 200 1],[424.639 190 1],[424.659 180 1],[424.677 170 1],[424.684 160 1],[427.536 170 1],[427.753 160 1],[427.893 160 1],[429.917 200 1],[444.653 160 1],[444.672 170 1],[444.719 180 1],[473.438 140 1],[485.939 170 1],[493.326 160 1],[496.065 6 0],[500.2 140 1],[517.325 150 1],[523.041 15 0],[527.901 12 0],[554.052 18 0],[555.243 12 0],[557.733 10 0],[558.927 160 1],[562.406 20 0],[562.693 12 0],[565.915 15 0],[566.753 40 0],[567.167 90 0],[568.914 18 0],[570.082 25 0],[570.731 25 0],[595.015 12 0],[595.919 25 0],[596.528 70 0],[599.443 50 0],[601.583 150 0],[603.804 80 0],[604.754 900 0],[608.011 100 0],[614.976 800 0],[621.087 400 0],[623.965 13000 0],[624.79 140 1],[634.851 10000 0],[641.365 8000 0],[656.969 450 0],[658.039 300 0],[665.041 400 0],[669.048 1800 0],[670.828 400 0],[677.398 7000 0],[679.553 1500 0],[683.426 9000 0],[685.603 50000 0],[687.022 8000 0],[690.248 15000 0],[690.982 6000 0],[696.635 4000 0],[703.747 45000 0],[712.789 30000 0],[717.99 130 1],[720.236 15000 0],[721.179 130 1],[730.903 1000 0],[731.102 15000 0],[731.43 700 0],[733.196 5000 0],[739.869 10000 0],[742.565 4000 0],[748.272 2200 0],[748.916 2500 0],[751.492 900 0],[755.224 5000 0],[757.338 5000 0],[760.717 7000 0],[775.47 18000 0],[442.03 140 2],[442.735 120 2],[443.232 120 2],[447.999 140 2],[501.254 150 2],[511.099 160 2],[575.317 140 2],[576.12 120 2],[609.182 150 2],[612.55 140 2],[623.357 130 2],[636.305 140 2],[733.677 120 2],[735.494 130 2]}{50000}% +\wl@elt@search{#1}{Ne}{[381.843 100 1],[382.975 120 1],[421.974 150 1],[423.385 100 1],[425.065 120 1],[436.986 120 1],[437.94 70 1],[437.955 150 1],[438.506 100 1],[439.199 200 1],[439.799 150 1],[440.93 150 1],[441.322 100 1],[442.139 100 1],[442.852 100 1],[442.863 100 1],[443.09 150 1],[443.094 150 1],[445.705 120 1],[452.272 100 1],[453.7754 10 0],[454.038 10 0],[456.906 100 1],[470.4395 15 0],[470.8862 12 0],[471.0067 10 0],[471.2066 10 0],[471.5347 15 0],[475.2732 10 0],[478.8927 12 0],[479.022 10 0],[482.7344 10 0],[488.4917 10 0],[500.5159 4 0],[503.7751 10 0],[514.4938 10 0],[533.0778 25 0],[534.1094 20 0],[534.3283 8 0],[540.0562 60 0],[556.2766 5 0],[565.6659 10 0],[571.9225 5 0],[574.8298 12 0],[576.4419 80 0],[580.445 12 0],[582.0156 40 0],[585.2488 500 0],[587.2828 100 0],[588.1895 100 0],[590.2462 60 0],[590.6429 60 0],[594.4834 100 0],[596.5471 100 0],[597.4627 100 0],[597.5534 120 0],[598.7907 80 0],[602.9997 100 0],[607.4338 100 0],[609.6163 80 0],[612.845 60 0],[614.3063 100 0],[616.3594 120 0],[618.2146 250 0],[621.7281 150 0],[626.6495 150 0],[630.4789 60 0],[633.4428 100 0],[638.2992 120 0],[640.2246 200 0],[650.6528 150 0],[653.2882 60 0],[659.8953 150 0],[665.2093 70 0],[667.8276 90 0],[671.7043 20 0],[692.9467 100 0],[702.405 90 0],[703.2413 100 0],[705.1292 50 0],[705.9107 80 0],[717.3938 100 0],[721.32 150 1],[723.519 150 1],[724.5167 100 0],[734.394 150 1],[747.2439 40 0],[748.8871 90 0],[749.21 100 1],[752.282 150 1],[753.5774 80 0],[754.4044 60 0],[772.4628 100 0],[774.074 120 1]}{500}% +\wl@elt@search{#1}{Na}{[408.137 200 1],[411.37 300 1],[412.308 250 1],[423.326 250 1],[423.899 2 0],[424.037 200 1],[424.09 250 1],[424.208 3 0],[427.364 4 0],[427.679 5 0],[428.784 2 0],[429.101 3 0],[429.248 250 1],[429.286 250 1],[430.881 250 1],[430.904 250 1],[432.091 250 1],[432.14 6 0],[432.462 7 0],[433.729 250 1],[434.149 4 0],[434.411 250 1],[434.474 5 0],[436.86 200 1],[437.522 200 1],[438.749 200 1],[439.003 8 0],[439.281 250 1],[439.334 9 0],[440.512 200 1],[441.989 6 0],[442.325 7 0],[444.67 200 1],[444.741 200 1],[445.474 200 1],[445.523 200 1],[445.721 200 1],[447.463 200 1],[447.88 200 1],[448.167 200 1],[449.015 200 1],[449.087 200 1],[449.418 10 0],[449.766 11 0],[449.962 200 1],[450.697 200 1],[451.921 200 1],[452.498 200 1],[453.332 200 1],[454.163 7 0],[454.519 8 0],[455.153 200 1],[459.092 160 1],[472.223 160 1],[473.11 160 1],[473.25 100 1],[474.167 160 1],[476.879 160 1],[478.879 100 1],[481.475 50 1],[483.526 50 1],[514.311 60 1],[519.165 100 1],[520.333 50 1],[520.855 80 1],[539.063 60 1],[540.046 70 1],[541.455 90 1],[568.2633 5 0],[568.8204 9 0],[588.995 1000 0],[589.5924 500 0],[617.525 60 1],[619.926 70 1],[623.468 70 1],[626.001 80 1],[627.474 80 1],[631.08 60 1],[635.283 60 1],[635.805 60 1],[636.115 70 1],[636.641 70 1],[637.891 60 1],[647.529 50 1],[651.421 90 1],[652.468 80 1],[653.07 130 1],[654.404 130 1],[654.575 130 1],[655.243 80 1]}{1000}% +\wl@elt@search{#1}{Mg}{[382.93 140 0],[383.23 300 0],[383.829 500 0],[384.824 8 1],[384.891 1 0],[385.04 7 1],[385.396 2 0],[385.496 1 0],[385.886 2 0],[387.831 3 0],[389.191 2 0],[389.33 2 0],[389.557 3 0],[390.386 4 0],[393.84 6 0],[398.421 1 0],[398.675 8 0],[405.469 2 0],[405.75 10 0],[407.506 3 0],[408.183 2 0],[416.51 4 0],[416.727 15 0],[435.191 20 0],[435.453 6 0],[438.038 6 0],[438.464 9 1],[439.059 10 1],[442.8 8 1],[443.399 9 1],[443.649 5 1],[443.66 4 1],[448.116 14 1],[448.133 13 1],[453.429 6 1],[457.11 28 0],[462.13 3 0],[470.299 7 0],[473.003 10 0],[473.959 6 1],[473.971 5 1],[485.11 7 1],[516.733 75 0],[517.268 220 0],[518.361 400 0],[526.421 8 1],[526.437 7 1],[534.598 1 0],[540.154 9 1],[550.96 2 0],[552.841 6 0],[571.109 30 0],[578.531 5 0],[578.556 4 0],[591.643 7 1],[591.816 6 1],[631.872 10 0],[631.924 9 0],[631.949 7 0],[634.674 10 1],[634.696 9 1],[654.597 11 1],[662.044 5 1],[662.057 6 1],[663.083 2 0],[678.145 7 1],[678.785 8 1],[681.286 7 1],[681.927 8 1],[689.49 4 0],[696.54 6 0],[706.041 8 0],[719.317 10 0],[729.106 10 0],[738.7 5 0],[738.769 12 0],[758.076 4 1],[765.76 20 0],[765.915 19 0],[765.99 17 0],[769.016 8 0],[769.155 15 0],[772.261 1 0],[774.634 1 0],[775.93 1 0],[778.65 5 1],[779.098 4 1],[491.6 10 2],[583.982 10 2],[625.675 15 2]}{500}% +\wl@elt@search{#1}{Al}{[390.068 450 1],[393.2 60 0],[394.4006 4500 0],[396.152 9000 0],[399.586 110 1],[422.681 290 1],[458.582 150 1],[458.819 110 1],[466.68 550 1],[489.876 110 1],[490.277 110 1],[528.021 150 1],[510.752 70 0],[528.377 290 1],[528.585 150 1],[531.232 110 1],[531.607 220 1],[537.184 150 1],[555.706 180 0],[555.795 110 0],[559.323 450 1],[585.362 110 1],[597.194 220 1],[600.176 290 1],[600.188 220 1],[600.642 450 1],[606.111 150 1],[606.843 290 1],[606.853 110 1],[607.323 450 1],[618.157 110 1],[618.168 150 1],[618.228 290 1],[618.245 220 1],[618.342 450 1],[620.152 450 1],[620.17 360 1],[622.618 290 1],[623.178 360 1],[624.336 450 1],[633.574 450 1],[669.602 360 0],[669.867 230 0],[708.397 60 0],[708.464 70 0],[736.157 110 0],[736.23 140 0],[760.616 60 0],[761.482 90 0],[398.014 110 2],[408.245 110 2],[408.861 150 2],[414.237 110 2],[414.992 650 2],[415.017 650 2],[436.464 110 2],[447.989 650 2],[447.997 650 2],[451.256 760 2],[452.894 550 2],[452.919 870 2],[470.115 110 2],[470.141 150 2],[490.41 110 2],[515.101 110 2],[516.389 110 2],[569.66 1200 2],[572.273 1000 2],[605.521 110 2],[763.537 220 2],[766.026 150 2],[768.197 220 2]}{9000}% +\wl@elt@search{#1}{Si}{[385.366 100 1],[385.602 500 1],[386.26 200 1],[390.5523 300 0],[395.574 10 1],[397.746 10 1],[399.177 15 1],[399.801 10 1],[407.545 20 1],[407.678 15 1],[410.2936 70 0],[412.807 300 1],[413.089 500 1],[418.335 10 1],[419.072 100 1],[419.813 50 1],[462.142 100 1],[462.172 150 1],[478.2991 50 0],[479.2212 35 0],[479.2324 80 0],[488.32 15 1],[490.699 20 1],[493.28 20 1],[494.7607 30 0],[500.6061 40 0],[504.103 1000 1],[505.598 1000 1],[518.19 100 1],[518.525 100 1],[519.286 200 1],[520.241 500 1],[529.519 30 1],[540.534 100 1],[541.724 15 1],[542.892 15 1],[543.289 15 1],[543.862 100 1],[544.726 20 1],[545.449 15 1],[545.645 100 1],[546.643 500 1],[546.687 500 1],[546.921 100 1],[549.323 40 0],[549.645 200 1],[551.7535 35 0],[554.074 100 1],[557.666 150 1],[562.2221 30 0],[563.297 100 1],[563.948 200 1],[564.5611 90 0],[566.066 150 1],[566.5554 80 0],[566.956 1000 1],[568.144 30 1],[568.4484 120 0],[568.881 300 1],[569.0425 100 0],[570.1105 90 0],[570.137 200 1],[570.637 100 1],[570.8397 160 0],[574.7667 45 0],[575.3625 45 0],[575.422 45 0],[576.2977 45 0],[577.2145 70 0],[578.0384 70 0],[578.573 30 1],[579.3071 90 0],[579.49 30 1],[579.7859 100 0],[580.047 150 1],[580.674 200 1],[582.78 30 1],[584.613 50 1],[586.748 10 1],[586.84 300 1],[587.3764 40 0],[591.522 150 1],[594.8545 200 0],[595.756 500 1],[597.893 500 1],[606.745 10 1],[608.006 20 1],[608.667 10 1],[612.5021 90 0],[613.1574 85 0],[613.185 90 0],[614.2487 100 0],[614.5015 100 0],[615.5134 160 0],[623.732 160 0],[623.8287 40 0],[624.3813 125 0],[624.4468 125 0],[625.4188 180 0],[633.1954 45 0],[634.71 1000 1],[637.136 1000 1],[652.6609 45 0],[652.7199 45 0],[655.5462 45 0],[666.052 50 1],[666.5 15 1],[667.188 100 1],[669.938 20 1],[671.704 50 1],[672.1853 100 0],[674.164 30 0],[675.028 20 1],[681.845 30 1],[682.982 50 1],[684.8568 30 0],[697.6523 80 0],[700.3567 180 0],[700.5883 180 0],[701.728 30 0],[701.7646 90 0],[703.4903 250 0],[716.469 70 0],[716.5545 200 0],[718.489 70 0],[719.358 65 0],[719.39 30 0],[722.6206 100 0],[723.5326 100 0],[723.582 60 0],[725.0625 180 0],[727.5294 160 0],[728.281 40 0],[728.9173 400 0],[729.026 55 0],[737.3 35 0],[740.5774 375 0],[740.9082 200 0],[741.535 40 0],[741.5946 275 0],[742.3497 425 0],[742.46 85 0],[768.0267 100 0],[774.271 40 0],[380.654 30 2],[384.246 7 2],[392.447 20 2],[394.749 6 2],[396.384 6 2],[398.124 5 2],[410.186 5 2],[410.242 8 2],[411.55 5 2],[433.85 9 2],[434.14 8 2],[437.763 8 2],[440.59 6 2],[440.672 8 2],[449.405 6 2],[455.262 30 2],[455.4 8 2],[456.782 25 2],[457.476 20 2],[461.966 7 2],[463.828 7 2],[466.587 8 2],[468.302 9 2],[468.38 7 2],[471.665 16 2],[473.052 7 2],[480.043 8 2],[481.333 15 2],[481.972 16 2],[482.897 18 2],[509.142 10 2],[511.376 7 2],[511.412 8 2],[519.726 5 2],[545.146 6 2],[547.305 7 2],[570.46 7 2],[571.629 8 2],[573.973 20 2],[589.879 10 2],[631.446 7 2],[652.436 6 2],[683.156 6 2],[685.165 7 2],[746.189 5 2],[746.262 8 2],[746.632 9 2],[761.236 12 2],[403.139 1 3],[403.806 2 3],[408.885 10 3],[411.61 9 3],[421.241 7 3],[431.41 3 3],[432.818 5 3],[440.373 2 3],[441.165 1 3],[461.127 1 3],[462.862 3 3],[463.124 9 3],[465.432 10 3],[465.692 3 3],[466.714 1 3],[467.33 2 3],[494.745 1 3],[495.011 3 3],[530.497 2 3],[530.949 1 3],[666.756 5 3],[670.121 7 3],[699.836 3 3],[704.794 6 3],[706.841 4 3],[763.05 2 3],[765.456 4 3],[767.875 4 3],[771.879 5 3],[772.382 6 3],[772.564 2 3],[773.047 1 3],[775.291 1 3]}{1000}% +\wl@elt@search{#1}{P}{[417.848 100 1],[428.86 200 1],[438.535 200 1],[442.071 400 1],[445.246 100 1],[446.3 150 1],[446.798 120 1],[447.526 200 1],[449.924 200 1],[453.081 120 1],[455.483 120 1],[455.807 120 1],[458.171 120 1],[458.804 500 1],[458.986 500 1],[460.208 600 1],[462.67 300 1],[465.831 300 1],[486.442 200 1],[492.72 150 1],[494.353 500 1],[495.439 300 1],[496.971 300 1],[519.141 150 1],[525.352 300 1],[529.613 400 1],[531.607 250 1],[534.475 300 1],[537.82 250 1],[538.688 300 1],[540.972 200 1],[542.591 400 1],[545.074 400 1],[545.831 100 0],[546.12 125 1],[547.775 200 0],[548.355 200 1],[549.973 200 1],[550.719 200 1],[554.114 200 1],[558.327 200 1],[558.834 250 1],[572.771 100 1],[602.418 500 1],[603.404 400 1],[604.312 500 1],[605.55 250 1],[605.786 100 1],[608.782 350 1],[609.768 150 0],[616.559 350 1],[619.901 180 0],[623.229 100 1],[636.727 200 1],[643.532 250 1],[643.631 130 1],[645.999 600 1],[650.346 600 1],[650.797 600 1],[671.328 150 1],[671.742 120 0],[716.545 100 0],[717.512 150 0],[717.666 120 0],[750.576 100 0],[390.4812 200 2],[391.4314 250 2],[395.7641 300 2],[397.8307 350 2],[405.744 200 2],[405.9312 400 2],[408.0084 300 2],[422.2195 500 2],[424.672 350 2],[442.8171 200 2],[446.3668 200 2],[447.9776 250 2],[608.3409 150 2],[640.9204 150 2],[648.444 150 2],[648.6381 150 2],[699.269 150 2],[424.9656 300 3],[454.0288 250 3],[454.1112 250 3],[454.8056 150 3],[454.8449 200 3],[523.5499 150 3],[598.9774 150 3],[614.2605 150 3],[671.3939 150 3],[671.5906 120 3],[744.3657 200 3],[408.318 150 4],[409.495 110 4],[515.672 110 4]}{600}% +\wl@elt@search{#1}{S}{[386.76 285 0],[390.2 285 0],[393.33 360 1],[412.08 450 0],[414.23 280 1],[414.51 360 1],[415.31 450 1],[416.27 450 1],[469.41 450 0],[469.54 285 0],[469.62 160 0],[471.62 280 1],[481.55 450 1],[492.41 360 1],[492.53 450 1],[499.35 285 0],[542.86 360 1],[543.28 650 1],[545.38 1000 1],[547.36 1000 1],[550.97 1000 1],[556.49 280 1],[560.61 1000 1],[564 450 1],[564.03 450 1],[564.7 280 1],[565.99 650 1],[566.47 450 1],[570.61 160 0],[581.92 450 1],[605.27 450 0],[628.64 280 1],[628.71 450 1],[630.55 450 1],[631.27 450 1],[638.49 280 1],[639.73 280 1],[639.8 280 1],[641.37 360 1],[674.36 160 0],[674.88 285 0],[675.72 450 0],[757.9 450 0],[762.98 450 0],[768.61 285 0],[769.67 450 0],[383.83 160 2],[392.86 160 2],[425.36 360 2],[428.5 110 2],[433.27 70 2]}{1000}% +\wl@elt@search{#1}{Cl}{[380.518 1900 1],[380.946 1300 1],[382.02 1700 1],[382.759 2800 1],[383.335 4500 1],[384.32 2500 1],[384.537 3100 1],[384.565 3900 1],[384.58 1500 1],[385.099 10000 1],[385.137 7900 1],[385.165 1200 1],[386.083 25000 1],[386.099 4400 1],[386.137 1000 1],[391.387 1500 1],[391.663 1100 1],[394.482 20 0],[410.479 20 0],[413.25 10000 1],[420.967 65 0],[422.642 50 0],[426.458 60 0],[436.327 100 0],[436.95 100 0],[437.293 5000 1],[437.99 100 0],[438.975 100 0],[439.04 90 0],[440.303 90 0],[443.849 100 0],[447.53 90 0],[448.991 1500 1],[452.619 100 0],[460.098 80 0],[462.3938 40 0],[465.404 50 0],[466.1208 80 0],[469.1523 45 0],[472.1255 40 0],[474.0729 45 0],[476.865 4300 1],[478.132 13000 1],[479.455 99000 1],[481.006 29000 1],[481.947 16000 1],[489.677 81000 1],[490.478 47000 1],[491.773 26000 1],[499.548 10000 1],[507.826 26000 1],[509.9789 30 0],[521.794 56000 1],[522.136 23000 1],[539.212 15000 1],[542.323 99000 1],[542.351 10000 1],[544.337 19000 1],[544.421 10000 1],[545.702 5600 1],[553.2162 40 0],[579.6305 50 0],[579.9914 45 0],[585.6742 30 0],[594.858 100 0],[601.9812 50 0],[608.261 35 0],[609.469 1900 1],[611.443 160 0],[614.0245 200 0],[619.4757 160 0],[639.866 160 0],[643.4833 150 0],[653.143 150 0],[666.167 1400 1],[667.843 150 0],[668.602 1300 1],[671.341 1200 1],[684.029 150 0],[693.2903 300 0],[698.1886 300 0],[708.6814 600 0],[725.662 7500 0],[741.411 5000 0],[746.237 550 0],[748.947 550 0],[749.2118 700 0],[754.7072 11000 0],[767.242 2300 0],[770.2828 450 0],[771.7581 7000 0],[774.497 10000 0],[776.916 2200 0],[777.109 650 0],[392.587 500 2],[399.15 700 2],[401.85 600 2],[405.907 600 2],[410.423 500 2],[410.683 500 2],[437.091 400 2],[460.821 500 2],[470.314 300 2],[486.375 100 2],[497.164 10 2]}{99000}% +\wl@elt@search{#1}{Ar}{[380.3172 25 1],[380.9456 50 1],[383.4679 7 0],[385.0581 70 1],[386.8528 35 1],[392.5719 35 1],[392.8623 50 1],[393.2547 25 1],[394.6097 70 1],[394.7505 7 0],[394.8979 35 0],[397.9356 20 1],[399.4792 35 1],[401.3857 50 1],[403.3809 50 1],[403.546 20 1],[404.2894 150 1],[404.4418 50 0],[405.2921 100 1],[407.2005 200 1],[407.2385 70 1],[407.6628 25 1],[407.9574 35 1],[408.2387 25 1],[410.3912 150 1],[413.1724 300 1],[415.6086 35 1],[415.859 400 0],[416.418 50 0],[417.9297 35 1],[418.1884 50 0],[419.0713 100 0],[419.1029 50 0],[419.8317 200 0],[420.0674 400 0],[421.8665 25 1],[422.2637 25 1],[422.6988 25 1],[422.8158 100 1],[423.722 100 1],[425.1185 25 0],[425.9362 200 0],[426.6286 100 0],[426.6527 70 1],[427.2169 150 0],[427.7528 550 1],[428.2898 20 1],[430.0101 100 0],[430.065 25 1],[430.9239 70 1],[433.12 200 1],[433.203 50 1],[433.3561 100 0],[433.5338 50 0],[434.5168 25 0],[434.8064 800 1],[435.2205 50 1],[436.2066 25 1],[436.7832 50 1],[437.0753 200 1],[437.1329 70 1],[437.5954 50 1],[437.9667 150 1],[438.5057 50 1],[440.0097 70 1],[440.0986 200 1],[442.6001 400 1],[443.0189 150 1],[443.0996 50 1],[443.3838 50 1],[443.9461 20 1],[444.8879 35 1],[447.4759 100 1],[448.1811 200 1],[451.0733 100 0],[452.2323 20 0],[453.0552 20 1],[454.5052 400 1],[456.4405 20 1],[457.935 400 1],[458.9898 400 1],[459.6097 15 0],[460.9567 550 1],[462.8441 7 0],[463.7233 35 1],[465.7901 400 1],[470.2316 15 0],[472.1591 20 1],[472.6868 550 1],[473.2053 50 1],[473.5906 300 1],[476.4865 800 1],[480.602 550 1],[484.781 150 1],[486.591 50 1],[487.9864 800 1],[488.9042 70 1],[490.4752 20 1],[493.3209 35 1],[496.508 200 1],[500.9334 50 1],[501.7163 70 1],[506.2037 70 1],[509.0495 20 1],[514.1783 100 1],[514.5308 70 1],[515.1391 5 0],[516.2285 15 0],[516.5773 25 1],[518.7746 20 0],[521.6814 20 1],[522.1271 7 0],[542.1352 5 0],[545.1652 10 0],[549.5874 25 0],[550.6113 5 0],[555.8702 25 0],[557.2541 10 0],[560.6733 35 0],[565.0704 20 0],[573.952 10 0],[583.4263 5 0],[586.031 10 0],[588.2624 15 0],[588.8584 25 0],[591.2085 50 0],[592.8813 15 0],[594.2669 5 0],[598.7302 7 0],[599.8999 5 0],[602.515 5 0],[603.2127 70 0],[604.3223 35 0],[605.2723 10 0],[605.9372 20 0],[609.8803 7 0],[610.5635 10 0],[611.4923 100 1],[614.5441 10 0],[617.0174 7 0],[617.2278 150 1],[617.3096 10 0],[621.2503 10 0],[621.5938 5 0],[624.312 25 1],[629.6872 7 0],[630.7657 15 0],[636.9575 7 0],[638.4717 20 0],[641.6307 70 0],[648.3082 25 1],[653.8112 15 0],[660.4853 15 0],[663.8221 25 1],[663.974 20 1],[664.3698 50 1],[666.0676 5 0],[666.4051 5 0],[666.6359 25 1],[667.7282 100 0],[668.4293 35 1],[675.2834 150 0],[675.6163 5 0],[676.6612 15 0],[686.1269 20 1],[687.1289 150 0],[687.9582 5 0],[688.8174 10 0],[693.7664 50 0],[695.1478 7 0],[696.025 7 0],[696.5431 10000 0],[703.0251 150 0],[706.7218 10000 0],[706.8736 100 0],[710.7478 25 0],[712.582 25 0],[714.7042 1000 0],[715.8839 15 0],[720.698 70 0],[726.5172 15 0],[727.0664 7 0],[727.2936 2000 0],[731.1716 35 0],[731.6005 25 0],[735.0814 5 0],[735.3293 70 0],[737.2118 200 0],[738.0426 20 1],[738.398 10000 0],[739.298 20 0],[741.2337 15 0],[742.5294 10 0],[743.5368 25 0],[743.6297 10 0],[750.3869 20000 0],[751.4652 15000 0],[763.5106 25000 0],[772.3761 15000 0],[772.4207 10000 0],[385.832 10 2],[390.784 7 2],[396.053 8 2],[402.36 6 2],[414.67 5 2]}{25000}% +\wl@elt@search{#1}{K}{[380.014 6 1],[381.656 6 1],[381.75 7 1],[387.374 5 1],[387.862 4 1],[389.792 8 1],[392.3 5 1],[392.636 5 1],[394.253 6 1],[395.521 6 1],[396.672 6 1],[397.258 6 1],[399.51 6 1],[400.124 7 1],[401.21 5 1],[404.259 6 1],[404.414 18 0],[404.721 17 0],[409.369 5 1],[411.499 6 1],[413.472 7 1],[414.919 7 1],[418.624 8 1],[422.297 7 1],[422.567 7 1],[426.34 7 1],[430.5 7 1],[430.91 7 1],[434.003 5 1],[438.816 7 1],[446.665 5 1],[450.533 6 1],[459.565 5 1],[460.845 8 1],[464.188 10 0],[464.237 11 0],[465.938 5 1],[474.091 4 0],[474.435 6 0],[475.393 5 0],[475.739 7 0],[478.649 5 0],[479.105 7 0],[479.975 6 0],[480.435 8 0],[482.923 9 1],[484.986 7 0],[485.609 8 0],[486.348 8 0],[486.976 9 0],[494.202 8 0],[494.329 6 1],[495.082 9 0],[495.615 9 0],[496.503 10 0],[500.56 8 1],[505.627 7 1],[508.423 10 0],[509.717 11 0],[509.92 11 0],[511.225 12 0],[531.024 5 1],[532.328 12 0],[533.969 13 0],[534.297 12 0],[535.957 14 0],[547.013 6 1],[564.273 5 1],[577.232 4 1],[578.238 16 0],[580.175 17 0],[581.215 15 0],[583.189 17 0],[596.964 2 1],[612.027 8 1],[624.659 6 1],[630.729 7 1],[642.796 5 1],[659.5 2 1],[691.108 19 0],[693.628 12 0],[693.877 20 0],[696.418 7 0],[696.467 12 0],[766.49 25 0],[769.896 24 0],[388.55 1 2]}{25}% +\wl@elt@search{#1}{Ca}{[387.048 9 0],[387.254 11 0],[387.256 11 0],[387.578 12 0],[387.58 12 0],[388.91 6 0],[392.348 6 0],[393.366 230 1],[393.529 9 0],[394.604 6 0],[394.89 15 0],[395.705 17 0],[396.847 220 1],[397.257 8 0],[397.371 18 0],[409.71 50 1],[409.853 15 0],[409.857 15 0],[410.982 60 1],[411.028 30 1],[420.618 40 1],[422.007 50 1],[422.673 50 0],[424.046 15 0],[428.301 24 0],[428.936 22 0],[429.899 22 0],[430.253 25 0],[430.774 23 0],[431.865 22 0],[435.508 20 0],[442.544 25 0],[443.496 26 0],[443.569 25 0],[445.478 30 0],[445.589 28 0],[445.661 20 0],[447.204 20 1],[447.923 10 1],[448.918 20 1],[452.694 23 0],[457.855 22 0],[458.14 23 0],[458.147 23 0],[458.587 24 0],[458.596 24 0],[468.527 20 0],[471.674 30 1],[472.103 40 1],[479.997 40 1],[487.813 25 0],[500.148 70 1],[501.997 80 1],[502.114 40 1],[504.162 23 0],[518.885 25 0],[526.171 22 0],[526.224 23 0],[526.424 22 0],[526.556 24 0],[527.027 25 0],[528.527 60 1],[530.722 70 1],[533.919 50 1],[534.947 27 0],[551.298 23 0],[558.197 25 0],[558.876 27 0],[559.012 24 0],[559.447 26 0],[559.849 25 0],[560.129 24 0],[560.285 24 0],[585.745 30 0],[592.272 10 1],[592.369 10 1],[610.272 27 0],[612.222 29 0],[616.129 22 0],[616.217 30 0],[616.376 22 0],[616.644 24 0],[616.906 26 0],[616.956 28 0],[643.907 35 0],[644.981 30 0],[645.56 22 0],[645.687 80 1],[646.257 34 0],[647.166 29 0],[649.378 32 0],[649.965 28 0],[657.278 23 0],[671.769 30 0],[714.815 33 0],[720.219 31 0],[732.615 33 0],[757.581 30 1],[758.111 60 1],[760.13 80 1],[760.232 20 1],[408.177 15 2],[415.357 15 2],[416.431 15 2],[418.42 15 2],[420.724 18 2],[423.374 17 2],[424.074 16 2],[428.439 15 2],[430.281 20 2],[432.919 15 2],[433.357 16 2],[435.838 15 2],[439.959 19 2],[440.629 17 2],[443.13 17 2],[449.988 19 2],[451.659 18 2],[457.212 18 2],[470.883 11 2],[471.627 11 2],[485.917 10 2],[500.895 10 2],[505.007 10 2],[523.182 10 2],[524.737 11 2],[527.198 13 2],[530.132 10 2],[532.129 11 2],[532.806 10 2],[557.058 11 2],[557.906 10 2],[606.998 13 2],[617.322 10 2],[621.398 12 2],[629.489 11 2],[637.011 11 2],[638.755 10 2],[642.451 12 2],[648.535 12 2],[653.878 10 2],[654.224 10 2],[730.869 10 2]}{230}% +\wl@elt@search{#1}{Sc}{[383.307 270 1],[384.303 610 1],[389.497 90 0],[390.749 20000 0],[391.181 23000 0],[392.351 45 1],[393.338 4400 0],[395.227 45 0],[398.906 45 1],[399.661 5500 0],[401.449 530 1],[402.04 20000 0],[402.369 20000 0],[403.067 220 0],[403.139 140 0],[403.423 100 0],[404.38 220 0],[404.648 200 0],[404.779 2700 0],[404.995 120 0],[405.455 5500 0],[405.659 220 0],[407.497 160 0],[407.857 160 0],[408.24 6100 0],[408.667 200 0],[408.716 400 0],[409.313 40 0],[409.485 65 0],[409.835 55 0],[410.033 65 0],[413.3 440 0],[414.03 530 0],[414.74 65 0],[415.236 720 0],[415.472 55 -1],[416.188 90 0],[416.519 1100 0],[417.156 65 0],[418.645 45 0],[418.762 65 0],[420.52 75 0],[421.234 65 0],[421.249 45 0],[421.61 75 0],[421.826 110 0],[421.973 110 0],[422.188 40 0],[422.559 90 0],[423.193 180 0],[423.361 200 0],[423.782 100 0],[423.805 400 0],[423.957 90 0],[424.612 100 0],[424.683 15000 1],[428.356 55 -1],[429.477 290 1],[430.571 350 1],[431.409 4200 1],[432.074 3300 1],[432.501 2400 1],[434.853 28 0],[435.461 180 1],[435.864 110 0],[435.908 55 0],[436.492 28 0],[437.446 2000 1],[438.481 130 1],[438.96 45 0],[440.037 1100 1],[441.556 880 1],[442.066 28 1],[443.136 45 1],[454.255 65 0],[454.468 90 0],[455.724 120 0],[457.399 160 0],[459.294 65 0],[459.845 65 0],[460.472 55 0],[460.953 45 0],[460.995 45 0],[467.04 350 1],[468.049 40 0],[469.829 50 1],[470.697 120 0],[470.934 120 0],[472.877 200 0],[472.923 490 0],[473.23 40 0],[473.41 590 0],[473.508 60 -1],[473.765 690 0],[474.102 790 0],[474.381 1200 0],[475.316 200 0],[477.935 220 0],[479.15 90 0],[482.728 100 0],[483.367 100 0],[483.944 170 0],[484.047 40 0],[484.768 80 0],[485.268 80 0],[485.779 140 -1],[490.667 80 0],[490.976 90 0],[492.284 90 0],[493.425 90 0],[493.574 45 0],[494.133 70 0],[495.406 170 0],[497.366 120 0],[498.037 150 0],[498.345 80 0],[499.192 140 0],[501.839 80 0],[502.014 70 0],[502.151 80 0],[503.102 530 1],[503.274 55 0],[506.432 250 0],[506.886 80 0],[507.023 530 0],[507.581 250 0],[508.156 2100 0],[508.372 1200 0],[508.555 1100 0],[508.695 750 0],[508.714 390 0],[508.989 270 0],[509.246 45 0],[509.673 390 0],[509.923 620 0],[510.112 370 0],[510.906 180 0],[511.286 150 0],[511.669 320 0],[513.368 70 -1],[517.106 45 -1],[521.052 390 0],[521.128 45 0],[521.967 280 0],[523.982 350 1],[525.833 280 0],[528.497 35 0],[528.576 210 0],[530.194 35 0],[531.835 22 1],[533.177 70 0],[533.423 14 1],[533.941 95 0],[534.105 120 0],[534.296 95 0],[534.93 350 0],[534.971 120 0],[535.03 60 0],[535.575 210 0],[535.61 530 0],[535.719 14 1],[537.535 270 0],[539.208 370 0],[541.612 45 0],[542.557 45 0],[542.941 45 0],[543.294 35 0],[543.323 55 0],[543.822 45 0],[543.903 55 0],[544.26 55 0],[544.62 270 0],[544.739 18 0],[545.134 120 0],[545.521 30 0],[546.52 18 0],[546.84 55 0],[547.219 60 0],[547.464 18 0],[548.199 750 0],[548.462 530 0],[551.422 570 0],[551.539 16 0],[552.05 660 0],[552.606 45 0],[552.682 660 1],[554.104 55 0],[554.64 30 0],[555.04 18 0],[555.225 5 1],[555.359 35 0],[556.11 16 0],[556.486 70 0],[557.124 18 0],[557.976 14 0],[559.133 110 0],[559.338 35 0],[560.419 22 0],[563.102 22 0],[564.098 80 1],[564.636 45 0],[564.76 16 0],[564.956 55 0],[565.788 250 1],[565.834 60 1],[566.716 55 1],[566.904 70 1],[567.181 1500 0],[568.42 95 1],[568.684 1200 0],[570.021 1100 0],[570.861 190 0],[571.175 880 0],[571.728 230 0],[572.408 180 0],[573.685 55 -1],[576.445 55 -1],[577.274 95 -1],[577.532 55 -1],[580.984 70 -1],[581.16 70 -1],[584.773 95 -1],[584.907 70 -1],[588.738 70 -1],[591.804 35 -1],[591.911 30 0],[592.81 60 -1],[596.149 35 0],[596.825 60 -1],[596.919 35 0],[598.842 90 0],[601.707 160 -1],[602.618 60 0],[603.617 620 -1],[606.431 490 -1],[607.265 440 -1],[607.93 620 -1],[610.187 320 -1],[610.993 370 -1],[611.597 370 -1],[614.87 180 -1],[615.393 150 -1],[618.809 150 -1],[619.29 150 -1],[621.068 620 0],[623.941 90 0],[623.978 320 0],[624.563 120 1],[624.996 110 0],[625.896 250 0],[626.225 60 0],[627.631 55 0],[627.976 45 1],[630.07 18 1],[630.567 750 0],[630.99 26 1],[632.085 16 1],[634.483 26 0],[637.882 60 0],[640.841 55 -1],[641.335 90 0],[643.708 26 -1],[644.624 55 -1],[645.778 26 -1],[648.54 35 -1],[649.59 26 -1],[652.562 55 -1],[653.53 22 -1],[655.784 45 -1],[656.688 35 -1],[657.585 18 -1],[660.46 60 1],[660.999 26 -1],[661.794 18 -1],[664.508 18 -1],[665.442 22 -1],[666.101 26 -1],[670.048 18 -1],[670.593 18 -1],[673.787 65 0],[673.94 35 0],[681.708 35 0],[681.952 50 0],[682.954 29 0],[683.503 50 0],[696.312 5 -1],[699.068 5 -1],[702.572 5 -1],[703.577 8 -1],[707.237 5 -1],[709.438 5 -1],[713.814 12 0],[716.913 14 0],[725.757 12 0],[727.557 8 0],[730.062 3 0],[752.413 12 0],[755.396 14 0],[757.444 15 0],[761.745 11 0],[766.572 14 0],[769.773 30 0],[772.972 18 0],[774.117 55 0],[775.037 5 0],[775.272 5 0],[777.106 6 0],[778.517 15 0],[779.468 8 0],[406.121 80 2],[406.866 100 2],[430.947 40 2],[474.095 10 2],[478.087 15 2],[499.289 50 2],[503.209 60 2],[625.601 80 2],[630.76 60 2],[744.916 90 2],[754.815 70 2],[459.442 8 3],[463.996 8 3],[550.174 8 3],[562.072 9 3],[570.682 10 3],[577.163 14 3],[654.803 9 3]}{23000}% +\wl@elt@search{#1}{Ti}{[381.822 70 0],[382.203 60 0],[382.819 240 0],[383.368 95 0],[383.678 95 0],[384.645 60 0],[385.305 130 0],[385.373 130 0],[385.814 170 0],[386.644 240 0],[386.84 170 0],[387.321 120 0],[387.526 260 0],[388.215 170 0],[388.233 170 0],[388.289 500 0],[388.802 60 0],[388.995 70 0],[389.525 200 0],[389.849 85 0],[390.054 530 1],[390.096 180 0],[390.478 2600 0],[391.119 110 0],[391.346 500 1],[391.434 500 0],[391.474 24 0],[391.982 35 0],[392.142 290 0],[392.453 1100 0],[392.632 110 0],[392.988 890 0],[393.202 35 1],[393.424 70 0],[394.778 1100 0],[394.867 4500 0],[395.634 4500 0],[395.821 5200 0],[396.285 950 0],[396.427 950 0],[398.176 4800 0],[398.248 570 0],[398.433 60 0],[398.525 35 0],[398.559 60 0],[398.976 5700 0],[399.47 35 0],[399.864 7800 0],[399.936 70 0],[400.249 70 0],[400.381 70 0],[400.597 35 0],[400.806 70 0],[400.893 950 0],[400.966 190 0],[401.239 70 1],[401.358 180 0],[401.538 70 0],[401.628 35 0],[401.777 120 0],[402.183 140 0],[402.457 1200 0],[402.514 40 1],[402.654 190 0],[402.748 40 0],[402.834 40 1],[403.051 190 0],[403.391 40 0],[403.491 30 0],[403.583 110 0],[404.032 35 0],[405.502 290 0],[405.762 85 0],[405.814 85 0],[406.026 410 0],[406.422 200 0],[406.51 200 0],[407.847 840 0],[407.972 40 0],[408.246 290 0],[409.917 85 0],[411.271 220 0],[412.217 85 0],[412.331 40 0],[412.357 85 0],[412.754 130 0],[412.917 40 0],[413.125 40 0],[413.729 140 0],[414.305 85 0],[415.096 170 0],[415.964 85 0],[416.365 70 1],[416.414 35 0],[416.632 40 0],[416.935 85 0],[417.103 120 0],[417.19 40 1],[418.33 35 0],[418.612 360 0],[418.869 40 0],[420.075 70 0],[420.346 85 0],[421.173 35 0],[422.479 40 0],[422.765 40 0],[423.789 130 0],[424.912 85 0],[425.604 130 0],[425.854 70 0],[426.16 70 0],[426.313 330 0],[426.571 35 0],[426.622 40 0],[427.014 70 0],[427.243 85 0],[427.458 240 0],[427.643 120 0],[427.823 120 0],[427.881 30 0],[428.138 110 0],[428.271 220 0],[428.499 160 0],[428.601 890 0],[428.74 840 0],[428.816 30 0],[428.907 950 0],[429.023 120 1],[429.094 840 0],[429.114 120 0],[429.412 140 1],[429.576 840 0],[429.866 2000 0],[429.923 200 0],[429.964 200 0],[430.005 200 1],[430.056 2900 0],[430.109 4100 0],[430.193 85 1],[430.592 6000 0],[430.79 180 1],[430.85 35 0],[431.165 40 0],[431.287 85 1],[431.435 85 0],[431.48 1200 0],[431.864 360 0],[432.166 180 0],[432.513 190 0],[432.636 160 0],[433.484 30 0],[433.792 160 1],[434.429 24 1],[434.611 70 0],[435.406 35 0],[436.049 95 0],[436.894 24 0],[436.968 95 0],[437.238 60 0],[438.808 30 0],[439.392 170 0],[439.504 330 1],[439.977 60 1],[440.428 240 0],[440.49 60 0],[440.568 30 0],[441.654 60 0],[441.728 220 0],[441.772 60 1],[442.176 120 0],[442.282 120 0],[442.439 24 0],[442.583 30 0],[442.606 120 0],[442.71 890 0],[443.002 21 0],[443.037 85 0],[443.128 50 0],[443.26 30 0],[443.358 24 0],[443.4 170 0],[443.659 70 0],[443.823 30 0],[444.035 130 0],[444.127 50 0],[444.38 230 1],[444.427 24 0],[444.915 840 0],[445.049 30 1],[445.09 550 0],[445.332 840 0],[445.371 290 0],[445.533 950 0],[445.743 1100 0],[446.209 21 0],[446.338 70 0],[446.354 95 0],[446.581 290 0],[446.85 240 1],[447.124 240 0],[447.485 95 0],[447.97 95 0],[448.059 50 0],[448.126 530 0],[448.269 95 0],[448.832 19 1],[448.909 260 0],[449.255 24 0],[449.501 40 0],[449.615 240 0],[449.773 24 0],[450.127 200 1],[450.378 40 0],[450.636 21 0],[451.117 50 0],[451.274 780 0],[451.562 19 0],[451.803 1000 0],[451.87 95 0],[452.28 1000 0],[452.731 780 0],[453.324 6000 0],[453.397 240 1],[453.478 3600 0],[453.558 2400 0],[453.592 1200 0],[453.605 1200 0],[453.723 24 0],[453.91 24 0],[454.469 720 0],[454.877 950 0],[454.963 240 1],[455.246 950 0],[455.508 24 0],[455.549 720 0],[455.786 19 0],[455.811 19 0],[455.992 60 0],[456.263 50 0],[456.343 35 0],[456.377 110 1],[457.091 35 0],[457.198 240 1],[458.584 19 -1],[458.995 24 1],[459.923 60 0],[460.937 21 0],[461.727 950 0],[461.952 24 0],[462.309 480 0],[462.934 190 0],[463.487 50 -1],[463.788 60 0],[463.937 240 0],[463.967 220 0],[463.995 190 0],[464.519 140 0],[465.002 120 0],[465.604 24 0],[465.647 720 0],[466.759 840 0],[467.512 70 0],[468.192 950 0],[468.692 21 0],[469.08 24 0],[469.134 190 0],[469.368 40 0],[469.694 24 0],[469.876 190 0],[471.019 120 0],[471.53 24 0],[472.262 65 0],[472.317 65 0],[473.117 55 0],[473.343 45 0],[473.468 18 0],[474.211 22 0],[474.279 170 0],[474.768 22 0],[475.812 310 0],[475.928 310 0],[476.633 45 0],[476.977 28 0],[477.826 65 0],[478.172 45 0],[479.249 110 0],[479.622 45 0],[479.798 35 0],[479.98 110 0],[480.51 28 1],[480.543 110 0],[480.853 45 0],[481.108 22 0],[481.225 40 0],[482.042 200 0],[482.546 22 0],[483.613 40 0],[484.087 470 0],[484.847 65 0],[485.601 290 0],[486.418 35 0],[486.826 200 0],[487.014 250 0],[488.091 28 0],[488.235 45 0],[488.508 400 0],[489.991 380 0],[491.362 320 0],[491.524 55 0],[491.987 130 0],[492.177 180 0],[492.541 55 0],[492.616 30 0],[492.834 150 0],[493.774 30 0],[493.829 95 0],[494.158 30 0],[494.819 21 0],[495.825 21 0],[496.475 55 0],[496.604 21 0],[496.858 65 0],[497.305 75 0],[497.535 120 0],[497.774 65 0],[497.82 120 0],[498.173 5800 0],[498.915 150 0],[499.107 4600 0],[499.508 30 0],[499.71 140 0],[499.951 4000 0],[500.101 230 0],[500.721 3600 0],[500.965 120 0],[501.33 230 0],[501.419 3200 0],[501.617 580 0],[502.003 840 0],[502.287 840 0],[502.484 580 0],[502.558 300 0],[503.591 1200 0],[503.647 840 0],[503.84 740 0],[503.995 1200 0],[504.062 75 0],[504.359 85 0],[504.427 35 0],[504.541 55 0],[504.821 26 0],[505.287 110 0],[505.408 21 0],[506.211 110 0],[506.407 35 0],[506.466 1400 0],[506.599 95 0],[506.833 35 0],[506.935 65 0],[507.148 130 0],[508.534 40 0],[508.707 130 0],[510.315 21 0],[510.944 55 0],[511.344 190 0],[512.042 270 0],[512.915 30 1],[514.547 270 0],[514.748 230 0],[515.22 210 0],[516.686 21 -1],[517.375 1100 0],[518.634 40 0],[518.87 85 1],[518.958 30 0],[519.298 1300 0],[519.404 85 0],[520.11 65 0],[520.608 120 0],[520.787 75 0],[520.842 65 -1],[521.039 1400 0],[521.229 65 0],[521.971 150 0],[522.269 95 0],[522.364 85 0],[522.432 250 0],[522.456 95 0],[522.495 190 0],[522.656 65 1],[523.858 120 0],[524.615 21 0],[524.657 55 0],[524.731 75 0],[525.095 21 0],[525.211 110 0],[525.583 75 0],[525.999 55 0],[526.35 55 0],[526.598 150 0],[528.239 40 0],[528.345 140 0],[528.439 35 0],[528.881 26 -1],[529.579 65 0],[529.726 120 0],[529.844 65 0],[533.681 26 1],[534.15 17 0],[535.108 75 0],[536.665 26 0],[536.964 55 0],[538.918 40 0],[538.999 55 0],[539.66 17 0],[539.709 85 0],[540.402 35 0],[540.961 110 0],[542.626 40 0],[542.915 75 0],[543.673 26 0],[543.832 17 0],[544.664 40 0],[544.834 11 -1],[544.89 30 0],[544.916 21 0],[545.365 35 0],[546.051 55 0],[547.121 75 0],[547.27 35 0],[547.355 40 0],[547.423 85 0],[547.446 30 0],[547.771 120 0],[548.143 110 0],[548.187 75 0],[548.82 85 0],[549.015 150 0],[549.084 26 0],[550.39 110 0],[551.178 40 0],[551.253 340 0],[551.435 270 0],[551.454 320 0],[553.049 26 -1],[556.549 110 0],[557.916 13 -1],[558.298 21 -1],[558.568 30 -1],[559.785 65 -1],[562.928 55 -1],[563.584 17 -1],[564.414 250 0],[564.858 75 0],[566.155 26 -1],[566.216 190 0],[566.291 75 0],[567.342 21 0],[567.544 130 0],[567.994 30 0],[568.947 95 0],[570.268 75 0],[570.823 35 0],[571.188 65 0],[571.392 40 0],[571.513 95 0],[571.648 55 0],[572.048 35 0],[573.951 85 0],[574.002 40 0],[574.122 19 0],[575.284 21 0],[575.686 19 0],[576.227 40 0],[576.635 55 0],[577.405 75 0],[578.078 30 0],[578.598 75 0],[580.426 65 0],[581.496 21 -1],[582.371 40 0],[584.118 21 -1],[585.234 21 -1],[586.646 400 0],[588.031 65 0],[588.868 21 -1],[589.932 230 0],[590.333 55 0],[591.855 120 0],[592.212 150 0],[593.782 75 0],[594.176 120 0],[595.317 300 0],[596.584 200 0],[597.856 270 0],[599.904 340 0],[599.968 65 0],[601.273 21 -1],[606.463 110 0],[608.523 120 0],[609.117 120 0],[609.281 40 0],[609.867 40 0],[612.101 35 0],[612.622 120 0],[613.838 19 0],[614.622 30 0],[614.974 21 0],[616.223 30 -1],[618.615 35 0],[621.528 95 0],[622.049 75 0],[622.141 65 0],[625.81 380 0],[625.87 380 0],[626.11 300 0],[630.375 65 0],[631.224 55 0],[631.803 26 0],[633.61 30 0],[636.635 35 0],[641.91 11 0],[649.769 17 0],[650.814 19 0],[654.628 55 0],[655.423 65 0],[655.483 11 -1],[655.607 75 0],[656.562 19 0],[657.518 14 0],[659.911 35 0],[665.146 18 -1],[666.655 18 0],[666.774 22 -1],[666.839 9 -1],[667.718 18 0],[669.121 22 -1],[671.668 26 0],[672.395 16 -1],[674.312 80 0],[674.552 22 0],[684.464 18 -1],[686.039 18 -1],[686.147 35 0],[687.392 9 0],[691.319 12 0],[693.315 14 0],[694.37 14 0],[699.663 23 0],[700.466 15 0],[700.835 14 0],[701.094 14 0],[703.586 14 0],[703.88 40 0],[705.065 14 0],[705.451 40 -1],[706.911 23 0],[707.205 23 -1],[708.789 45 -1],[712.49 30 -1],[712.561 40 -1],[713.891 26 0],[716.713 26 -1],[717.153 23 -1],[718.989 55 0],[720.364 26 -1],[720.944 260 0],[721.62 60 0],[724.486 130 0],[725.172 130 0],[726.34 19 -1],[726.629 19 0],[726.905 19 -1],[731.556 15 0],[731.839 26 0],[734.472 120 0],[735.216 11 0],[735.774 90 0],[736.411 60 0],[744.06 26 0],[747.494 9 0],[748.961 26 0],[749.612 19 0],[758.055 12 0],[758.962 9 -1],[761.45 15 0],[765.444 23 0],[770.521 11 -1],[387.25 12 2],[388.121 12 2],[389.363 12 2],[389.633 10 2],[391.547 15 2],[392.138 12 2],[392.161 10 2],[392.295 12 2],[392.486 10 2],[406.021 10 2],[411.914 10 2],[421.552 11 2],[426.984 11 2],[429.67 11 2],[434.804 10 2],[443.391 11 2],[454.022 10 2],[454.984 15 2],[455.546 10 2],[457.22 15 2],[464.945 10 2],[465.286 12 2],[487.4 10 2],[495.01 10 2],[497.119 10 2],[508.38 10 2],[514.731 14 2],[522.628 12 2],[524.749 11 2],[527.812 17 2],[527.87 10 2],[529.843 12 2],[530.12 16 2],[530.688 15 2],[539.569 10 2],[553.301 12 2],[581.744 10 2],[661.138 12 2],[662.158 18 2],[662.937 10 2],[664.747 14 2],[666.799 18 2],[667.419 15 2],[670.776 14 2],[672.48 12 2],[673.41 16 2],[686.226 15 2],[687.435 12 2],[689.612 10 2],[701.538 12 2],[707.193 10 2],[707.264 20 2],[708.457 18 2],[712.413 15 2],[717.179 11 2],[717.592 10 2],[721.75 10 2],[722.555 9 2],[727.067 12 2],[731.63 14 2],[731.668 10 2],[737.996 12 2],[740.813 10 2],[745.785 10 2],[750.687 15 2],[750.768 17 2],[752.385 10 2],[754.429 12 2],[756.625 9 2],[413.122 13 3],[413.378 14 3],[439.733 10 3],[440.345 9 3],[461.811 15 3],[539.893 20 3],[547.098 8 3],[549.251 18 3],[551.772 10 3],[587.779 14 3],[588.596 15 3],[589.115 7 3],[623.162 6 3],[624.665 17 3],[624.774 11 3],[629.241 15 3],[691.385 12 3],[697.851 15 3],[749.137 9 3],[749.477 8 3],[765.212 5 3],[770.685 8 3]}{7800}% +\wl@elt@search{#1}{V}{[380.347 570 0],[380.68 190 0],[380.75 300 0],[380.852 520 0],[380.96 230 0],[381.349 1000 0],[381.784 140 0],[381.824 1300 0],[381.996 230 0],[382.149 230 0],[382.201 570 0],[382.289 450 0],[382.321 300 0],[382.856 1700 0],[383.422 280 0],[383.9 160 0],[383.938 110 0],[384.044 570 0],[384.075 2600 0],[384.189 110 0],[384.444 380 0],[384.733 320 0],[384.932 110 0],[385.537 1200 0],[385.584 3000 0],[386.222 150 0],[386.387 130 0],[386.486 1300 0],[386.76 230 0],[387.108 170 0],[387.508 1500 0],[387.59 420 0],[387.609 570 0],[387.871 130 1],[389.018 700 0],[389.286 460 0],[389.802 280 0],[389.913 140 1],[390.018 140 0],[390.115 140 0],[390.225 2400 0],[390.675 100 0],[390.989 700 0],[391.079 100 0],[391.221 220 0],[391.433 140 1],[391.641 100 1],[392.049 100 0],[392.19 100 0],[392.243 230 0],[392.466 240 0],[392.524 150 0],[392.793 200 0],[393.002 260 0],[393.134 150 0],[393.401 260 0],[393.514 150 0],[393.628 100 0],[394.366 150 0],[395.023 100 0],[395.197 140 1],[397.364 100 1],[399.057 540 0],[399.28 260 0],[399.873 430 0],[400.571 170 1],[402.339 120 1],[403.183 120 0],[403.563 150 1],[404.264 120 0],[405.096 360 0],[405.135 360 0],[405.707 280 0],[405.782 130 0],[406.393 230 0],[407.154 230 0],[409.058 1100 0],[409.241 180 0],[409.269 1800 0],[409.35 120 0],[409.549 890 0],[409.98 2800 0],[410.216 590 0],[410.44 230 0],[410.478 260 0],[410.517 2800 0],[410.822 120 0],[410.979 2300 0],[411.178 8900 0],[411.233 120 0],[411.352 230 0],[411.518 4300 0],[411.647 1800 0],[411.818 180 0],[411.864 180 0],[411.946 230 0],[412.054 180 0],[412.319 180 0],[412.357 2000 0],[412.407 120 0],[412.807 3100 0],[412.886 120 0],[413.202 3100 0],[413.449 2300 0],[415.969 150 0],[417.401 100 0],[417.942 230 0],[418.259 150 0],[418.984 180 0],[419.156 180 0],[420.986 230 0],[422.662 120 0],[423.246 360 0],[423.295 180 0],[423.4 180 0],[423.576 120 0],[425.737 100 0],[425.931 120 0],[426.216 120 0],[426.864 560 0],[427.155 460 0],[427.696 460 0],[428.406 430 0],[429.182 330 0],[429.611 220 0],[429.768 170 0],[429.803 170 0],[430.621 170 0],[430.718 140 0],[430.98 170 0],[433.002 460 0],[433.282 510 0],[434.101 760 0],[435.287 1000 0],[435.498 130 0],[435.594 150 0],[436.804 150 0],[437.323 140 0],[437.53 100 0],[437.924 12000 0],[438.055 100 0],[438.472 7000 0],[438.997 4800 0],[439.523 3600 0],[440.058 1400 0],[440.664 2300 0],[440.764 2800 0],[440.82 3600 0],[440.851 4600 0],[441.214 140 0],[441.647 640 0],[441.994 120 0],[442.157 640 0],[442.6 460 0],[442.731 120 0],[442.852 310 0],[442.98 230 0],[443.614 430 0],[443.784 640 0],[444.168 830 0],[444.421 640 0],[445.201 610 0],[445.748 410 0],[445.776 120 0],[445.976 1000 0],[446.029 2000 0],[446.236 610 0],[446.801 120 0],[446.971 380 0],[447.404 120 0],[447.471 200 0],[448.889 380 0],[449.606 100 0],[450.195 120 0],[452.422 140 0],[454.539 360 0],[454.965 100 0],[456.071 280 0],[457.178 200 0],[457.717 510 0],[457.873 140 0],[458.04 640 0],[458.636 830 0],[459.122 170 0],[459.411 1300 0],[460.615 100 0],[460.965 30 0],[461.174 25 0],[461.977 230 0],[462.441 65 0],[462.648 50 0],[463.518 100 0],[464.007 65 0],[464.074 65 0],[464.64 130 0],[464.889 30 0],[466.614 30 0],[467.049 160 0],[468.445 24 0],[468.692 35 0],[470.616 55 0],[470.657 80 0],[471.056 80 0],[471.412 65 0],[471.589 35 0],[471.769 55 0],[472.151 40 0],[472.286 40 0],[472.953 40 0],[473.038 27 0],[474.263 27 0],[474.663 24 0],[474.852 40 0],[475.098 45 0],[475.156 35 0],[475.393 40 0],[475.748 65 0],[476.663 55 0],[477.636 130 0],[478.651 110 0],[479.692 130 0],[479.977 19 0],[480.753 130 0],[482.745 130 0],[483.164 150 0],[483.243 120 0],[483.302 19 0],[484.881 19 0],[485.148 320 0],[486.261 35 0],[486.474 480 0],[487.126 21 0],[487.548 620 0],[488.056 55 0],[488.156 740 0],[489.16 27 0],[489.421 21 0],[490.062 55 0],[490.429 95 0],[492.565 85 0],[493.203 35 0],[496.612 23 0],[500.233 70 0],[501.462 85 0],[505.163 28 0],[506.412 35 0],[510.514 35 0],[512.853 110 0],[513.842 110 0],[513.953 25 0],[514.872 70 0],[515.935 40 0],[516.994 23 0],[517.677 70 0],[519.201 20 0],[519.299 110 0],[519.362 23 0],[519.483 110 0],[519.536 55 0],[520.661 20 0],[521.659 40 0],[522.577 35 0],[523.375 35 0],[523.407 110 0],[524.02 20 0],[524.087 110 0],[526.098 17 0],[535.341 40 0],[538.343 35 0],[538.514 40 0],[538.83 14 0],[539.787 11 0],[540.193 100 0],[541.526 140 0],[541.809 28 0],[542.408 50 0],[543.418 40 0],[543.766 11 0],[545.812 17 0],[547.133 13 -1],[548.722 25 0],[548.792 85 0],[548.994 25 0],[550.487 28 0],[550.775 70 0],[551.118 14 0],[554.593 23 0],[554.707 70 0],[555.875 35 0],[556.166 28 0],[558.45 140 0],[558.6 23 0],[559.242 100 0],[560.138 28 0],[560.494 70 0],[562.42 13 0],[562.46 200 0],[562.489 70 0],[562.601 55 0],[562.764 400 0],[563.246 13 0],[563.39 10 0],[563.551 13 0],[564.611 85 0],[565.744 110 0],[566.836 110 0],[567.085 310 0],[568.322 20 0],[569.852 1200 0],[570.356 920 0],[570.698 570 0],[570.895 11 0],[571.621 11 0],[572.564 70 0],[572.703 850 0],[572.766 170 0],[573.125 230 0],[573.401 40 0],[573.706 230 0],[574.345 110 0],[574.77 17 0],[574.887 40 0],[575.274 17 0],[576.141 17 0],[577.242 70 0],[577.664 35 0],[578.261 11 0],[578.35 11 0],[578.438 40 0],[578.616 55 0],[578.856 23 0],[580.714 35 0],[581.706 23 0],[581.753 35 0],[583.072 55 0],[584.63 85 0],[585.032 11 0],[592.457 40 0],[597.891 28 0],[598.078 20 0],[600.231 28 0],[600.263 55 0],[601.612 28 0],[602.541 20 0],[603.973 450 0],[605.814 100 0],[606.726 20 0],[608.144 480 0],[609.022 1300 0],[610.698 28 0],[611.167 280 0],[611.952 600 0],[612.834 20 0],[613.538 280 0],[615.015 180 0],[617.036 85 0],[618.935 23 0],[619.919 450 0],[621.387 130 0],[621.637 450 0],[621.831 28 0],[622.45 130 0],[623.074 430 0],[623.32 100 0],[624.013 55 0],[624.281 170 0],[624.31 710 0],[625.182 280 0],[625.69 85 0],[625.857 85 0],[626.122 55 0],[626.632 85 0],[626.882 130 0],[627.465 170 0],[628.233 17 0],[628.516 200 0],[629.283 200 0],[629.649 170 0],[631.15 28 0],[632.466 14 0],[632.684 70 0],[633.909 55 0],[634.948 50 0],[635.558 14 0],[635.73 50 0],[635.882 25 0],[636.127 35 0],[637.936 23 0],[639.328 14 0],[643.047 35 0],[643.163 23 0],[643.318 14 0],[643.516 11 0],[645.234 70 0],[648.805 11 0],[650.417 55 0],[653.143 110 0],[654.351 28 0],[655.802 17 0],[656.588 11 0],[660.597 50 0],[660.783 15 0],[662.354 10 0],[662.485 50 0],[663.326 13 0],[664.379 13 0],[669.366 8 0],[670.807 8 0],[675.3 65 0],[676.012 10 0],[676.649 50 0],[678.498 40 0],[678.632 15 0],[681.24 26 0],[682.994 9 0],[683.244 15 0],[683.958 12 0],[684.19 12 0],[687.088 10 0],[687.156 8 0],[689.4 7 0],[697.45 12 0],[702.607 21 0],[706.369 7 0],[709.208 11 0],[710.258 6 0],[714.815 24 0],[715.136 7 0],[718.208 7 0],[726.429 14 0],[732.144 8 0],[733.892 40 0],[735.654 35 0],[735.866 11 0],[736.139 24 0],[736.249 12 0],[736.316 24 0],[738.595 9 0],[739.349 6 -1],[748.59 12 0],[748.808 12 0],[749.244 12 -1],[757.875 12 0],[759.124 9 0],[759.692 14 0],[759.828 12 0],[762.481 24 0],[770.137 5 0],[770.481 8 0],[471.489 40 2],[659.72 50 2],[498.565 50 3],[513.078 50 3],[526.216 50 3],[535.232 60 3],[594.012 40 3],[420.032 20 4],[493.053 15 4],[535.607 8 4],[662.88 7 4],[759.551 3 4]}{12000}% +\wl@elt@search{#1}{Cr}{[380.48 530 0],[380.683 110 0],[380.793 110 0],[381.543 180 0],[381.848 70 0],[381.956 180 0],[382.352 70 0],[382.642 130 0],[383.003 130 0],[384.128 380 0],[384.898 190 0],[384.936 140 0],[385.004 290 0],[385.222 140 0],[385.422 190 0],[385.529 110 0],[385.557 140 0],[385.763 260 0],[387.453 70 0],[388.329 660 0],[388.366 50 0],[388.522 570 0],[388.679 380 0],[389.193 60 0],[389.404 260 0],[389.765 40 0],[390.211 35 0],[390.292 360 0],[390.316 60 0],[390.876 960 0],[391.182 120 0],[391.584 120 0],[391.624 190 0],[391.76 35 0],[391.916 1900 0],[392.102 600 0],[392.665 30 0],[392.864 600 0],[394.149 410 0],[395.11 30 0],[395.24 40 0],[395.316 35 0],[396.369 1900 0],[396.906 120 0],[396.975 1600 0],[397.126 85 0],[397.666 1600 0],[397.868 85 0],[397.98 40 0],[398.123 85 0],[398.391 960 0],[398.434 190 0],[398.999 160 0],[399.112 960 0],[399.167 160 0],[399.284 190 0],[399.397 40 0],[400.144 160 0],[401.247 120 1],[401.467 30 0],[402.226 85 0],[402.501 70 0],[402.617 120 0],[402.71 85 0],[403.068 85 0],[403.91 190 0],[404.878 160 0],[405.877 120 0],[406.572 40 0],[406.694 85 0],[407.486 35 0],[407.606 40 0],[407.709 40 0],[407.768 40 0],[410.487 40 0],[410.958 40 0],[412.061 40 0],[412.182 40 0],[412.216 35 0],[412.339 40 0],[412.652 140 0],[412.73 35 0],[412.764 40 0],[413.136 40 0],[415.278 30 0],[415.382 120 0],[416.142 85 0],[416.362 140 0],[416.552 70 0],[416.984 40 0],[417.02 35 0],[417.277 40 0],[417.48 170 0],[417.594 30 0],[417.926 170 0],[418.49 35 0],[418.636 30 0],[419.013 35 0],[419.127 85 0],[419.21 35 0],[419.366 85 0],[419.495 70 0],[419.723 40 0],[419.852 85 0],[420.359 60 0],[420.447 40 0],[420.836 35 0],[420.937 110 0],[420.976 40 0],[421.135 40 0],[421.636 40 0],[421.763 85 0],[422.157 40 0],[422.273 40 0],[423.896 40 0],[424.07 60 0],[425.435 20000 0],[425.55 70 0],[426.135 60 0],[426.314 110 0],[427.106 30 0],[427.291 40 0],[427.48 16000 0],[428.04 85 0],[428.972 10000 0],[429.196 40 0],[429.576 85 0],[429.774 70 0],[430.051 35 0],[430.118 50 0],[430.545 30 0],[431.964 35 0],[432.508 60 0],[433.757 780 0],[433.945 1100 0],[433.972 380 0],[434.013 60 0],[434.451 1900 0],[434.683 70 0],[435.105 380 0],[435.177 2300 0],[435.963 570 0],[436.313 70 0],[437.128 530 0],[437.325 70 0],[437.416 110 0],[437.533 70 0],[438.111 50 0],[438.498 530 0],[438.75 60 0],[439.175 70 0],[440.35 60 0],[441.03 24 0],[441.109 60 0],[441.225 35 0],[441.387 50 0],[442.428 60 0],[442.85 24 0],[443.049 50 0],[443.218 50 0],[445.854 110 0],[445.974 30 0],[446.536 30 0],[448.288 30 0],[448.805 40 0],[448.947 50 0],[449.231 60 0],[449.686 660 0],[449.873 50 0],[450.03 70 0],[450.111 50 0],[450.179 22 0],[450.685 24 0],[451.19 95 0],[451.437 12 0],[451.453 35 0],[452.114 24 0],[452.611 24 0],[452.647 380 0],[452.734 70 0],[452.985 24 0],[453.074 380 0],[453.515 50 0],[453.572 240 0],[453.979 40 0],[454.05 240 0],[454.072 240 0],[454.107 35 0],[454.151 19 0],[454.262 24 0],[454.462 140 0],[454.534 24 0],[454.596 600 0],[455.617 50 0],[455.866 22 1],[456.417 19 0],[456.551 120 0],[456.964 95 0],[457.168 120 0],[457.512 22 0],[458.006 360 0],[458.614 24 0],[459.139 360 0],[459.559 70 0],[460.01 50 0],[460.075 480 0],[460.102 50 0],[461.337 240 0],[461.614 600 0],[461.955 70 0],[462.196 85 0],[462.249 70 0],[462.276 24 0],[462.619 550 0],[463.218 24 0],[463.718 40 0],[463.777 50 0],[463.952 50 0],[464.617 1600 0],[464.681 24 0],[464.813 24 0],[464.887 24 0],[464.946 35 0],[465.128 570 0],[465.216 840 0],[465.474 35 0],[465.619 19 0],[466.333 40 0],[466.383 70 0],[466.48 95 0],[466.59 35 0],[466.622 22 0],[466.651 70 0],[466.934 50 0],[468.054 40 0],[468.087 19 0],[468.937 70 0],[469.395 60 0],[469.515 24 0],[469.706 60 0],[469.846 240 0],[470.061 35 0],[470.804 190 0],[471.843 240 0],[472.31 50 0],[472.442 50 0],[472.715 50 0],[472.972 24 0],[473.071 120 0],[473.735 140 0],[474.531 19 0],[475.208 70 0],[475.611 340 0],[476.429 50 0],[476.663 22 0],[476.786 30 0],[478.932 190 0],[479.251 95 0],[480.103 120 0],[482.938 110 0],[483.686 14 0],[486.12 17 0],[486.184 70 0],[487.08 140 0],[488.578 35 0],[488.596 19 0],[488.701 130 0],[488.853 19 0],[490.324 35 0],[492.227 260 0],[493.633 110 0],[494.25 70 0],[495.481 110 0],[496.493 35 0],[501.332 60 0],[505.19 17 0],[506.591 17 0],[506.771 40 0],[507.292 40 0],[511.075 30 0],[511.313 17 0],[512.346 17 0],[513.965 50 0],[514.467 14 0],[516.623 70 0],[517.743 35 0],[518.459 70 0],[519.2 70 0],[519.349 12 0],[519.644 85 0],[520.019 35 0],[520.452 5300 0],[520.604 8400 0],[520.844 11000 0],[521.413 19 0],[522.175 30 0],[522.494 85 0],[522.689 12 0],[523.897 19 0],[524.34 30 0],[524.756 290 0],[525.492 60 0],[525.513 60 0],[526.175 19 0],[526.415 530 0],[526.516 30 0],[526.572 180 0],[527.201 35 0],[527.344 30 0],[527.517 95 0],[527.569 35 0],[527.603 70 0],[528.029 19 0],[528.719 10 0],[529.669 340 0],[529.736 70 0],[529.827 660 0],[530.075 85 0],[530.421 17 0],[531.288 24 0],[531.878 24 0],[532.834 340 0],[532.917 70 0],[532.972 17 0],[534.044 14 0],[534.476 10 0],[534.581 780 0],[534.832 380 0],[538.698 30 0],[538.757 22 0],[539.039 10 0],[540.061 40 0],[540.5 22 0],[540.979 1400 0],[544.241 12 0],[546.397 19 0],[548.05 19 0],[562.864 24 0],[564.236 7 0],[564.937 12 0],[566.404 24 0],[568.12 7 0],[568.248 7 0],[569.473 24 0],[569.833 40 0],[570.231 24 0],[571.264 12 0],[571.278 24 0],[571.982 7 0],[574.643 7 0],[575.369 7 0],[578.12 12 0],[578.181 6 0],[578.311 24 0],[578.393 30 0],[578.5 24 0],[578.582 19 0],[578.799 60 0],[579.1 180 0],[633.01 35 0],[636.287 22 0],[666.108 19 0],[666.926 11 0],[688.162 5 0],[688.238 10 0],[688.303 21 0],[692.413 27 0],[692.52 17 0],[697.848 30 0],[697.982 11 0],[718.552 7 0],[723.62 6 0],[735.59 85 0],[740.021 130 0],[746.231 150 0]}{20000}% +\wl@elt@search{#1}{Mn}{[380.055 110 0],[380.191 55 0],[380.672 3200 0],[380.959 700 0],[381.069 55 0],[381.675 90 0],[382.351 2100 0],[382.389 390 0],[382.968 200 0],[383.386 480 0],[383.436 1300 0],[383.978 350 0],[384.108 670 0],[384.398 350 0],[391.832 65 0],[392.647 120 0],[395.284 65 0],[397.589 55 0],[397.708 65 0],[398.258 130 0],[398.524 150 0],[398.683 190 0],[398.71 150 0],[401.81 1500 0],[402.644 150 0],[403.076 27000 0],[403.307 19000 0],[403.449 11000 0],[403.573 1500 0],[403.873 55 0],[404.136 5600 0],[404.513 210 0],[404.876 1100 0],[404.9 80 0],[405.173 55 0],[405.247 65 0],[405.521 150 0],[405.554 1900 0],[405.795 210 0],[405.893 1100 0],[405.939 150 0],[406.174 730 0],[406.353 730 0],[406.508 80 0],[406.8 80 0],[407.028 290 0],[407.924 730 0],[407.942 730 0],[408.294 1100 0],[408.363 1100 0],[408.994 65 0],[410.536 55 0],[411.09 200 0],[413.112 150 0],[413.504 120 0],[414.106 80 0],[414.753 55 0],[414.88 80 0],[417.66 150 0],[418.999 120 0],[420.176 65 0],[421.175 65 0],[423.514 370 0],[423.529 510 0],[423.972 190 0],[425.766 290 0],[426.592 290 0],[428.11 270 0],[428.408 65 0],[431.255 65 0],[432.363 50 1],[437.495 45 0],[438.17 45 0],[441.188 55 0],[441.488 350 0],[441.978 55 0],[443.635 210 0],[445.159 800 0],[445.3 160 0],[445.501 130 0],[445.532 160 0],[445.582 110 0],[445.704 55 0],[445.755 210 0],[445.826 270 0],[446.038 55 0],[446.108 150 0],[446.202 510 0],[446.468 290 0],[447.014 200 0],[447.279 130 0],[447.94 40 0],[449.008 170 0],[449.89 240 0],[450.222 240 0],[460.536 80 0],[462.654 80 0],[467.169 35 0],[470.116 50 0],[470.972 160 0],[472.748 180 0],[473.911 130 0],[475.404 1000 0],[476.153 180 0],[476.238 750 0],[476.586 300 0],[476.643 500 0],[478.342 940 0],[482.352 1000 0],[484.432 25 0],[496.588 35 0],[500.491 19 0],[507.479 30 0],[511.794 60 0],[515.089 50 0],[519.659 50 0],[525.532 85 0],[534.106 160 0],[534.988 19 0],[537.763 95 0],[539.467 95 0],[539.949 50 0],[540.742 95 0],[541.369 35 0],[542.036 85 0],[543.255 35 0],[545.747 12 0],[547.064 60 0],[548.14 40 0],[550.587 30 0],[551.677 50 0],[553.776 40 0],[555.198 21 0],[556.776 8 0],[557.301 7 0],[557.368 8 0],[573.829 7 0],[578.019 7 0],[581.684 7 0],[601.35 140 0],[601.664 200 0],[602.18 290 0],[638.467 7 0],[644.097 17 0],[649.171 24 0],[694.252 14 0],[698.996 12 0],[706.984 14 0],[718.425 12 0],[724.782 10 0],[728.382 24 0],[730.289 35 0],[732.651 50 0],[768.02 12 0],[771.242 10 0],[776.472 10 0],[424.617 100 2],[507.92 200 2],[510.003 150 2],[511.703 100 2],[525.223 100 2],[536.559 100 2],[545.407 150 2],[547.468 200 2],[567.112 100 2],[594.665 200 2],[621.311 100 2],[623.121 200 2],[623.864 100 2],[627.371 100 2]}{27000}% +\wl@elt@search{#1}{Fe}{[380.5345 200 0],[380.6696 80 0],[381.2964 600 0],[381.3059 60 0],[381.584 1500 0],[382.0425 2500 0],[382.1179 150 0],[382.4306 80 0],[382.4444 2500 0],[382.588 1500 0],[382.7823 1200 0],[383.4222 1000 0],[383.9257 120 0],[384.0437 500 0],[384.1047 800 0],[384.3256 120 0],[384.68 80 0],[384.996 200 0],[385.0817 120 0],[385.6372 2500 0],[385.9212 150 0],[385.9911 10000 0],[386.5523 150 0],[386.7215 60 0],[387.2501 250 0],[387.3761 150 0],[387.8018 250 0],[387.8573 2000 0],[388.6282 4000 0],[388.7048 200 0],[388.8513 300 0],[389.5656 800 0],[389.9707 1200 0],[390.2945 400 0],[390.6479 250 0],[391.6731 80 0],[392.0258 600 0],[392.2911 1200 0],[392.792 1200 0],[393.0296 2000 0],[394.8774 60 0],[394.9953 60 0],[395.1164 50 0],[395.2601 50 0],[395.6454 60 0],[395.668 250 0],[396.6614 60 0],[396.9257 100 0],[397.7741 80 0],[398.1771 40 0],[398.3956 50 0],[399.4114 60 0],[399.7392 200 0],[399.8053 40 0],[400.5241 400 0],[400.9713 60 0],[401.453 80 0],[402.1867 100 0],[404.0638 50 0],[404.5813 4000 0],[406.3594 1500 0],[406.6975 50 0],[406.7977 50 0],[407.1737 1200 0],[407.6629 40 0],[410.0737 40 0],[410.7489 40 0],[411.8544 150 0],[412.7608 40 0],[413.2058 400 0],[413.4676 80 0],[413.6997 40 0],[414.3415 200 0],[414.3869 800 0],[415.3898 40 0],[415.45 50 0],[415.6799 60 0],[417.2744 50 0],[417.4912 60 0],[417.5635 50 0],[417.7593 50 0],[418.1754 120 0],[418.4891 50 0],[418.7038 120 0],[418.7795 120 0],[419.143 80 0],[419.5329 40 0],[419.8304 150 0],[419.9095 40 0],[420.2029 300 0],[420.3984 40 0],[420.6696 80 0],[421.0343 80 0],[421.6183 400 0],[421.936 100 0],[422.2212 50 0],[422.5956 50 0],[422.7423 200 0],[423.317 11 1],[423.3602 100 0],[423.5936 250 0],[423.8809 50 0],[424.7425 50 0],[425.0118 200 0],[425.0787 300 0],[425.8315 40 0],[426.0473 800 0],[427.1153 250 0],[427.1759 1200 0],[428.2402 1200 0],[429.1462 80 0],[429.9234 250 0],[430.7901 1200 0],[431.5084 150 0],[432.5761 1500 0],[435.2734 80 0],[436.9771 80 0],[437.5929 800 0],[438.3544 3000 0],[440.475 1200 0],[441.5122 300 0],[442.7299 600 0],[446.1652 400 0],[446.6551 120 0],[447.6017 80 0],[448.2169 80 0],[448.2252 200 0],[448.9739 50 0],[452.8613 50 0],[458.383 11 1],[464.7433 30 0],[473.6771 30 0],[485.9741 50 0],[487.1317 120 0],[487.2136 60 0],[487.8208 30 0],[489.0754 100 0],[489.1492 250 0],[490.3309 30 0],[491.8992 150 0],[492.0502 500 0],[492.392 12 1],[495.7597 1500 0],[499.05 11 1],[500.1862 80 0],[500.191 18 1],[500.42 11 1],[500.5711 30 0],[500.6117 100 0],[501.2067 60 0],[501.4941 30 0],[501.843 12 1],[503.064 11 1],[503.077 25 0],[503.571 12 1],[504.1755 150 0],[504.9819 30 0],[505.1634 30 0],[507.4748 25 0],[510.073 18 1],[510.095 15 1],[511.0357 150 0],[513.369 40 0],[513.9251 40 0],[513.9462 100 0],[514.436 11 1],[514.946 12 1],[515.191 25 0],[516.227 30 0],[516.6281 80 0],[516.7487 2500 0],[516.8897 80 0],[516.903 12 1],[517.1595 500 0],[519.1454 50 0],[519.2343 80 0],[519.4941 200 0],[520.4582 30 0],[521.5179 25 0],[521.6274 150 0],[521.685 18 1],[522.6862 60 0],[522.715 1000 0],[522.749 13 1],[523.2939 250 0],[524.795 13 1],[525.123 13 1],[526.026 18 1],[526.418 11 1],[526.6555 100 0],[526.9537 1200 0],[527.0357 800 0],[528.1789 30 0],[528.3621 60 0],[530.2299 25 0],[530.618 11 1],[531.623 13 1],[532.4178 150 0],[532.8038 800 0],[532.8531 300 0],[533.2899 100 0],[533.959 14 1],[533.9928 80 0],[534.1023 500 0],[536.487 25 0],[536.747 40 0],[536.996 50 0],[537.1489 400 0],[538.337 60 0],[538.706 14 1],[539.3167 40 0],[539.586 12 1],[539.7127 300 0],[540.206 15 1],[540.412 60 0],[540.5774 250 0],[541.091 30 0],[541.52 60 0],[542.407 60 0],[542.783 30 1],[542.9695 250 0],[542.999 13 1],[543.4523 100 0],[544.6871 200 0],[545.545 25 0],[545.5609 120 0],[546.593 16 1],[546.694 20 1],[548.231 16 1],[549.383 14 1],[549.7516 25 0],[550.1464 20 0],[550.62 18 1],[550.6778 30 0],[551.078 12 1],[552.906 12 1],[554.476 13 1],[556.9618 30 0],[557.2841 60 0],[558.6755 120 0],[561.5644 200 0],[562.4541 20 0],[564.54 12 1],[566.2515 50 0],[576.299 20 0],[578.363 11 1],[586.2353 30 0],[588.502 13 1],[590.282 16 1],[591.4114 30 0],[595.57 14 1],[598.6956 30 0],[596.171 18 1],[596.24 30 1],[596.563 13 1],[606.5482 40 0],[610.2159 30 0],[613.6614 40 0],[613.7694 40 0],[614.773 30 1],[614.924 20 1],[617.516 15 1],[619.1558 40 0],[621.3429 30 0],[621.9279 30 0],[623.0726 40 0],[623.837 20 1],[624.6317 20 0],[624.756 80 1],[625.2554 30 0],[630.532 15 1],[633.197 12 1],[638.375 15 1],[639.3602 20 0],[639.9999 30 0],[641.1647 20 0],[641.69 20 1],[642.1349 20 0],[643.0844 30 0],[644.643 20 1],[645.638 200 1],[649.4981 60 0],[651.605 20 1],[654.6239 20 0],[659.2913 20 0],[667.7989 40 0],[685.518 15 0],[694.521 15 0],[706.744 20 1],[713.094 15 0],[716.4443 25 0],[718.7313 80 0],[720.7381 30 0],[722.451 12 1],[730.797 50 1],[732.07 40 1],[737.646 20 1],[744.5746 30 0],[746.238 20 1],[749.5059 40 0],[751.1045 60 0],[758.604 15 0],[771.171 15 1],[778.059 30 0],[395.433 16 2],[396.872 11 2],[396.949 9 2],[397.942 10 2],[403.542 10 2],[405.311 11 2],[408.1 12 2],[412.09 10 2],[412.202 11 2],[412.278 11 2],[413.776 15 2],[413.935 13 2],[414.048 9 2],[415.496 9 2],[416.473 18 2],[416.492 9 2],[416.684 13 2],[417.426 13 2],[421.067 9 2],[422.227 11 2],[423.556 13 2],[423.862 9 2],[424.375 12 2],[427.34 12 2],[427.972 12 2],[428.616 14 2],[429.685 16 2],[430.478 18 2],[431.036 20 2],[432.368 9 2],[437.204 9 2],[437.214 9 2],[437.231 11 2],[437.253 14 2],[437.281 18 2],[439.576 9 2],[441.96 12 2],[443.102 9 2],[511.107 9 2],[512.735 9 2],[515.612 12 2],[519.908 10 2],[523.566 10 2],[524.331 18 2],[526.034 13 2],[527.237 9 2],[527.298 14 2],[527.648 15 2],[528.23 16 2],[528.483 12 2],[529.812 11 2],[529.993 12 2],[530.26 14 2],[530.676 10 2],[531.088 9 2],[532.274 10 2],[534.688 11 2],[535.377 12 2],[536.376 12 2],[536.806 10 2],[537.547 11 2],[571.988 11 2],[574.419 9 2],[575.638 10 2],[583.393 18 2],[584.876 9 2],[585.462 10 2],[587.626 9 2],[589.191 15 2],[589.868 9 2],[591.896 9 2],[592.013 10 2],[592.969 18 2],[595.231 10 2],[595.362 14 2],[596.848 9 2],[597.932 12 2],[598.101 9 2],[598.908 12 2],[599.954 18 2],[603.102 9 2],[603.259 16 2],[603.656 13 2],[604.872 11 2],[605.418 11 2],[605.636 9 2],[614.999 9 2],[616.974 9 2],[618.526 9 2],[618.656 7 2],[619.479 7 2],[619.543 6 2],[620.137 6 2],[620.304 5 2],[625.981 5 2],[629.45 6 2],[635.781 5 2],[731.763 5 2],[732.014 6 2]}{10000}% +\wl@elt@search{#1}{Co}{[384.205 1400 0],[384.547 6900 0],[387.312 5500 0],[387.396 2800 0],[389.408 7900 0],[391.14 20 1],[393.597 1500 0],[396.31 80 1],[397.674 40 1],[398.302 10 1],[399.531 6000 0],[399.791 970 0],[402.09 350 0],[403.614 10 1],[403.737 20 1],[404.002 4 1],[404.539 370 0],[405.023 5 1],[405.24 10 1],[406.273 20 1],[406.45 2 1],[406.637 350 0],[407.434 5 1],[409.239 830 0],[409.657 1 1],[411.054 550 0],[411.877 2800 0],[412.132 4400 0],[413.088 3 1],[414.513 3 1],[416.067 3 1],[418.113 1 1],[419.071 90 0],[420.861 1 1],[424.425 30 1],[427.233 8 1],[428.825 20 1],[432.886 3 1],[438.426 2 1],[439.694 2 1],[441.391 3 1],[446.956 90 0],[448.25 10 1],[448.912 2 1],[449.744 4 1],[450.054 10 1],[453.096 690 0],[453.322 2 1],[454.966 90 0],[455.929 1 1],[456.559 140 0],[456.926 1 1],[458.16 190 0],[461.63 5 1],[462.938 120 0],[466.066 25 1],[466.341 85 0],[479.286 110 0],[483.116 10 1],[484.027 100 0],[486.788 150 0],[496.418 80 1],[497.005 10 1],[499.047 10 1],[499.598 20 1],[514.674 35 0],[521.271 50 0],[523.022 50 0],[523.521 45 0],[524.793 50 0],[526.63 26 0],[526.649 45 0],[526.852 26 0],[528.065 45 0],[530.106 26 0],[534.271 50 0],[534.339 26 0],[535.205 50 0],[535.348 26 0],[536.958 35 0],[548.334 45 0],[553.077 17 0],[564.722 17 0],[599.188 17 0],[608.244 17 0],[628.263 17 0],[645.024 45 0],[645.5 21 0],[656.342 15 0],[663.244 15 0],[681.494 14 0],[687.24 14 0],[705.289 21 0],[708.499 45 0],[741.738 8 0],[771.268 8 0]}{7900}% +\wl@elt@search{#1}{Ni}{[380.714 700 0],[383.169 110 0],[385.83 1200 0],[388.967 30 0],[397.217 35 0],[397.356 110 0],[440.155 110 0],[445.904 85 0],[446.246 18 0],[447.048 55 0],[459.253 35 0],[460.037 18 0],[460.5 65 0],[460.623 18 0],[464.866 75 0],[468.622 23 0],[471.442 110 0],[471.578 22 0],[475.652 30 0],[476.395 15 0],[478.654 45 0],[480.7 22 0],[482.903 22 0],[483.118 19 0],[485.541 45 0],[486.627 30 0],[487.344 17 0],[490.441 40 0],[491.836 22 0],[493.583 16 0],[498.016 45 0],[498.413 45 0],[499.202 500 1],[500.034 16 0],[501.246 18 0],[501.759 50 0],[503.537 100 0],[504.885 16 0],[508.052 100 0],[508.111 65 0],[508.408 26 0],[509.932 18 0],[509.995 26 0],[511.54 21 0],[512.938 18 0],[513.708 23 0],[514.277 23 0],[514.648 40 0],[515.576 40 0],[516.866 16 0],[517.656 13 0],[543.587 8 0],[547.691 180 0],[551 6 0],[557.873 6 0],[558.786 9 0],[559.228 13 0],[561.479 9 0],[562.533 5 0],[564.97 4 0],[566.402 5 0],[568.22 12 0],[569.5 8 0],[570.956 23 0],[571.19 10 0],[571.509 10 0],[575.468 16 0],[576.085 8 0],[585.776 10 0],[589.288 10 0],[610.812 10 0],[617.681 10 0],[619.118 10 0],[625.636 13 0],[631.466 10 0],[664.364 16 0],[676.777 22 0],[677.232 9 0],[691.456 10 0],[711.09 5 0],[712.22 26 0],[718.2 6 0],[719.702 5 0],[726.193 5 0],[729.145 5 0],[738.524 4 0],[739.36 16 0],[740.935 16 0],[741.451 5 0],[742.228 23 0],[752.276 13 0],[752.512 9 0],[755.56 19 0],[757.405 8 0],[761.7 23 0],[761.921 9 0],[771.432 16 0],[771.558 5 0],[772.761 19 0],[774.889 19 0],[778.894 10 0],[779.759 13 0]}{1200}% +\wl@elt@search{#1}{Cu}{[381.8879 100 1],[382.6921 140 1],[386.4137 160 1],[388.4131 280 1],[389.2924 150 1],[390.3177 170 1],[392.0654 140 1],[393.3268 120 1],[398.7024 120 1],[399.3302 150 1],[400.3476 140 1],[402.263 1250 0],[403.2647 100 1],[404.3484 600 1],[404.3751 500 1],[406.264 2000 0],[406.8106 120 1],[413.1363 500 1],[414.3017 200 1],[415.3623 300 1],[416.114 500 1],[416.4284 370 1],[417.1851 400 1],[417.9512 500 1],[421.1866 500 1],[423.0449 320 1],[425.5635 200 1],[427.511 950 0],[427.9962 300 1],[429.247 500 1],[436.537 400 1],[444.4831 100 1],[450.6002 400 1],[451.6049 150 1],[454.1032 150 1],[455.592 500 1],[459.6906 100 1],[464.9271 120 1],[465.112 2000 0],[466.1363 120 1],[467.1702 320 1],[467.3577 300 1],[468.1994 450 1],[475.8433 100 1],[481.2948 400 1],[485.1262 120 1],[485.4988 300 1],[487.3304 100 1],[490.1427 150 1],[490.9734 1000 1],[491.8376 500 1],[492.6424 200 1],[493.1698 900 1],[494.3026 120 1],[495.3724 700 1],[498.5506 500 1],[500.6801 400 1],[500.9851 350 1],[501.262 400 1],[502.1279 350 1],[503.9016 200 1],[504.7348 300 1],[505.1793 900 1],[505.891 400 1],[506.5459 500 1],[506.7094 450 1],[507.2302 350 1],[508.8277 450 1],[509.3816 420 1],[510.0067 350 1],[510.554 1500 0],[512.4476 250 1],[515.324 2000 0],[515.8093 100 1],[518.3367 100 1],[521.82 2500 0],[526.9991 100 1],[527.6525 100 1],[529.252 1650 0],[536.8383 100 1],[570.024 1500 0],[578.213 1500 0],[580.5989 150 1],[583.3515 100 1],[589.7971 200 1],[593.7577 120 1],[594.1196 400 1],[599.326 100 1],[600.012 650 1],[602.3264 100 1],[607.2218 250 1],[608.0343 150 1],[609.999 150 1],[610.7412 160 1],[611.4493 300 1],[615.0384 600 1],[615.4222 750 1],[617.2037 500 1],[618.6884 550 1],[618.8676 400 1],[619.8092 300 1],[620.4261 470 1],[620.8457 450 1],[621.6939 750 1],[621.9844 700 1],[626.1848 500 1],[627.3349 1000 1],[628.8696 350 1],[630.1009 900 1],[630.5972 550 1],[631.2492 400 1],[632.6466 120 1],[637.3268 400 1],[637.784 750 1],[640.3384 400 1],[642.3884 850 1],[644.2965 200 1],[644.8559 750 1],[646.6246 170 1],[647.0168 950 1],[648.1437 750 1],[648.4421 400 1],[651.7317 220 1],[653.0083 400 1],[655.1286 120 1],[657.708 200 1],[662.4292 750 1],[664.1396 800 1],[666.0962 450 1],[677.0362 100 1],[680.6216 300 1],[680.9647 400 1],[682.3202 320 1],[684.4157 250 1],[686.8791 320 1],[687.2231 270 1],[687.9404 270 1],[693.7553 220 1],[695.2871 150 1],[697.7572 150 1],[702.286 200 1],[719.4896 300 1],[732.6008 400 1],[733.1694 300 1],[738.2277 250 1],[740.4354 1000 1],[743.4156 270 1],[756.2015 500 1],[765.2333 700 1],[766.4648 1000 1],[768.1788 150 1],[774.4097 450 1],[777.8738 800 1],[380.413 600 2],[380.918 600 2],[388.168 300 2],[395.381 150 2],[409.049 100 2],[428.34 200 2],[435.197 500 2],[435.28 1000 2],[435.524 500 2],[437.084 500 2],[437.14 500 2],[437.343 500 2],[437.711 1000 2],[438.642 200 2],[492.741 150 2],[509.428 400 2],[516.897 200 2],[520.834 400 2],[521.921 600 2],[526.859 200 2],[531.778 400 2],[536.979 300 2],[541.848 350 2],[549.494 250 2],[557.394 50 2],[560.9 100 2],[570.212 75 2],[576.856 100 2],[585.072 100 2],[596.525 200 2],[610.087 30 2],[636.927 50 2],[651.254 20 2],[664.413 20 2],[679.32 50 2]}{2500}% +\wl@elt@search{#1}{Zn}{[380.634 50 1],[384.029 100 1],[388.334 50 0],[396.543 15 0],[411.321 10 0],[429.288 25 0],[429.833 25 0],[462.981 35 0],[468.014 300 0],[472.215 400 0],[481.053 400 0],[491.162 800 1],[492.403 500 1],[506.866 7 0],[506.958 15 0],[518.198 200 0],[530.865 8 0],[531.024 7 0],[531.102 7 0],[577.21 4 0],[577.55 4 0],[577.711 10 0],[589.433 500 1],[602.118 500 1],[610.249 500 1],[611.153 100 1],[621.461 500 1],[623.79 8 0],[623.917 8 0],[636.234 1000 0],[647.918 10 0],[692.832 15 0],[693.847 8 0],[694.32 3 0],[747.88 200 1],[758.85 300 1],[761.29 100 1],[773.25 300 1],[775.79 200 1],[779.936 10 0]}{1000}% +\wl@elt@search{#1}{Ga}{[392.439 9 1],[403.299 10 0],[417.204 10 0],[425.111 4 1],[425.116 15 1],[425.404 10 1],[425.564 4 1],[425.57 5 1],[425.577 10 1],[426.2 40 1],[521.821 3 1],[533.83 1 1],[535.349 2 0],[536.06 2 1],[536.35 1 1],[541.68 3 1],[542.16 1 1],[542.56 1 1],[633.42 10 1],[639.656 2000 0],[641.344 1000 0],[641.94 5 1],[645.63 3 1],[700 1 1],[705.124 3 0],[710.682 5 0],[711.63 1 0],[717.29 2 0],[719.36 5 0],[719.87 7 1],[725.14 10 0],[728.96 3 0],[734.93 5 0],[740.3 20 0],[746.4 30 0],[755.66 6 0],[762.05 10 0],[773.477 50 0],[779.3 2 1],[380.66 10 2],[438.069 100 2],[438.176 150 2],[486.3 100 2],[499.378 150 2],[580.828 10 2],[584.825 20 2],[599.351 15 2]}{2000}% +\wl@elt@search{#1}{Ge}{[384.511 30 1],[422.6562 70 0],[468.5829 10 0],[468.987 75 1],[469.002 50 1],[474.1806 1000 1],[481.4608 1000 1],[482.4097 50 1],[513.1752 100 1],[517.8648 200 1],[519.4583 3 0],[526.5892 6 0],[551.3263 6 0],[556.4741 8 0],[560.701 8 0],[561.6135 6 0],[562.1426 7 0],[565.596 8 0],[566.4226 6 0],[566.4842 5 0],[569.1954 9 0],[570.1776 6 0],[571.7877 5 0],[580.1029 6 0],[580.2093 9 0],[589.3389 1000 1],[602.1041 500 1],[607.839 150 1],[626.714 50 1],[626.807 150 1],[626.834 100 1],[628.3452 75 1],[633.6377 100 1],[648.4181 100 1],[655.7488 6 0],[678.051 50 1],[704.9369 50 1],[713.012 6 0],[714.539 30 1],[733.038 7 0],[735.3334 5 0],[738.4208 7 0],[740.264 6 0],[751.157 7 0],[777.62 5 0],[388.478 15 2],[417.896 200 2],[424.541 12 2],[426.085 200 2],[429.171 150 2],[467.436 10 2],[501.688 10 2],[513.475 18 2],[522.937 5 2],[525.661 3 2]}{1000}% +\wl@elt@search{#1}{As}{[384.26 340 1],[419.0082 715 1],[419.74 615 1],[424.2982 615 1],[431.5657 500 1],[432.3867 500 1],[433.664 500 1],[435.2145 500 1],[435.2864 425 1],[437.117 375 1],[442.7106 615 1],[443.1562 615 1],[445.8469 715 1],[446.1075 340 1],[446.6348 715 1],[447.446 500 1],[449.423 800 1],[450.7659 850 1],[453.974 615 1],[454.3483 715 1],[460.2427 615 1],[462.9787 340 1],[470.7586 340 1],[473.067 340 1],[488.8557 340 1],[506.898 100 0],[510.558 340 1],[510.755 500 1],[512.134 100 0],[514.163 100 0],[523.138 425 1],[533.123 500 1],[540.813 100 0],[545.132 135 0],[549.7727 340 1],[555.809 425 1],[565.132 425 1],[611.007 425 1],[617.027 500 1],[651.174 300 1],[709.227 300 1],[710.272 300 1],[392.26 325 2],[403.72 185 2]}{850}% +\wl@elt@search{#1}{Se}{[407.02 285 1],[417.53 360 1],[418.09 450 1],[432.87 120 0],[433.03 100 0],[438.29 285 1],[444.6 285 1],[444.92 220 1],[446.76 285 1],[473.08 500 0],[473.9 400 0],[474.22 300 0],[484.06 285 1],[484.5 360 1],[522.75 450 1],[530.54 360 1],[536.55 100 0],[536.99 120 0],[537.41 110 0],[552.24 285 1],[556.69 285 1],[586.63 285 1],[605.6 450 1],[632.56 200 0],[644.42 360 1],[649.05 285 1],[653.5 285 1],[683.13 150 0],[699.069 120 0],[699.1792 100 0],[701.0809 200 0],[701.3875 150 0],[706.2065 300 0],[757.51 200 0],[758.34 250 0],[759.22 150 0],[760.68 120 0],[380.09 450 2],[404.67 360 2],[408.32 220 2],[416.91 450 2],[463.79 220 2],[630.38 285 2]}{500}% +\wl@elt@search{#1}{Br}{[381.565 1200 0],[383.469 350 1],[387.121 300 1],[389.163 400 1],[390.124 300 1],[391.42 300 1],[391.438 500 1],[391.951 350 1],[392.409 400 1],[392.955 300 1],[393.969 350 1],[395.061 350 1],[398.038 500 1],[399.236 1500 0],[402.404 300 1],[413.566 300 1],[414.02 300 1],[417.963 400 1],[419.345 300 1],[422.389 1000 1],[423.689 300 1],[429.139 300 1],[436.514 2000 0],[436.56 1000 1],[442.514 1500 0],[444.174 10000 0],[447.261 10000 0],[447.772 20000 0],[449.042 1000 0],[451.344 3000 0],[452.559 15000 0],[452.96 300 1],[454.292 500 1],[457.574 3000 0],[460.136 300 1],[461.458 2500 0],[462.27 350 1],[464.202 300 1],[465.198 300 1],[467.87 500 1],[469.317 400 1],[470.485 500 1],[471.976 350 1],[472.036 400 1],[472.82 300 1],[473.541 300 1],[474.264 400 1],[475.228 2500 0],[476.6 350 1],[477.94 400 1],[478.031 4000 0],[478.519 1600 0],[478.55 500 1],[480.233 300 1],[481.67 500 1],[481.846 300 1],[484.481 350 1],[484.875 350 1],[492.112 400 1],[492.879 400 1],[493.066 450 1],[494.551 300 1],[497.976 4000 0],[503.874 300 1],[505.464 300 1],[516.438 400 1],[518.001 300 1],[518.235 500 1],[519.39 300 1],[523.823 500 1],[527.268 300 1],[530.41 350 1],[533.057 400 1],[533.205 500 1],[539.548 1200 0],[542.278 400 1],[542.499 350 1],[543.507 300 1],[546.622 1200 0],[547.847 350 1],[548.879 300 1],[549.506 300 1],[550.669 500 1],[558.994 350 1],[571.871 300 1],[583.078 300 1],[585.208 1800 0],[594.048 1600 0],[612.214 2400 0],[614.86 40000 0],[616.174 300 1],[617.739 2000 0],[633.548 1500 0],[635.073 60000 0],[635.294 400 1],[641.032 2500 0],[648.356 1800 0],[651.462 1000 0],[654.457 20000 0],[654.809 1500 0],[655.98 50000 0],[657.131 1000 0],[657.914 1800 0],[658.217 20000 0],[662.047 1500 0],[663.162 50000 0],[668.228 20000 0],[669.213 10000 0],[672.828 8000 0],[676.006 2000 0],[677.948 2000 0],[678.674 2200 0],[679.004 6500 0],[679.148 1600 0],[686.115 1800 0],[700.519 10000 0],[726.045 2000 0],[734.851 10000 0],[751.296 40000 0],[759.161 1600 0],[759.507 1800 0],[761.641 2000 0],[382.026 450 2],[390.395 200 2],[450.655 350 2],[451.974 200 2],[517.587 150 2],[544.68 100 2],[719.28 100 2],[767.31 100 2]}{60000}% +\wl@elt@search{#1}{Kr}{[387.544 150 1],[390.6177 150 1],[392.0081 200 1],[399.484 100 1],[399.7793 100 1],[405.7037 300 1],[406.5128 300 1],[408.8337 500 1],[409.8729 250 1],[410.9248 100 1],[414.5122 250 1],[425.058 150 1],[427.3969 1000 0],[428.2967 100 0],[429.2923 600 1],[430.049 200 1],[431.781 500 1],[431.8551 400 0],[431.9579 1000 0],[432.298 150 1],[435.1359 100 0],[435.5477 3000 1],[436.2641 500 0],[436.969 200 1],[437.6121 800 0],[438.654 300 1],[439.9965 200 0],[442.5189 100 0],[443.1685 500 1],[443.6812 600 1],[445.3917 600 0],[446.3689 800 0],[447.5014 800 1],[448.988 400 1],[450.2353 600 0],[452.314 400 1],[455.661 200 1],[457.7209 800 1],[458.2978 300 1],[459.28 150 1],[461.5292 500 1],[461.9166 1000 1],[463.3885 800 1],[465.8876 2000 1],[468.0406 500 1],[469.1301 100 1],[469.436 200 1],[473.9002 3000 1],[476.2435 300 1],[476.5744 1000 1],[481.176 300 1],[482.518 300 1],[483.2077 800 1],[484.6612 700 1],[485.72 150 1],[494.559 300 1],[502.24 200 1],[508.652 250 1],[512.573 400 1],[520.832 500 1],[530.866 200 1],[533.341 500 1],[546.817 200 1],[556.2224 500 0],[557.0288 2000 0],[558.0386 80 0],[564.9561 100 0],[568.189 400 1],[569.035 200 1],[583.2855 100 0],[587.0914 3000 0],[599.222 200 1],[599.3849 60 0],[605.6125 60 0],[642.018 300 1],[642.1026 100 0],[645.6288 200 0],[657.007 150 1],[669.9228 60 0],[690.4678 100 0],[721.313 250 1],[722.4104 100 0],[728.7258 80 0],[728.978 400 1],[740.702 400 1],[742.5541 60 0],[743.578 200 1],[748.6862 100 0],[752.446 300 1],[758.7411 1000 0],[760.1544 2000 0],[764.116 150 1],[768.5244 1000 0],[769.4538 1200 0],[773.569 250 1],[774.6827 150 0],[386.87 40 2],[406.737 50 2],[413.133 40 2],[415.446 40 2],[501.645 20 2],[550.143 10 2],[603.717 10 2],[607.838 10 2],[631.022 10 2],[380.93 3 3],[386.058 5 3],[393.429 5 3]}{3000}% +\wl@elt@search{#1}{Rb}{[380.19 2500 1],[382.666 1000 1],[386.074 450 1],[390.729 250 1],[392.22 500 1],[392.644 2500 1],[394.051 25000 1],[397.815 1000 1],[402.949 1700 1],[408.388 2500 1],[410.428 2000 1],[413.611 1700 1],[419.308 3500 1],[420.18 1000 0],[421.553 500 0],[424.44 90000 1],[426.658 500 1],[427.025 250 1],[427.314 15000 1],[428.797 2500 1],[429.397 1500 1],[430.626 500 1],[434.696 1000 1],[437.712 2500 1],[444.01 300 1],[446.947 1000 1],[449.392 400 1],[451.904 700 1],[453.034 3000 1],[453.379 500 1],[454.074 400 1],[457.177 20000 1],[462.242 3000 1],[463.189 350 1],[464.857 10000 1],[465.928 500 1],[473.045 1000 1],[475.53 1000 1],[475.782 400 1],[477.595 30000 1],[478.283 5000 1],[485.534 300 1],[488.559 1500 1],[508.7987 2 0],[513.2471 2 0],[515.0134 10 0],[515.208 10000 1],[516.458 300 1],[516.5023 1 0],[516.5142 2 0],[516.965 1 0],[519.5278 15 0],[523.3968 2 0],[526.0034 20 0],[526.0228 1 0],[527.051 200 1],[532.238 3 0],[536.2601 40 0],[539.0568 4 0],[543.1532 75 0],[543.183 3 0],[551.255 500 1],[552.278 5000 1],[557.8788 6 0],[563.599 5000 1],[564.7774 40 0],[565.375 20 0],[569.915 3000 1],[572.4121 60 0],[572.4614 3 0],[573.964 200 1],[607.0755 75 0],[613.527 200 1],[615.9626 30 0],[619.908 1000 1],[620.6309 75 0],[626.94 300 1],[629.8325 120 0],[629.9224 5 0],[645.833 10000 1],[655.562 1000 1],[656.081 5000 1],[677.507 3000 1],[727.9997 100 0],[731.652 300 1],[740.8173 150 0],[761.8933 200 0],[775.7651 300 0],[775.9436 60 0]}{90000}% +\wl@elt@search{#1}{Sr}{[394.08 300 0],[396.926 600 0],[397.004 300 0],[403.038 1300 0],[403.238 300 0],[407.771 46000 1],[416.18 200 1],[421.552 32000 1],[430.545 340 1],[443.804 350 0],[460.733 65000 0],[472.228 3200 0],[474.192 2200 0],[478.432 1400 0],[481.188 4800 0],[483.208 3600 0],[485.504 500 0],[486.87 600 0],[487.249 3000 0],[487.606 600 0],[487.632 2000 0],[489.198 1000 0],[496.226 8000 0],[496.794 1300 0],[515.607 800 0],[522.22 1400 0],[522.511 2000 0],[522.927 2000 0],[523.855 2800 0],[525.69 4800 0],[532.982 350 0],[545.084 1500 0],[548.084 7000 0],[548.612 1100 0],[550.417 3500 0],[552.183 2600 0],[553.481 2000 0],[554.005 2000 0],[554.336 250 0],[597.01 200 0],[634.575 250 0],[636.394 250 0],[636.996 350 0],[638.075 1000 0],[638.65 900 0],[638.824 600 0],[640.847 9000 0],[644.668 250 0],[646.579 250 0],[650.4 5500 0],[654.679 1000 0],[655.026 1700 0],[661.726 3000 0],[664.354 800 0],[679.105 1800 0],[687.838 4800 0],[689.259 1200 0],[707.01 5500 0],[715.309 60 0],[716.724 250 0],[723.227 200 0],[730.941 2500 0],[762.15 500 0],[767.306 400 0],[387.426 30 2],[393.64 30 2],[393.672 30 2],[395.875 30 2],[409.403 30 2],[409.702 30 2],[410.563 30 2],[433.58 35 2],[507.109 30 2],[513.034 30 2],[515.826 35 2],[525.771 40 2],[526.221 30 2],[528.832 30 2],[539.103 30 2],[544.348 40 2],[546.39 30 2],[566.466 30 2],[568.972 30 2],[429.857 9 3],[468.508 9 3]}{65000}% +\wl@elt@search{#1}{Y}{[381.835 1300 1],[383.288 4000 1],[384.787 70 1],[387.682 80 0],[387.828 480 1],[388.777 30 0],[390.459 60 0],[391.825 50 0],[393.011 60 0],[393.066 240 1],[395.036 4400 1],[395.16 150 1],[395.509 60 0],[398.26 3600 1],[398.75 40 0],[403.983 940 0],[404.764 2400 0],[407.738 9400 0],[408.122 90 0],[408.371 2000 0],[410.238 9900 0],[410.639 60 0],[411.081 80 0],[412.492 320 1],[412.831 8900 0],[414.285 7500 0],[415.763 100 0],[416.752 2400 0],[417.414 2000 0],[417.754 8000 1],[419.928 120 1],[420.47 380 1],[421.302 80 0],[421.354 40 0],[421.78 160 0],[422.063 280 0],[422.425 80 0],[423.573 600 1],[423.594 2200 0],[425.12 300 0],[430.23 360 0],[430.963 2800 1],[431.63 50 0],[433.078 110 0],[433.729 30 0],[434.465 60 0],[434.879 440 0],[435.233 60 0],[435.27 60 0],[435.773 120 0],[435.873 800 1],[436.603 120 0],[437.494 12000 1],[437.561 150 0],[437.933 80 0],[438.548 30 0],[438.774 100 0],[439.401 30 0],[439.467 30 0],[439.802 1800 1],[442.259 890 1],[443.734 80 0],[444.366 100 0],[444.663 130 0],[446.527 20 0],[447.389 40 0],[447.572 170 0],[447.696 180 0],[447.745 160 0],[448.728 110 0],[448.747 300 0],[449.175 30 0],[449.242 25 0],[450.595 500 0],[451.358 50 0],[451.401 80 0],[452.205 40 0],[452.725 890 0],[452.78 440 0],[454.432 100 0],[455.937 100 0],[456.439 30 0],[457.356 60 0],[458.132 35 0],[458.177 30 0],[459.655 130 0],[460.48 95 0],[461.3 40 0],[464.37 2000 0],[465.832 200 0],[465.889 70 0],[466.747 85 0],[467.082 60 0],[467.484 2000 0],[467.835 60 0],[468.232 260 1],[468.977 85 0],[469.681 180 0],[470.885 35 0],[472.585 60 0],[472.853 170 0],[473.237 60 0],[474.14 85 0],[475.279 160 0],[476.098 410 0],[478.018 17 0],[478.104 120 0],[478.658 160 1],[478.689 170 0],[479.93 180 0],[480.431 50 0],[480.481 70 0],[481.738 85 -1],[481.82 140 -1],[481.964 140 0],[482.213 120 0],[482.331 190 1],[483.915 60 0],[483.987 770 0],[484.568 550 0],[485.269 410 0],[485.425 120 0],[485.487 890 1],[485.67 50 0],[485.984 330 0],[487.965 50 0],[488.369 1900 1],[488.628 50 0],[488.665 40 0],[489.344 95 0],[490.012 1100 1],[490.611 100 0],[490.9 45 0],[492.187 150 0],[493.093 35 0],[495.066 45 0],[497.43 120 0],[498.213 120 1],[500.697 100 0],[507.021 75 0],[507.219 75 0],[508.742 1100 1],[508.818 30 0],[511.911 210 1],[512.321 450 1],[513.52 180 0],[519.643 120 1],[520.041 960 1],[520.572 1500 1],[524.081 180 0],[528.982 60 1],[532.078 45 1],[538.062 75 0],[540.278 220 1],[541.703 24 0],[542.437 90 0],[543.824 190 0],[546.646 710 0],[546.847 100 0],[547.339 90 1],[548.074 90 1],[549.317 60 0],[549.559 35 0],[549.741 240 1],[550.345 300 0],[550.99 250 1],[551.364 60 0],[552.163 120 0],[552.676 24 0],[552.754 740 0],[554.163 35 0],[554.45 120 0],[554.602 90 1],[555.643 75 0],[556.775 60 0],[557.742 180 0],[558.108 24 0],[558.187 620 0],[559.096 21 0],[559.412 21 0],[560.633 120 0],[562.391 15 0],[563.013 560 0],[563.225 24 0],[563.289 21 0],[564.469 120 0],[564.847 120 0],[566.294 740 1],[567.527 90 0],[569.363 18 0],[570.673 160 0],[572.061 24 0],[572.889 75 1],[573.012 150 -1],[573.209 21 0],[574.385 90 0],[574.693 18 -1],[576.422 24 -1],[576.564 75 0],[577.395 35 0],[578.169 100 1],[580 15 -1],[581.858 15 -1],[582.187 30 0],[583.227 21 0],[583.807 9 -1],[585.883 15 -1],[587.183 15 0],[587.614 24 -1],[587.996 24 0],[589.394 24 -1],[590.296 35 0],[591.219 24 -1],[593.11 24 -1],[593.908 90 -1],[594.572 45 0],[595.002 24 0],[595.641 75 -1],[597.204 1300 -1],[598.186 50 0],[598.764 1000 -1],[600.36 740 -1],[600.465 120 -1],[600.919 120 0],[601.987 620 -1],[602.341 120 0],[603.66 500 -1],[605.381 420 -1],[607.278 130 -1],[608.8 50 0],[608.935 210 -1],[609.678 160 -1],[610.782 130 -1],[611.473 130 -1],[612.738 75 -1],[613.206 1400 -1],[613.504 120 0],[613.843 150 0],[614.836 1100 -1],[615.172 120 -1],[616.508 820 -1],[618.223 560 -1],[619.173 1200 0],[619.982 590 -1],[621.796 450 -1],[622.259 300 0],[623.672 270 -1],[625.105 45 0],[627.501 120 -1],[629.546 60 -1],[631.62 24 -1],[633.81 24 -1],[635.948 15 -1],[636.987 15 -1],[640.201 75 0],[643.5 1000 0],[643.718 24 0],[650.123 18 -1],[651.833 18 -1],[653.584 18 -1],[653.86 90 0],[655.384 12 -1],[655.739 70 0],[657.258 12 -1],[657.685 35 0],[658.487 23 0],[661.375 95 1],[662.249 14 0],[663.649 19 0],[665.061 40 0],[666.44 21 0],[668.758 150 0],[669.183 14 0],[669.475 7 0],[669.926 16 0],[670.071 70 0],[671.32 35 0],[673.599 40 0],[679.371 190 0],[679.541 70 1],[680.315 12 0],[681.516 21 0],[683.249 14 1],[684.524 45 0],[685.824 14 1],[688.722 29 0],[689.6 21 1],[690.826 9 0],[693.352 14 0],[695.031 24 0],[695.168 10 1],[695.804 10 0],[697.988 24 0],[700.897 13 0],[700.993 10 0],[703.518 19 0],[705.294 29 0],[705.428 13 0],[707.513 9 0],[712.792 11 0],[719.166 35 0],[719.593 10 0],[726.417 35 1],[729.308 9 0],[733.062 9 0],[733.296 5 1],[734.646 50 0],[739.877 11 0],[745.03 29 1],[749.488 17 0],[753.671 7 0],[756.313 35 0],[761.772 8 0],[762.294 19 0],[765.289 7 0],[768.949 5 0],[769.8 8 0],[771.989 19 0],[772.408 19 0],[778.842 13 0],[779.632 13 0],[386.696 500 2],[390.074 3000 2],[391.458 4000 2],[403.96 3800 2],[404.011 3000 2],[412.161 120 2],[473.762 2000 2],[510.288 7500 2],[512.04 1300 2],[523.81 10000 2],[526.358 3000 2],[538.364 4000 2],[556.281 6000 2],[556.727 600 2],[557.224 4000 2],[559.548 400 2],[560.208 3000 2],[725.458 2000 2],[755.871 9000 2]}{12000}% +\wl@elt@search{#1}{Zr}{[381.758 210 1],[382.241 560 0],[383.596 2200 0],[383.676 1300 1],[384.302 550 1],[384.701 550 0],[384.925 550 0],[386.387 2900 0],[386.434 770 0],[387.76 990 0],[387.905 200 0],[388.542 1500 0],[389.032 2900 0],[389.138 2000 0],[390.052 400 0],[391.594 310 1],[392.179 610 0],[392.953 1200 0],[393.412 200 1],[393.479 200 1],[395.822 940 1],[396.666 490 0],[396.826 990 0],[397.35 660 0],[397.529 200 0],[398.16 200 0],[399.113 770 1],[399.897 770 1],[400.76 200 0],[401.225 200 0],[402.398 400 0],[402.492 770 0],[402.72 990 0],[402.895 240 0],[402.968 400 1],[403.004 490 0],[403.589 400 0],[404.222 240 0],[404.358 610 0],[404.456 490 0],[404.561 400 1],[404.867 610 1],[405.033 200 1],[405.048 200 0],[405.503 770 0],[405.571 600 0],[406.153 330 0],[406.416 1500 0],[407.27 2000 0],[407.493 310 0],[407.653 200 0],[407.831 240 0],[408.122 2000 0],[410.84 200 0],[412.146 400 0],[414.92 1200 1],[415.264 200 0],[415.624 290 1],[416.121 400 1],[416.636 400 0],[418.332 200 0],[418.756 660 0],[419.476 400 0],[419.909 610 0],[420.146 610 0],[420.898 610 1],[421.188 200 1],[421.386 400 0],[422.776 2000 0],[423.606 200 0],[423.931 2000 0],[424.034 770 0],[424.12 770 0],[424.169 1200 0],[426.802 310 0],[428.22 550 0],[429.479 550 0],[430.289 310 0],[434.113 550 0],[434.789 1000 0],[435.974 290 1],[436.081 310 0],[436.645 350 0],[437.978 240 1],[441.304 190 0],[442.046 240 0],[442.724 120 0],[443.149 160 0],[444.3 140 1],[445.743 110 0],[446.691 110 0],[447.031 110 0],[447.056 190 0],[449.697 200 1],[450.712 550 0],[453.575 610 0],[454.222 490 0],[455.301 200 0],[455.513 200 0],[455.552 140 0],[457.552 490 0],[458.229 100 0],[459.055 140 0],[460.257 350 0],[460.442 140 0],[462.641 210 0],[463.398 700 0],[464.483 210 0],[468.342 260 0],[468.78 2300 0],[468.845 510 0],[470.779 110 0],[471.008 1900 0],[471.192 160 0],[471.762 120 0],[471.912 210 0],[473.233 300 0],[473.948 1400 0],[476.278 190 0],[477.231 870 0],[478.492 210 0],[478.867 160 0],[480.587 260 0],[480.947 140 0],[481.504 190 0],[481.563 700 0],[482.429 280 0],[482.804 190 0],[483.878 110 0],[485.136 210 0],[486.606 160 0],[488.124 110 0],[488.36 110 0],[499.476 100 0],[501.146 30 0],[504.658 250 0],[506.039 85 0],[506.491 360 0],[506.522 110 0],[507.026 100 0],[507.398 75 0],[507.825 470 0],[508.526 85 0],[511.227 50 1],[511.524 140 0],[512.042 50 0],[513.34 85 0],[515.545 300 0],[515.8 200 0],[515.867 35 0],[516.099 75 0],[516.596 85 0],[517.899 17 0],[518.37 100 0],[518.703 30 0],[519.16 100 1],[520.115 100 0],[520.93 85 0],[522.493 85 0],[524.347 30 0],[527.741 120 0],[528.005 75 0],[529.482 60 0],[529.679 120 0],[530.197 60 0],[531.14 110 0],[532.126 25 0],[533.084 22 0],[533.843 12 0],[535.009 30 1],[535.035 30 1],[535.09 25 0],[535.192 25 0],[536.256 75 0],[536.335 12 0],[536.939 17 0],[538.237 20 0],[538.514 270 0],[538.665 30 0],[539.118 17 0],[539.588 17 0],[540.513 25 0],[540.762 85 0],[541.393 17 0],[542.186 20 0],[542.636 15 0],[542.842 25 0],[543.776 25 0],[544.041 15 0],[544.857 35 0],[547.492 10 0],[547.74 10 0],[547.833 35 0],[548.083 35 0],[548.116 10 0],[548.609 30 0],[550.212 140 0],[550.787 25 0],[551.711 30 0],[551.805 10 0],[552.841 75 0],[553.23 20 0],[553.746 45 0],[554.532 50 0],[555.175 22 -1],[555.317 25 -1],[561.211 12 0],[562.014 120 0],[562.353 35 0],[562.902 25 -1],[562.958 25 -1],[566.451 160 0],[566.628 20 0],[568.09 120 0],[568.542 15 0],[570.889 30 0],[571.821 75 -1],[573.57 120 0],[574.817 35 -1],[577.857 17 -1],[579.774 160 0],[584.732 30 0],[586.827 50 0],[586.95 110 0],[587.98 340 0],[588.562 85 0],[590.109 50 0],[590.861 30 -1],[592.513 140 0],[593.52 100 0],[595.535 110 0],[597.78 30 -1],[598.423 100 0],[599.537 17 0],[600.105 50 0],[602.536 30 0],[603.261 85 0],[604.585 170 0],[604.924 100 0],[606.284 140 0],[612.083 50 0],[612.191 170 0],[612.484 85 0],[612.744 680 0],[613.455 340 0],[614.046 100 0],[614.32 440 0],[615.561 30 0],[615.771 75 0],[616.02 25 0],[618.94 35 0],[619.296 60 0],[621.305 85 0],[621.469 100 0],[622.651 170 -1],[625.726 100 0],[626.105 50 -1],[626.706 35 0],[629.284 45 -1],[629.966 120 0],[630.434 15 0],[631.302 300 0],[631.471 30 0],[632.135 50 0],[634.036 22 0],[634.51 50 -1],[634.522 75 0],[637.856 75 -1],[640.7 35 0],[641.239 50 -1],[642.617 12 0],[643.433 35 0],[644.574 60 0],[645.162 20 0],[645.763 20 0],[647.021 110 0],[647.379 60 -1],[648.435 11 0],[648.964 110 0],[649.31 22 0],[650.326 50 0],[650.636 50 0],[650.815 50 -1],[654.29 30 -1],[655.054 35 0],[656.943 30 0],[657.656 20 0],[657.806 30 -1],[659.199 50 0],[659.671 10 0],[659.884 10 0],[660.327 50 0],[662.056 15 0],[667.801 11 1],[668.818 22 0],[670.212 11 0],[670.961 17 0],[671.788 27 0],[675.273 40 0],[676.238 75 0],[676.916 85 0],[677.289 27 0],[678.715 15 1],[679.085 35 0],[682.878 45 0],[683.289 45 0],[684.533 13 0],[684.634 17 0],[684.697 100 0],[684.926 27 0],[685.256 13 0],[688.829 120 0],[690.059 29 0],[690.436 20 0],[690.737 29 0],[691.687 20 0],[693.238 16 0],[694.846 29 0],[695.384 150 0],[696.644 60 0],[697.591 10 0],[699.084 150 0],[699.432 80 0],[700.546 10 0],[702.74 100 0],[705.736 25 0],[705.796 14 0],[708.73 140 0],[708.943 25 0],[709.446 35 0],[709.559 50 0],[709.77 540 0],[710.291 280 0],[710.372 170 0],[711.168 140 0],[711.282 40 0],[711.352 18 0],[713.295 12 0],[714.074 16 0],[714.447 12 0],[716.909 590 0],[720.162 50 0],[725.817 12 0],[726.476 35 0],[730.621 20 0],[731.162 25 0],[731.372 35 0],[731.808 90 0],[732.782 10 0],[733.597 50 0],[734.396 50 0],[737.35 20 0],[738.363 25 0],[740.09 14 0],[741.139 10 0],[742.275 10 0],[743.31 10 0],[743.986 110 0],[746.757 18 0],[747.958 16 0],[751.57 14 0],[751.795 12 0],[754.062 20 0],[754.459 20 0],[755.146 29 0],[755.47 40 0],[755.845 25 0],[756.009 12 0],[756.212 12 0],[760.715 80 0],[761.208 14 0],[762.117 20 0],[765.86 29 0],[769.083 18 0],[770.427 14 0],[770.842 10 0],[776.655 10 0]}{2900}% +\wl@elt@search{#1}{Nb}{[380.13 270 0],[380.292 2700 0],[380.388 670 0],[380.474 530 0],[381.049 670 0],[381.103 530 0],[381.551 530 0],[381.886 210 1],[381.915 210 0],[382.488 670 0],[383.518 350 0],[383.645 250 0],[384.59 210 0],[385.895 290 0],[386.338 350 0],[386.792 270 0],[387.756 530 0],[387.882 870 0],[388.314 670 0],[388.544 1100 0],[388.568 670 0],[388.607 210 0],[389.13 580 0],[390.897 210 0],[391.47 670 0],[392.02 530 0],[393.744 670 0],[394.367 520 0],[396.569 250 0],[396.609 910 0],[397.185 210 0],[403.252 1100 0],[403.953 250 0],[405.894 16000 0],[405.951 210 0],[406.079 350 0],[406.826 210 0],[407.973 12000 0],[408.486 270 0],[410.04 440 0],[410.092 6700 0],[411.69 310 0],[412.381 5300 0],[412.943 670 0],[412.993 770 0],[413.71 2300 0],[413.944 440 0],[413.971 2700 0],[414.321 350 0],[415.012 870 0],[415.258 4400 0],[416.347 870 0],[416.366 4400 0],[416.466 4000 0],[416.813 3500 0],[418.444 310 0],[419.088 1200 0],[419.207 870 0],[419.509 870 0],[419.566 1300 0],[419.851 310 0],[420.152 350 0],[420.531 870 0],[421.473 350 0],[421.794 420 0],[422.915 420 0],[425.544 250 0],[426.205 770 0],[426.602 420 0],[427.069 290 0],[428.699 400 0],[429.96 580 0],[430.099 580 0],[430.956 120 0],[431.127 390 0],[431.245 120 0],[432.633 350 0],[432.738 120 0],[433.137 390 0],[434.282 140 0],[434.865 140 0],[434.903 110 0],[435.157 290 0],[436.843 210 0],[437.796 140 0],[438.836 130 0],[439.269 160 0],[441.021 330 0],[441.944 190 0],[443.722 230 0],[444.718 290 0],[445.68 140 0],[445.742 140 0],[446.971 140 0],[447.129 140 0],[447.253 140 0],[450.304 150 0],[452.341 530 0],[454.682 480 0],[456.453 370 0],[457.308 720 0],[458.162 480 0],[460.677 1200 0],[461.617 170 0],[463.011 450 0],[464.895 450 0],[464.927 110 0],[466.383 450 0],[466.624 340 0],[466.722 240 0],[467.209 580 0],[467.537 530 0],[467.848 110 0],[468.514 320 0],[470.614 130 0],[470.829 260 0],[471.35 150 0],[473.389 110 0],[474.97 220 0],[481.638 110 0],[484.837 110 0],[496.778 130 0],[497.314 110 0],[498.897 190 0],[500.095 85 0],[500.225 65 0],[501.327 40 0],[501.775 230 0],[501.951 40 0],[502.636 150 0],[503.013 40 0],[503.904 210 0],[504.796 40 0],[505.801 170 0],[505.935 65 0],[506.525 130 0],[507.74 40 0],[507.896 750 0],[509.441 40 0],[509.53 420 0],[510.016 170 0],[512.03 170 0],[512.18 85 0],[512.766 85 0],[513.334 40 0],[513.475 210 0],[514.058 75 0],[514.754 75 0],[515.064 40 0],[515.263 75 0],[516.033 250 0],[516.438 250 0],[518.031 230 0],[518.698 110 0],[518.92 190 0],[519.308 170 0],[519.584 150 0],[520.322 65 0],[520.513 35 0],[521.91 85 0],[522.516 65 0],[523.281 150 0],[523.743 85 0],[524.039 29 0],[525.162 150 0],[525.303 75 0],[525.393 85 0],[526.992 50 0],[527.153 270 0],[527.248 25 0],[527.62 130 0],[527.943 29 0],[528.526 50 0],[529.634 35 0],[531.555 50 0],[531.701 17 0],[531.86 250 0],[531.949 50 0],[533.487 75 0],[533.681 25 0],[534.08 50 0],[534.358 25 0],[534.417 460 0],[535.074 340 0],[535.328 40 0],[535.531 25 0],[535.57 40 0],[535.919 29 0],[536.201 17 0],[537.527 40 0],[538.134 40 0],[538.83 17 0],[539.586 21 0],[539.633 29 0],[541.124 29 0],[541.63 21 0],[542.244 65 0],[543.126 21 0],[543.727 110 0],[544.831 19 0],[545.619 19 0],[545.804 40 0],[546.81 19 0],[548.1 40 0],[548.309 13 0],[548.349 19 0],[549.106 13 0],[549.953 17 0],[550.458 40 0],[550.912 17 0],[551.282 35 0],[551.739 17 0],[552.357 50 0],[554.147 25 0],[555.135 85 0],[556.3 29 0],[557.144 17 0],[557.616 35 0],[557.829 35 0],[558.697 50 0],[559.095 17 0],[559.489 13 0],[559.959 17 0],[560.352 40 0],[560.393 13 0],[562.826 25 0],[562.917 65 0],[563.542 35 0],[564.211 170 0],[564.53 35 0],[565.414 17 0],[566.471 130 0],[566.563 170 0],[566.686 17 0],[567.102 65 0],[567.191 85 0],[567.747 25 0],[569.309 25 0],[569.79 35 0],[570.616 40 0],[570.648 85 0],[570.933 29 0],[571.559 17 0],[571.635 65 0],[572.566 25 0],[572.919 130 0],[573.736 21 0],[573.82 13 0],[575.144 85 0],[576.034 110 0],[576.499 65 0],[577.108 29 0],[577.607 50 0],[578.034 17 0],[578.754 85 0],[578.979 17 0],[579.424 50 0],[580.403 50 0],[581.533 29 0],[581.943 110 0],[582.062 35 0],[583.49 75 0],[583.815 25 0],[583.864 130 0],[584.247 50 0],[584.609 17 0],[586.647 65 0],[587.47 35 0],[587.779 17 0],[589.344 40 0],[590.062 190 0],[590.38 40 0],[592.741 29 0],[593.416 40 0],[595.77 40 0],[598.322 150 0],[598.608 65 0],[599.793 85 0],[602.975 50 0],[603.184 50 0],[604.55 50 0],[604.872 25 0],[605.665 29 0],[610.771 29 0],[614.251 40 0],[614.813 50 0],[616.432 50 0],[621.306 29 0],[622.196 75 0],[625.176 40 0],[626.077 21 0],[643.046 85 0],[643.322 50 0],[649.784 17 0],[654.461 65 0],[657.473 15 0],[659.1 19 0],[660.616 19 0],[660.728 19 0],[661.415 35 0],[662.698 19 0],[666.084 210 0],[667.733 150 0],[670.12 65 0],[672.362 130 0],[673.988 75 0],[679.531 25 0],[682.811 85 0],[684.935 25 0],[687.092 19 0],[687.636 40 0],[690.289 25 0],[690.807 35 0],[691.832 40 0],[694.607 17 0],[697.249 17 0],[698.609 25 0],[699.032 85 0],[699.611 17 0],[702.348 21 0],[703.804 17 0],[704.681 190 0],[706.641 8 0],[707.523 8 0],[709.894 40 0],[710.201 17 0],[711.931 19 0],[712.295 15 0],[712.617 35 0],[713.006 17 0],[715.943 130 0],[719.137 17 0],[720.894 19 0],[725.235 50 0],[727.481 15 0],[731.703 13 0],[732.392 17 0],[732.838 29 0],[735.316 65 0],[737.25 190 0],[741.983 13 0],[743.602 15 0],[747.82 19 0],[751.593 65 0],[751.977 29 0],[757.458 170 0],[758.321 17 0],[763.981 13 0],[764.771 13 0],[770.333 25 0],[772.668 75 0],[775.731 25 0],[778.711 6 0]}{16000}% +\wl@elt@search{#1}{Mo}{[380.184 290 0],[382.67 520 0],[382.887 940 0],[383.375 1700 0],[384.725 380 0],[386.411 29000 0],[386.908 580 0],[388.682 580 0],[390.177 380 0],[390.296 19000 0],[394.148 65 1],[394.304 230 0],[405.601 270 0],[406.208 1400 0],[406.988 2300 0],[408.144 1300 0],[408.438 940 0],[410.215 250 0],[410.747 730 0],[412.01 630 0],[414.355 2900 0],[414.894 230 0],[415.528 250 0],[415.74 200 0],[417.827 200 0],[418.582 480 0],[418.832 2500 0],[419.456 250 0],[423.259 1500 0],[426.928 270 0],[427.691 890 0],[427.724 1200 0],[428.864 1400 0],[429.213 680 0],[429.321 890 0],[429.388 360 0],[432.614 840 0],[432.674 250 0],[435.034 230 0],[436.904 230 0],[438.164 1900 0],[441.157 2500 0],[442.362 210 0],[443.495 990 0],[444.22 200 0],[444.974 340 0],[445.736 480 0],[447.456 630 0],[449.128 230 0],[450.49 120 0],[451.215 140 0],[451.713 230 0],[452.434 230 0],[452.94 120 0],[453.68 400 0],[455.811 110 0],[457.65 210 0],[459.516 170 0],[460.988 360 0],[462.138 100 0],[462.647 460 0],[462.748 100 0],[466.276 220 0],[467.19 130 0],[468.822 130 0],[470.726 640 0],[470.822 150 0],[471.792 220 0],[472.914 100 0],[473.144 700 0],[475.039 100 0],[476.019 770 0],[477.634 150 0],[479.652 100 0],[481.925 410 0],[483.051 410 0],[486.8 360 0],[495.062 110 0],[495.754 150 0],[497.912 210 0],[499.991 110 0],[501.081 20 0],[501.46 180 0],[501.678 26 0],[501.985 20 0],[502.9 80 0],[503.078 65 0],[503.891 23 0],[504.652 26 0],[504.771 100 0],[505.5 50 0],[505.807 35 0],[505.988 200 0],[506.252 35 0],[506.464 29 0],[507.987 35 0],[508.002 100 0],[508.126 35 0],[509.097 40 0],[509.134 35 0],[509.216 35 0],[509.589 40 0],[509.665 100 0],[509.752 130 0],[509.803 35 0],[510.971 130 0],[511.497 80 0],[511.697 35 0],[512.383 29 0],[514.538 150 0],[514.739 110 0],[516.319 80 0],[516.776 100 0],[517.108 160 0],[517.294 230 0],[517.418 160 0],[519.144 40 0],[520.017 110 0],[520.074 50 0],[521.044 26 0],[521.186 50 0],[521.94 80 0],[523.106 65 0],[523.236 26 0],[523.426 100 0],[523.82 460 0],[524.088 230 0],[524.281 110 0],[524.551 100 0],[525.904 150 0],[526.017 16 0],[526.114 65 0],[526.895 20 0],[527.18 35 0],[527.628 35 0],[527.965 65 0],[528.086 210 0],[528.384 20 0],[529.208 55 0],[529.346 35 0],[529.547 55 0],[530.626 20 0],[531.389 55 0],[531.504 35 0],[531.989 20 0],[532.447 20 0],[532.706 35 0],[535.235 20 0],[535.488 80 0],[535.551 35 0],[535.648 65 0],[536.056 560 0],[536.428 110 0],[536.711 35 0],[537.24 35 0],[538.869 26 0],[539.452 65 0],[539.738 35 0],[540.047 50 0],[540.579 35 0],[540.639 35 0],[541.738 40 0],[542.689 23 0],[543.568 55 0],[543.775 65 0],[545.051 40 0],[545.646 35 0],[546.053 26 0],[546.557 23 0],[547.59 35 0],[549.028 35 0],[549.217 20 0],[549.38 26 0],[549.849 26 0],[550.154 50 0],[550.187 23 0],[550.354 26 0],[550.649 7800 0],[552.004 23 0],[552.064 26 0],[552.652 40 0],[552.697 40 0],[553.305 5200 0],[553.941 40 0],[554.312 50 0],[554.449 40 0],[555.628 55 0],[555.672 26 0],[556.405 20 0],[556.862 40 0],[556.948 26 0],[557.045 2500 0],[557.519 35 0],[559.158 20 0],[560.276 40 0],[560.862 23 0],[560.923 23 0],[561.093 100 0],[561.307 23 0],[561.845 20 0],[561.938 23 0],[563.247 330 0],[563.486 50 0],[565.013 230 0],[567.363 23 0],[567.447 55 0],[567.789 40 0],[568.289 35 0],[568.914 460 0],[569.928 23 0],[570.572 80 0],[571.18 23 0],[572.274 210 0],[572.877 23 0],[572.945 26 0],[575.14 620 0],[577.455 23 0],[577.936 40 0],[578.333 23 0],[579.185 520 0],[579.577 23 0],[580.046 26 0],[580.267 35 0],[582.52 23 0],[583.559 23 0],[583.999 20 0],[584.886 20 0],[584.973 55 0],[585.152 50 0],[585.827 520 0],[586.138 20 0],[586.933 50 0],[587.659 26 0],[588.833 820 0],[589.229 23 0],[589.338 50 0],[589.878 20 0],[590.147 40 0],[592.636 40 0],[592.888 160 0],[598.817 40 0],[602.549 35 0],[602.727 16 0],[603.066 1300 0],[604.783 20 0],[605.481 20 0],[607.958 20 0],[608.127 10 0],[610.187 40 0],[613.063 10 0],[619.766 10 0],[621.789 20 0],[626.427 10 0],[626.588 16 0],[629.074 15 0],[630.175 13 0],[632.354 11 0],[635.722 40 0],[638.911 16 0],[639.112 11 0],[640.107 35 0],[640.911 26 0],[641.239 10 0],[642.437 100 0],[644.634 20 0],[647.12 20 0],[647.399 20 0],[649.313 10 0],[651.984 23 0],[661.12 15 0],[661.913 230 0],[662.457 10 0],[665.038 50 0],[665.968 13 0],[669.047 18 0],[673.398 110 0],[674.608 21 0],[674.627 50 0],[675.397 35 0],[676.35 13 0],[679.988 10 0],[680.262 10 0],[681.203 10 0],[682.563 13 0],[682.887 18 0],[683.888 40 0],[684.892 16 0],[688.628 21 0],[689.236 16 0],[689.801 10 0],[689.898 10 0],[690.82 13 0],[691.401 35 0],[693.41 13 0],[694.739 10 0],[696.064 10 0],[697.871 16 0],[698.894 26 0],[699.913 12 0],[700.16 16 0],[703.798 22 0],[706.021 22 0],[706.334 13 0],[708.122 13 0],[710.987 110 0],[713.408 27 0],[724.25 150 0],[724.585 40 0],[726.762 22 0],[730.019 17 0],[734.849 13 0],[736.165 13 0],[736.441 10 0],[739.136 40 0],[743.41 10 0],[744.734 13 0],[745.285 13 0],[748.574 140 0],[750.447 13 0],[757.264 11 0],[759.516 11 0],[760.184 11 0],[765.676 17 0],[767.949 13 0],[772.077 27 0]}{29000}% +\wl@elt@search{#1}{Tc}{[381.467 200 0],[381.689 300 0],[382.447 300 0],[382.854 500 0],[383.035 200 0],[383.245 200 0],[383.282 600 0],[383.756 1500 0],[384.131 800 0],[384.597 800 0],[384.76 500 0],[385.122 300 0],[385.673 500 0],[386.307 200 0],[386.411 400 0],[386.824 1000 0],[387.566 200 0],[387.916 500 0],[388.072 600 0],[389.212 300 0],[389.322 200 0],[389.983 600 0],[391.938 300 0],[392.366 300 0],[392.757 200 0],[393.37 200 0],[394.657 4000 0],[394.709 2000 0],[395.573 200 0],[397.964 300 0],[398.035 500 0],[398.497 10000 0],[398.778 400 0],[399.404 300 0],[399.451 2000 0],[399.697 200 0],[400.469 300 0],[400.714 500 0],[401.2 1000 0],[401.668 400 0],[401.722 600 0],[402.076 2000 0],[403.163 20000 0],[403.925 1000 0],[404.178 200 0],[404.911 10000 0],[405.195 500 0],[405.318 200 0],[405.608 200 0],[408.354 400 0],[408.871 10000 0],[409.369 200 0],[409.567 15000 0],[411.022 1000 0],[411.508 10000 0],[411.927 600 0],[412.422 8000 0],[412.827 1000 0],[413.481 300 0],[413.912 300 0],[413.985 800 0],[414.127 400 0],[414.495 6000 0],[414.508 3000 0],[414.762 200 0],[416.561 10000 0],[416.742 500 0],[416.968 1000 0],[417.027 4000 0],[417.253 5000 0],[417.628 1000 0],[418.651 800 0],[421.861 300 0],[423.819 10000 0],[426.227 20000 0],[426.269 1000 0],[427.497 800 1],[427.89 800 0],[429.706 30000 0],[433.686 400 0],[435.849 400 0],[435.926 200 0],[442.959 1000 0],[448.153 1000 0],[448.706 3000 0],[449.503 400 0],[451.598 1000 0],[452.284 10000 0],[453.953 2000 0],[454.209 400 0],[455.22 400 0],[455.285 800 0],[455.705 1000 0],[456.454 2000 0],[457.845 1000 0],[459.335 1000 0],[460.916 300 0],[461.686 1000 0],[462.269 200 0],[462.496 300 0],[463.057 1000 0],[463.315 200 0],[463.75 3000 0],[464.328 500 0],[464.833 2000 0],[466.021 2000 0],[466.93 2000 0],[467.217 400 0],[467.89 200 0],[468.936 400 0],[469.428 300 0],[470.692 1000 0],[471.422 200 0],[471.777 2000 0],[471.902 500 0],[471.928 4000 0],[473.651 200 0],[474.061 10000 0],[474.961 500 0],[475.272 1000 0],[476.236 200 0],[477.154 4000 0],[477.389 200 0],[478.392 200 0],[478.56 500 0],[479.048 200 0],[479.162 250 0],[479.998 300 0],[480.569 100 0],[480.942 100 0],[481.679 500 0],[482.074 10000 0],[483.135 300 0],[483.437 1000 0],[483.539 1000 0],[484.136 100 0],[485.359 20000 0],[485.721 100 0],[486.219 100 0],[486.673 10000 0],[487.077 200 0],[488.87 100 0],[489.088 150 0],[489.192 8000 0],[489.249 150 0],[490.851 1000 0],[490.957 2000 0],[491.302 500 0],[491.47 150 0],[492.067 200 0],[492.36 300 0],[494.806 400 0],[497.634 5000 0],[499.5 400 0],[500.267 200 0],[500.574 100 0],[501.452 200 0],[502.624 500 0],[502.679 300 0],[502.789 150 0],[503.245 80 0],[505.527 300 0],[505.833 60 0],[506.069 500 0],[509.074 80 0],[509.628 5000 0],[510.324 200 0],[510.432 500 0],[510.981 200 0],[512.06 100 0],[513.926 500 0],[515.063 500 0],[516.181 2000 0],[517.481 2000 0],[520.656 100 0],[522.555 200 0],[526.022 200 0],[526.144 200 0],[527.551 1000 0],[528.507 800 0],[530.531 100 0],[531.496 400 0],[532.02 600 0],[533.479 200 0],[535.348 500 0],[535.663 200 0],[535.865 300 0],[536.014 200 0],[537.52 500 0],[542.305 150 0],[544.74 200 0],[545.19 500 0],[545.595 100 0],[547.196 300 0],[548.301 70 0],[548.537 60 0],[550.689 80 0],[552.411 150 0],[552.823 100 0],[554.194 200 0],[554.363 80 0],[555.053 100 0],[558.902 3000 0],[560.223 200 0],[562.045 2000 0],[562.994 300 0],[564.213 1500 0],[564.494 800 0],[565.6 100 0],[567.215 60 0],[568.73 200 0],[568.905 200 0],[572.531 700 0],[577.147 500 0],[579.465 100 0],[579.985 80 0],[581.424 100 0],[583.148 200 0],[583.633 150 0],[592.336 150 0],[592.447 1000 0],[592.629 200 0],[593.193 600 0],[603.236 60 0],[604.799 60 0],[606.509 200 0],[608.523 800 0],[609.939 300 0],[610.296 500 0],[612.068 1000 0],[613.08 1000 0],[613.223 150 0],[618.47 100 0],[619.266 800 0],[624.418 600 0],[631.218 100 0],[635.486 100 0],[635.673 100 0],[638.987 80 0],[640.883 100 0],[645.59 1000 0],[646.193 600 0],[647.027 100 0],[649.168 200 0],[652.682 200 0],[657.924 150 0],[662.557 500 0],[667.366 300 0],[668.71 100 0],[678.6 80 0],[679.863 70 0],[685.69 60 0],[700.237 150 0],[701.657 100 0],[708.618 500 0],[709.312 60 0],[714.128 200 0],[715.762 200 0],[725.608 70 0],[732.238 100 0],[732.914 80 0],[739.68 100 0],[740.261 100 0],[740.536 200 0],[742.715 60 0],[743.412 150 0],[745.249 600 0],[746.159 60 0],[753.495 80 0],[754.026 800 0],[754.339 80 0],[757.402 200 0],[757.926 500 0],[762.453 90 0],[768.445 100 0],[769.737 500 0],[769.819 80 0],[779.304 800 0],[779.828 60 0]}{30000}% +\wl@elt@search{#1}{Ru}{[380.026 310 0],[380.868 310 0],[381.272 600 0],[381.727 760 0],[381.903 760 0],[382.209 650 0],[382.493 550 0],[383.18 760 0],[383.505 220 0],[383.807 310 0],[383.97 930 0],[384.668 480 0],[385.043 760 0],[385.646 480 0],[385.755 1300 0],[386.072 220 0],[386.269 650 0],[386.784 1300 0],[387.352 260 0],[389.221 650 0],[390.908 760 0],[392.092 260 0],[392.347 1500 0],[392.592 3300 0],[393.176 600 0],[393.355 310 0],[394.557 760 0],[395.021 460 0],[395.268 310 0],[396.49 460 0],[397.844 600 0],[397.942 600 0],[398.486 870 0],[399.598 280 0],[402.216 1500 0],[402.383 600 0],[403.921 310 0],[405.14 1400 0],[405.405 710 0],[406.446 370 0],[406.761 200 0],[406.837 760 0],[407.3 200 0],[407.673 980 0],[408.06 6000 0],[408.543 310 0],[409.779 930 0],[410.174 350 0],[411.274 1900 0],[414.416 2000 0],[414.574 650 0],[414.677 260 0],[416.751 870 0],[419.758 550 0],[419.888 550 0],[419.99 7600 0],[420.602 1500 0],[421.206 5400 0],[421.444 760 0],[421.727 930 0],[422.068 370 0],[423.031 550 0],[424.105 760 0],[424.306 760 0],[424.673 370 0],[425.899 310 0],[428.433 760 0],[429.328 220 0],[429.479 260 0],[429.593 550 0],[429.771 3700 0],[430.76 930 0],[431.843 370 0],[431.987 550 0],[434.207 550 0],[434.97 350 0],[435.413 710 0],[436.121 870 0],[437.221 2400 0],[438.539 870 0],[438.565 1300 0],[439.044 1700 0],[441.003 1600 0],[442.146 160 0],[442.846 330 0],[443.976 460 0],[444.934 440 0],[446.004 1100 0],[447.393 190 0],[448.045 150 0],[449.814 350 0],[451.01 120 0],[451.689 220 0],[451.782 220 0],[452.095 110 0],[454.733 170 0],[454.785 110 0],[455.451 5400 0],[455.998 110 0],[458.444 1700 0],[459.11 110 0],[459.252 150 0],[459.908 330 0],[463.569 170 0],[464.509 200 0],[464.761 720 0],[465.432 290 0],[468.179 290 0],[468.402 190 0],[469.011 290 0],[470.948 1400 0],[473.133 140 0],[473.352 120 0],[475.784 500 0],[481.552 260 0],[484.456 120 0],[486.915 550 0],[489.56 160 0],[490.305 470 0],[490.789 120 0],[492.107 260 0],[493.843 180 0],[496.89 160 0],[498.035 160 0],[499.274 120 0],[501.123 160 0],[501.495 90 0],[502.618 90 0],[502.816 65 0],[504.035 35 0],[504.074 35 0],[504.731 65 0],[505.733 450 0],[506.264 21 0],[507.297 90 0],[507.632 120 0],[509.383 200 0],[510.707 80 0],[512.373 24 0],[512.726 55 0],[513.389 65 0],[513.655 530 0],[514.276 170 0],[514.724 250 0],[515.107 110 0],[515.32 55 0],[515.514 500 0],[516 55 0],[517.103 920 0],[519.502 180 0],[519.987 80 0],[520.212 45 0],[521.343 45 0],[522.355 65 0],[524.238 40 0],[525.167 55 0],[525.707 40 0],[526.647 40 0],[526.683 40 0],[528.082 40 0],[528.408 130 0],[529.116 40 0],[530.486 80 0],[530.927 260 0],[531.533 13 0],[533.293 40 0],[533.47 45 0],[533.593 110 0],[536.177 130 0],[537.784 65 0],[538.588 65 0],[540.104 110 0],[540.139 40 0],[541.886 40 0],[542.759 55 0],[543.921 26 0],[545.271 13 0],[545.482 80 0],[545.613 90 0],[547.518 13 0],[547.94 55 0],[548.03 26 0],[548.432 80 0],[548.464 18 0],[549.669 26 0],[550.102 13 0],[551.071 130 0],[551.237 20 0],[551.786 8 0],[552.178 12 0],[553.099 12 0],[554.066 24 0],[555.652 12 0],[555.975 90 0],[556.903 11 0],[557.84 21 0],[560.314 21 0],[560.355 8 0],[560.673 13 0],[562.979 11 0],[563.624 290 0],[564.166 11 0],[564.956 7 0],[565.33 7 0],[566.52 11 0],[567.963 16 0],[569.905 180 0],[572.482 13 0],[572.573 13 0],[574.599 16 0],[574.747 16 0],[575.202 11 0],[575.683 11 0],[576.792 11 0],[580.439 16 0],[581.498 65 0],[582.806 8 0],[583.321 16 0],[591.934 55 0],[592.145 80 0],[592.687 21 0],[593.238 26 0],[593.665 8 0],[595.115 8 0],[597.338 21 0],[597.417 8 0],[598.867 16 0],[599.365 35 0],[611.677 18 0],[619.942 26 0],[622.52 26 0],[628.449 9 0],[629.522 18 0],[633.062 13 0],[633.612 9 0],[636.341 9 0],[637.645 9 0],[639.023 16 0],[641.757 8 0],[644.484 26 0],[649.644 8 0],[652.874 11 0],[656.045 4 0],[659.374 4 0],[661.82 9 0],[666.314 21 0],[669 55 0],[670.752 11 0],[671.83 15 0],[673.045 15 0],[675.654 7 0],[676.695 21 0],[677.502 30 0],[678.723 13 0],[681.351 8 0],[682.388 15 0],[682.417 21 0],[683.152 7 0],[691.148 26 0],[692.323 110 0],[698.201 26 0],[702.798 26 0],[708.606 9 0],[708.735 12 0],[714.172 4 0],[721.926 6 0],[723.892 35 0],[726.696 7 0],[732.356 8 0],[739.393 16 0],[746.891 18 0],[747.54 12 0],[748.579 26 0],[749.975 70 0],[753.207 7 0],[755.961 26 0],[761.294 5 0],[762.15 18 0],[772.287 18 0],[772.991 5 0],[779.186 22 0],[779.789 4 0]}{7600}% +\wl@elt@search{#1}{Rh}{[380.592 760 0],[380.676 1300 0],[380.95 45 0],[381.245 95 0],[381.501 470 0],[381.647 760 0],[381.819 1300 0],[382.226 3800 0],[382.848 2300 0],[383.389 2000 0],[383.475 45 0],[385.652 5900 0],[387.001 490 0],[387.239 70 0],[387.734 380 0],[388.834 70 0],[390.422 29 0],[391.283 23 0],[391.351 120 0],[392.219 240 0],[393.423 2000 0],[393.498 45 0],[393.584 50 0],[394.272 590 0],[395.824 95 0],[395.886 3800 0],[396.454 45 1],[397.531 380 0],[398.44 240 0],[399.561 240 0],[399.615 380 0],[402.314 120 0],[404.841 60 0],[404.904 23 0],[405.344 40 0],[405.634 23 0],[407.757 70 0],[408.278 560 0],[408.428 19 0],[408.779 45 0],[408.85 60 0],[409.752 140 0],[410.749 45 0],[411.633 70 0],[411.968 120 0],[412.168 1100 0],[412.887 1500 0],[413.527 2100 0],[415.437 240 0],[419.65 330 0],[420.662 70 0],[421.114 3300 0],[423.02 29 0],[424.444 40 0],[427.343 60 0],[427.86 60 0],[428.871 820 0],[429.677 70 0],[434.244 23 0],[437.304 45 0],[437.48 4200 0],[437.992 95 0],[443.332 23 0],[449.247 35 0],[450.378 29 0],[452.872 23 0],[454.427 16 0],[454.873 35 0],[455.164 40 0],[456.089 19 0],[456.519 16 0],[456.9 130 0],[457.131 14 0],[460.812 29 0],[461.991 14 0],[464.318 23 0],[467.503 150 0],[472.1 19 0],[474.511 70 0],[475.558 12 0],[481.049 23 0],[484.243 21 0],[484.399 45 0],[485.163 60 0],[496.371 60 0],[497.775 60 0],[497.918 40 0],[508.552 14 0],[509.063 70 0],[512.069 23 0],[513.076 19 0],[515.554 60 0],[515.709 14 0],[515.869 40 0],[517.597 60 0],[517.727 12 0],[518.419 35 0],[519.314 95 0],[520.695 16 0],[521.152 16 0],[521.273 19 0],[521.479 16 0],[522.266 19 0],[523.062 19 0],[523.716 45 0],[523.78 9 0],[526.927 14 0],[528.012 11 0],[529.214 14 0],[531.479 14 0],[532.974 40 0],[533.108 14 0],[534.931 9 0],[535.44 130 0],[535.647 23 0],[537.91 45 0],[539.044 95 0],[540.473 23 0],[542.407 60 0],[542.472 19 0],[542.545 19 0],[543.958 12 0],[544.136 12 0],[544.432 9 0],[544.523 35 0],[546.811 23 0],[547.085 35 0],[547.612 12 0],[548.142 12 0],[548.423 16 0],[550.465 9 0],[553.504 29 0],[554.458 21 0],[559.942 160 0],[560.771 7 0],[560.835 16 0],[563.277 5 0],[565.962 9 0],[568.638 40 0],[570.247 9 0],[572.73 6 0],[579.266 29 0],[579.579 9 0],[580.334 9 0],[580.691 40 0],[582.184 6 0],[583.158 35 0],[590.731 7 0],[591.854 9 0],[594.146 7 0],[598.36 130 0],[599.119 9 0],[610.272 35 0],[611.615 6 0],[612.806 8 0],[618.689 8 0],[619.999 14 0],[625.372 16 0],[627.666 5 0],[627.746 8 0],[629.338 6 0],[631.953 29 0],[641.472 12 0],[651.041 16 0],[651.97 19 0],[662.78 9 0],[663.016 19 0],[675.235 40 0],[679.665 9 0],[682.733 13 0],[685.768 11 0],[687.994 20 0],[696.567 65 0],[697.291 8 0],[697.915 16 0],[700.158 16 0],[703.876 11 0],[710.164 18 0],[710.445 15 0],[714.255 6 0],[721.906 9 0],[726.818 18 0],[727.082 35 0],[727.194 12 0],[727.303 5 0],[737.557 9 0],[738.664 5 0],[743.08 9 0],[744.239 18 0],[744.677 7 0],[747.574 12 0],[749.524 12 0],[754.202 8 0],[755.767 11 0],[757.722 8 0],[769.005 11 0],[777.29 18 0],[779.161 29 0],[385.298 1 2]}{5900}% +\wl@elt@search{#1}{Pd}{[383.229 1500 0],[389.42 2200 0],[395.864 1500 0],[408.734 290 0],[416.984 90 0],[421.295 2500 0],[447.359 180 0],[478.818 55 0],[481.751 45 0],[487.543 35 0],[511.081 55 0],[511.702 75 0],[516.384 160 0],[523.486 55 0],[529.563 120 0],[531.257 18 0],[534.51 15 0],[539.524 35 0],[554.28 55 0],[554.702 35 0],[561.944 27 0],[564.269 15 0],[565.542 14 0],[567.007 75 0],[569.014 11 0],[569.509 55 0],[573.661 18 0],[677.454 23 0],[678.452 65 0],[683.342 4 0],[701.644 11 0],[731.006 13 0],[736.812 75 0],[739.192 27 0],[748.69 16 0],[776.403 120 0],[778.667 27 0]}{2500}% +\wl@elt@search{#1}{Ag}{[381.094 200 0],[381.178 50 0],[384.074 100 0],[384.785 15 0],[390.741 50 0],[390.931 50 1],[391.44 50 0],[392.01 70 1],[392.801 10 0],[394.043 10 0],[394.297 10 0],[394.943 60 1],[398.158 100 0],[398.519 70 1],[399.215 10 0],[405.548 100 0],[408.343 10 0],[408.591 80 1],[418.548 100 1],[421.096 90 0],[421.282 100 0],[431.107 50 0],[439.623 20 0],[447.604 50 0],[455.6 20 0],[461.569 30 0],[462.004 80 1],[462.046 50 1],[466.848 60 0],[467.76 30 0],[478.84 100 1],[479.62 20 0],[484.782 30 0],[487.41 100 0],[488.821 20 0],[491.75 10 0],[493.575 10 0],[499.289 20 0],[502.735 80 1],[512.35 15 0],[520.908 1000 0],[533.362 10 0],[546.55 1000 0],[547.155 100 0],[547.538 20 0],[554.567 20 0],[555.958 10 0],[566.734 100 0],[608.378 10 0],[626.85 10 0],[662.108 20 0],[735.996 20 0],[768.778 320 0]}{1000}% +\wl@elt@search{#1}{Cd}{[398.1926 10 0],[402.912 100 1],[413.477 200 1],[414.149 50 1],[428.508 100 1],[430.6672 8 0],[441.241 100 1],[441.2989 3 0],[441.563 1000 1],[444.045 30 1],[466.2352 8 0],[467.8149 200 0],[474.469 30 1],[479.9912 300 0],[488.172 50 1],[502.55 50 1],[508.5822 1000 0],[515.466 6 0],[526.801 100 1],[527.16 100 1],[533.748 1000 1],[537.813 1000 1],[538.189 200 1],[584.33 40 1],[588.022 50 1],[609.9142 300 0],[611.149 100 0],[632.5166 100 0],[633.0013 30 0],[635.472 400 1],[635.998 500 1],[643.847 2000 0],[646.494 400 1],[656.765 25 1],[672.578 500 1],[675.919 100 1],[677.8116 30 0],[723.701 50 1],[728.438 100 1],[734.567 1000 0]}{2000}% +\wl@elt@search{#1}{In}{[383.465 250 1],[384.218 200 1],[388.978 100 1],[390.207 100 1],[392.212 60 1],[393.44 65 1],[396.235 250 1],[400.466 120 1],[401.392 140 1],[405.694 410 1],[410.176 17000 0],[420.514 140 1],[421.304 100 1],[421.966 110 1],[437.287 150 1],[450.078 150 1],[451.131 18000 0],[454.901 110 1],[457.085 140 1],[457.802 180 1],[457.84 180 1],[461.608 140 1],[461.717 170 1],[462.014 250 1],[462.07 150 1],[462.73 170 1],[463.704 140 1],[463.816 380 1],[464.458 220 1],[465.562 360 1],[465.674 320 1],[468.111 190 1],[468.48 450 1],[487.837 3 0],[490.706 90 1],[492.493 70 1],[497.377 150 1],[510.936 80 1],[511.514 100 1],[511.74 140 1],[512.08 270 1],[512.175 200 1],[512.985 80 1],[517.542 240 1],[518.444 140 1],[525.432 30 0],[526.274 12 0],[530.945 150 1],[541.141 80 1],[541.845 140 1],[543.67 220 1],[549.75 130 1],[550.708 140 1],[551.3 320 1],[552.328 250 1],[553.65 130 1],[555.545 190 1],[557.69 240 1],[563.67 200 1],[570.85 160 1],[570.991 50 0],[572.18 100 1],[572.768 50 0],[585.315 210 1],[590.34 490 1],[591.54 260 1],[591.878 120 1],[606.29 130 1],[609.595 250 1],[610.866 210 1],[611.59 180 1],[612.87 230 1],[612.94 240 1],[613.21 320 1],[614 150 1],[614.323 90 1],[614.81 140 1],[614.95 190 1],[616.115 80 1],[616.245 180 1],[622.428 100 1],[622.83 280 1],[623.11 140 1],[630.48 270 1],[636.23 290 1],[646.9 300 1],[654.12 210 1],[675.188 190 1],[676.59 180 1],[678.372 100 1],[684.744 8 0],[689.15 320 1],[690.013 4 0],[718.29 380 1],[725.5 180 1],[727.65 210 1],[730.34 180 1],[735.06 320 1],[763.27 100 1],[768.29 100 1],[774.07 210 1],[777.696 100 1],[778.9 180 1],[385.282 100 2],[402.377 100 2],[403.232 150 2],[406.23 50 2],[407.157 100 2],[407.293 100 2],[425.268 100 2],[450.958 40 2],[524.877 200 2],[564.515 100 2],[572.317 40 2],[581.95 100 2],[619.772 200 2]}{18000}% +\wl@elt@search{#1}{Sn}{[380.102 280 0],[384.144 4 1],[429.465 1 1],[452.474 40 0],[457.913 1 1],[458.029 1 1],[487.722 2 1],[494.431 3 1],[497.973 20 0],[507.114 2 1],[507.267 2 1],[517.454 20 0],[533.236 10 1],[556.195 20 1],[558.892 25 1],[559.62 2 1],[563.171 500 0],[575.359 15 0],[579.72 1 1],[579.918 15 1],[592.544 50 0],[597.03 100 0],[603.77 150 0],[605.486 200 -1],[606.9 250 0],[607.346 100 0],[607.748 6 1],[607.97 5 1],[614.971 400 0],[615.46 200 0],[617.15 150 0],[631.078 100 0],[635.435 40 0],[645.35 70 1],[676.145 8 1],[684.405 25 1],[719.14 20 1],[738.779 10 1],[739.86 20 0],[740.862 1 1],[768.53 30 0],[774.18 13 1],[775.497 100 0]}{500}% +\wl@elt@search{#1}{Sb}{[385.022 20 1],[403.355 200 0],[403.356 20 1],[413.363 20 1],[414.054 15 1],[419.517 15 1],[421.907 20 1],[431.432 20 1],[434.483 12 1],[441.142 12 1],[444.648 12 1],[450.692 12 1],[451.45 15 1],[459.69 30 1],[459.909 20 1],[460.477 15 1],[464.732 30 1],[467.574 20 1],[471.126 40 1],[473.544 12 1],[475.781 20 1],[476.536 20 1],[476.691 12 1],[478.403 30 1],[480.201 20 1],[483.282 20 1],[487.724 20 1],[494.74 15 1],[504.456 15 1],[516.632 12 1],[517.655 15 1],[523.894 20 1],[535.424 20 1],[546.408 15 1],[549.032 30 0],[555.61 40 0],[556.813 15 1],[560.219 30 0],[563.202 100 0],[563.975 30 1],[583.034 60 0],[589.509 15 1],[600.521 100 1],[605.341 20 1],[607.98 30 1],[613.004 50 1],[615.494 20 1],[630.276 12 1],[661.149 20 0],[664.744 30 1],[668.801 15 1],[680.667 6 1],[764.828 30 0],[426.509 40 2],[435.216 50 2],[459.189 30 2],[469.291 30 2],[524.771 1 2],[569.08 1 2],[571.73 1 2],[584.55 3 2],[624.67 5 2],[628.76 3 2]}{200}% +\wl@elt@search{#1}{Te}{[380.092 20 1],[390.567 20 1],[391.854 20 1],[393.149 30 1],[394.798 20 1],[396.922 40 1],[397.594 25 1],[398.177 20 1],[400.652 50 1],[401.169 20 1],[402.973 30 1],[404.717 40 1],[404.888 30 1],[407.348 15 1],[410.104 30 1],[412.732 70 1],[416.355 30 1],[416.977 100 1],[417.929 30 1],[421.131 25 1],[422.573 80 1],[424.647 30 1],[425.115 20 1],[426.111 100 1],[426.436 30 1],[427.343 60 1],[428.585 80 1],[432.09 40 1],[436.128 30 1],[436.4 150 1],[437.712 30 1],[438.51 75 1],[439.6 60 1],[447.863 170 1],[453.707 80 1],[455.778 100 1],[463.062 70 1],[464.112 100 1],[465.437 180 1],[468.691 200 1],[469.638 100 1],[470.653 100 1],[476.605 100 1],[477.156 70 1],[478.487 100 1],[482.714 100 1],[483.128 150 1],[484.29 150 1],[486.512 130 1],[486.624 200 1],[488.522 80 1],[490.444 80 1],[496.188 60 1],[500.082 60 1],[508.3 8 0],[514.87 7 0],[544.984 50 1],[548.795 50 1],[557.635 150 1],[564.926 150 1],[566.62 100 1],[570.812 200 1],[573.35 7 0],[575.585 150 1],[578.91 8 0],[593.615 50 1],[597.468 100 1],[627.35 8 0],[634.97 8 0],[636.713 50 1],[640.59 8 0],[645.67 7 0],[661.34 8 0],[664.858 10 1],[666.02 8 0],[669 8 0],[679 10 0],[683.76 20 0],[685.47 20 0],[701.606 10 1],[703.913 10 1],[719.11 15 0],[723.662 10 1],[726.35 20 0],[728.09 8 0],[728.926 10 1],[744.539 10 1],[746.098 12 1],[746.875 15 1],[748.126 10 1],[755.68 10 0],[768.861 6 1],[775.91 15 0]}{200}% +\wl@elt@search{#1}{I}{[410.223 200 0],[412.921 200 0],[413.415 100 0],[432.184 500 0],[445.286 300 1],[459.977 200 1],[463.245 300 1],[466.648 500 1],[467.553 1000 1],[476.331 250 0],[486.232 1000 0],[491.694 200 0],[498.692 1000 1],[506.537 400 1],[511.929 10000 0],[514.973 200 1],[516.12 3000 1],[517.619 300 1],[521.627 600 1],[522.897 500 1],[523.457 1000 0],[524.571 3000 1],[526.936 500 1],[529.978 400 1],[532.28 400 1],[533.822 10000 1],[534.515 5000 1],[536.986 1000 1],[540.542 800 1],[540.736 800 1],[542.706 600 0],[543.583 3000 1],[543.8 1000 1],[546.462 2000 1],[549.15 800 1],[549.694 1000 1],[550.472 1000 1],[552.206 600 1],[559.852 600 1],[560.032 1000 1],[561.289 1500 1],[562.569 10000 1],[567.808 1000 1],[569.091 2000 1],[570.205 500 1],[571.053 4000 1],[573.827 1000 1],[576.072 1000 1],[576.433 1000 0],[577.483 500 1],[578.702 500 1],[589.403 2000 0],[595.025 5000 1],[598.486 300 0],[602.408 2000 0],[606.893 500 1],[607.498 2000 1],[608.243 1000 0],[612.749 2000 1],[619.188 800 0],[620.486 1000 1],[621.31 500 0],[624.448 800 0],[625.749 900 1],[629.398 1000 0],[631.313 500 0],[633.037 800 0],[633.35 400 0],[633.785 2000 0],[633.944 1000 0],[635.916 500 0],[656.649 1000 0],[658.375 2000 0],[658.527 1000 0],[661.966 5000 0],[666.111 500 0],[666.596 600 1],[669.729 500 0],[671.883 300 1],[673.203 400 0],[681.257 4000 1],[695.878 1000 1],[698.978 500 0],[708.521 200 1],[712.005 500 0],[712.205 1200 0],[714.206 2000 0],[716.479 1000 0],[719.166 400 0],[722.73 700 0],[723.678 1000 0],[723.784 500 0],[735.135 500 1],[740.206 5000 0],[741.05 1000 0],[741.648 500 0],[746.899 5000 0],[749.052 500 0],[755.418 2000 0],[755.665 500 0],[770.02 2000 0],[779.898 500 1],[396.316 3 2],[407.714 3 2]}{10000}% +\wl@elt@search{#1}{Xe}{[390.791 100 1],[403.759 100 1],[405.746 200 1],[409.889 100 1],[415.804 200 1],[418.01 1000 1],[419.315 500 1],[420.848 300 1],[420.947 100 1],[421.372 300 1],[421.56 100 1],[422.3 300 1],[423.825 400 1],[424.538 500 1],[425.157 100 1],[429.64 500 1],[431.051 500 1],[433.052 1000 1],[436.92 200 1],[437.378 100 1],[439.32 500 1],[439.577 500 1],[440.688 200 1],[441.607 150 1],[444.813 500 1],[446.219 1000 1],[448.086 500 1],[452.186 100 1],[473.4152 600 0],[479.2619 150 0],[480.702 500 0],[482.971 400 0],[484.329 300 0],[491.651 500 0],[492.3152 500 0],[497.171 200 1],[497.271 400 1],[498.877 300 1],[499.117 100 1],[502.828 200 0],[504.492 200 1],[508.062 1000 1],[512.242 300 1],[512.57 100 1],[517.882 100 1],[518.804 300 1],[519.137 400 1],[519.21 100 1],[526.044 500 1],[526.195 500 1],[529.222 2000 1],[530.927 300 1],[531.387 1000 1],[533.933 2000 1],[536.32 200 1],[536.807 200 1],[537.239 500 1],[539.28 100 0],[541.915 3000 1],[543.896 800 1],[544.545 300 1],[545.045 200 1],[546.039 400 1],[547.261 1000 1],[549.486 100 1],[552.553 200 1],[553.107 600 1],[556.662 100 0],[561.667 300 1],[565.938 300 1],[566.756 600 1],[567.091 150 1],[569.575 100 0],[569.961 200 1],[571.61 200 1],[572.691 500 1],[575.103 500 1],[575.865 300 1],[577.639 300 1],[581.596 100 1],[582.389 300 0],[582.48 150 0],[587.502 100 0],[589.329 300 1],[589.499 100 0],[590.513 200 1],[593.417 100 0],[594.553 500 1],[597.113 300 1],[597.646 2000 1],[600.892 200 1],[603.62 1000 1],[605.115 2000 1],[609.35 600 1],[609.759 1500 1],[610.143 400 1],[611.508 100 1],[614.645 100 1],[617.83 150 0],[617.966 120 0],[618.242 300 0],[619.407 500 1],[619.826 100 0],[622.002 100 1],[627.082 500 1],[627.754 400 1],[628.441 100 1],[628.601 100 0],[630.086 250 1],[631.806 500 0],[634.396 400 1],[635.635 600 1],[637.528 200 1],[639.799 100 1],[646.97 300 0],[647.284 150 0],[648.776 120 0],[649.872 100 0],[650.418 200 0],[651.283 300 1],[652.865 200 1],[653.316 100 0],[659.501 1000 1],[659.556 100 0],[659.725 400 1],[659.884 100 1],[666.892 150 0],[669.432 300 1],[672.801 200 0],[678.871 150 1],[679.037 100 1],[680.574 1000 1],[682.732 200 0],[687.211 100 0],[688.216 300 0],[691.022 80 1],[692.553 100 0],[694.211 800 1],[697.618 100 0],[699.088 2000 1],[708.215 150 1],[711.96 500 0],[714.75 50 1],[714.903 200 1],[716.483 500 1],[728.434 100 1],[730.18 200 1],[733.93 200 1],[738.6 100 0],[739.379 150 0],[754.845 300 1],[758.468 200 0],[761.857 80 1],[764.202 500 0],[764.391 100 0],[767.066 200 1],[778.704 60 1],[384.15 100 2],[387.78 200 2],[388.05 60 2],[392.255 500 2],[395.059 300 2],[405.007 200 2],[406.04 60 2],[410.91 100 2],[414.57 100 2],[428.59 30 2],[443.42 50 2],[446.21 100 2],[456.91 100 2],[457.01 100 2],[464.14 100 2],[467.37 30 2],[468.357 60 2],[472.36 30 2],[475.73 100 2],[486.95 40 2],[523.9 60 2],[536.71 30 2],[540.1 50 2],[552.44 40 2],[620.597 60 2],[622.17 25 2],[623.82 60 2],[625.905 60 2]}{3000}% +\wl@elt@search{#1}{Cs}{[380.51 500 1],[387.016 15 1],[387.6143 150 0],[388.8608 80 0],[389.698 1000 1],[390.693 350 1],[392.558 500 1],[395.95 350 1],[396.519 500 1],[397.8 150 1],[404.718 350 1],[405.396 200 1],[406.796 500 1],[406.877 500 1],[407.336 70 1],[411.929 60 1],[412.121 500 1],[413.2 100 1],[415.127 350 1],[415.861 350 1],[419.32 60 1],[421.313 500 1],[422.112 200 1],[423.219 500 1],[423.441 350 1],[424.197 100 1],[427.174 100 1],[427.71 2000 1],[428.835 1000 1],[429.2 200 1],[430.064 500 1],[430.794 50 1],[432.758 50 1],[433.024 350 1],[436.328 2000 1],[437.302 500 1],[438.443 400 1],[438.876 100 1],[439.691 200 1],[439.95 350 1],[440.385 350 1],[440.525 1000 1],[441.021 350 1],[442.405 100 1],[443.571 350 1],[444.4 100 1],[445.344 200 1],[445.768 200 1],[445.918 200 1],[449.366 100 1],[450.152 1000 1],[450.671 200 1],[450.683 100 1],[451.55 100 1],[452.285 150 1],[452.672 1000 1],[453.894 800 1],[455.5276 400 0],[456.698 150 1],[457.179 150 1],[459.3169 200 0],[460.376 2500 1],[460.999 100 1],[461.613 150 1],[462.309 350 1],[464.651 500 1],[465.654 150 1],[467.028 350 1],[469.561 100 1],[470.179 500 1],[473.298 350 1],[473.966 350 1],[474.913 100 1],[476.362 500 1],[478.636 200 1],[483.016 800 1],[487.002 800 1],[495.284 800 1],[497.259 500 1],[504.38 800 1],[505.27 500 1],[505.987 500 1],[508.177 100 1],[509.66 400 1],[522.7 1500 1],[524.937 800 1],[527.404 400 1],[530.661 350 1],[534.916 350 1],[537.097 800 1],[541.969 500 1],[546.5944 5 0],[550.2884 5 0],[556.302 1000 1],[563.5212 11 0],[566.4018 30 0],[574.5724 8 0],[581.418 350 1],[583.116 500 1],[583.8835 5 0],[584.5141 30 0],[592.565 500 1],[601.049 80 0],[603.4089 30 0],[612.862 400 1],[621.31 120 0],[621.7599 15 0],[635.4555 50 0],[641.954 100 1],[643.1969 15 0],[647.2623 15 0],[649.553 200 1],[653.644 200 1],[658.602 30 0],[658.651 200 0],[662.866 35 0],[672.3284 200 0],[682.4652 100 0],[687.0455 100 0],[695.552 400 1],[697.3297 200 0],[698.3491 35 0],[722.8536 200 0],[727.99 60 0],[727.9957 200 0],[760.8903 150 0]}{2500}% +\wl@elt@search{#1}{Ba}{[381.669 200 1],[384.28 200 1],[385.476 100 1],[388.933 20 0],[389.178 1400 1],[389.265 20 0],[390.991 40 0],[391.473 500 1],[393.572 50 0],[393.787 20 0],[393.967 200 1],[394.951 500 1],[399.34 80 0],[399.566 30 0],[403.626 300 1],[408.377 200 1],[408.486 30 0],[413.066 1500 1],[413.243 20 0],[416.6 200 1],[421.604 500 1],[426.795 800 1],[428.31 100 0],[428.78 300 1],[429.76 200 1],[430.932 800 1],[432.3 20 0],[432.573 600 1],[432.674 200 1],[432.962 300 1],[435.033 80 0],[440.254 60 0],[440.523 400 1],[443.189 40 0],[448.898 60 0],[449.364 50 0],[450.592 40 0],[450.963 200 1],[452.317 60 0],[452.493 130 1],[455.403 65000 1],[457.385 40 0],[457.964 80 0],[459.975 30 0],[461.992 20 0],[462.833 25 0],[464.41 300 1],[467.362 30 0],[469.162 35 0],[470.043 20 0],[470.894 800 1],[472.644 40 0],[484.346 800 1],[484.714 300 1],[485.084 200 1],[487.765 30 0],[489.997 400 1],[490.29 15 0],[493.409 20000 1],[494.735 8 0],[495.715 1000 1],[499.781 300 1],[501.3 1000 1],[515.994 20 0],[526.703 20 0],[536.135 800 1],[539.16 1000 1],[542.105 200 1],[542.455 100 0],[542.879 200 1],[548.03 300 1],[551.905 200 0],[553.548 1000 0],[562.04 20 0],[568.018 10 0],[577.762 400 0],[578.418 800 1],[580.023 100 0],[580.569 20 0],[582.628 150 0],[585.368 2800 1],[590.764 15 0],[597.17 100 0],[598.125 800 1],[599.709 100 0],[599.985 300 1],[601.947 100 0],[606.312 200 0],[611.078 300 0],[613.583 400 1],[614.172 20000 1],[634.168 150 0],[637.891 500 1],[645.085 90 0],[648.291 150 0],[649.69 12000 1],[649.876 300 0],[652.731 150 0],[659.533 3000 0],[665.41 150 0],[667.527 1500 0],[669.384 1800 0],[676.962 1000 1],[686.569 600 0],[686.785 300 0],[687.409 1000 1],[705.994 6000 0],[712.033 2400 0],[719.524 600 0],[722.884 600 0],[728.03 3000 0],[739.241 1200 0],[741.753 300 0],[745.978 900 0],[748.808 600 0],[763.69 450 0],[764.291 600 0],[767.209 1800 0],[778.048 1200 0],[392.685 25 2],[399.306 25 2],[405.371 18 2],[469.744 15 2],[504.955 10 2],[509.754 10 2],[510.225 12 2],[513.454 10 2],[599.8 10 2],[610.199 13 2],[637.711 10 2],[638.376 10 2],[652.617 8 2],[709.549 8 2]}{65000}% +\wl@elt@search{#1}{La}{[383.508 190 1],[384.072 600 1],[384.6 120 1],[384.902 1600 1],[385.491 130 1],[387.164 3400 1],[388.637 1700 1],[391.605 1300 1],[392.154 1100 1],[392.756 160 0],[392.922 2200 1],[393.622 180 1],[394.91 9000 1],[398.852 4400 1],[399.575 3600 1],[401.539 180 0],[402.588 250 1],[403.169 2800 1],[403.721 140 0],[404.291 3000 1],[405.008 320 1],[406.033 220 0],[406.479 160 0],[406.739 850 1],[407.671 110 1],[407.735 2800 1],[407.918 120 0],[408.672 5500 1],[408.961 180 0],[409.954 280 1],[410.487 110 0],[412.323 4400 1],[413.704 110 0],[414.174 550 1],[415.197 1100 1],[415.278 220 1],[416.026 100 0],[418.732 280 0],[419.236 280 1],[419.655 1500 1],[420.404 240 1],[421.756 300 1],[423.095 200 1],[423.838 1600 1],[424.999 140 1],[426.359 320 1],[426.95 480 1],[427.564 240 1],[428.027 300 0],[428.697 600 1],[429.605 600 1],[430.044 120 1],[432.251 440 1],[433.374 4600 1],[435.44 550 1],[436.467 110 1],[437.197 110 -1],[437.584 110 -1],[437.81 110 1],[438.344 280 1],[438.52 100 1],[441.824 220 -1],[442.317 160 -1],[442.39 160 0],[442.755 260 1],[442.81 100 -1],[442.99 2000 1],[443.298 160 -1],[443.801 100 -1],[445.215 100 0],[445.58 100 1],[452.237 850 1],[452.531 170 1],[452.612 420 1],[455.846 400 1],[455.929 110 1],[456.791 160 0],[457.002 200 0],[457.488 400 1],[458.006 200 1],[460.578 160 1],[461.339 410 1],[461.988 410 1],[464.528 110 1],[465.55 540 1],[466.251 360 1],[466.376 230 1],[466.891 200 1],[467.183 160 1],[469.25 230 1],[470.328 140 1],[471.644 170 1],[471.994 140 1],[472.842 230 1],[474.028 500 1],[474.309 390 1],[474.873 320 1],[476.689 160 0],[480.404 160 1],[480.901 160 1],[482.406 200 1],[486.091 320 1],[489.992 850 1],[492.098 1000 1],[492.179 1000 1],[493.483 140 1],[494.647 110 1],[494.977 370 0],[497.039 340 1],[498.683 370 1],[499.128 140 1],[499.947 720 1],[504.688 140 0],[505.057 210 0],[505.646 170 0],[510.623 200 0],[511.456 470 1],[512.299 470 1],[514.542 450 0],[515.674 180 1],[515.743 180 1],[515.869 290 0],[516.362 120 1],[517.731 580 0],[518.342 850 1],[518.822 260 1],[520.415 170 1],[521.186 720 0],[523.427 520 0],[525.346 340 0],[525.939 110 1],[527.119 370 0],[529.084 140 1],[530.198 370 1],[530.262 140 1],[530.355 180 1],[534.067 110 1],[535.786 110 0],[537.709 130 1],[538.099 140 1],[545.515 500 0],[550.134 470 0],[560.25 110 -1],[563.122 160 0],[564.825 240 0],[565.772 130 0],[574.066 180 0],[574.441 160 0],[576.184 160 0],[576.907 160 1],[576.934 370 0],[578.924 320 0],[579.134 450 0],[579.758 220 1],[580.578 160 1],[582.199 140 0],[593.062 320 0],[624.993 720 0],[626.23 260 1],[629.609 180 1],[632.039 160 1],[632.591 110 0],[639.048 170 1],[639.423 450 0],[641.099 210 0],[645.599 250 0],[652.699 110 1],[654.316 130 0],[657.851 140 0],[670.95 180 0],[677.426 120 1],[701.122 13 -1],[702.367 75 0],[703.205 26 0],[704.084 26 -1],[704.596 110 0],[705.48 13 -1],[706.623 160 1],[706.837 65 0],[707.079 21 -1],[707.638 13 0],[708.54 21 -1],[710.102 26 -1],[711.68 10 1],[713.158 19 -1],[714.977 10 0],[715.808 40 0],[716.125 50 0],[716.26 10 -1],[721.991 21 0],[725.716 10 -1],[727.009 26 0],[727.03 10 0],[728.234 110 1],[732.091 10 0],[733.418 110 0],[734.534 65 0],[737.971 50 -1],[738.008 85 -1],[738.273 35 0],[740.352 110 -1],[740.375 210 -1],[741.134 50 -1],[743.428 65 -1],[743.436 110 -1],[744.292 30 -1],[746.308 50 0],[746.525 50 -1],[746.548 95 -1],[748.35 75 1],[749.65 40 -1],[749.678 95 -1],[749.883 50 0],[750.679 30 -1],[752.821 19 -1],[752.839 50 -1],[753.359 30 0],[753.923 85 0],[756.009 35 -1],[759.226 35 -1],[761.294 19 1],[762.499 19 -1],[766.434 21 0],[412.924 3 2],[413.743 5 2],[448.297 200 2],[449.905 300 2],[514.573 5 2],[515.841 8 2],[546.781 6 2],[549.19 55 2],[551.172 2 2],[551.819 1 2],[552.954 45 2],[574.409 1 2],[577.814 200 2],[581.345 2 2],[587.563 3 2],[588.862 55 2],[593.271 3 2],[601.711 2 2],[605.584 20 2],[611.925 35 2],[614.199 120 2],[622 55 2],[634.821 60 2],[427.076 2000 3],[454.98 1500 3],[483.689 500 3]}{9000}% +\wl@elt@search{#1}{Ce}{[380.152 2500 1],[380.309 800 1],[380.811 1000 1],[380.921 490 1],[381.22 250 1],[381.585 490 1],[381.746 470 1],[381.902 300 1],[382.39 470 1],[383.055 470 1],[383.108 490 1],[383.455 490 1],[383.61 270 1],[383.854 1100 1],[384.376 200 1],[384.652 220 1],[384.81 250 1],[384.859 860 1],[385.315 860 1],[385.418 1200 1],[385.431 1200 1],[385.529 620 1],[385.702 390 1],[385.764 370 1],[386.246 200 1],[386.813 200 1],[387.468 270 1],[387.697 620 1],[387.836 1100 1],[388.245 1500 1],[388.998 1000 1],[389.075 210 1],[389.098 210 1],[389.511 620 1],[389.68 590 1],[389.827 490 1],[389.894 270 1],[390.334 200 1],[390.434 250 1],[390.692 200 1],[390.729 770 1],[390.841 560 1],[390.854 390 1],[390.931 270 1],[391.219 230 1],[391.244 980 1],[391.552 390 1],[391.614 390 1],[391.764 230 1],[391.828 770 1],[391.981 480 1],[392.173 590 1],[392.311 560 1],[392.464 450 1],[393.109 770 1],[393.137 310 1],[393.183 230 1],[393.373 310 1],[393.809 560 1],[394.034 770 1],[394.097 310 1],[394.215 2000 1],[394.275 2700 1],[394.389 770 1],[394.797 310 1],[395.254 3100 1],[395.366 340 1],[395.536 310 1],[395.606 230 1],[395.628 980 1],[395.827 230 1],[395.887 230 1],[396.091 770 1],[396.45 390 1],[396.705 770 1],[397.168 450 1],[397.207 270 1],[397.507 270 1],[397.865 770 1],[398.088 560 1],[398.289 560 1],[398.329 310 1],[398.468 770 1],[398.944 370 1],[399.239 700 1],[399.291 370 1],[399.382 910 1],[399.924 2800 1],[400.156 230 1],[400.377 910 1],[400.564 370 1],[400.759 210 1],[401.239 2700 1],[401.49 910 1],[401.588 250 1],[401.904 200 1],[402.227 240 1],[402.449 840 1],[402.515 240 1],[402.841 840 1],[403.034 250 1],[403.134 840 1],[403.767 340 1],[404.076 2100 1],[404.258 910 1],[404.521 230 1],[404.634 620 1],[405.143 210 1],[405.199 210 1],[405.351 700 1],[405.499 450 1],[406.222 280 1],[406.294 230 1],[406.728 280 1],[406.884 420 1],[407.181 1100 1],[407.292 270 1],[407.348 1800 1],[407.374 210 1],[407.571 1500 1],[407.585 1500 1],[407.624 210 1],[407.747 420 1],[407.832 530 1],[407.852 270 1],[408.044 270 1],[408.122 670 1],[408.323 910 1],[408.523 450 1],[408.736 250 1],[408.885 230 1],[410.177 450 1],[410.5 250 1],[410.742 510 1],[411.038 200 1],[411.139 250 1],[411.537 420 1],[411.701 250 1],[411.729 200 1],[411.759 200 1],[411.814 770 1],[411.902 250 1],[411.979 310 1],[411.988 310 1],[412.083 450 1],[412.324 510 1],[412.349 510 1],[412.387 980 1],[412.479 510 1],[412.737 980 1],[412.774 250 1],[412.807 200 1],[413.071 530 1],[413.11 480 1],[413.38 2700 1],[413.544 270 1],[413.747 270 1],[413.765 2000 1],[413.81 270 1],[413.835 210 1],[414.24 770 1],[414.449 390 1],[414.5 670 1],[414.623 480 1],[414.89 280 1],[414.979 420 1],[414.994 980 1],[415.091 420 1],[415.197 1400 1],[415.313 230 1],[415.903 450 1],[416.352 310 1],[416.561 1300 1],[416.688 620 1],[416.78 250 1],[416.977 320 1],[416.988 320 1],[417.67 340 1],[418.108 340 1],[418.533 340 1],[418.66 3500 1],[418.732 530 1],[419.309 560 1],[419.328 370 1],[419.387 370 1],[419.634 630 1],[419.8 280 1],[419.867 280 1],[419.872 840 1],[420.124 240 1],[420.294 910 1],[420.941 270 1],[421.404 370 1],[421.759 310 1],[422.26 1500 1],[422.775 770 1],[423.174 390 1],[423.421 240 1],[423.602 200 1],[423.992 980 1],[424.272 390 1],[424.589 310 1],[424.598 310 1],[424.672 390 1],[424.868 1100 1],[425.337 390 1],[425.579 620 1],[426.343 200 1],[427.019 620 1],[427.072 390 1],[427.886 200 1],[428.537 280 1],[428.866 200 1],[428.944 200 1],[428.994 2000 1],[429.607 200 1],[429.667 1500 1],[429.678 420 1],[429.936 590 1],[430.033 770 1],[430.514 420 1],[430.672 770 1],[430.974 390 1],[432.072 560 1],[433.045 310 1],[433.271 310 1],[433.623 240 1],[433.777 980 1],[433.931 340 1],[434.979 700 1],[435.271 560 1],[436.466 910 1],[437.382 350 1],[437.592 530 1],[438.217 910 1],[438.684 700 1],[438.801 310 1],[439.166 1700 1],[439.879 200 1],[439.92 510 1],[441.064 350 1],[441.076 350 1],[441.69 310 1],[441.878 980 1],[442.368 200 1],[442.707 310 1],[442.792 480 1],[442.844 310 1],[442.927 650 1],[444.439 480 1],[444.47 450 1],[444.934 770 1],[445.073 620 1],[446.021 2400 1],[446.114 450 1],[446.341 420 1],[446.754 280 1],[447.124 1400 1],[447.272 450 1],[447.936 700 1],[448.39 700 1],[448.691 840 1],[449.785 250 1],[450.641 100 0],[451.586 110 1],[451.959 100 1],[452.308 770 1],[452.735 840 1],[452.847 840 1],[453.249 110 1],[453.907 110 1],[453.975 840 1],[454.496 210 1],[455.13 250 1],[456.028 650 1],[456.096 310 1],[456.236 2100 1],[456.584 420 1],[457.228 1100 1],[458.25 420 1],[459.112 130 1],[459.393 840 1],[460.64 420 1],[462.49 420 1],[462.816 1700 1],[463.232 170 0],[465.051 110 0],[465.429 130 1],[466.95 110 1],[468.013 150 1],[468.461 270 1],[471.4 200 1],[471.481 100 1],[472.509 110 1],[473.352 100 1],[473.728 310 1],[473.953 100 1],[474.717 160 1],[475.784 110 1],[476.877 100 1],[477.394 230 1],[482.255 110 0],[484.777 140 0],[488.246 180 1],[494.344 110 0],[497.15 130 1],[499.463 130 0],[500.91 210 0],[501.177 100 1],[502.287 120 1],[503.778 120 1],[504.085 120 0],[504.402 180 1],[507.178 120 0],[507.535 240 1],[507.968 470 1],[511.27 130 0],[511.717 160 1],[512.957 170 0],[514.757 110 1],[514.999 100 0],[515.969 280 0],[516.148 280 0],[517.455 190 0],[518.746 370 1],[519.166 210 1],[521.192 190 0],[522.346 260 0],[522.975 180 0],[523.292 140 1],[524.592 260 0],[526.571 130 1],[527.423 340 1],[529.656 130 0],[532.808 130 0],[533.054 190 1],[535.353 450 1],[539.34 300 1],[539.764 150 0],[540.923 280 1],[542.038 110 0],[544.924 140 0],[546.837 140 1],[547.229 140 1],[551.208 260 1],[555.625 110 0],[556.497 170 0],[556.597 130 0],[559.588 100 0],[560.128 240 0],[565.514 190 0],[566.996 240 0],[567.775 120 0],[569.294 120 0],[569.699 300 0],[569.923 370 0],[571.903 240 0],[577.312 140 0],[578.815 120 0],[581.292 120 0],[594.086 230 0],[600.018 11 0],[600.19 55 0],[600.586 55 0],[600.62 15 0],[600.682 55 0],[600.737 19 0],[601.342 75 0],[601.659 23 0],[602.42 110 0],[602.716 15 0],[603.126 11 0],[603.358 23 1],[603.42 35 1],[603.441 23 0],[603.549 35 1],[604.339 110 1],[604.542 28 0],[604.74 55 0],[605.18 19 1],[605.75 23 0],[605.8 35 0],[606.675 23 0],[606.946 19 0],[606.948 35 0],[607.2 35 0],[607.661 35 0],[607.716 17 0],[608.037 17 0],[608.128 17 0],[608.886 19 0],[608.896 19 0],[609.319 35 0],[609.834 45 1],[609.98 11 0],[610.874 28 1],[611.856 15 0],[611.89 17 0],[612.367 45 0],[613.2 19 1],[613.218 19 0],[613.545 11 0],[613.903 23 0],[614.292 15 0],[614.336 35 1],[614.643 23 0],[614.784 19 0],[615.172 23 0],[615.982 19 0],[616.214 19 0],[616.545 19 0],[617.528 19 0],[618.617 35 0],[618.797 15 0],[619.523 15 0],[619.553 19 0],[619.805 19 0],[620.898 35 0],[621.682 11 0],[622.894 35 0],[622.913 19 0],[623.245 23 1],[623.745 28 0],[623.871 13 0],[624.187 11 0],[624.291 13 0],[625.365 15 0],[625.799 13 0],[626.427 15 0],[627.205 45 1],[627.647 15 0],[629.558 35 0],[629.951 28 1],[630.021 23 0],[630.664 13 0],[631.001 35 0],[633.54 15 0],[633.721 11 0],[634.07 13 0],[634.395 35 1],[637.111 35 1],[638.684 28 0],[639.302 23 1],[639.516 11 0],[642.529 11 1],[643.007 35 0],[643.439 19 0],[643.64 23 0],[644.612 19 0],[645.803 35 0],[646.688 19 1],[646.739 28 0],[647.372 35 0],[649.097 17 0],[650.327 11 1],[650.716 11 1],[651.359 23 1],[651.731 19 0],[655.17 19 0],[655.565 45 0],[657.91 23 0],[660.635 15 0],[660.686 15 1],[661.206 22 0],[662.3 10 0],[662.893 30 0],[665.089 13 0],[665.272 22 1],[666.141 10 0],[666.559 13 0],[667.554 10 1],[668.66 15 0],[670.066 26 0],[670.427 35 0],[670.452 13 1],[670.604 10 1],[672.871 15 0],[672.957 15 0],[674.47 15 1],[674.69 10 0],[677.428 30 1],[677.559 35 0],[677.828 10 0],[680.781 18 0],[680.882 10 0],[681.823 15 0],[682.973 10 1],[684.725 13 0],[685.655 12 0],[689.366 10 0],[689.845 10 1],[692.481 30 0],[693.945 10 0],[697.35 19 1],[698.382 10 1],[698.602 30 0],[705.451 12 0],[705.868 11 1],[706 11 0],[706.175 35 1],[706.449 11 0],[708.635 35 1],[710.504 11 1],[711.508 11 1],[712.473 10 0],[714.142 16 0],[715.023 19 1],[715.167 10 0],[715.525 16 0],[715.699 16 1],[718.94 16 1],[719.172 10 0],[720.156 11 1],[720.189 16 0],[720.355 10 0],[721.067 12 0],[721.736 19 0],[723.571 16 1],[723.836 22 1],[724.173 12 0],[725.275 25 0],[726.264 12 0],[727.79 11 0],[729.617 11 0],[730.142 19 1],[731.345 19 1],[732.991 25 0],[733.468 16 1],[734.344 12 0],[739.777 25 0],[740.127 11 0],[741.794 12 1],[742.47 11 -1],[743.308 12 0],[743.856 11 0],[744.444 12 0],[747.241 10 0],[748.657 16 1],[752.746 11 0],[752.768 11 0],[753.373 10 0],[755.125 10 0],[756.244 12 0],[756.286 10 0],[756.36 10 0],[760.31 10 0],[761.611 25 1],[764.608 12 0],[764.788 10 0],[768.247 12 0],[768.917 25 1],[773.233 10 0],[774.835 16 0],[779.77 10 0],[393.68 800 2],[395.71 300 2],[416.942 500 2],[419.17 300 2],[419.483 500 2],[421.326 300 2],[421.713 300 2],[428.477 400 2],[430.471 300 2],[434.635 600 2],[438.997 400 2],[444.832 600 2],[448.527 500 2],[452.192 1000 2],[453.573 1000 2],[457.69 300 2],[462.76 500 2],[476.607 300 2],[497.645 500 2],[565.097 500 2],[566.42 1000 2],[569.108 500 2],[571.059 300 2],[574.947 500 2],[594.983 500 2],[596.222 2000 2],[596.271 500 2],[597.956 400 2],[598.34 1000 2],[600.263 3000 2],[603.254 10000 2],[606.091 10000 2],[606.179 500 2],[609.735 500 2],[609.887 500 2],[613.51 500 2],[628.779 300 2],[630.816 500 2],[634.175 300 2],[694.494 1000 2],[773.904 700 2],[775.827 300 2]}{10000}% +\wl@elt@search{#1}{Pr}{[380.03 680 1],[380.484 290 1],[380.918 140 1],[381.184 390 1],[381.602 1300 1],[381.766 120 1],[381.828 680 1],[381.914 120 1],[382.18 310 1],[382.318 150 1],[382.667 120 1],[383.072 960 1],[383.493 140 1],[384.099 480 1],[384.234 270 1],[384.454 150 1],[384.659 580 1],[385.079 1200 1],[385.155 720 1],[385.28 960 1],[385.825 120 1],[385.914 110 1],[386.545 480 1],[386.752 210 1],[387.072 210 1],[387.619 480 1],[387.718 1700 1],[387.92 270 1],[388.047 680 1],[388.519 440 1],[388.934 440 1],[389.171 120 1],[389.725 190 1],[389.884 210 1],[390.245 250 1],[390.805 770 1],[391.29 630 1],[391.355 310 1],[391.476 210 1],[391.885 1300 1],[391.963 420 1],[392.053 250 1],[392.547 960 1],[392.746 480 1],[392.929 370 1],[393.582 370 1],[393.83 250 1],[394.763 730 1],[394.943 900 1],[395.351 900 1],[395.675 380 1],[395.944 190 0],[396.245 470 1],[396.426 560 1],[396.481 1600 1],[396.657 560 1],[397.116 500 1],[397.167 320 1],[397.214 620 1],[397.485 320 1],[398.968 1300 1],[399.191 230 1],[399.216 340 1],[399.479 1600 1],[399.583 270 1],[399.704 560 1],[399.796 230 1],[399.912 320 1],[400.017 620 1],[400.47 730 1],[400.869 1900 1],[401.06 620 1],[401.539 730 1],[402.096 620 1],[402.271 470 1],[402.554 360 1],[402.683 230 1],[402.9 230 1],[402.972 360 1],[403.175 730 1],[403.247 230 1],[403.383 960 1],[403.433 230 1],[403.822 230 1],[403.845 730 1],[403.934 470 1],[404.481 1300 1],[404.57 230 1],[404.663 230 1],[404.708 340 1],[405.113 450 1],[405.488 2200 1],[405.654 2200 1],[405.88 450 1],[406.222 230 1],[406.281 3400 1],[406.88 210 1],[407.977 500 1],[408.098 500 1],[408.185 790 1],[408.334 500 1],[408.721 200 1],[409.682 560 1],[409.84 380 1],[410.072 2900 1],[411.389 270 1],[411.846 1700 1],[412.915 250 1],[413.077 340 1],[413.361 200 1],[414.122 1500 1],[414.311 2700 1],[414.65 270 1],[414.844 270 1],[415.65 200 1],[416.416 1700 1],[416.804 270 1],[416.945 230 1],[417.182 620 1],[417.225 730 1],[417.532 250 1],[417.562 250 1],[417.863 200 1],[417.939 5200 1],[418.948 2500 1],[419.16 560 1],[420.117 290 1],[420.672 2500 1],[420.832 500 1],[421.186 320 1],[421.781 320 1],[422.293 3800 1],[422.535 3800 1],[423.311 320 1],[423.615 320 1],[424.002 270 1],[424.101 960 1],[424.351 340 1],[424.763 840 1],[425.44 500 1],[426.378 270 1],[426.909 320 1],[427.227 790 1],[428.007 470 1],[428.242 790 1],[429.898 450 1],[430.361 290 1],[430.576 1500 1],[432.355 210 1],[432.941 270 1],[433.397 1300 1],[433.574 200 1],[433.87 360 1],[434.43 620 1],[434.749 470 1],[435.04 340 1],[435.491 450 1],[435.979 410 1],[436.833 1200 1],[437.162 320 1],[439.608 270 1],[440.36 170 1],[440.512 100 1],[440.583 430 1],[440.882 1700 1],[441.377 410 1],[441.904 160 1],[441.965 190 1],[442.122 160 1],[442.458 160 1],[442.913 1200 1],[443.228 110 1],[444.983 730 1],[445.19 140 1],[445.468 140 1],[446.597 100 1],[446.866 960 1],[447.726 140 1],[449.646 1100 1],[451.015 790 1],[451.758 200 1],[453.415 340 1],[453.592 340 1],[456.312 200 1],[461.208 140 1],[462.874 270 1],[463.228 140 0],[463.568 140 0],[463.955 200 0],[464.349 110 1],[464.605 140 1],[465.15 200 1],[466.465 140 1],[467.209 270 1],[468.78 180 0],[469.577 290 0],[470.807 140 1],[470.952 140 0],[473.067 180 0],[473.669 250 0],[474.416 100 0],[474.692 150 1],[476.272 100 1],[478.335 110 1],[490.699 110 0],[491.402 140 0],[492.46 200 0],[493.6 140 0],[493.974 320 0],[494.03 160 0],[495.137 380 0],[497.575 110 0],[501.859 120 0],[501.976 200 0],[502.696 200 0],[503.338 100 0],[503.441 270 1],[504.383 110 0],[504.552 320 0],[505.34 160 0],[508.712 180 0],[511.038 360 1],[511.076 560 1],[512.952 410 1],[513.344 270 0],[513.514 270 1],[513.981 100 0],[515.23 100 1],[516.174 200 1],[517.39 620 1],[519.132 200 1],[519.443 120 0],[519.511 150 1],[519.531 200 1],[520.655 360 1],[520.79 150 1],[521.905 360 1],[522.011 560 1],[522.797 110 0],[525.973 680 1],[526.388 180 1],[529.202 340 1],[529.262 340 1],[529.809 230 1],[532.276 430 1],[535.24 200 1],[550.15 16 0],[550.879 40 1],[550.915 65 1],[551.163 16 1],[551.358 55 1],[551.512 28 1],[551.938 13 1],[552.031 20 1],[552.279 45 1],[552.415 28 0],[552.591 28 1],[552.793 16 0],[553.021 13 0],[553.116 45 0],[553.517 150 1],[553.837 28 0],[553.878 20 1],[554.501 55 1],[554.833 20 1],[555.342 11 1],[556.146 22 1],[556.206 45 0],[556.552 13 0],[556.691 13 1],[557.183 45 1],[557.461 11 1],[557.881 11 0],[558.235 13 1],[558.402 11 1],[559.492 22 0],[559.729 22 1],[560.13 13 1],[560.565 90 1],[560.668 13 0],[560.893 28 1],[561.022 55 1],[562.006 11 1],[562.026 20 0],[562.189 45 1],[562.305 110 1],[562.445 90 1],[563.303 11 0],[563.646 22 1],[563.879 55 1],[564.037 16 1],[564.316 16 0],[564.541 22 1],[565.423 35 1],[565.984 55 1],[566.157 35 0],[566.219 16 1],[566.846 65 0],[566.955 45 1],[566.999 35 1],[567.414 16 1],[567.703 16 1],[568.189 55 1],[568.56 13 1],[568.652 16 0],[568.717 22 1],[568.844 65 1],[568.921 22 1],[569.097 55 1],[569.59 22 1],[570.438 22 0],[570.761 65 0],[571.163 40 1],[571.383 22 1],[571.608 16 1],[571.908 45 1],[571.963 45 1],[572.838 11 0],[573.188 40 1],[574.713 20 1],[574.774 11 0],[574.795 11 1],[575.302 22 1],[575.617 90 1],[575.94 16 1],[576.02 22 0],[576.916 22 1],[576.979 16 1],[577.316 45 1],[577.591 11 1],[577.729 16 1],[577.928 90 0],[578.528 65 1],[578.617 65 1],[578.829 16 1],[578.892 16 1],[579.086 16 1],[579.136 45 1],[579.295 22 0],[581.058 40 1],[581.355 16 1],[581.517 160 1],[581.857 55 1],[582.062 40 1],[582.136 16 0],[582.259 55 1],[582.372 90 1],[583.094 45 1],[583.513 40 0],[584.465 35 1],[584.498 40 1],[584.713 65 1],[585.064 65 1],[585.263 45 1],[585.444 11 0],[585.607 45 1],[585.69 55 1],[585.968 90 1],[586.883 80 1],[587.383 22 1],[587.472 35 0],[587.81 35 0],[587.904 35 0],[587.925 80 1],[588.472 35 0],[589.223 55 1],[589.422 22 1],[590.311 40 1],[590.445 45 1],[590.867 40 1],[591.531 11 0],[591.597 11 0],[592.076 40 0],[593.066 40 1],[593.633 16 1],[593.99 160 1],[594.072 65 1],[594.165 22 0],[594.716 35 1],[594.976 22 0],[595.127 55 1],[595.176 20 1],[595.66 90 1],[595.925 13 0],[596.218 20 0],[596.3 28 0],[596.782 110 1],[597.695 13 0],[597.888 13 0],[598.119 65 1],[598.614 40 0],[598.714 45 0],[599.127 13 0],[599.489 13 0],[599.606 11 0],[600.244 29 1],[600.633 90 1],[600.854 13 0],[601.648 55 1],[601.78 150 1],[601.985 28 0],[602.572 150 1],[604.287 35 1],[604.666 55 1],[604.926 35 0],[605.004 28 1],[605.088 11 0],[605.513 140 0],[606.727 13 1],[608.581 13 0],[608.616 28 1],[608.752 65 1],[609.038 20 1],[609.309 28 1],[609.628 18 0],[610.672 22 1],[610.908 18 0],[611.438 65 1],[611.802 22 0],[612.215 22 0],[614.151 35 1],[614.823 65 0],[615.782 22 1],[615.91 13 1],[616.118 190 1],[616.538 18 0],[616.594 270 1],[618.234 55 1],[618.796 13 0],[619.745 35 1],[620.081 35 1],[620.563 13 1],[621.059 13 0],[621.273 22 0],[621.806 18 0],[623.68 20 0],[624.105 20 0],[624.435 45 1],[625.51 35 1],[626.255 40 1],[626.454 18 1],[627.466 22 1],[627.868 40 1],[628.128 110 1],[628.902 18 0],[629.801 11 0],[630.205 11 0],[630.235 35 1],[630.405 16 0],[630.523 35 1],[631.813 11 1],[632.236 45 0],[634.388 22 0],[634.711 28 1],[635.098 18 0],[635.72 22 0],[635.903 55 0],[636.362 11 1],[637.761 16 0],[637.859 16 0],[638.957 11 0],[639.199 18 0],[639.318 40 0],[639.796 45 1],[641.069 10 0],[641.123 55 0],[641.368 40 1],[641.543 10 0],[642.963 45 1],[643.184 45 1],[644.278 7 1],[644.391 9 1],[645.344 16 0],[645.484 9 1],[645.618 9 0],[646.019 9 0],[646.772 18 1],[647.526 9 1],[647.802 35 1],[648.655 45 0],[648.697 9 1],[649.175 40 0],[649.349 9 0],[649.489 11 0],[649.711 22 0],[649.894 18 1],[650.072 22 0],[650.409 9 0],[651.714 8 0],[651.879 16 1],[653.452 8 0],[654.047 16 0],[655.33 7 0],[656.462 22 1],[656.677 45 1],[657.103 7 0],[657.8 6 0],[658.456 6 1],[659.374 9 1],[659.548 11 0],[660.986 15 0],[661.667 55 0],[661.834 11 1],[663.1 7 0],[663.206 13 0],[664.712 14 0],[665.683 75 1],[667.341 55 1],[667.378 75 1],[668.751 5 1],[669.925 4 0],[673.679 13 0],[674.709 35 0],[674.919 19 0],[678.499 7 1],[679.86 55 0],[681.176 11 1],[681.287 17 1],[681.404 13 1],[681.761 9 0],[682.76 35 1],[683.05 19 1],[684.439 9 0],[684.547 9 1],[684.659 9 1],[685.046 17 1],[685.277 11 0],[687.044 11 0],[688.466 7 0],[689.271 8 0],[697.038 8 -1],[698.012 8 0],[702.151 40 1],[702.453 10 0],[704.24 13 0],[704.445 8 1],[705.107 7 0],[707.999 10 0],[709.518 11 0],[711.455 20 0],[711.69 10 0],[711.824 11 1],[713.733 7 1],[715.988 10 0],[716.777 7 1],[718.995 7 0],[720.885 10 1],[722.77 24 1],[723.153 13 0],[724.326 7 0],[725.921 7 0],[728.761 7 0],[728.919 7 0],[732.442 7 0],[732.847 7 0],[734.486 7 -1],[740.756 16 1],[745.174 20 1],[749.559 11 0],[749.942 6 0],[754.102 14 1],[757.486 6 0],[764.566 20 1],[770.498 7 1],[772.184 16 0],[778.616 6 1],[381.725 60 2],[386.18 60 2],[398.051 150 2],[400.02 200 2],[401.836 90 2],[402.96 180 2],[414.246 90 2],[414.448 120 2],[414.785 90 2],[417.215 90 2],[417.977 150 2],[418.418 180 2],[419.701 240 2],[421.945 120 2],[423.145 180 2],[427.507 180 2],[428.632 120 2],[429.827 90 2],[430.173 90 2],[431.634 90 2],[435.428 60 2],[437.982 90 2],[438.147 90 2],[440.471 120 2],[442.11 120 2],[443.185 120 2],[444.793 150 2],[445.014 180 2],[445.1 120 2],[446.102 120 2],[446.181 200 2],[450.031 300 2],[461.202 450 2],[462.518 600 2],[465.416 120 2],[471.37 600 2],[472.555 300 2],[472.821 270 2],[474.711 300 2],[477.183 300 2],[477.53 450 2],[485.739 600 2],[520.851 150 2],[526.168 150 2],[526.444 1000 2],[528.47 1500 2],[529.999 1500 2],[534.002 1500 2],[542.77 100 2],[558.174 100 2],[564.68 150 2],[576.527 600 2],[584.441 1500 2],[594.798 200 2],[595.605 7000 2],[599.894 900 2],[605.301 1500 2],[607.109 900 2],[609.002 9000 2],[616.024 5000 2],[616.122 1500 2],[619.505 100 2],[619.563 2000 2],[631.036 200 2],[636.165 100 2],[642.926 300 2],[644.474 300 2],[650.004 600 2],[650.149 300 2],[657.89 200 2],[661.646 100 2],[670.67 600 2],[672.763 100 2],[682.796 200 2],[685.463 100 2],[685.73 200 2],[686.68 1000 2],[689.906 1000 2],[690.352 500 2],[691.014 7000 2],[693.455 150 2],[697.096 500 2],[697.983 100 2],[703.039 5000 2],[707.521 100 2],[707.662 4500 2],[708.399 100 2],[711.253 500 2],[716.564 100 2],[723.162 250 2],[723.826 100 2],[724.021 250 2],[726.232 100 2],[734.069 150 2],[734.37 350 2],[734.975 200 2],[735.061 300 2],[735.552 100 2],[742.648 2000 2],[742.905 4000 2],[746.396 100 2],[748.74 250 2],[749.32 200 2],[751.117 100 2],[752.911 500 2],[754.92 100 2],[758.864 150 2],[759.641 300 2],[762.563 100 2],[764.834 100 2],[767.065 100 2],[767.465 200 2],[774.234 500 2],[774.559 250 2],[775.431 500 2],[775.548 100 2],[778.198 3000 2]}{9000}% +\wl@elt@search{#1}{Nd}{[380.112 370 1],[380.138 200 1],[380.23 340 1],[380.347 1200 1],[380.41 200 1],[380.536 2500 1],[380.555 340 1],[380.723 470 1],[380.877 540 1],[380.906 440 1],[381.049 580 1],[381.106 240 1],[381.177 270 1],[381.253 200 1],[381.473 710 1],[381.97 240 1],[382.247 410 1],[382.642 1200 1],[382.8 240 1],[382.885 540 1],[382.916 440 1],[383.047 510 1],[383.654 740 1],[383.791 340 1],[383.898 1700 1],[383.951 340 1],[384.182 410 1],[384.824 1700 1],[384.852 1500 1],[385.022 470 1],[385.166 2400 1],[385.855 340 1],[386.094 270 1],[386.252 300 1],[386.333 3700 1],[386.652 240 1],[386.681 220 1],[386.907 850 1],[387.574 240 1],[387.587 470 1],[387.858 1100 1],[387.955 1000 1],[388.038 780 1],[388.078 1200 1],[388.159 200 -1],[388.787 540 1],[388.966 370 1],[388.993 1300 1],[389.058 1300 1],[389.094 1300 1],[389.151 580 1],[389.206 470 1],[389.463 810 1],[389.613 270 1],[389.763 440 1],[390.021 2000 1],[390.184 1300 1],[390.589 1700 1],[390.77 200 1],[390.784 510 1],[391.116 2000 1],[391.223 850 1],[391.369 340 1],[391.513 440 1],[391.595 610 1],[391.765 340 1],[391.992 220 1],[392.096 1100 1],[392.71 510 1],[392.926 200 1],[393.482 610 1],[393.611 410 1],[393.886 510 1],[394.151 2000 1],[395.116 2000 1],[395.22 810 1],[395.287 320 1],[395.352 320 1],[395.745 240 1],[395.8 590 1],[396.221 510 1],[396.312 1400 1],[396.39 270 1],[397.33 1100 1],[397.369 740 1],[397.685 740 1],[397.949 740 1],[398.236 320 1],[398.625 470 1],[399.01 1400 1],[399.174 1000 1],[399.468 1100 1],[400.05 410 1],[400.402 540 1],[400.743 410 1],[401.225 3700 1],[401.27 540 1],[401.881 370 1],[402.087 1000 1],[402.134 1000 1],[402.178 1000 1],[402.3 1200 1],[402.478 340 1],[403.047 410 1],[403.182 1200 1],[403.812 270 1],[404.08 3000 1],[404.106 200 1],[404.359 410 1],[404.881 410 1],[405.115 850 1],[405.996 850 1],[406.109 4700 1],[406.928 1100 1],[407.512 710 1],[407.528 470 1],[407.762 240 1],[408.023 470 1],[408.582 240 1],[409.613 270 1],[409.818 220 1],[410.659 200 1],[410.908 1400 1],[410.946 2500 1],[411.048 510 1],[411.383 300 1],[412.388 410 1],[413.336 470 1],[413.533 510 1],[415.608 3000 1],[415.626 510 1],[416.057 340 1],[416.8 410 1],[417.561 810 1],[417.732 2400 1],[417.864 200 1],[417.959 640 1],[418.498 250 1],[420.56 470 1],[421.129 470 1],[422.025 290 1],[422.773 440 1],[423.238 1300 1],[423.419 250 1],[423.524 290 1],[423.984 290 1],[424.738 2000 1],[425.244 850 1],[425.429 290 -1],[426.184 410 1],[426.671 340 1],[427.056 240 1],[427.279 340 1],[427.509 340 1],[428.244 470 1],[428.257 240 1],[428.452 710 1],[429.78 270 1],[430.358 5400 1],[430.445 340 1],[430.778 200 1],[431.452 470 1],[432.576 1100 1],[432.793 510 1],[433.87 540 1],[435.129 680 1],[435.817 850 1],[436.638 240 1],[436.864 340 1],[437.493 470 1],[438.566 710 1],[439.066 250 1],[440.083 540 1],[441.106 510 1],[444.639 580 1],[445.157 1400 1],[445.199 200 1],[445.64 300 1],[446.299 740 1],[450.182 410 1],[450.659 200 1],[451.334 170 1],[451.636 250 1],[452.725 120 0],[454.127 340 1],[454.261 340 1],[455.614 100 1],[455.967 170 0],[456.322 340 1],[457.889 200 1],[457.932 200 1],[458.662 100 0],[459.702 200 1],[460.382 100 0],[460.987 100 0],[462.194 300 0],[462.798 100 0],[463.424 510 0],[464.11 340 0],[464.577 250 1],[464.64 200 0],[464.967 300 0],[465.473 200 0],[467.056 130 1],[468.074 170 1],[468.345 310 0],[468.404 110 0],[469.035 110 0],[469.644 190 0],[470.357 130 1],[470.654 470 1],[470.696 140 0],[470.971 190 1],[471.559 190 1],[471.902 240 0],[472.435 190 1],[473.177 140 0],[477.946 120 0],[478.941 170 1],[479.715 120 1],[481.134 240 1],[482.034 140 1],[482.548 350 1],[483.228 130 1],[484.906 110 1],[485.902 280 1],[486.674 190 0],[488.381 350 0],[488.91 140 1],[489.07 220 1],[489.107 240 0],[489.693 280 0],[490.153 120 0],[490.184 210 0],[490.203 110 1],[491.341 190 0],[491.437 170 1],[492.068 330 1],[492.453 470 0],[494.483 260 0],[495.478 290 0],[495.913 290 1],[496.139 150 1],[498.994 250 1],[503.352 150 1],[506.373 110 1],[507.659 360 1],[508.984 150 1],[509.28 360 1],[510.239 180 1],[510.521 150 1],[510.759 360 1],[512.379 340 1],[513.06 680 1],[513.233 170 1],[516.514 170 1],[518.117 130 1],[518.26 120 1],[519.145 500 1],[519.262 630 1],[520.012 330 1],[521.237 310 1],[521.323 150 0],[522.505 130 1],[522.843 130 1],[523.42 450 1],[523.979 250 1],[524.959 720 1],[525.082 200 1],[525.551 360 1],[526.948 120 1],[527.343 590 1],[527.688 150 1],[529.167 110 0],[529.317 680 1],[530.228 160 1],[530.647 110 1],[531.146 220 1],[531.982 500 1],[535.698 180 1],[536.147 290 1],[537.194 150 1],[538.59 110 1],[543.153 160 1],[545.112 110 1],[548.57 170 1],[550.147 35 0],[552.572 45 0],[553.382 90 0],[553.527 55 1],[554.324 55 0],[554.847 55 1],[556.117 55 0],[557.55 27 0],[557.67 27 0],[557.77 27 0],[558.761 27 0],[559.443 240 1],[560.143 55 0],[560.192 45 0],[562.054 220 0],[563.576 65 0],[563.954 45 0],[565.357 35 0],[566.887 70 1],[566.977 65 0],[567.597 140 0],[567.633 55 0],[568.853 220 1],[568.951 23 0],[570.157 30 0],[570.224 130 1],[570.621 80 1],[570.828 160 1],[571.812 80 1],[572.683 65 1],[572.929 100 0],[573.455 23 -1],[574.086 70 1],[574.919 55 0],[574.966 27 0],[576.733 23 0],[577.612 45 0],[578.496 45 0],[578.822 45 0],[580.009 45 0],[580.402 160 1],[581.157 80 1],[581.389 45 0],[582.037 27 0],[582.587 70 1],[582.674 30 0],[584.239 80 1],[584.466 30 0],[584.595 23 0],[585.891 55 0],[586.708 35 0],[586.89 30 0],[587.104 27 0],[588.329 30 0],[588.624 23 0],[588.791 30 0],[592.122 27 0],[595.587 27 0],[599.476 30 0],[599.647 27 0],[600.767 45 0],[603.127 35 1],[603.329 27 0],[603.424 45 1],[606.603 55 0],[607.17 27 0],[607.397 30 0],[613.347 23 1],[614.928 27 0],[615.506 27 0],[615.783 35 1],[616.667 23 1],[617.049 35 1],[617.859 45 0],[618.391 27 1],[620.824 27 0],[622.339 45 0],[622.65 27 0],[623.85 23 1],[624.408 35 0],[625.749 23 0],[625.873 27 1],[627.729 23 1],[628.579 27 0],[629.284 23 1],[629.707 23 0],[631.049 55 0],[634.151 27 1],[638.207 23 1],[638.52 65 1],[648.569 35 0],[663.014 45 0],[663.796 35 1],[665.057 45 1],[665.567 30 0],[673.779 25 1],[674.011 40 1],[674.254 25 0],[679.037 30 1],[680.4 30 1],[684.672 25 1],[690.043 40 1],[694.139 24 1],[701.08 17 1],[701.885 8 1],[702.092 17 1],[702.458 17 1],[703.321 10 -1],[703.73 35 1],[705.214 7 1],[705.474 7 1],[706.147 7 1],[706.689 40 1],[708.293 8 1],[708.971 12 1],[709.209 12 -1],[709.274 12 1],[709.294 12 -1],[709.398 17 0],[709.542 20 0],[712.935 29 1],[714.204 12 1],[714.372 10 -1],[715.103 8 1],[715.309 6 0],[718.501 6 -1],[718.909 10 1],[718.942 24 1],[719.201 20 1],[719.9 10 1],[722.701 8 0],[723.654 15 1],[726.164 7 1],[728.529 9 1],[728.856 9 1],[729.138 6 1],[729.872 7 1],[731.681 12 1],[732.143 7 0],[732.312 7 1],[733.454 6 0],[735.71 6 0],[737.404 6 1],[738.179 7 1],[740.131 9 0],[740.662 10 1],[741.12 6 1],[741.818 10 1],[742.741 9 1],[744.871 9 1],[748.128 5 1],[751.116 12 1],[751.373 17 1],[751.444 7 1],[751.602 7 1],[752.645 9 1],[752.899 12 1],[753.826 10 1],[754.097 5 1],[754.7 7 1],[757.754 5 1],[758.765 7 1],[759.075 6 1],[760.373 6 1],[760.592 5 1],[761.472 5 0],[763.979 9 1],[764.6 8 1],[766.352 6 1],[769.656 12 1],[771.82 6 1],[774.39 4 1],[774.892 4 1],[775.095 10 1],[777.306 6 1],[779.222 7 1],[779.64 6 1],[779.732 8 1],[779.832 5 1]}{5400}% +\wl@elt@search{#1}{Pm}{[380.606 250 1],[380.92 300 0],[381.093 400 0],[381.926 200 1],[382.053 300 1],[383.952 300 0],[384.288 200 1],[384.298 300 1],[384.538 250 1],[387.403 300 0],[387.762 800 1],[388.579 300 0],[389.097 250 0],[389.215 1000 1],[389.873 300 0],[389.978 400 1],[390.95 250 1],[391.026 1000 1],[391.91 1000 1],[393.648 800 1],[394.421 300 1],[395.476 300 0],[395.774 1000 1],[398.074 500 1],[399.505 300 1],[399.896 1000 1],[400.996 500 1],[401.272 200 1],[401.42 250 1],[401.934 200 1],[402.82 250 1],[404.536 200 1],[405.154 300 1],[405.52 600 1],[405.656 200 0],[407.584 600 1],[408.531 200 0],[408.61 500 1],[414.046 250 1],[418.574 200 1],[419.292 300 1],[419.47 200 1],[422.215 200 1],[426.432 300 0],[428.437 300 0],[429.778 600 1],[430.389 200 1],[430.564 200 0],[431.88 400 0],[432.592 250 1],[433.205 200 1],[433.654 300 1],[433.748 200 1],[434.212 300 1],[434.772 200 0],[436.392 350 0],[436.964 300 0],[438.188 200 1],[438.849 400 0],[438.876 200 1],[440.942 400 0],[441.247 500 0],[441.796 1000 1],[443.251 400 1],[443.586 250 0],[443.655 300 0],[443.868 300 0],[444.541 500 1],[444.69 600 1],[445.395 800 1],[445.997 200 1],[446.816 250 0],[447.148 200 1],[447.323 300 1],[447.746 200 1],[447.858 350 0],[448.16 300 0],[448.505 300 0],[449.05 300 0],[449.205 250 1],[450.015 600 1],[450.033 350 0],[450.684 250 0],[450.938 100 1],[451.356 100 1],[451.731 200 0],[452.332 200 0],[452.52 600 1],[452.612 250 0],[452.676 250 0],[452.77 400 0],[452.921 800 1],[454.006 300 0],[454.142 300 0],[454.175 450 0],[454.408 500 0],[454.517 200 0],[454.978 400 0],[455.403 300 0],[455.463 200 0],[455.534 500 0],[455.606 200 0],[455.703 300 0],[455.921 300 0],[456.483 100 1],[456.814 300 0],[457.037 200 0],[457.215 300 0],[457.527 400 0],[457.828 300 0],[457.841 200 0],[457.948 300 0],[458.114 300 0],[458.549 300 0],[459.382 200 0],[459.582 400 0],[459.755 800 0],[460.025 500 0],[460.296 400 0],[460.459 400 0],[460.566 600 0],[460.985 500 0],[461.587 100 1],[461.702 600 0],[461.84 200 0],[461.849 400 0],[461.975 500 0],[462.157 500 0],[462.331 500 0],[462.368 700 0],[462.441 900 0],[462.529 500 0],[462.76 400 0],[463.093 200 0],[463.345 600 0],[464.096 400 0],[464.336 700 0],[464.376 700 0],[464.594 400 0],[464.703 600 0],[465.042 600 0],[465.052 500 0],[465.341 400 0],[465.45 400 0],[465.505 500 0],[465.938 300 0],[466.079 500 0],[466.326 300 0],[466.346 600 0],[466.519 400 0],[467.123 500 0],[467.176 400 0],[467.442 500 0],[467.746 200 0],[467.792 500 0],[467.809 400 0],[468.292 700 0],[469.68 500 0],[469.951 200 0],[472.206 250 1],[472.706 300 0],[472.836 900 0],[472.868 400 0],[473.427 800 0],[473.799 200 0],[473.908 100 1],[473.978 200 0],[474.513 350 0],[475.773 500 0],[475.9 800 0],[476.257 700 0],[477.346 700 0],[478.129 900 0],[479.459 250 0],[479.543 200 0],[479.898 700 0],[480.136 900 0],[480.954 700 0],[481.196 900 0],[481.712 400 0],[482.772 400 0],[483.766 800 0],[483.892 400 0],[483.962 300 0],[484.401 200 0],[485.273 350 0],[486.062 400 0],[486.074 700 0],[486.53 300 0],[486.572 500 0],[486.98 400 0],[487.242 700 0],[488.702 500 0],[489.252 700 0],[490.03 400 0],[490.428 300 0],[491.828 400 0],[493.299 600 0],[495.946 700 0],[497.14 100 1],[499.71 500 0],[503.08 200 0],[505.831 300 0],[506.735 100 1],[508.052 150 1],[508.935 150 1],[509.242 200 0],[509.483 400 0],[509.618 200 0],[509.73 150 1],[510.077 400 0],[512.147 250 1],[512.734 400 0],[512.975 200 0],[514.513 400 0],[514.63 500 0],[515.386 400 1],[516.971 300 1],[517.158 500 1],[519.405 300 1],[520.809 500 1],[521.596 150 1],[522.512 250 1],[523.626 500 1],[523.666 300 1],[524.633 400 1],[526.242 150 1],[527.064 500 1],[529.392 200 1],[530.886 100 1],[531.858 150 1],[541.045 200 1],[542.454 200 1],[542.479 180 1],[542.904 150 1],[546.764 100 1],[549.545 150 1],[551.642 100 1],[553.496 180 1],[553.738 200 0],[554.608 800 1],[555.688 120 1],[555.839 150 1],[556.173 200 1],[557.602 800 1],[564.129 200 1],[573.081 200 0],[576.816 200 1],[577.699 200 0],[582.393 500 1],[586.879 300 1],[587.531 200 1],[587.876 100 1],[589.976 150 1],[590.471 250 0],[590.59 100 0],[591.496 125 0],[592.717 250 1],[593.966 150 0],[594.649 400 1],[595.642 800 0],[595.669 200 0],[596.008 100 1],[596.3 150 1],[596.789 400 0],[597.973 200 0],[598.482 200 0],[598.713 100 1],[599.712 400 0],[602.711 200 1],[603.006 300 0],[603.132 400 0],[604.339 500 0],[605.257 150 1],[606.7 100 1],[606.906 500 0],[607.64 100 1],[608.541 200 1],[610.021 900 0],[610.64 400 0],[611.49 100 1],[615.176 400 0],[615.953 100 1],[616.316 400 0],[618.452 100 1],[620.891 200 1],[622.964 500 0],[623.779 400 0],[626.325 100 1],[627.269 400 0],[628.606 400 0],[630.829 500 0],[631.42 100 1],[632.384 700 0],[639.031 500 0],[642.964 100 1],[643.193 500 0],[643.657 100 1],[648.761 400 0],[651.034 400 0],[651.725 500 0],[651.943 200 1],[652.045 1000 0],[654.22 500 0],[655.848 100 1],[658.639 100 1],[659.229 100 1],[659.815 900 0],[659.866 800 0],[660.637 700 0],[662.523 800 0],[662.554 100 1],[664.981 700 0],[665.905 400 1],[666.125 100 1],[666.168 500 0],[666.376 400 0],[666.751 800 0],[667.747 700 0],[668.089 200 1],[668.555 500 0],[668.568 500 0],[669.009 150 1],[670.033 600 0],[670.627 100 1],[671.467 700 0],[671.726 500 0],[672.071 500 0],[672.75 700 0],[674.371 600 0],[674.991 900 0],[675.048 900 0],[675.645 200 1],[677.229 300 1],[677.878 400 0],[678.309 100 1],[679.687 100 1],[681.168 200 1],[683.33 800 0],[684.837 400 0],[685.858 50 1]}{1000}% +\wl@elt@search{#1}{Sm}{[380.089 800 1],[380.563 320 1],[380.846 420 1],[380.975 320 1],[380.988 320 1],[381.043 420 1],[381.207 500 1],[381.363 480 1],[381.463 420 1],[382.082 930 -1],[382.418 530 1],[382.62 1600 1],[383.029 530 1],[383.15 1100 1],[383.383 530 1],[383.448 560 0],[383.46 560 1],[383.572 370 1],[383.894 500 1],[384.045 400 1],[384.35 1600 1],[384.751 530 1],[384.878 640 1],[385.188 420 1],[385.33 530 0],[385.421 2700 1],[385.456 480 0],[385.59 800 1],[385.791 480 1],[385.874 400 0],[386.205 660 1],[386.223 350 1],[386.524 320 1],[387.178 800 1],[387.519 400 1],[387.554 560 1],[388.077 800 1],[388.138 450 1],[388.179 450 1],[388.25 320 1],[388.529 3700 1],[388.916 660 1],[389.008 610 1],[389.121 320 1],[389.405 400 1],[389.698 1600 1],[390.342 1300 1],[391.744 620 1],[392.24 2500 1],[392.828 1900 1],[393.576 470 1],[394.187 1300 1],[394.324 620 1],[394.651 500 1],[394.811 740 1],[395.189 470 0],[395.953 370 1],[396.3 1500 1],[396.604 620 1],[396.768 470 1],[397.053 740 1],[397.14 1500 1],[397.466 620 0],[397.627 960 1],[397.643 1000 1],[397.92 960 1],[398.314 740 1],[398.668 740 1],[398.743 370 1],[399 1500 1],[399.331 740 1],[400.346 280 1],[400.748 470 1],[401.998 280 1],[402.323 880 1],[403.511 740 1],[404.168 590 1],[404.272 740 1],[404.29 880 1],[404.411 240 1],[404.505 560 1],[404.616 440 1],[404.716 740 1],[404.862 210 1],[404.981 590 1],[405.887 440 1],[406.354 560 1],[406.432 280 1],[406.458 1400 1],[406.674 810 1],[406.833 710 1],[407.584 810 1],[407.665 280 1],[408.056 240 1],[408.26 410 1],[408.358 280 1],[408.44 220 1],[409.227 1000 1],[409.405 290 1],[410.413 240 1],[410.728 810 1],[410.94 410 1],[411.019 280 1],[411.39 410 1],[411.855 1900 1],[412.136 410 1],[412.251 280 1],[412.396 710 1],[412.923 280 1],[413.514 250 1],[414.771 320 1],[414.983 810 1],[415.221 1200 1],[415.333 530 1],[415.522 560 1],[416.948 810 1],[417.157 410 1],[417.802 440 1],[418.11 530 1],[418.333 210 0],[418.376 530 1],[418.813 1000 1],[419.193 410 1],[419.945 270 1],[420.292 650 1],[420.305 1100 1],[420.613 660 1],[420.662 270 1],[421.035 660 1],[422.066 740 1],[422.533 1000 1],[422.97 740 1],[423.457 620 1],[423.674 1200 1],[423.766 500 1],[424.47 620 1],[424.955 210 1],[425.178 250 1],[425.639 2100 1],[425.858 210 1],[426.268 1300 1],[426.508 500 1],[427.968 1200 1],[427.994 240 1],[428.079 2200 1],[428.221 710 0],[428.283 470 0],[428.35 240 0],[428.664 350 1],[429.218 350 1],[429.674 1600 0],[430.494 320 1],[430.901 880 1],[431.285 240 0],[431.894 1900 1],[431.953 470 0],[432.328 590 1],[432.446 240 0],[432.902 1800 1],[433.002 440 0],[433.415 1300 1],[433.614 880 0],[434.586 560 1],[434.78 1100 1],[435.046 560 1],[435.21 560 1],[436.072 560 1],[436.107 220 1],[436.204 810 1],[436.291 440 0],[436.345 220 1],[436.803 500 1],[436.992 210 1],[437.346 440 1],[437.498 320 1],[437.824 880 1],[438.042 530 0],[438.429 290 1],[439.086 1600 1],[439.335 210 0],[439.734 290 0],[440.117 410 0],[440.306 810 1],[440.336 410 1],[440.933 520 1],[441.158 290 0],[441.758 380 1],[441.933 470 0],[442.053 1500 1],[442.114 960 1],[442.434 2900 1],[442.966 470 0],[443.388 1600 1],[443.432 1800 1],[444.181 530 0],[444.228 440 0],[444.426 710 1],[444.515 710 0],[445.273 1300 1],[445.295 250 0],[445.463 1200 1],[445.852 1000 1],[445.929 250 0],[446.734 2200 1],[447.089 810 0],[447.243 470 1],[447.302 620 1],[447.866 740 1],[449.911 370 0],[449.948 370 1],[450.338 240 0],[450.505 180 1],[451.133 120 0],[451.183 560 1],[451.509 440 1],[451.963 880 1],[452.304 440 1],[452.391 650 1],[453.38 290 0],[453.651 270 1],[453.795 710 1],[453.853 150 1],[454.019 290 1],[454.206 380 1],[454.395 810 1],[454.483 100 1],[455.266 410 1],[455.445 270 1],[456.043 240 1],[456.621 470 1],[457.769 590 1],[458.158 290 0],[458.173 440 0],[458.483 560 1],[459.182 290 1],[459.354 380 1],[459.529 560 1],[459.674 240 0],[460.418 220 1],[460.651 290 1],[461.544 290 1],[461.569 470 1],[463.021 150 1],[464.224 880 1],[464.54 290 0],[464.668 290 1],[464.816 240 1],[464.949 380 0],[465.513 150 1],[466.356 290 0],[466.94 740 1],[466.965 620 1],[467.075 470 0],[467.46 1100 1],[467.691 680 1],[468.155 210 0],[468.718 370 1],[468.873 370 0],[469.363 130 1],[469.934 120 1],[470.44 530 1],[471.306 270 1],[471.526 130 1],[471.61 730 0],[471.707 270 0],[471.772 210 1],[471.833 190 1],[471.984 270 1],[472.602 130 1],[472.842 770 0],[474.568 470 1],[475.072 150 0],[476.027 730 0],[477.02 110 0],[477.415 110 1],[477.785 190 1],[478.31 580 0],[478.586 350 0],[478.996 160 0],[479.158 230 1],[481.581 430 1],[482.957 130 1],[484.17 970 0],[484.421 310 1],[484.776 140 1],[484.832 270 0],[485.436 120 1],[488.377 210 0],[488.397 730 0],[490.497 170 0],[491.04 630 0],[491.325 350 1],[491.899 430 0],[492.404 110 0],[493.81 120 1],[494.863 170 1],[495.237 120 1],[496.194 170 1],[497.598 170 0],[502.844 140 1],[504.428 400 0],[505.276 200 1],[506.946 170 1],[507.12 540 0],[510.022 170 1],[510.309 260 1],[510.448 140 1],[511.67 140 1],[511.716 510 0],[512.214 350 0],[515.503 360 1],[517.274 250 0],[517.542 470 0],[520.059 250 0],[525.192 260 0],[527.14 400 0],[528.291 250 0],[532.06 190 0],[534.129 110 0],[536.836 140 0],[540.523 130 0],[545.3 220 0],[546.672 140 0],[549.372 230 0],[551.21 80 0],[551.609 230 0],[554.895 50 0],[555.04 140 0],[557.342 45 0],[558.82 35 0],[560.086 50 1],[562.179 50 0],[562.601 70 0],[564.41 85 0],[565.986 140 0],[569.673 120 0],[570.62 85 0],[571.093 35 0],[573.295 50 0],[574.335 50 1],[575.952 45 1],[577.377 70 0],[577.833 60 0],[577.924 45 0],[578.193 45 1],[578.698 70 1],[578.838 60 0],[580.052 60 0],[580.284 65 0],[581.489 45 0],[583.102 45 1],[583.637 45 1],[586.078 35 0],[586.779 65 0],[586.861 45 0],[587.106 35 0],[587.421 50 0],[589.739 45 1],[589.896 50 0],[593.89 35 1],[596.571 65 1],[596.882 35 1],[598.429 35 0],[604.5 50 0],[604.539 45 0],[607.006 50 0],[608.412 45 0],[609.14 35 0],[611.066 45 1],[615.956 45 0],[624.676 45 1],[625.654 45 0],[625.666 45 1],[626.728 100 1],[629.182 50 1],[630.706 35 1],[632.747 70 1],[642.664 45 1],[647.234 45 1],[648.452 35 1],[649.867 35 1],[654.276 50 1],[656.931 140 1],[657.067 35 1],[658.521 40 1],[658.972 110 1],[660.183 40 1],[660.456 95 1],[663.228 40 1],[667.151 50 0],[667.921 70 1],[669.355 70 1],[672.307 40 0],[673.184 120 1],[673.406 70 1],[673.481 40 1],[674.147 55 1],[677.861 40 1],[679 60 1],[679.42 95 1],[684.471 55 1],[685.603 75 1],[686.093 120 0],[686.282 40 1],[695.051 30 1],[695.529 120 1],[702.044 90 1],[703.673 13 1],[703.922 90 1],[704.224 90 1],[704.915 13 1],[705.152 90 1],[705.497 16 1],[707.467 19 0],[708.237 90 1],[708.552 40 1],[708.83 26 0],[709.116 16 0],[709.55 30 0],[709.633 16 0],[710.454 30 0],[710.623 19 0],[711.596 26 0],[711.751 23 1],[711.981 26 1],[712.24 12 1],[712.511 23 1],[713.18 13 0],[713.601 10 0],[713.939 12 1],[714.398 40 1],[714.96 85 1],[717.267 10 0],[718.957 10 1],[721.095 9 0],[721.382 23 0],[721.809 26 1],[722.007 13 0],[723.702 13 1],[724.09 60 1],[725.711 9 1],[726.152 9 1],[727.925 13 0],[728.147 26 1],[728.221 8 0],[728.333 19 1],[728.892 16 1],[729.023 13 0],[730.072 26 1],[732.708 13 1],[733.265 13 0],[733.804 8 0],[734.73 26 0],[737.669 26 1],[739.398 13 1],[744.456 30 0],[744.541 26 0],[745.303 26 1],[747.076 13 0],[748.199 26 1],[750.239 23 1],[751.7 10 1],[754.142 23 1],[754.474 9 0],[754.657 10 0],[756.003 12 1],[756.294 19 1],[757.095 23 1],[757.229 23 1],[757.809 19 1],[758.585 30 1],[758.831 23 1],[759.801 10 0],[760.748 23 1],[761.394 12 1],[763.177 10 1],[763.794 23 1],[764.509 45 1],[764.582 12 0],[764.802 19 1],[765.578 10 1],[766.72 19 1],[767.249 8 1],[767.879 10 1],[769.578 10 0],[771.204 23 1],[772.856 30 1],[773.626 30 1],[774.93 30 1],[775.52 23 1],[779.45 10 0]}{3700}% +\wl@elt@search{#1}{Eu}{[380.136 70 -1],[380.754 95 1],[381.133 120 0],[381.55 120 1],[381.967 39000 1],[382.668 120 1],[384.423 140 1],[386.557 190 0],[387.272 45 0],[387.727 70 1],[388.475 150 0],[389.678 23 0],[390.018 23 0],[390.051 70 0],[390.71 28000 1],[391.524 45 1],[391.6 45 0],[391.729 230 0],[391.77 23 1],[391.852 40 0],[391.909 100 1],[392.887 40 1],[393.048 32000 1],[394.156 55 1],[394.221 30 1],[394.294 60 1],[394.308 120 1],[394.459 30 1],[394.567 30 1],[394.913 30 1],[394.96 60 0],[395.076 45 1],[395.133 55 1],[395.575 60 0],[395.792 40 1],[396.361 30 0],[396.49 120 1],[396.659 150 1],[396.718 45 0],[397.196 30000 1],[397.842 60 0],[397.963 30 1],[398.66 55 0],[398.824 40 1],[399.393 30 1],[399.598 55 1],[400.371 60 1],[401.169 180 1],[401.758 150 1],[403.919 120 0],[407.824 45 0],[408.538 120 1],[409.68 75 1],[410.688 60 0],[411.204 90 1],[411.93 45 1],[412.728 75 0],[412.97 33000 1],[413.659 30 1],[413.707 40 0],[414.102 30 1],[414.172 60 1],[415.152 30 1],[415.164 45 1],[415.772 30 0],[417.28 110 1],[417.516 30 1],[418.222 110 0],[419.536 40 1],[419.618 40 1],[420.505 60000 1],[422.108 45 1],[422.388 40 1],[422.74 90 1],[422.933 75 1],[423.245 75 1],[423.751 90 1],[423.869 45 1],[424.474 45 0],[424.706 45 1],[425.38 45 1],[427.024 30 1],[429.873 150 0],[432.936 90 0],[432.997 75 0],[433.061 60 1],[433.118 40 0],[433.768 90 0],[435.509 240 1],[436.157 27 1],[436.947 55 1],[437.22 45 1],[438.317 75 1],[438.788 90 0],[440.527 21 1],[440.707 55 1],[441.966 18 1],[443.481 120 1],[443.556 14000 1],[446.497 75 1],[448.515 24 1],[452.257 3000 1],[453.559 45 0],[459.403 11000 0],[460.263 21 0],[462.722 9800 0],[466.188 8300 0],[471.359 30 0],[474.05 27 0],[479.259 45 0],[482.93 40 0],[483.033 60 0],[484.047 40 0],[484.964 60 0],[486.762 110 0],[488.405 40 0],[489.468 90 0],[490.086 60 0],[490.718 150 0],[491.14 180 0],[495.352 55 0],[496.021 55 0],[496.255 55 0],[497.576 45 0],[501.317 180 0],[502.291 170 0],[502.954 110 0],[503.355 90 0],[506.795 75 0],[509.269 75 0],[509.644 90 0],[511.437 170 0],[512.477 90 0],[512.91 170 0],[513.008 90 0],[513.352 210 0],[516.007 270 0],[516.67 210 0],[519.374 60 0],[519.985 200 0],[520.096 110 0],[520.644 120 0],[521.51 750 0],[522.349 300 0],[523.924 120 0],[526.64 200 0],[527.196 390 0],[527.248 110 0],[528.282 150 0],[528.725 55 0],[528.925 60 0],[529.126 120 0],[529.368 60 0],[529.464 120 0],[530.385 90 0],[535.041 30 0],[535.169 75 0],[535.284 40 0],[535.51 90 0],[535.761 540 0],[536.083 60 0],[536.161 120 0],[537.694 110 0],[539.294 120 0],[540.277 450 0],[540.533 45 0],[541.186 45 0],[542.107 55 0],[542.694 90 0],[544.356 40 0],[545.151 380 0],[545.294 260 0],[545.762 40 0],[547.232 90 0],[548.865 120 0],[549.52 45 0],[550.083 15 0],[551.052 120 0],[552.663 30 0],[553.325 30 0],[554.254 30 0],[554.744 200 0],[557.033 150 0],[557.714 200 0],[557.963 75 0],[558.003 120 0],[558.624 90 0],[558.683 75 0],[559.225 18 0],[559.98 18 0],[560.586 18 0],[561.881 40 0],[562.244 60 0],[563.254 75 0],[564.58 210 0],[565.111 15 0],[567.385 60 0],[568.11 27 0],[568.424 27 0],[573.087 60 0],[573.9 60 0],[576.52 330 0],[578.369 180 0],[579.272 15 0],[580.027 60 0],[581.874 170 1],[583.098 600 0],[584.577 27 0],[586.097 27 0],[586.477 15 0],[587.298 90 1],[589.531 15 0],[590.297 27 0],[590.994 12 0],[591.574 75 0],[592.53 12 0],[592.652 27 0],[594.272 45 0],[595.349 27 0],[595.384 27 1],[595.428 30 0],[596.376 90 0],[596.607 330 1],[596.71 480 0],[596.843 15 0],[597.169 30 0],[597.275 170 0],[598.047 15 0],[598.314 27 0],[598.378 27 0],[599.283 240 0],[600.436 60 0],[600.561 15 0],[601.22 60 0],[601.256 110 0],[601.558 60 0],[601.815 420 0],[602.315 60 0],[602.9 170 0],[604.466 60 0],[604.951 420 1],[605.736 140 0],[607.558 90 0],[607.738 30 0],[608.384 240 0],[609.935 240 0],[610.815 60 0],[611.878 120 0],[612.467 60 0],[617.305 330 1],[617.876 110 0],[618.813 260 0],[619.507 140 0],[620.76 15 0],[623.051 15 0],[623.373 90 0],[625.047 55 0],[626.225 240 0],[626.695 55 0],[628.595 15 0],[629.134 60 0],[629.977 170 0],[630.341 230 1],[631.378 24 0],[631.858 15 0],[633.582 75 0],[635.004 120 0],[635.589 60 0],[636.925 60 0],[638.273 55 0],[638.386 75 0],[640.093 120 0],[640.611 40 0],[641.004 180 0],[641.132 140 0],[642.829 55 0],[643.764 830 1],[643.993 18 0],[645.796 120 0],[647.07 12 0],[648.302 18 0],[650.155 45 0],[651.959 60 0],[652.272 15 0],[654.912 8 0],[656.787 75 0],[659.379 45 0],[660.355 18 0],[664.511 1400 1],[668.521 26 0],[669.396 95 0],[670.106 7 0],[671.045 12 0],[674.488 30 0],[678.254 30 0],[678.748 14 0],[680.272 140 0],[681.606 35 0],[683.43 11 0],[684.093 17 0],[684.483 17 0],[684.704 14 0],[686.454 360 0],[689.821 21 0],[690.367 60 0],[691.017 14 0],[691.482 30 0],[704.02 120 0],[707.454 12 0],[707.71 330 1],[710.648 100 0],[716.466 6 0],[717.555 30 0],[719.481 570 1],[721.755 570 1],[722.468 11 0],[725.872 15 0],[726.277 30 0],[728.153 11 0],[729.756 6 0],[730.117 540 1],[731.046 11 0],[731.363 12 0],[733.618 55 0],[734.625 4 0],[735.665 4 0],[736.225 11 0],[736.96 55 0],[737.022 720 1],[738.736 4 0],[738.916 12 0],[740.441 11 0],[742.657 300 1],[743.659 21 0],[747.053 8 0],[749.1 5 0],[752.87 50 0],[753.302 5 0],[754.732 6 0],[758.391 160 0],[774.257 60 0],[774.619 70 0],[483.798 10 2],[666.635 50 2],[722.184 30 2],[769.044 20 2]}{60000}% +\wl@elt@search{#1}{Gd}{[380.129 720 1],[380.439 210 0],[380.509 210 1],[380.552 560 1],[381.397 3700 1],[381.474 430 1],[381.664 770 1],[381.875 430 1],[382.605 350 1],[382.733 230 1],[382.946 230 1],[383.18 370 1],[383.297 210 0],[383.499 330 1],[383.691 970 1],[383.964 1000 1],[384.22 1200 1],[384.328 1400 0],[384.458 1400 1],[385.069 3300 1],[385.097 5100 1],[385.245 4300 1],[385.556 470 1],[386.305 250 1],[386.699 1600 0],[387.357 250 0],[387.546 220 1],[389.47 1500 1],[389.579 450 1],[390.24 750 1],[390.271 300 0],[390.429 240 0],[390.565 450 0],[391.651 2200 1],[392.325 450 1],[393.479 1200 0],[393.538 220 0],[394.18 450 0],[394.263 590 0],[394.324 270 0],[394.362 220 0],[394.554 1400 0],[395.2 300 1],[395.337 590 0],[395.767 1200 1],[395.944 750 1],[396.366 220 1],[396.628 590 0],[396.826 590 1],[396.9 750 0],[396.929 270 1],[397.175 450 1],[397.271 390 0],[397.398 590 1],[397.481 300 0],[397.933 750 0],[398.721 450 1],[398.784 470 0],[399.269 320 0],[399.321 220 1],[399.416 650 1],[399.632 700 1],[399.776 320 1],[400.126 470 1],[400.494 260 1],[400.833 320 0],[400.891 300 1],[401.38 300 1],[401.558 200 0],[401.725 300 0],[401.771 430 0],[401.973 300 0],[402.233 300 1],[402.314 1100 0],[402.335 810 0],[402.761 220 0],[402.815 1100 0],[403.088 860 0],[403.349 700 0],[403.54 340 0],[403.684 260 0],[403.733 1400 1],[403.79 700 1],[404.371 410 0],[404.501 1600 0],[404.684 270 1],[404.709 270 0],[404.92 270 0],[404.943 1300 1],[404.986 2200 1],[405.037 270 0],[405.329 810 1],[405.364 2600 0],[405.472 810 0],[405.822 2600 0],[405.988 650 0],[406.13 270 1],[406.259 650 1],[406.339 1900 1],[406.359 540 1],[406.604 260 0],[406.835 520 0],[406.874 260 0],[407.029 750 1],[407.32 650 1],[407.376 300 1],[407.844 1300 1],[407.87 2800 0],[408.37 520 0],[408.556 1500 1],[408.769 260 1],[409.041 650 0],[409.271 1100 0],[409.372 260 0],[409.448 260 1],[409.861 2600 1],[409.89 520 1],[410.026 650 0],[411.144 390 1],[413.037 2200 1],[413.148 270 1],[413.228 1100 1],[413.416 750 0],[413.71 410 1],[414.886 280 0],[416.273 540 1],[416.309 280 1],[416.716 280 1],[417.554 2400 0],[418.425 2400 1],[419.078 2200 0],[419.107 750 1],[419.163 750 0],[419.768 450 1],[420.486 590 1],[421.2 1300 1],[421.502 970 1],[421.72 650 1],[422.503 320 0],[422.585 4800 0],[422.714 220 1],[422.98 220 1],[423.878 650 1],[424.657 200 1],[425.173 1700 1],[425.337 860 1],[425.361 650 1],[426.012 810 0],[426.209 1600 0],[426.66 650 0],[426.7 470 0],[427.417 300 0],[428.049 910 1],[428.582 430 0],[428.612 300 0],[429.608 540 1],[429.717 220 1],[429.929 430 0],[430.634 1100 0],[430.929 260 0],[431.384 1800 0],[431.44 520 0],[431.605 520 1],[432.052 370 0],[432.111 750 1],[432.557 2600 1],[432.712 1900 0],[432.958 370 0],[433.061 340 1],[433.138 240 0],[434.128 450 1],[434.218 910 1],[434.43 1000 1],[434.646 2200 0],[434.662 910 0],[434.731 220 1],[436.977 300 1],[437.383 970 0],[439.206 280 0],[440.186 1400 0],[440.314 520 0],[440.667 260 1],[440.825 260 1],[440.925 220 0],[441.116 520 0],[441.416 860 0],[441.473 700 0],[441.903 340 1],[442.241 1400 0],[443.063 1100 0],[443.61 240 0],[446.474 300 0],[446.655 300 1],[446.708 520 0],[447.413 700 0],[447.612 860 0],[447.88 220 1],[448.106 280 1],[448.333 220 1],[448.47 220 0],[448.69 280 0],[449.713 500 0],[449.732 220 0],[450.621 430 0],[450.633 140 1],[451.45 140 1],[451.966 1100 0],[452.282 300 1],[452.412 150 0],[453.781 910 0],[454.002 220 1],[454.203 300 0],[454.8 240 0],[455.808 120 1],[457.381 130 0],[457.591 260 0],[457.959 280 0],[458.129 410 0],[458.253 130 1],[458.307 410 0],[458.699 160 0],[459.698 220 1],[459.791 320 1],[459.89 410 0],[460.105 340 1],[460.293 240 0],[461.45 520 0],[462.442 140 0],[463.664 430 0],[463.9 110 1],[464.004 170 0],[464.6 170 0],[464.764 170 0],[464.859 170 0],[465.354 430 0],[467.087 140 0],[467.918 170 0],[468.004 260 0],[468.333 430 0],[468.812 140 0],[469.433 700 0],[469.549 170 0],[469.742 430 0],[470.313 170 0],[470.978 200 0],[472.146 110 0],[472.847 150 1],[473.26 220 1],[473.575 260 0],[474.365 410 0],[474.582 110 0],[475.87 320 0],[476.074 110 0],[476.382 130 0],[476.724 470 0],[478.192 180 0],[478.462 300 0],[478.675 110 0],[480.105 140 1],[480.745 220 0],[482.169 320 0],[483.526 130 0],[484.81 110 0],[486.259 110 0],[486.502 170 1],[487.15 120 0],[493.412 280 0],[493.861 220 0],[495.247 110 0],[495.879 130 0],[501.082 65 1],[501.174 55 0],[501.504 750 0],[502.313 55 1],[503.129 65 1],[503.909 75 0],[505.088 65 1],[507.374 55 0],[508.28 55 0],[509.225 95 1],[509.606 65 1],[509.838 130 1],[510.094 55 1],[510.345 910 0],[510.891 180 1],[512.556 120 1],[513.028 65 1],[513.559 65 0],[513.604 75 0],[514.084 85 1],[514.15 75 0],[514.268 75 0],[515.584 860 0],[515.676 55 1],[515.848 75 0],[516.37 75 0],[516.454 55 1],[517.628 190 1],[518.724 55 1],[518.788 55 0],[519.108 55 1],[519.777 410 0],[521.049 55 1],[521.748 85 0],[521.94 280 0],[522.03 75 1],[523.393 130 0],[524.687 65 0],[525.118 320 0],[525.214 120 1],[525.475 85 0],[525.58 140 0],[526.878 65 0],[527.291 55 0],[528.248 55 0],[528.308 280 0],[530.167 280 0],[530.276 220 0],[530.67 55 0],[530.73 280 0],[532.15 130 0],[532.178 280 0],[532.732 110 0],[532.83 65 0],[533.33 170 0],[533.753 55 0],[534.3 300 0],[534.513 85 0],[534.568 75 0],[534.867 200 0],[535.038 300 0],[535.326 240 0],[536.166 55 0],[536.538 95 0],[536.992 95 0],[537.063 150 0],[538.95 85 0],[541.32 85 0],[541.569 85 0],[545.346 65 0],[558.368 55 1],[559.185 55 0],[561.791 190 0],[562.955 65 0],[563.225 110 0],[564.324 260 0],[568.089 55 -1],[569.622 390 0],[570.135 95 0],[570.942 65 0],[573.386 120 1],[574.636 85 0],[575.417 85 0],[577.602 75 0],[579.138 240 0],[579.68 65 0],[580.292 55 0],[580.772 55 0],[580.922 55 0],[581.585 55 1],[581.951 65 -1],[584.047 55 1],[585.163 220 0],[585.524 55 1],[585.622 280 0],[586.073 55 1],[587.726 65 1],[588.646 55 0],[590.407 55 1],[590.456 110 0],[591.145 170 1],[591.355 65 1],[591.677 55 0],[593.029 85 0],[593.684 85 0],[593.771 65 0],[594.095 55 -1],[594.278 55 -1],[595.16 55 1],[595.648 55 1],[597.725 85 0],[598.802 110 0],[599.908 85 0],[600.096 65 -1],[600.187 75 -1],[600.457 55 1],[600.871 55 0],[602.113 55 0],[608.065 55 1],[611.407 430 0],[618.042 55 1],[618.268 110 -1],[620.086 110 -1],[621.171 110 -1],[622.093 110 -1],[623.162 55 -1],[624.166 75 -1],[625.212 55 -1],[626.264 55 -1],[627.3 45 -1],[628.973 85 1],[629.287 30 0],[630.515 75 1],[630.911 30 1],[631.719 27 0],[633.135 40 0],[633.375 17 0],[633.634 17 0],[634.665 27 1],[635.172 27 0],[636.323 17 0],[638.095 40 1],[638.219 17 1],[640.855 22 0],[642.242 22 1],[642.452 17 0],[647.029 19 0],[648.011 15 1],[653.815 40 0],[654.925 22 0],[656.478 55 0],[656.8 10 1],[657.38 10 0],[659.16 30 0],[659.342 15 0],[661.004 10 1],[663.436 50 1],[664.008 35 0],[664.276 10 0],[664.398 30 0],[664.685 10 0],[665.355 10 0],[667.956 10 1],[668.123 35 1],[669.286 10 0],[670.418 10 1],[671.814 14 1],[672.783 17 1],[673.073 85 0],[675.267 50 1],[675.391 14 1],[678.339 14 0],[678.633 26 1],[678.718 10 0],[681.456 12 0],[681.649 26 0],[682.09 17 0],[682.825 100 0],[684.66 35 1],[685.713 30 1],[686.425 15 0],[688.763 21 1],[690.073 14 1],[691.657 100 0],[692.062 21 1],[692.499 15 1],[692.649 21 0],[694.598 17 1],[695.774 15 1],[695.924 15 1],[696.433 14 0],[697.166 15 1],[697.635 12 1],[697.827 10 1],[698.086 26 0],[698.589 50 1],[698.875 10 1],[699.192 75 0],[699.318 21 0],[699.676 60 1],[700.075 17 1],[700.616 45 1],[701.66 10 0],[703.726 21 1],[705.1 14 1],[705.462 13 1],[705.802 10 1],[706.809 10 1],[707.1 18 0],[707.363 18 0],[709.811 14 0],[709.873 14 0],[711.677 10 1],[711.886 21 1],[712.257 35 0],[713.573 13 1],[714.731 18 1],[715.828 13 0],[716.837 170 0],[717.226 21 1],[718.957 28 1],[719.708 13 1],[720.141 13 1],[722.802 10 0],[723.345 25 0],[725.27 14 1],[726.266 28 0],[729.135 14 0],[731.328 21 0],[732.489 18 1],[737.381 14 0],[737.641 14 0],[737.727 13 1],[738.028 13 0],[739.49 13 1],[743.019 13 0],[744.185 35 0],[746.436 40 0],[756.297 55 0],[756.319 10 1],[758.82 10 0],[761.178 10 0],[762.196 21 0],[765.032 21 0],[767.256 25 0],[767.606 10 0],[769.445 13 0],[773.35 80 0],[774.93 35 0],[775.597 10 0],[776.648 10 1],[383.173 300 2],[391.024 300 2],[401.691 300 2],[417.726 600 2],[427.996 400 2],[431.428 300 2],[444.591 300 2],[468.425 600 2],[471.506 600 2],[478.279 600 2],[497.672 250 2],[509.17 5000 2],[512.406 300 2],[534.795 1800 2],[536.596 3000 2],[541.262 1100 2],[555.33 4000 2],[558.788 3000 2],[565.898 3000 2],[578.696 1800 2],[586.209 1500 2],[598.785 1500 2]}{5100}% +\wl@elt@search{#1}{Tb}{[380.18 330 1],[380.685 760 1],[383.026 1500 0],[383.342 540 0],[384.25 920 1],[384.561 370 1],[384.873 3700 1],[386.975 450 1],[387.417 3500 1],[388.334 330 0],[388.822 480 0],[389.464 490 0],[389.599 330 0],[389.658 330 1],[389.789 330 0],[389.92 2400 1],[390.133 1600 0],[390.806 480 0],[390.914 380 0],[390.955 330 0],[391.543 650 0],[391.952 480 1],[392.21 300 1],[392.274 480 1],[392.545 760 1],[393.524 650 1],[393.952 810 1],[394.689 650 1],[395.836 350 1],[397.684 2200 1],[398.187 1800 1],[398.385 300 1],[399.94 350 1],[400.219 350 1],[400.259 970 1],[400.547 1900 1],[401.004 300 0],[401.275 760 1],[401.326 330 0],[401.914 370 1],[402.047 540 1],[402.288 220 0],[402.477 370 0],[403.166 520 1],[403.228 870 0],[403.303 2100 1],[403.622 350 0],[403.886 210 0],[405.186 300 1],[405.287 300 1],[405.412 430 0],[406.037 410 0],[406.087 220 1],[406.158 1300 0],[406.389 220 1],[406.622 390 1],[407.522 260 0],[408.124 390 0],[408.66 210 0],[409.219 210 0],[409.437 260 1],[409.449 260 0],[410.39 260 1],[410.537 650 0],[411.25 300 0],[411.992 260 0],[414.351 280 0],[414.441 1100 1],[415.853 350 0],[416.909 240 0],[416.932 240 0],[417.105 240 0],[417.26 240 0],[417.282 240 0],[417.347 260 0],[418.621 240 0],[418.716 300 0],[419.674 390 0],[420.1 450 1],[420.374 650 0],[420.649 600 0],[421.35 300 0],[421.442 300 1],[421.509 480 0],[421.756 300 0],[421.916 260 0],[422.428 260 0],[422.645 480 1],[423.189 260 0],[423.282 480 0],[423.535 300 0],[425.524 370 0],[425.823 480 1],[426.366 260 0],[426.634 650 0],[426.969 330 0],[427.521 220 0],[427.852 760 1],[428.513 300 1],[428.97 300 0],[429.836 370 0],[429.99 300 0],[430.295 240 0],[430.718 240 0],[431.042 450 0],[431.156 300 0],[431.325 370 0],[431.883 2200 0],[432.223 600 0],[432.583 600 1],[432.643 3000 0],[432.89 240 0],[433.212 600 0],[433.643 870 0],[433.764 600 0],[433.841 1700 0],[434.062 700 0],[434.253 430 0],[435.32 430 1],[435.609 280 0],[435.681 870 0],[436.016 280 0],[436.73 220 1],[437.202 220 0],[438.245 330 0],[438.823 300 0],[439.091 260 0],[441.627 200 1],[442.019 140 0],[442.31 350 0],[443.272 110 0],[443.612 240 0],[443.938 110 0],[444.804 240 0],[446.769 110 0],[449.307 430 0],[450.904 45 1],[451.152 150 0],[451.296 45 1],[451.431 75 1],[451.972 45 1],[452.501 45 1],[452.976 45 -1],[453.183 45 1],[453.413 45 0],[453.714 45 0],[453.723 45 0],[454.907 110 0],[454.972 45 1],[455.045 110 0],[455.646 110 0],[456.224 55 1],[456.369 110 1],[456.485 30 1],[457.319 55 1],[457.869 210 1],[458.484 65 1],[459.156 65 1],[459.238 45 0],[460.41 45 1],[461.196 30 0],[461.592 45 1],[461.749 27 0],[461.936 30 1],[462.632 75 1],[462.694 95 1],[463.207 65 0],[463.659 65 0],[463.699 30 1],[464.1 85 1],[464.198 210 1],[464.531 260 1],[464.723 80 0],[465.838 60 0],[465.873 20 -1],[466.279 80 0],[466.545 50 0],[466.94 40 0],[467.69 80 0],[468.187 70 0],[468.252 50 0],[468.279 25 1],[468.863 80 1],[469.311 80 1],[469.339 30 1],[470.241 200 1],[470.794 110 1],[471.607 40 1],[472.816 40 1],[473.42 60 0],[473.993 80 0],[474.78 70 0],[475.253 410 1],[475.844 40 1],[476.019 40 1],[476.237 30 1],[476.447 25 1],[477.836 35 1],[477.88 35 1],[478.678 180 0],[478.991 40 1],[480.187 30 1],[481.377 100 0],[483.759 60 1],[484.039 25 0],[484.269 30 1],[484.489 30 1],[485.481 30 0],[485.654 20 1],[485.887 30 1],[487.557 80 1],[487.612 25 1],[488.115 80 1],[489.433 29 -1],[491.59 95 0],[492.409 35 0],[492.683 35 0],[492.893 50 0],[493.179 65 0],[497.099 29 1],[497.142 29 0],[497.304 29 0],[498.016 29 1],[498.056 29 0],[499.382 85 1],[499.584 50 1],[499.795 55 0],[500.61 29 1],[502.216 50 0],[502.424 29 1],[502.465 29 0],[503.312 50 0],[504.206 50 1],[505.43 55 0],[506.579 55 0],[507.825 110 0],[508.005 24 1],[508.111 24 0],[508.912 75 1],[508.966 24 0],[510.109 24 0],[510.856 24 0],[511.839 35 0],[512.018 24 0],[513.169 50 0],[514.108 50 1],[514.758 50 0],[516.427 24 0],[517.013 29 0],[517.061 24 0],[517.651 50 0],[517.997 50 0],[518.459 50 0],[518.613 85 0],[518.848 50 0],[519.886 50 0],[520.277 35 0],[520.455 40 0],[520.797 40 0],[521.428 40 0],[522.199 40 0],[522.812 120 0],[523.511 40 0],[524.871 75 0],[526.211 75 1],[527.503 24 0],[528.105 75 0],[530.472 65 0],[530.819 29 0],[530.946 29 0],[531.923 110 0],[533.104 35 0],[533.79 65 0],[533.859 35 0],[534.783 24 1],[535.488 160 0],[536.972 75 0],[537.598 75 0],[540.206 29 1],[541.365 29 0],[541.62 29 0],[542.41 50 1],[542.643 29 0],[544.338 35 0],[545.7 29 0],[545.981 55 0],[547.034 29 1],[548.145 24 0],[550.961 55 0],[551.454 50 0],[552.412 65 0],[552.562 24 0],[556.593 35 0],[563.88 29 0],[568.574 29 1],[568.648 40 0],[574.758 85 0],[576.266 24 0],[578.518 24 1],[579.564 75 0],[580.313 75 1],[581.536 65 0],[584.297 29 0],[585.107 65 0],[587.062 65 0],[589.884 35 0],[590.24 24 0],[590.471 35 0],[592.078 65 0],[593.938 50 0],[594.017 35 0],[595.117 24 0],[596.734 75 1],[603.897 29 0],[603.938 29 0],[610.429 24 1],[629.243 24 0],[633.168 35 1],[633.491 24 1],[644.687 24 1],[651.868 35 0],[657.404 24 1],[658.182 35 0],[660.717 30 1],[667.794 90 1],[670.261 40 0],[670.679 20 1],[678.512 30 1],[679.458 130 1],[687.418 40 1],[689.637 55 1],[689.995 45 0],[690.198 40 0],[700.599 9 1],[708.285 17 1],[708.922 11 1],[711.269 11 0],[718.748 10 0],[719.589 10 1],[720.428 65 0],[723.498 19 0],[725.773 40 0],[731.157 17 0],[734.888 45 1],[739.827 10 1],[742.424 15 1],[742.962 10 1],[747.215 9 0],[748.454 22 0],[749.545 9 0],[749.612 45 0],[749.969 17 1],[751.14 27 0],[751.977 9 1],[755.759 6 1],[758.203 27 1],[758.749 27 0],[759.024 45 0],[759.644 65 0],[760.118 17 1],[761.601 17 1],[762.405 22 0],[762.781 30 0],[763.905 9 1],[767.272 8 1],[769.474 8 1],[770.616 22 1],[772.697 22 1],[773.763 30 0],[779.32 22 0]}{3700}% +\wl@elt@search{#1}{Dy}{[380.414 510 1],[380.627 580 1],[381.227 470 0],[381.367 470 1],[381.676 1400 1],[382.568 700 1],[383.65 2300 1],[384.089 370 0],[384.131 1400 1],[384.2 330 1],[384.436 330 0],[384.634 420 1],[384.702 420 0],[384.939 330 1],[385.303 1200 1],[385.84 420 0],[386.658 370 1],[386.845 560 1],[386.881 1600 0],[386.942 300 1],[386.986 820 1],[387.211 7000 1],[387.399 1200 1],[387.911 470 1],[388.199 300 1],[389.853 5800 1],[391.487 540 1],[391.559 540 1],[391.729 540 0],[392.338 320 1],[392.786 420 0],[393.014 540 0],[393.152 2100 1],[393.222 320 1],[393.3 370 1],[393.421 320 1],[393.67 420 0],[394.253 540 1],[394.468 10000 1],[394.693 420 1],[395.039 540 1],[395.455 420 1],[395.779 800 1],[396.259 370 0],[396.751 320 0],[396.839 14000 1],[397.857 2700 1],[398.192 1400 1],[398.365 1600 1],[398.421 800 1],[399.132 540 1],[399.669 1600 1],[400.045 8000 1],[400.584 420 0],[400.607 320 0],[401.129 540 1],[401.382 540 0],[401.47 540 1],[402.371 370 0],[402.778 420 1],[402.832 520 1],[403.247 520 1],[403.365 420 1],[403.632 420 1],[404.198 320 1],[404.597 12000 0],[405.056 1600 1],[405.514 520 1],[407.312 2500 1],[407.796 7400 1],[408.534 370 0],[409.61 390 0],[410.33 3900 1],[410.387 860 0],[411.134 1500 1],[412.463 490 1],[412.824 390 1],[412.912 350 0],[412.942 990 1],[413.035 350 0],[413.385 390 0],[414.15 470 1],[414.31 1200 1],[414.606 990 0],[416.797 5700 0],[417.193 370 0],[418.372 930 0],[418.682 12000 0],[419.094 320 0],[419.164 2200 0],[419.484 6800 0],[419.519 320 1],[419.802 800 0],[420.13 680 0],[420.224 680 0],[420.506 230 0],[420.654 370 1],[421.124 440 0],[421.172 16000 0],[421.318 1800 0],[421.516 3700 0],[421.809 4400 0],[422.111 4400 0],[422.221 540 0],[422.516 2700 0],[423.202 680 0],[423.985 680 0],[424.591 440 0],[425.633 440 1],[427.669 250 0],[429.493 370 1],[430.863 1000 1],[432.586 320 0],[435.844 200 1],[437.424 320 1],[437.476 320 1],[440.938 540 1],[444.458 150 0],[444.97 740 1],[445.56 110 1],[446.814 250 1],[452.758 100 0],[454.166 100 1],[456.509 140 0],[457.778 420 0],[458.936 2100 0],[461.226 990 0],[461.383 50 0],[461.482 50 0],[461.726 60 1],[462.003 140 1],[466.272 50 0],[466.466 110 1],[467.36 85 1],[468.203 50 1],[468.975 50 1],[469.868 95 1],[472.122 85 0],[472.713 70 1],[473.184 170 1],[474.573 40 1],[475.499 60 1],[476.004 50 1],[477.194 60 0],[477.48 50 0],[477.579 120 0],[478.692 75 1],[479.129 95 0],[480.064 29 0],[480.794 50 0],[481.028 40 0],[481.28 50 0],[481.904 75 0],[482.496 85 0],[482.888 75 0],[482.968 50 1],[483.238 70 0],[483.375 35 1],[484.175 75 0],[485.624 40 1],[486.805 40 1],[487.593 40 0],[488.016 85 0],[488.455 40 0],[488.808 95 0],[488.933 40 1],[489.01 75 1],[489.368 50 0],[489.924 24 0],[491.641 55 0],[492.222 50 1],[492.316 65 1],[495.734 480 1],[495.959 24 0],[497.357 28 0],[498.552 40 0],[500.387 50 0],[500.428 55 1],[501.06 24 0],[501.798 24 1],[502.212 70 0],[502.403 30 0],[502.454 24 0],[502.787 40 0],[503.3 50 0],[504.263 160 0],[504.725 24 0],[505.021 50 0],[505.335 30 0],[505.546 24 0],[507.068 95 0],[507.767 120 0],[509.038 80 1],[511.032 80 0],[512.004 130 0],[513.502 30 0],[513.96 190 1],[516.103 40 1],[516.412 40 1],[516.534 50 0],[516.969 110 1],[517.29 20 1],[518.53 80 0],[518.845 40 1],[519.286 290 1],[519.766 95 1],[524.694 50 1],[525.988 70 0],[526.056 130 0],[526.33 55 -1],[526.711 65 0],[527.225 50 1],[527.529 50 1],[527.97 50 1],[528.207 55 0],[528.499 28 1],[529.782 40 1],[530.158 160 0],[530.902 40 1],[532.469 50 0],[533.743 24 1],[534.03 65 0],[535.211 30 0],[536.82 30 1],[538.563 20 1],[538.958 85 1],[539.557 40 0],[539.826 20 -1],[539.993 24 1],[540.419 50 0],[541.913 80 0],[542.332 70 0],[542.427 30 0],[542.67 40 1],[544.334 30 1],[545.111 95 0],[545.547 30 1],[546.91 24 1],[549.683 28 0],[550.279 24 0],[550.652 28 0],[551.541 24 1],[552.801 30 0],[554.727 65 0],[560.065 40 1],[560.553 24 0],[561.323 30 0],[562.749 20 0],[563.95 100 0],[564.599 55 0],[565.201 80 0],[568.558 24 0],[569.367 28 -1],[569.41 24 -1],[569.454 28 -1],[569.872 28 1],[570.291 24 0],[571.846 70 0],[572.584 28 -1],[572.864 55 -1],[573.873 24 -1],[574.02 50 0],[574.553 55 0],[575.048 24 0],[575.879 24 0],[583.201 80 -1],[583.385 55 -1],[583.486 40 -1],[584.441 28 -1],[584.565 24 -1],[584.805 40 -1],[585.556 40 -1],[586.811 55 1],[591.516 40 1],[592.456 20 1],[594.58 70 0],[596.446 50 0],[597.449 120 0],[598.486 24 0],[598.856 140 0],[600.575 24 -1],[600.654 24 -1],[600.697 24 -1],[600.894 30 0],[601.082 65 0],[601.726 24 0],[603.098 24 0],[604.249 24 -1],[605.818 24 0],[608.506 30 0],[608.826 140 0],[612.715 24 0],[613.364 24 0],[615.828 24 0],[616.843 100 0],[619.623 20 1],[625.909 270 0],[626.036 30 0],[634.332 14 0],[638.68 40 0],[639.66 24 1],[642.192 50 0],[643.655 13 0],[646.083 8 0],[646.858 10 1],[647.491 11 0],[648.359 20 1],[648.659 28 0],[655.802 20 0],[657.937 160 0],[659.414 14 1],[664.337 15 0],[665.836 22 0],[666.164 29 0],[666.786 75 0],[670.064 10 1],[674.793 29 0],[675.762 10 0],[676.589 45 0],[681.82 12 0],[683.542 180 0],[685.296 80 0],[685.646 22 0],[688.883 22 0],[689.797 15 1],[689.932 65 1],[690.653 22 1],[692.955 15 0],[695.028 29 1],[695.142 11 0],[695.808 40 0],[698.244 13 0],[699.13 13 0],[699.81 45 0],[701.742 20 0],[705.595 35 1],[707.514 24 1],[710.926 17 1],[712.081 11 1],[717.511 13 1],[721.327 11 0],[723.004 17 0],[725.001 13 0],[734.513 17 1],[737.023 11 1],[737.604 20 0],[740.759 11 0],[741.237 24 0],[742.686 55 1],[745.705 20 1],[751.661 17 1],[754.373 55 0],[755.3 17 0],[755.978 27 0],[756.296 40 1],[757.746 20 1],[759.13 27 0],[761.155 13 0],[761.77 11 0],[764.109 35 0],[764.586 17 0],[764.664 13 0],[766.236 80 0],[766.678 11 1],[771.533 35 0],[772.976 45 1],[775.162 20 1]}{16000}% +\wl@elt@search{#1}{Ho}{[381.073 8900 1],[381.186 490 0],[381.325 900 1],[382.173 300 1],[382.927 390 0],[383.19 320 1],[383.535 410 1],[383.751 1300 1],[384.205 410 1],[384.386 1100 1],[384.673 490 1],[384.988 300 0],[385.24 320 1],[385.407 1800 1],[385.694 390 1],[385.772 720 1],[386.168 2700 1],[386.262 540 0],[387.205 360 1],[387.409 320 1],[387.468 630 1],[388.161 540 1],[388.896 3000 1],[389.042 490 0],[389.102 13000 1],[389.676 540 1],[390.223 290 1],[390.444 320 0],[390.568 1300 1],[391.18 320 0],[391.945 320 0],[393.644 320 1],[393.885 220 0],[394.053 320 1],[395.056 220 0],[395.573 580 0],[395.951 230 1],[395.968 490 0],[397.588 220 0],[397.693 390 0],[398.571 220 1],[399.373 220 1],[399.958 380 0],[400.259 160 1],[400.339 220 0],[401.35 110 0],[401.42 320 1],[401.809 160 1],[402.276 160 1],[402.394 160 1],[402.539 110 0],[402.721 320 0],[402.886 270 0],[403.18 180 0],[403.762 220 0],[403.887 220 1],[404.081 2700 0],[404.544 5400 1],[404.752 220 0],[405.393 8100 0],[405.448 540 1],[405.755 270 0],[406.031 220 0],[406.509 1700 1],[406.757 170 0],[406.805 720 0],[407.183 270 0],[407.313 270 0],[407.351 290 0],[408.023 120 1],[408.367 230 0],[408.509 140 0],[408.735 170 0],[408.759 200 0],[409.164 140 0],[409.478 120 0],[410.022 230 0],[410.384 8900 0],[410.504 120 0],[410.65 270 0],[410.736 100 0],[410.862 2900 0],[411.2 300 0],[411.272 100 0],[411.673 270 0],[412.02 1500 0],[412.565 1300 0],[412.716 4300 0],[413.454 300 0],[413.622 1500 0],[413.934 130 0],[414.219 230 0],[414.897 290 0],[415.261 980 1],[416.303 8100 0],[417.223 160 0],[417.323 2500 0],[419.435 540 0],[419.808 100 0],[420.321 130 0],[421.13 100 1],[422.229 290 0],[422.347 290 0],[422.704 2000 0],[422.952 390 1],[423.124 130 0],[424.378 290 0],[425.443 1300 0],[425.861 130 1],[426.405 490 0],[426.604 300 0],[427.363 100 1],[431.104 200 0],[433.064 250 1],[433.713 300 1],[434.684 100 1],[435.073 1300 0],[435.673 290 1],[436.393 140 1],[437.914 170 1],[438.483 180 1],[440.055 150 1],[440.124 120 1],[440.327 180 0],[442.056 200 1],[444.463 130 0],[447.359 100 1],[447.764 300 1],[448.457 120 1],[451.082 140 0],[452.614 100 1],[453.008 170 1],[453.128 170 0],[453.165 130 1],[453.458 170 0],[456.252 200 0],[460.932 120 1],[461.337 130 0],[461.884 100 0],[462.822 100 0],[462.91 290 1],[464.977 200 1],[466.133 130 1],[467.462 140 1],[470.117 70 1],[470.169 80 1],[470.984 130 1],[471.139 65 0],[471.752 130 0],[472.872 35 1],[473.8 35 1],[474.204 290 1],[474.909 35 1],[475.14 35 0],[475.701 100 0],[476.239 35 1],[476.357 35 1],[477.748 55 1],[477.942 30 0],[478.119 70 0],[478.292 65 0],[478.629 55 0],[479.148 35 1],[479.592 35 1],[479.887 45 0],[481.292 27 1],[483.231 55 1],[483.332 30 0],[485.554 30 1],[486.039 45 0],[488.967 27 1],[489.235 30 0],[489.644 35 1],[490.699 55 1],[492.273 45 0],[493.489 55 0],[493.901 290 0],[494.68 27 0],[494.818 45 1],[495.942 65 1],[496.103 35 1],[496.673 55 1],[496.721 250 1],[497.997 220 0],[498.896 35 0],[499.505 90 0],[501.242 35 0],[501.328 55 1],[502.653 65 0],[502.817 30 0],[503.295 55 1],[503.76 65 0],[504.237 130 0],[504.473 35 0],[505.144 30 1],[505.492 30 1],[506.075 35 0],[507.434 65 0],[509.307 80 0],[512.781 140 0],[512.927 55 1],[514.259 130 1],[514.322 110 1],[514.959 160 1],[516.788 90 0],[518.211 130 0],[518.785 55 0],[519.011 90 1],[519.523 18 0],[522.154 45 0],[524.447 35 0],[525.182 65 0],[527.548 55 0],[530.125 90 0],[531.924 35 0],[531.965 35 0],[533.011 80 0],[535.999 90 0],[538.14 55 0],[538.456 30 0],[538.497 30 0],[539.385 18 0],[540.317 70 0],[540.708 100 0],[541.362 14 1],[543.439 16 1],[543.587 18 0],[544.539 30 0],[544.98 18 1],[545.19 30 0],[545.4 14 1],[549.857 30 0],[550.451 30 0],[551.556 27 1],[551.645 18 1],[553.433 30 0],[555.314 27 0],[556.094 35 0],[556.36 35 -1],[556.652 70 0],[557.396 18 1],[558.47 35 -1],[559.11 55 -1],[559.23 55 -1],[560.71 30 -1],[561.364 27 0],[562.64 45 -1],[562.76 65 0],[562.824 30 1],[564.062 55 0],[565.59 70 -1],[565.89 65 -1],[565.958 140 0],[567.184 70 -1],[567.47 65 0],[569.147 140 0],[569.63 70 -1],[569.657 140 0],[573.402 27 0],[573.64 45 -1],[573.924 55 0],[574.958 22 0],[576.664 30 -1],[580.38 27 -1],[581.92 45 -1],[582.19 27 0],[583.947 22 0],[584.94 45 -1],[586.028 140 0],[586.442 27 0],[587.085 45 0],[587.96 27 -1],[588.299 70 0],[589.256 35 0],[590.429 22 0],[592.176 70 0],[593.371 30 0],[594.803 70 0],[595.598 45 0],[597.276 70 0],[597.352 90 0],[598.143 22 0],[598.29 230 0],[600.204 55 0],[600.533 27 0],[602.143 35 0],[603.897 16 0],[605.071 27 0],[606.031 45 0],[608.179 120 0],[613.36 70 0],[615.638 35 0],[615.658 27 0],[619.168 55 0],[620.865 70 0],[623.417 18 0],[625.575 45 0],[630.536 70 0],[630.668 22 0],[632.194 30 -1],[635.435 30 0],[637.259 30 0],[637.386 14 0],[641.341 22 0],[647.177 27 0],[647.917 13 0],[651.53 11 0],[653.899 11 0],[655.097 70 0],[656.008 15 0],[660.058 35 0],[660.494 260 0],[660.747 55 0],[662.835 13 0],[662.899 120 0],[663.224 15 0],[665.298 9 0],[666.252 15 0],[668.046 19 0],[668.162 24 0],[668.202 15 -1],[669.432 55 0],[672.234 15 0],[674.505 40 0],[676.674 13 0],[677.468 28 0],[678.543 55 0],[679.37 13 0],[681.104 13 0],[682.038 15 0],[682.164 24 0],[682.572 17 0],[682.662 8 -1],[685.297 8 -1],[686.585 17 0],[688.336 9 0],[688.85 13 0],[689.296 15 0],[689.795 17 0],[690.38 15 0],[691.347 15 0],[691.67 9 0],[693.949 40 0],[695.039 45 0],[695.53 13 0],[697.67 19 1],[698.511 10 -1],[699.438 9 -1],[700.071 14 -1],[707.907 10 -1],[709.858 12 -1],[724.208 9 0],[725.06 9 0],[730.855 14 -1],[734.143 25 -1],[738.94 18 -1],[749.62 5 0],[751.074 10 0],[755.509 140 0],[758.92 18 0],[759.187 25 0],[759.364 9 0],[759.435 7 0],[760.231 12 1],[760.535 16 0],[761.705 12 0],[762.798 14 0],[762.842 40 0],[764.114 9 0],[764.816 4 0],[765.38 14 0],[766.73 12 0],[769.043 20 0],[769.315 50 0],[771.506 40 0],[771.905 16 0],[773.898 16 0],[775.201 8 0]}{13000}% +\wl@elt@search{#1}{Er}{[381.033 1600 0],[383.048 3600 1],[384.991 540 0],[385.16 320 1],[385.59 680 0],[385.839 540 1],[386.285 7500 0],[388.061 1500 1],[388.289 1200 1],[389.061 400 1],[389.268 4200 0],[389.623 5200 1],[390.276 810 1],[390.398 250 0],[390.456 250 1],[390.54 1200 0],[390.631 11000 1],[391.805 280 0],[391.835 210 1],[392.188 280 1],[393.225 810 1],[393.701 3200 0],[393.863 2100 1],[394.442 3200 0],[394.806 550 0],[395.148 250 0],[395.642 320 0],[396.635 280 0],[397.304 2700 0],[397.358 3200 0],[397.472 1400 1],[397.673 280 0],[397.702 810 0],[398.233 1100 0],[398.753 280 0],[398.766 810 0],[399.115 230 0],[400.405 230 0],[400.796 14000 0],[400.818 230 1],[400.916 280 1],[401.258 1100 0],[401.557 350 1],[402.051 3000 0],[402.155 450 0],[404.301 230 1],[404.696 1000 0],[404.834 280 1],[404.949 200 1],[405.547 940 1],[405.951 550 0],[405.978 690 1],[407.788 420 0],[408.124 550 1],[408.763 3500 0],[409.29 210 0],[409.81 1100 0],[410.056 350 1],[411.636 320 0],[411.855 320 0],[413.15 600 0],[414.291 550 1],[415.111 6900 0],[418.998 280 1],[419.07 1000 0],[420.532 130 0],[421.843 1400 0],[422.099 200 0],[423.02 320 1],[423.478 140 1],[425.194 200 1],[427.648 140 1],[428.656 690 0],[429.891 320 0],[430.16 320 1],[430.381 140 1],[431.994 110 1],[432.881 130 0],[433.136 110 0],[434.092 140 0],[434.834 190 0],[436.939 110 1],[438.217 160 0],[438.47 300 1],[438.64 300 0],[440.317 100 1],[440.934 810 0],[441.87 180 0],[441.961 570 1],[442.251 110 1],[442.457 320 0],[442.677 370 0],[443.766 110 0],[445.924 100 1],[447.35 100 1],[449.639 130 0],[450.075 200 1],[452.274 130 0],[456.326 160 1],[460.661 1000 0],[463.088 160 1],[464.06 110 1],[466.544 110 1],[467.316 310 0],[467.562 570 1],[467.906 150 1],[472.269 230 0],[472.905 150 0],[475.152 130 1],[475.965 170 1],[482.035 190 1],[485.744 140 0],[487.209 150 1],[490.008 210 1],[493.411 210 1],[494.436 130 0],[495.174 180 1],[497.642 130 0],[500.725 250 0],[502.833 140 0],[502.891 120 1],[503.594 200 0],[504.205 210 1],[504.386 130 0],[504.489 130 0],[507.759 130 1],[512.456 120 0],[512.741 130 1],[513.153 120 0],[513.383 130 1],[516.477 170 1],[517.278 130 0],[518.89 160 1],[520.652 150 0],[521.291 60 1],[521.513 30 1],[521.826 30 1],[522.934 45 1],[525.593 140 1],[525.647 22 1],[525.702 27 1],[526.477 35 1],[527.291 80 0],[527.771 55 0],[527.934 27 1],[530.23 45 1],[533.306 55 0],[533.333 27 1],[533.423 27 1],[534.394 22 1],[534.45 30 1],[534.806 90 0],[535.047 45 0],[536.885 35 0],[539.587 35 1],[541.463 60 1],[542.281 18 1],[545.13 18 0],[545.427 35 1],[545.662 180 0],[546.243 35 1],[546.832 90 0],[547.747 18 1],[548.597 80 1],[549.744 27 1],[551.602 27 0],[559.346 80 0],[560.114 45 0],[560.994 45 0],[561.182 60 0],[562.201 70 0],[562.653 80 1],[563.62 30 0],[564.036 90 0],[564.142 22 0],[565.863 22 1],[566.495 70 0],[566.544 45 1],[567.548 55 0],[569.553 14 1],[571.087 27 1],[571.748 55 0],[571.955 70 0],[572.697 55 0],[573.343 22 1],[573.656 22 0],[573.694 22 0],[573.919 100 0],[574.061 35 0],[574.865 60 0],[575.253 55 0],[575.763 70 1],[576.28 290 0],[576.992 70 0],[578.282 45 0],[578.466 70 0],[579.115 22 1],[580.079 70 0],[580.61 22 0],[582.679 430 0],[583.584 45 0],[585.007 100 0],[585.531 120 0],[587.235 140 0],[588.114 120 0],[588.63 27 1],[590.208 27 1],[590.606 55 0],[590.924 45 0],[593.35 35 0],[594.637 22 0],[596.868 55 0],[597.549 27 0],[600.679 35 1],[600.875 22 1],[601.483 55 0],[601.574 35 1],[602.256 70 0],[603.212 22 1],[604.563 22 1],[604.814 22 1],[605.485 45 0],[606.125 70 0],[607.645 60 1],[611.601 35 0],[612.532 35 0],[617.006 30 1],[618.321 27 1],[622.102 360 0],[623.09 35 0],[626.256 55 0],[626.793 45 0],[626.887 60 0],[627.494 35 0],[628.686 30 0],[629.942 45 0],[630.877 130 0],[632.613 55 0],[634.716 22 1],[638.819 45 0],[643.253 22 0],[648.587 27 0],[649.235 55 0],[654.157 22 0],[658.348 60 0],[660.111 70 0],[672.191 27 0],[675.987 70 0],[676.292 22 0],[677.337 27 0],[679.092 35 0],[682.544 22 0],[682.598 22 0],[684.81 70 0],[686.513 55 0],[687.998 27 0],[700.14 22 0],[705.855 12 0],[706.504 12 0],[707.099 11 1],[710.127 18 0],[710.967 8 0],[715.54 11 1],[716.191 5 0],[719.7 14 0],[726.482 7 1],[728.395 7 0],[732.973 14 1],[735.537 18 0],[735.634 11 0],[742.867 18 0],[745.955 55 0],[746.042 9 0],[746.951 120 0],[753.234 22 0],[753.918 6 0],[755.626 27 0],[757.421 6 0],[759.051 5 0],[759.733 11 0],[760.723 6 0],[761.352 11 0],[762.348 6 0],[764.567 16 0],[765.063 8 0],[765.445 22 1],[765.805 12 0],[765.925 22 0],[766.564 4 0],[768.001 35 0],[772.214 9 0],[772.619 8 1],[774.744 11 0],[775.463 22 0],[776.216 4 0],[779.669 9 0],[779.747 35 0],[381.678 4000 2],[396.287 600 2],[400.97 40 2],[408.858 2 2],[428.818 1000 2],[429.006 40000 2],[433.824 300 2],[438.686 20000 2],[461.293 30 2],[473.556 15000 2],[478.312 2000 2],[487.607 8 2],[590.33 8000 2]}{40000}% +\wl@elt@search{#1}{Tm}{[380.772 600 0],[381.072 380 1],[381.739 550 1],[382.639 290 0],[383.82 1300 1],[384.087 290 0],[384.802 8900 1],[385.784 140 1],[388.313 6800 0],[388.344 1800 1],[388.735 5400 0],[389.053 440 1],[389.662 440 0],[390.079 680 1],[391.648 3500 0],[392.866 120 1],[392.958 570 1],[394.927 1500 0],[395.81 1500 1],[399.558 440 1],[399.652 1800 1],[402.423 220 0],[404.447 380 0],[409.419 10000 0],[410.584 9500 0],[413.269 120 1],[413.833 1100 0],[414.914 120 0],[415.86 120 0],[418.762 8800 0],[419.992 520 1],[420.373 6000 0],[420.6 220 1],[422.267 380 0],[424.215 3000 1],[427.171 270 0],[429.836 150 0],[435.993 2700 0],[438.643 1400 0],[439.442 200 0],[439.596 120 0],[439.65 140 0],[443.74 55 1],[444.274 80 0],[444.758 50 0],[445.403 120 0],[445.999 80 0],[446.798 50 0],[448.126 540 1],[448.97 80 1],[451.96 150 0],[452.257 260 1],[452.938 180 1],[453.215 80 0],[454.86 110 0],[455.668 40 1],[456.186 40 1],[456.468 80 0],[456.711 40 1],[459.663 95 0],[459.902 270 0],[460.129 35 1],[460.343 55 1],[460.485 40 0],[461.397 50 0],[461.447 40 1],[461.594 300 1],[461.906 35 1],[462.172 40 0],[462.633 80 1],[462.656 95 1],[462.697 40 0],[463.426 110 1],[464.296 40 1],[464.312 95 0],[464.458 35 0],[465.509 120 0],[466.67 35 1],[467.199 35 1],[467.51 35 0],[467.531 80 0],[467.786 40 1],[468.192 160 0],[468.511 70 0],[469.111 120 0],[472.426 110 0],[473.334 680 0],[475.075 35 1],[475.99 70 0],[478.992 27 1],[480.748 27 0],[480.868 35 0],[481.35 35 0],[482.699 27 1],[482.897 27 0],[483.12 80 1],[483.575 35 0],[485.176 27 0],[487.228 19 1],[487.919 27 0],[489.164 27 0],[490.974 24 0],[492.383 55 0],[495.718 140 0],[497.087 40 1],[497.126 27 0],[497.512 40 1],[497.89 50 0],[498.068 40 1],[498.932 55 1],[499.379 27 1],[499.472 19 1],[500.102 35 0],[500.159 27 0],[500.977 160 1],[501.456 35 1],[501.787 27 1],[503.422 160 1],[504.1 27 1],[504.35 22 0],[504.541 35 0],[506.042 27 1],[506.09 150 0],[506.225 27 0],[506.588 27 0],[506.667 80 0],[507.242 27 0],[507.636 27 0],[507.718 27 0],[508.509 35 0],[510.753 40 0],[511.397 95 0],[511.455 50 1],[512.067 22 0],[514.028 22 1],[514.94 40 1],[518.268 19 0],[518.525 40 0],[520.451 14 1],[521.338 80 0],[522.823 22 1],[526.093 14 1],[526.734 24 1],[529.114 40 0],[529.432 40 0],[530.021 35 0],[530.269 35 0],[530.587 55 1],[530.712 650 0],[532.299 16 1],[533.89 35 0],[534.649 80 1],[537.298 27 1],[539.196 14 1],[540.046 27 1],[540.223 27 0],[540.598 14 1],[546.195 14 1],[546.414 14 0],[546.554 14 1],[550.03 16 1],[552.682 14 1],[552.834 24 0],[553.903 14 1],[556.6 27 0],[558.137 22 0],[558.665 14 1],[558.994 14 1],[560.664 14 0],[563.141 270 0],[564.26 40 0],[564.54 27 0],[565.83 70 0],[567.584 520 0],[568.359 14 0],[568.476 40 1],[569.642 14 1],[570.997 35 1],[571.579 22 0],[573.381 14 1],[573.72 11 1],[573.892 14 1],[575.802 27 0],[576.02 55 0],[576.429 190 0],[577.882 5 1],[578.236 19 1],[578.446 22 1],[579.997 11 1],[581.119 14 1],[581.646 14 0],[583.876 35 1],[589.563 240 0],[589.947 35 0],[590.157 24 0],[591.258 8 0],[593.17 11 0],[593.59 27 0],[597.126 140 0],[597.502 27 0],[598.487 11 0],[602.544 19 0],[606.778 11 1],[613.153 16 0],[617.529 14 0],[618.141 14 1],[629.946 14 1],[635.266 27 0],[640.144 22 0],[643.094 8 1],[644.054 14 0],[646.026 200 0],[649.07 14 0],[651.978 14 0],[657.554 8 0],[660.496 95 0],[662.725 8 0],[665.772 35 0],[665.864 11 0],[669.293 11 0],[672.136 30 0],[672.634 9 0],[672.794 9 1],[673.922 18 0],[676.748 9 0],[677.793 9 0],[677.977 110 0],[678.2 14 0],[678.852 18 0],[682.027 13 0],[682.695 14 0],[682.912 14 1],[683.109 23 0],[684.426 120 0],[684.576 80 0],[685.412 18 0],[689.856 6 0],[691.586 6 0],[693.737 10 0],[694.954 5 0],[697.669 5 1],[701.079 5 0],[701.431 6 1],[701.79 10 0],[702.94 6 0],[703.434 12 0],[705.643 10 1],[706.097 5 0],[707.978 6 1],[710.614 10 0],[723.133 5 0],[723.374 5 1],[725.772 4 0],[727.262 17 0],[728.43 8 0],[728.616 11 0],[731.051 14 0],[733.663 11 1],[743.218 14 0],[743.451 5 1],[743.995 5 1],[748.108 75 0],[749.02 75 0],[750.728 10 0],[754.578 14 0],[755.833 140 0],[758.061 17 0],[759.374 20 0],[759.507 17 1],[762.985 5 0],[764.876 5 1],[765.5 17 0],[766.032 4 0],[766.624 7 0],[767.604 8 1],[770.146 8 0],[773.153 80 0],[777.827 4 0],[778.235 12 0],[778.551 8 0],[399.884 300 2],[402.192 200 2],[402.603 200 2],[403.213 700 2],[407.615 100 2],[433.547 200 2],[438.541 500 2]}{10000}% +\wl@elt@search{#1}{Yb}{[383.991 170 0],[387.285 340 0],[390.085 340 0],[390.481 50 1],[391.127 140 0],[398.799 32000 0],[399.088 930 0],[400.736 50 0],[405.228 70 0],[407.728 85 1],[408.968 440 0],[411.925 120 1],[413.509 70 1],[414.907 470 0],[417.456 120 0],[418.081 340 1],[421.856 150 1],[423.197 120 0],[427.774 70 0],[430.597 120 0],[431.695 70 1],[439.369 60 0],[443.021 60 0],[443.919 440 0],[448.242 85 0],[451.516 85 1],[455.358 35 1],[456.395 85 0],[457.621 640 0],[458.236 200 0],[458.921 70 0],[459.083 140 0],[459.836 40 1],[468.381 35 1],[468.427 40 0],[472.608 190 1],[478.187 170 0],[478.661 170 1],[481.643 35 0],[482.024 40 1],[483.696 35 1],[483.746 40 0],[485.115 17 1],[489.46 40 0],[491.236 27 0],[493.55 710 0],[493.722 24 1],[496.69 140 0],[500.952 24 1],[506.73 17 1],[506.78 30 0],[506.914 70 0],[507.434 220 0],[507.674 50 0],[513.598 20 1],[514.702 14 1],[518.415 20 1],[519.608 60 0],[521.16 85 0],[524.051 35 1],[524.411 100 0],[525.749 40 1],[527.704 150 0],[527.953 35 1],[530.094 17 1],[533.515 170 1],[534.566 30 1],[534.722 60 1],[535.129 30 0],[535.295 150 1],[535.864 30 1],[536.366 30 0],[538.984 17 1],[543.271 14 1],[544.927 40 1],[547.85 14 1],[548.192 60 0],[550.549 40 0],[552.454 17 0],[553.905 85 0],[555.647 2400 0],[556.209 35 0],[556.811 20 0],[558.636 20 0],[558.845 40 1],[565.198 60 1],[568.653 7 1],[571.999 220 0],[574.991 10 1],[575.589 10 0],[577.166 27 1],[580.344 10 0],[581.941 10 1],[583.399 35 1],[583.714 35 1],[585.451 27 0],[589.721 8 1],[590.836 20 1],[598.933 17 0],[599.151 40 1],[605.288 10 1],[605.457 10 0],[615.257 60 1],[624.697 30 1],[627.478 60 1],[630.815 14 1],[640.035 35 0],[641.791 35 0],[643.273 20 1],[646.315 17 1],[648.906 340 0],[664.355 20 0],[666.782 180 0],[667.817 15 0],[672.761 25 1],[676.87 25 0],[679.96 690 0],[693.405 18 1],[699.988 20 1],[704.378 10 1],[724.441 9 0],[730.522 8 0],[731.305 10 0],[735.004 16 0],[744.828 25 0],[752.746 30 0],[769.948 750 0],[387.998 20 2],[388.258 10 2],[388.717 20 2],[389.655 150 2],[391.275 15 2],[391.323 20 2],[393.123 500 2],[398.556 100 2],[399.174 10 2],[399.767 10 2],[402.814 2000 2],[403.303 10 2],[407.453 20 2],[409.067 20 2],[409.823 20 2],[412.106 15 2],[415.004 10 2],[415.311 15 2],[416.272 100 2],[417.295 60 2],[419.434 30 2],[419.495 100 2],[419.874 10 2],[421.364 300 2],[422.083 10 2],[423.107 15 2],[428.964 20 2],[430.114 40 2],[430.401 20 2],[435.08 15 2],[438.007 10 2],[451.758 100 2],[463.914 40 2],[483.493 10 2],[505.494 15 2],[525.685 20 2],[533.154 20 2],[574.083 15 2],[594.902 10 2],[597.305 20 2],[605.585 40 2],[621.422 100 2],[632.852 200 2],[636.588 10 2],[637.833 150 2],[646.633 25 2],[698.515 20 2],[703.704 10 2],[715.772 15 2],[731.102 10 2],[739.998 10 2],[741.001 80 2],[745.686 15 2],[766.441 70 2]}{32000}% +\wl@elt@search{#1}{Lu}{[380.067 150 0],[382.907 75 0],[384.118 2700 0],[384.361 75 0],[385.329 95 0],[387.461 40 0],[387.665 530 1],[391.177 29 0],[391.886 50 0],[392.662 35 0],[396.846 480 0],[399.138 50 0],[405.445 670 0],[409.613 75 -1],[410.744 35 0],[411.267 95 0],[412.249 310 0],[412.473 3100 0],[413.179 150 0],[415.408 460 0],[415.898 24 0],[418.425 1600 1],[427.75 150 0],[428.103 250 0],[429.597 330 0],[430.957 150 0],[433.272 75 0],[434.198 29 1],[442.096 65 0],[443.048 190 0],[443.879 35 0],[445.081 190 0],[447.155 50 0],[449.885 60 0],[451.857 3300 0],[456.095 24 -1],[457.531 24 -1],[460.539 85 0],[464.547 95 0],[464.821 100 0],[464.885 95 0],[465.403 65 -1],[465.802 1000 0],[465.903 85 0],[466.175 630 -1],[467.231 310 -1],[468.416 420 -1],[469.546 270 -1],[470.8 190 -1],[471.67 30 0],[472.086 65 -1],[472.62 65 0],[473.5 100 -1],[474.911 75 -1],[476.422 40 -1],[478.542 150 1],[481.505 85 0],[483.962 50 1],[486.536 18 1],[490.488 460 0],[494.234 180 0],[499.413 800 1],[500.114 800 0],[505.76 55 0],[513.405 140 0],[513.509 2700 0],[517.011 130 -1],[519.661 170 0],[520.647 90 0],[530.44 40 0],[534.912 80 0],[540.257 500 0],[542.19 140 0],[543.788 100 0],[545.357 35 0],[547.669 2100 1],[566.489 9 1],[571.349 14 1],[573.655 550 0],[577.54 55 0],[580.059 80 0],[586.079 40 0],[586.63 9 0],[598.39 690 1],[599.713 140 0],[600.452 1400 0],[604.166 35 0],[605.503 440 0],[614.071 11 0],[615.994 150 1],[619.966 160 1],[622.187 2100 1],[622.814 35 1],[623.536 80 1],[624.234 160 1],[624.88 16 0],[634.535 70 0],[635.485 18 0],[636.579 9 0],[636.6 16 0],[644.114 22 0],[644.489 11 1],[646.312 1100 1],[647.767 29 0],[652.318 55 0],[661.128 35 1],[661.915 11 1],[667.714 23 0],[673.576 9 0],[679.377 30 0],[682.659 11 1],[691.731 45 0],[694.396 8 1],[703.124 23 0],[709.634 14 0],[712.584 45 1],[714.279 9 0],[714.31 7 0],[716.594 8 1],[723.798 14 0],[740.97 5 1],[744.152 11 0],[745.696 8 1],[764.008 7 0],[775.83 7 0],[425.144 200 2],[427.191 300 2],[449 200 2],[495.643 400 2],[504.612 10 2],[514.586 150 2],[541.942 70 2],[551.988 60 2],[552.68 5 2],[574.871 5 2],[578.646 70 2],[586.971 80 2],[588.976 60 2],[619.796 300 2],[619.813 600 2],[730.995 100 2],[731.025 200 2],[753.427 50 2]}{3300}% +\wl@elt@search{#1}{Hf}{[380.038 850 0],[380.607 140 1],[381.178 320 0],[381.72 100 1],[381.938 100 0],[382.073 1300 0],[382.967 140 0],[383.002 280 0],[384.918 800 0],[384.952 140 1],[385.831 600 0],[386.091 230 0],[387.255 200 1],[387.71 160 1],[388.082 380 1],[388.252 200 0],[388.377 150 1],[388.923 200 0],[388.933 200 0],[389.994 620 0],[391.809 620 1],[392.39 200 1],[392.642 120 0],[392.757 150 0],[392.954 110 1],[393.138 320 0],[393.565 120 1],[393.904 120 0],[395.183 410 0],[396.801 160 0],[397.005 150 -1],[397.348 200 0],[403.227 180 0],[404.796 100 1],[406.284 230 0],[406.621 140 0],[408.335 180 0],[409.316 540 1],[410.423 110 0],[410.658 140 0],[411.353 110 1],[411.86 110 0],[412.78 150 1],[414.576 140 0],[416.236 150 1],[416.269 110 0],[417.434 1100 0],[419.095 120 0],[420.658 160 1],[420.97 190 0],[422.808 170 0],[423.244 170 1],[425.208 120 -1],[426.098 170 0],[426.339 200 0],[427.285 170 1],[429.479 320 0],[431.814 120 0],[433.027 160 0],[433.666 180 1],[435.051 150 1],[435.633 250 0],[436.79 110 1],[437.097 180 1],[441.735 120 1],[441.791 160 0],[443.804 200 0],[445.734 140 0],[446.118 140 0],[454.093 140 0],[456.594 250 0],[459.88 500 0],[462.086 230 0],[465.519 210 0],[469.901 120 0],[478.274 160 0],[480.05 310 0],[485.924 130 0],[497.525 120 0],[501.82 95 0],[502.175 15 0],[504.082 55 1],[504.745 95 0],[507.474 55 -1],[507.965 30 1],[509.388 55 -1],[511.213 15 0],[512.853 19 1],[515.796 30 0],[516.742 55 0],[517.018 75 0],[518.186 230 0],[518.684 30 0],[518.775 30 1],[524.399 110 0],[524.71 55 1],[526.044 25 1],[526.495 30 1],[527.504 55 0],[528.609 22 0],[529.487 120 0],[529.806 45 1],[530.782 30 0],[530.968 45 0],[531.16 55 1],[532.426 12 1],[534.63 9 1],[535.473 110 0],[537.386 110 0],[538.934 40 0],[539.136 19 1],[540.447 19 0],[542.402 28 0],[543.578 12 0],[543.874 40 0],[544.407 14 1],[545.292 75 0],[546.338 30 1],[549.73 15 0],[551.012 15 0],[551.045 15 0],[552.435 19 1],[553.802 45 0],[553.826 28 0],[555.06 230 0],[555.212 230 0],[557.586 55 0],[560.077 14 0],[561.327 95 0],[561.401 25 0],[562.827 8 0],[565.083 19 0],[569.803 40 -1],[571.328 25 0],[571.918 160 0],[572.016 25 -1],[574.872 12 0],[576.718 14 1],[580.95 12 1],[581.747 19 0],[584.223 25 1],[584.587 25 0],[584.777 19 0],[588.366 22 0],[592.647 15 0],[593.369 60 0],[597.428 75 0],[597.472 25 0],[597.866 60 0],[599.296 25 0],[601.679 45 0],[602.112 28 -1],[604.319 25 -1],[605.417 25 0],[609.867 95 0],[618.513 95 0],[621.07 55 0],[621.682 28 0],[623.858 45 0],[624.895 60 1],[629.954 22 0],[631.185 25 0],[631.833 19 0],[633.81 30 0],[638.019 19 0],[638.623 60 0],[640.952 19 0],[655.65 15 0],[658.723 28 0],[664.46 45 1],[664.706 19 1],[665.94 11 0],[671.348 30 0],[675.461 17 1],[676.995 11 0],[678.927 85 0],[681.894 160 0],[682.656 15 0],[685.007 13 0],[685.87 35 0],[691.14 45 0],[692.619 10 0],[697.959 19 0],[698.091 21 1],[701.925 7 0],[703.033 7 1],[703.513 7 0],[706.19 11 0],[706.287 15 0],[706.383 160 0],[709.44 11 0],[710.054 15 0],[711.952 55 0],[713.181 570 0],[723.71 650 0],[724.087 410 0],[726.262 6 0],[732.005 75 0],[732.176 16 0],[735.61 6 0],[736.528 6 0],[739.07 20 0],[742.369 6 0],[743.756 25 0],[746.386 13 0],[748.456 7 0],[755.637 15 0],[756.293 75 0],[756.422 15 0],[757.695 11 0],[759.296 11 0],[760.859 13 0],[762.44 360 0],[764.564 20 0],[774.017 110 0],[774.357 8 0],[775.789 5 1],[779.09 40 0],[779.681 7 0],[775.129 20 3],[726.758 10 3]}{1300}% +\wl@elt@search{#1}{Ta}{[383.374 210 1],[384.805 100 0],[388.52 100 0],[391.851 210 0],[392.278 140 0],[392.292 140 0],[397.01 210 0],[399.617 210 0],[399.928 100 0],[400.684 190 0],[402.694 190 0],[402.994 140 0],[404.087 120 0],[406.14 410 0],[406.463 210 0],[406.724 100 0],[406.791 310 0],[410.502 120 0],[412.938 210 0],[413.62 230 0],[414.789 230 0],[417.521 210 0],[417.792 100 0],[418.115 130 0],[420.588 300 0],[420.64 120 0],[424.535 130 0],[426.826 130 0],[430.298 160 0],[435.514 110 0],[437.882 100 0],[438.607 150 0],[439.845 110 0],[440.25 180 0],[441.574 130 0],[451.098 360 0],[453.085 190 0],[455.195 130 0],[456.585 170 0],[457.431 340 0],[461.951 260 0],[466.914 130 0],[468.188 450 0],[469.19 130 0],[474.016 150 0],[475.651 220 0],[476.898 120 0],[481.275 220 0],[492.011 110 0],[492.127 100 0],[492.6 110 0],[493.642 150 0],[503.737 200 0],[506.787 100 0],[511.584 110 0],[514.162 100 0],[514.369 100 0],[515.656 330 0],[521.274 110 0],[521.845 110 0],[534.105 140 0],[540.251 200 0],[541.919 130 0],[550.068 18 0],[550.566 20 0],[551.627 15 0],[551.891 90 0],[552.115 9 0],[552.398 10 0],[552.836 13 0],[554.52 10 0],[554.832 20 0],[558.402 30 0],[559.875 15 0],[559.952 30 0],[560.55 9 0],[561.771 9 0],[562.068 40 0],[562.82 13 0],[563.571 20 0],[564.018 40 0],[564.591 150 0],[566.49 130 0],[568.825 30 0],[569.924 40 0],[570.431 15 0],[570.628 25 0],[571.524 30 0],[571.653 8 0],[574.671 23 0],[575.581 30 0],[576.161 15 0],[576.656 25 0],[576.791 30 0],[577.193 10 0],[577.677 130 0],[578.002 25 0],[578.071 90 0],[581.11 130 0],[581.651 25 0],[584.394 45 0],[584.968 13 0],[586.661 15 0],[587.736 240 0],[588.23 130 0],[590.191 90 0],[591.651 30 0],[591.895 90 0],[592.59 15 0],[593.062 15 0],[593.105 23 0],[593.168 20 0],[593.554 18 0],[593.976 130 0],[594.402 240 0],[595.178 25 0],[596.013 18 0],[599.723 190 0],[600.989 25 0],[601.59 25 0],[602.072 100 0],[604.539 250 0],[604.725 100 0],[605.37 25 0],[609.082 30 0],[609.206 18 0],[610.158 100 0],[614.007 25 0],[614.456 65 0],[615.254 30 0],[615.45 130 0],[615.884 40 0],[617.046 15 0],[618.966 15 0],[619.311 15 0],[620.837 25 0],[624.979 40 0],[625.668 150 0],[626.87 150 0],[627.834 50 0],[628.133 65 0],[628.736 15 0],[628.791 40 0],[628.934 40 0],[630.906 50 0],[630.958 150 0],[631.222 25 0],[632.508 75 0],[633.291 50 0],[634.117 65 0],[634.602 30 0],[635.616 75 0],[636.084 65 0],[637.306 40 0],[637.907 15 0],[638.945 90 0],[639.221 23 0],[642.86 65 0],[643.079 250 0],[643.736 13 0],[644.461 40 0],[644.587 30 0],[645.036 200 0],[645.583 20 0],[645.992 30 0],[648.537 380 0],[650.243 18 0],[650.552 65 0],[651.439 100 0],[651.61 100 0],[656.16 25 0],[656.426 25 0],[657.484 100 0],[658.513 10 0],[658.716 15 0],[661.195 110 0],[662.13 75 0],[666.224 15 0],[667.373 100 0],[667.553 180 0],[668.4 30 0],[669.361 15 0],[670.646 15 0],[670.939 25 0],[671.444 10 0],[672.361 15 0],[674.073 75 0],[675.491 40 0],[675.585 13 0],[677.037 13 0],[677.174 75 0],[677.425 40 0],[678.899 40 0],[679.006 13 0],[679.927 13 0],[681.046 40 0],[681.325 160 0],[681.936 20 0],[682.496 18 0],[683.2 13 0],[685.083 15 0],[686.513 15 0],[686.623 210 0],[687.527 180 0],[687.749 40 0],[689.677 15 0],[690.055 40 0],[690.21 150 0],[692.738 140 0],[692.854 140 0],[693.933 8 0],[694.687 20 0],[695.126 65 0],[695.388 45 0],[696.613 180 0],[696.949 8 0],[697.131 8 0],[697.153 9 0],[698.352 23 0],[699.522 110 0],[700.021 20 0],[700.507 40 0],[700.696 75 0],[702.503 50 0],[703.151 13 0],[703.907 40 0],[708.13 15 0],[708.54 20 0],[709.302 23 0],[710.805 8 0],[711.752 15 0],[712.127 20 0],[712.572 40 0],[714.863 150 0],[717.29 110 0],[717.491 13 0],[719.135 13 0],[723.345 8 0],[725.027 30 0],[726.482 11 0],[727.229 6 0],[727.696 30 0],[727.754 5 0],[728.636 9 0],[729.632 13 0],[730.174 140 0],[731.984 20 0],[732.272 11 0],[732.595 13 0],[734.019 11 0],[734.641 160 0],[735.286 140 0],[735.696 100 0],[736.909 90 0],[740.789 160 0],[743.519 11 0],[744.017 23 0],[746.775 30 0],[748.601 23 0],[752.056 30 0],[756.923 6 0],[759.022 9 0],[764.962 6 0],[772.202 11 0],[776.311 11 0],[777.967 9 0]}{450}% +\wl@elt@search{#1}{W}{[380.922 290 0],[381.038 190 0],[381.079 260 0],[381.748 1400 0],[382.913 110 0],[383.506 1100 0],[383.851 290 0],[384.622 730 0],[384.749 250 0],[385.157 27 1],[385.555 150 0],[385.93 150 0],[386.434 180 0],[386.799 1800 0],[387.284 250 0],[387.441 110 0],[388.141 730 0],[389.272 110 0],[389.791 140 0],[393.503 150 0],[393.697 120 0],[394.798 120 0],[395.252 120 0],[395.29 120 0],[395.315 160 0],[395.53 200 0],[396.514 160 0],[396.859 130 0],[397.08 150 0],[397.929 130 0],[398.064 130 0],[398.329 250 0],[400.875 8600 0],[401.522 540 0],[401.652 170 0],[401.923 220 0],[402.212 130 0],[402.879 180 0],[403.686 180 0],[403.985 140 0],[404.428 140 0],[404.559 910 0],[406.479 180 0],[406.979 150 0],[406.995 730 0],[407.061 340 0],[407.193 100 0],[407.436 5000 0],[408.296 150 0],[408.833 130 0],[409.569 100 0],[410.27 1000 0],[410.975 150 0],[411.182 100 0],[411.805 150 0],[411.819 100 0],[412.085 100 0],[412.516 100 0],[412.68 150 0],[413.348 100 0],[413.746 540 0],[413.802 150 0],[414.225 110 0],[414.516 140 0],[414.595 110 0],[415.466 160 0],[417.053 160 0],[417.117 450 0],[420.44 160 0],[420.705 220 0],[421.538 110 0],[421.937 250 0],[422.204 110 0],[423.434 150 0],[424.144 290 0],[424.436 540 0],[425.935 290 0],[426.029 200 0],[426.33 200 0],[426.938 1400 0],[426.977 110 0],[427.455 220 0],[427.549 160 0],[427.674 160 0],[428.234 110 0],[428.601 110 0],[429.41 110 0],[429.461 4100 0],[430.211 2200 0],[430.687 160 0],[430.764 110 0],[433.213 110 0],[434.7 100 0],[435.517 150 0],[436.181 100 0],[436.478 150 0],[436.595 100 0],[437.252 150 0],[437.848 200 0],[438.485 180 0],[440.395 100 0],[440.828 200 0],[441.219 130 0],[443.69 160 0],[446.049 140 0],[446.634 140 0],[446.674 140 0],[448.419 640 0],[450.484 160 0],[451.288 130 0],[451.325 120 0],[454.354 150 0],[454.647 150 0],[455.182 150 0],[457.064 140 0],[458.873 170 0],[459.994 140 0],[460.989 140 0],[461.33 160 0],[464.253 100 0],[465.742 130 0],[465.987 640 0],[468.051 640 0],[469.372 100 0],[475.754 140 0],[484.381 790 0],[488.69 380 0],[498.259 220 0],[500.615 330 0],[501.53 220 0],[505.328 820 0],[505.46 210 0],[506.912 210 0],[507.174 120 0],[522.466 770 0],[550.049 27 0],[550.344 27 0],[550.861 10 0],[551.468 220 0],[553.138 15 0],[553.772 15 0],[556.809 13 0],[560.431 13 0],[563.127 11 0],[563.194 27 0],[564.837 65 0],[566.072 35 0],[567.439 27 0],[567.66 13 0],[567.69 15 0],[569.779 15 0],[573.509 55 0],[574.924 13 0],[575.61 11 0],[579.306 13 0],[579.649 13 0],[580.485 45 0],[580.605 13 0],[583.361 13 0],[583.897 13 0],[584.527 17 0],[585.158 28 0],[585.661 11 0],[586.463 22 0],[587.422 11 0],[588.021 13 0],[589.161 13 0],[590.12 13 0],[590.264 40 0],[592.858 13 0],[594.757 55 0],[595.396 13 0],[595.619 13 0],[596.083 27 0],[596.586 55 0],[597.251 27 0],[597.886 20 0],[598.382 20 0],[600.901 13 0],[601.278 55 0],[602.152 40 0],[602.832 20 0],[604.331 20 0],[604.992 13 0],[606.508 13 0],[608.144 22 0],[611.166 13 0],[611.552 13 0],[612.825 22 0],[614.394 13 0],[615.372 20 0],[615.487 20 0],[620.351 20 0],[625.428 20 0],[628.588 27 0],[629.202 45 0],[630.321 20 0],[638.647 13 0],[640.421 35 0],[644.512 40 0],[650.805 11 0],[653.239 15 0],[653.811 13 0],[656.32 13 0],[657.393 20 0],[660.713 11 0],[660.905 11 0],[661.162 17 0],[662.174 11 0],[667.842 13 0],[669.308 15 0],[674.656 5 0],[676.445 5 0],[680.531 7 0],[681.492 9 0],[682.027 9 0],[682.843 8 0],[685.374 4 0],[687.601 4 0],[690.829 5 0],[693.423 9 0],[696.412 8 0],[698.427 13 0],[699.327 8 0],[699.406 4 0],[701.788 8 0],[702.868 3 0],[709.822 3 0],[711.118 4 0],[714.052 15 0],[716.264 9 0],[719.133 5 0],[719.862 5 0],[720.016 11 0],[721.635 5 0],[722.606 4 0],[723.712 8 0],[727.447 5 0],[727.824 10 0],[728.581 15 0],[729.655 15 0],[729.825 3 0],[738.508 7 0],[745.139 4 0],[745.637 3 0],[748.335 8 0],[750.413 7 0],[750.9 10 0],[752.066 3 0],[753.745 9 0],[755.048 9 0],[756.992 17 0],[758.288 5 0],[761.218 3 0],[761.415 17 0],[763.129 3 0],[765.481 3 0],[768.897 13 0],[770.101 4 0],[776.116 5 0],[777.673 3 0],[778.415 11 0]}{8600}% +\wl@elt@search{#1}{Re}{[380.774 190 0],[381.566 120 0],[383.63 120 0],[386.994 240 0],[387.526 240 0],[387.686 240 0],[390.821 100 0],[391.392 130 0],[391.727 380 0],[392.985 550 0],[393.69 140 0],[394.472 110 0],[394.591 180 0],[396.104 280 0],[396.248 350 0],[400.493 100 0],[402.296 140 0],[402.331 100 0],[402.963 110 0],[403.331 220 0],[403.749 110 0],[404.899 200 0],[408.143 240 0],[410.442 140 0],[411.089 240 0],[412.164 190 0],[413.342 240 0],[413.645 1800 0],[414.436 700 0],[414.996 140 0],[417.04 160 0],[418.29 220 0],[418.306 220 0],[422.108 650 0],[422.746 3600 0],[424.139 150 0],[425.76 260 0],[429.117 120 0],[430.44 200 0],[433.225 200 0],[435.798 40 1],[435.869 380 0],[436.758 190 0],[439.134 140 0],[439.438 360 0],[440.64 110 0],[441.582 180 0],[447.508 150 0],[447.839 120 0],[450.704 120 0],[451.331 2600 0],[451.664 260 0],[452.273 500 0],[452.388 120 0],[452.995 120 0],[454.517 100 0],[458.068 120 0],[460.573 120 0],[462.138 100 0],[479.142 190 0],[488.914 2200 0],[492.39 220 0],[505.856 40 0],[509.65 70 0],[512.032 20 0],[516.165 25 0],[517.889 40 0],[518.174 20 0],[523.431 35 0],[524.886 50 0],[527.095 1300 0],[527.556 1600 0],[527.824 100 0],[530.556 30 0],[531.728 20 0],[532.128 35 0],[532.746 50 0],[533.19 20 0],[533.276 20 0],[533.385 20 0],[536.948 35 0],[536.98 50 0],[537.71 100 0],[543.19 25 0],[543.703 14 0],[544.792 14 0],[546.064 25 0],[552.005 14 0],[552.11 25 0],[553.268 50 0],[556.324 50 0],[557.347 25 0],[558.472 25 0],[560.721 10 0],[561.227 12 0],[566.788 100 0],[571.143 25 0],[571.695 18 0],[575.293 110 0],[577.683 110 0],[579.16 18 0],[581.592 10 0],[583.431 550 0],[591.986 10 0],[594.324 60 0],[595.021 10 0],[596.977 18 0],[598.999 10 0],[599.573 18 0],[611.422 30 0],[614.581 35 0],[614.682 50 0],[620.324 18 0],[621.797 25 0],[622.942 30 0],[624.324 35 0],[626.002 35 0],[627.137 18 0],[627.876 18 0],[628.641 10 0],[630.342 10 0],[630.77 200 0],[632.19 200 0],[635.075 80 0],[638.294 16 0],[641.147 14 0],[651.147 50 0],[651.525 14 0],[654.491 12 0],[657.711 35 0],[659.252 40 0],[660.519 100 0],[662.391 30 0],[663.725 10 0],[665.239 27 0],[668.328 15 0],[671.13 9 0],[675.122 30 0],[676.119 5 0],[681.341 180 0],[682.99 260 0],[697.153 85 0],[700.663 35 0],[702.415 65 0],[724.667 65 0],[729.272 13 0],[757.873 40 0],[761.189 13 0],[762.025 7 0],[764.094 50 0]}{3600}% +\wl@elt@search{#1}{Os}{[383.606 250 0],[384.03 150 0],[384.129 150 0],[384.994 190 0],[385.709 230 0],[386.547 230 0],[387.677 730 0],[388.186 250 0],[390.039 140 0],[390.171 190 0],[393 100 0],[393.859 250 0],[394.978 100 0],[396.102 200 0],[396.363 1000 0],[396.496 100 0],[396.967 150 0],[397.544 110 0],[397.723 730 0],[398.818 100 0],[400.348 150 0],[400.402 100 0],[400.516 150 0],[401.826 160 0],[403.784 100 0],[404.192 280 0],[404.805 160 0],[406.669 960 0],[407.086 250 0],[407.156 190 0],[407.468 230 0],[409.182 490 0],[410.03 120 0],[411.202 1200 0],[412.46 180 0],[412.896 180 0],[413.578 2500 0],[413.784 150 0],[417.257 180 0],[417.323 1200 0],[417.563 620 0],[418.413 120 0],[418.991 320 0],[420.145 180 0],[420.206 250 0],[421.186 1200 0],[421.386 120 0],[421.516 100 0],[423.346 170 0],[426.085 4900 0],[426.475 100 0],[426.961 120 0],[428.59 100 0],[429.395 560 0],[431.14 560 0],[432.625 110 0],[432.868 340 0],[433.875 100 0],[435.153 100 0],[436.567 210 0],[437.066 110 0],[439.486 520 0],[439.726 160 0],[440.274 160 0],[442.047 4900 0],[443.241 100 0],[443.632 290 0],[443.964 100 0],[444.735 230 0],[448.476 120 0],[454.866 110 0],[455.041 540 0],[455.13 140 0],[461.678 170 0],[463.183 170 0],[466.382 140 0],[479.399 670 0],[486.56 110 0],[503.183 55 0],[503.912 45 0],[507.288 35 0],[507.477 35 0],[507.909 35 0],[510.35 90 0],[511.081 55 0],[512.223 22 0],[514.554 22 0],[514.974 140 0],[515.201 28 0],[516.898 28 0],[519.352 40 0],[520.263 270 0],[520.323 35 0],[525.046 20 -1],[525.582 45 0],[526.515 55 0],[528.389 20 0],[529.565 20 0],[529.878 40 0],[530.258 13 0],[533.623 18 0],[534.603 11 0],[535.225 13 0],[537.679 110 0],[540.343 16 0],[541.214 13 0],[541.634 120 0],[541.669 45 0],[541.751 28 0],[544.182 16 0],[544.331 55 0],[544.693 22 0],[544.776 11 0],[544.937 20 0],[545.34 20 0],[545.73 22 0],[547 28 0],[547.458 13 0],[547.513 13 0],[547.727 9 0],[548.185 16 0],[550.933 22 0],[551.601 9 0],[552.353 270 0],[554.682 22 0],[554.979 9 0],[555.288 13 0],[556.062 11 0],[558.066 16 0],[558.444 80 0],[560.05 8 0],[562.008 35 0],[563.741 9 0],[564.256 22 0],[564.525 28 0],[564.898 7 0],[566.021 9 0],[567.438 7 0],[568.088 28 0],[570.937 11 0],[572.193 170 0],[573.789 8 0],[573.972 8 0],[576.505 22 0],[578.082 170 0],[580.06 40 0],[584.249 8 0],[585.776 110 0],[586.064 28 0],[588.292 11 0],[590.398 11 0],[590.684 11 0],[590.895 7 0],[598.136 7 0],[598.322 11 0],[599.6 65 0],[601.579 20 0],[605.463 7 0],[614.453 20 0],[615.803 11 0],[622.77 35 0],[624.17 7 0],[626.941 22 0],[627.494 11 0],[628.683 11 0],[639.886 9 0],[640.315 22 0],[644.813 9 0],[652.085 6 0],[652.887 7 0],[653.314 7 0],[653.83 11 0],[657.683 11 0],[661.456 8 0],[661.543 4 0],[666.181 7 0],[672.956 27 0],[679.153 18 0],[680.661 14 0],[687.87 5 0],[690.158 4 0],[695.602 11 0],[698.495 6 0],[706.067 15 0],[714.554 22 0],[714.989 10 0],[718.41 4 0],[720.633 10 0],[720.996 5 0],[725.116 9 0],[725.349 6 0],[737.507 6 0],[740.795 9 0],[760.295 26 0],[770.146 4 0],[778.996 7 0]}{4900}% +\wl@elt@search{#1}{Ir}{[380.012 3100 0],[381.724 230 0],[386.564 170 0],[390.251 480 0],[391.538 480 0],[393.484 400 0],[394.627 120 0],[397.631 590 0],[399.212 460 0],[402.003 180 0],[403.376 350 0],[404.008 130 0],[406.992 370 0],[407.068 150 0],[409.261 100 0],[411.578 140 0],[412.792 23 0],[415.57 27 0],[416.604 15 0],[417.256 90 0],[418.247 35 0],[418.321 15 0],[418.566 18 0],[419.754 23 0],[421.776 27 0],[422.08 13 0],[425.911 75 0],[426.53 27 0],[426.81 260 0],[428.662 23 0],[430.16 75 0],[431.059 55 0],[431.15 220 0],[435.13 18 0],[435.256 18 0],[439.259 18 0],[439.947 160 0],[440.378 65 0],[442.627 110 0],[445.018 15 0],[447.848 55 0],[449.535 16 0],[449.603 11 0],[454.568 55 0],[454.848 30 0],[455.078 13 0],[456.809 35 0],[457.002 18 0],[460.448 18 0],[461.639 75 0],[465.618 26 0],[466.899 17 0],[470.888 21 0],[472.886 50 0],[473.186 21 0],[475.646 26 0],[475.796 13 0],[477.816 65 0],[479.567 30 0],[480.714 10 0],[480.947 21 0],[484.077 10 0],[484.538 17 0],[493.809 50 0],[497.048 26 0],[499.974 25 0],[500.274 25 0],[500.917 17 0],[501.498 30 0],[504.606 17 0],[512.366 30 0],[517.795 20 0],[523.892 22 0],[534.074 12 0],[536.432 35 0],[544.95 75 0],[545.45 30 0],[546.94 7 0],[562.004 10 0],[562.555 45 0],[582.855 10 0],[588.23 10 0],[588.736 7 0],[589.406 35 0],[602.61 7 0],[606.783 12 0],[611.067 20 0],[628.828 12 0],[633.444 7 0],[662.473 5 0],[668.608 10 0],[683.001 5 0],[692.988 5 0],[718.371 4 0]}{3100}% +\wl@elt@search{#1}{Pt}{[380.105 20 -1],[381.869 80 0],[390.073 40 0],[392.296 110 0],[394.84 35 0],[396.636 100 0],[399.657 20 0],[411.869 110 0],[416.456 80 0],[419.243 40 0],[432.706 18 0],[439.183 18 0],[444.255 80 0],[444.555 14 0],[449.876 25 0],[452.09 12 0],[455.242 35 0],[487.953 12 0],[504.404 14 0],[505.948 30 0],[522.766 35 0],[530.102 40 0],[536.899 12 0],[539.079 12 0],[547.577 14 0],[547.85 14 0],[576.357 6 0],[584.012 20 0],[584.484 8 0],[602.604 6 0],[631.837 7 0],[632.658 8 0],[652.345 9 0],[671.042 10 0],[676.002 20 0],[684.26 60 0],[711.373 20 0]}{110}% +\wl@elt@search{#1}{Au}{[380.192 30 0],[380.401 30 1],[382.185 10 0],[382.57 10 0],[387.473 100 0],[388.025 30 0],[388.948 30 0],[389.226 100 0],[389.786 400 0],[390.109 30 0],[390.938 300 0],[392.769 100 0],[395.91 10 0],[396.623 30 0],[397.665 30 0],[397.968 30 0],[399.137 30 0],[401.257 3 0],[401.607 10 1],[404.093 400 0],[405.279 30 1],[406.507 700 0],[407.635 10 1],[408.328 3 1],[408.41 100 0],[410.17 30 0],[412.859 30 0],[420.113 30 0],[422.788 30 0],[424.18 100 0],[431.511 200 0],[436.104 30 1],[442.061 10 1],[443.727 120 0],[448.825 250 0],[460.751 900 0],[462.056 100 0],[466.392 1 0],[466.397 3 0],[469.469 10 0],[476.017 3 1],[479.258 500 0],[481.16 100 0],[482.296 10 0],[495.082 30 0],[506.459 30 0],[510.884 30 0],[514.744 100 0],[523.026 300 0],[526.176 100 0],[565.577 100 0],[572.136 100 0],[583.737 300 0],[586.293 100 0],[595.696 300 0],[596.268 30 0],[627.817 600 0],[656.268 100 0],[665.289 30 0],[751.073 600 0]}{900}% +\wl@elt@search{#1}{Hg}{[380.166 30 0],[390.1867 20 0],[390.6372 60 0],[398.3839 200 1],[404.6572 1800 0],[407.7838 150 0],[410.8057 40 0],[433.9224 250 0],[434.7496 400 0],[435.8337 4000 0],[491.6068 80 0],[546.0753 1100 0],[567.5922 160 0],[576.9598 240 0],[579.0663 280 0],[607.2713 20 0],[623.4402 30 0],[671.6429 160 0],[690.7461 250 0],[380.166 30 0],[380.638 100 1],[390.187 20 0],[390.637 60 0],[391.892 100 1],[398.396 200 1],[404.656 1800 0],[407.783 150 0],[410.805 40 0],[433.922 250 0],[434.749 400 0],[435.833 4000 0],[439.862 100 1],[466.028 90 1],[485.572 80 1],[488.3 5 0],[488.991 5 0],[491.607 80 0],[497.037 5 0],[498.064 5 0],[510.27 20 0],[512.064 40 0],[512.845 100 1],[513.794 20 0],[529.074 20 0],[531.678 5 0],[535.405 60 0],[538.463 30 0],[546.074 1100 0],[554.963 30 0],[567.586 160 0],[576.96 240 0],[578.966 100 0],[579.066 280 0],[580.378 140 0],[585.925 60 0],[587.173 60 1],[587.198 20 0],[607.272 20 0],[614.95 1000 1],[623.44 30 0],[652.113 80 1],[671.643 160 0],[690.752 250 0],[708.19 250 0],[709.186 200 0],[734.637 40 1],[748.587 100 1],[772.882 20 0],[380.351 15 2],[412.207 70 2],[414.034 10 2],[421.674 100 2],[447.058 15 2],[455.284 12 2],[479.701 50 2],[486.985 10 2],[497.357 80 2],[521.082 30 2],[569.571 6 2],[622.035 25 2],[641.898 35 2],[650.138 40 2],[658.426 10 2],[661.012 6 2],[670.929 30 2],[751.746 12 2]}{4000}% +\wl@elt@search{#1}{Tl}{[383.23 10 1],[386.915 6 1],[388.715 10 1],[422.305 8 1],[427.498 20 1],[430.68 40 1],[435.99 2 0],[449.077 8 1],[473.705 20 1],[498.135 15 1],[507.854 25 1],[515.214 25 1],[518.195 6 1],[518.31 6 1],[535.046 18000 0],[538.485 15 1],[540.992 7 1],[541.097 10 1],[594.948 25 1],[617.998 10 1],[623.903 8 1],[637.832 10 1],[654.984 16 0],[671.38 6 0],[696.65 10 1],[749.36 3 0],[767.893 2 0],[393.305 6 2],[394.602 2 2],[410.985 7 2],[415.575 4 2],[426.981 6 2],[438.057 2 2],[508.699 4 2],[536.24 4 2],[549.94 2 2],[592.78 5 2]}{18000}% +\wl@elt@search{#1}{Pb}{[401.9632 15000 0],[405.7807 95000 0],[406.2136 14000 0],[411.076 5 1],[411.335 4 1],[415.282 10 1],[415.7814 10 0],[416.8033 10000 0],[424.214 9 1],[424.492 20 1],[429.382 7 1],[429.665 6 1],[434.0413 200 0],[435.274 10 1],[438.646 20 1],[457.9051 10 1],[458.227 10 1],[500.5416 1000 0],[500.6572 100 0],[504.258 50 1],[507.058 10 1],[507.453 10 1],[507.635 10 0],[508.9484 50 0],[509.001 20 0],[510.7242 10 0],[511.164 10 1],[520.1437 2000 0],[536.764 10 1],[537.2099 10 1],[554.425 10 1],[560.885 20 1],[569.2346 40 0],[589.5624 200 0],[600.1862 2000 0],[600.958 9 1],[601.1667 500 0],[604.117 8 1],[605.9356 500 0],[607.574 40 1],[608.1409 40 1],[611.052 50 0],[615.989 10 1],[623.5266 100 0],[666.02 50 1],[689.211 10 0],[712.894 5 0],[719.36 20 1],[722.8965 20000 0],[730.468 5 0],[733.015 8 0],[734.6676 10 0],[755.897 10 1],[763.256 10 1],[773.296 4 1],[385.408 12 2],[395.192 8 2],[403.116 3 2],[409.454 3 2],[412.811 2 2],[427.266 8 2],[449.934 6 2],[457.121 7 2],[459.645 1 2],[476.112 6 2],[479.859 4 2],[482.686 1 2],[485.506 2 2],[506.512 3 2],[519.156 4 2],[552.397 5 2],[577.941 3 2],[585.796 6 2],[396.248 4 3],[404.98 4 3],[449.615 10 3],[453.46 16 3],[460.54 8 3],[591.454 2 3],[480.936 4 4],[665.099 5 4],[675.32 4 4]}{95000}% +\wl@elt@search{#1}{Bi}{[381.11 12 1],[381.58 20 1],[384.58 10 1],[386.39 30 1],[407.91 40 1],[409.72 10 1],[412.153 140 0],[412.186 140 0],[425.94 75 1],[427.2 25 1],[430.17 70 1],[433.98 12 1],[434.05 25 1],[437.94 12 1],[447.68 25 1],[470.53 60 1],[472.252 600 0],[473.03 30 1],[474.97 20 1],[490.82 12 1],[491.66 10 1],[496.97 12 1],[499.36 20 1],[509.16 10 1],[512.43 50 1],[514.43 60 1],[520.15 20 1],[520.92 75 1],[527.03 40 1],[539.78 10 1],[555.235 10 0],[559.941 3 0],[565.52 20 1],[571.92 40 1],[574.255 6 0],[581.83 12 1],[586.02 20 1],[597.3 20 1],[605.91 15 1],[612.8 15 1],[613.482 6 0],[647.573 3 0],[647.624 3 0],[649.77 15 1],[657.72 10 1],[660.02 40 1],[680.86 50 1],[699.112 4 0],[703.3 12 1],[703.615 2 0],[738.1 10 1],[750.233 2 0],[763.7 10 1],[775 10 1],[422.46 12 2],[432.78 25 2],[456.084 30 2],[456.154 30 2],[479.74 40 2],[507.93 45 2],[662.34 12 2],[738.1 10 2],[755.1 12 2],[759.8 25 2],[763.7 10 2],[386.8 100 3],[434.2 30 3],[534.7 30 3]}{600}% +\wl@elt@search{#1}{Po}{[386.193 500 0],[405.198 200 -1],[417.052 1200 0],[423.613 250 -1],[441.558 200 -1],[449.321 800 0],[461.144 350 0],[486.712 200 -1],[487.624 400 0],[494.681 450 -1],[532.323 350 0],[574.485 300 0]}{1200}% +\wl@elt@search{#1}{Rn}{[391.72 10 0],[394.172 10 0],[395.236 10 0],[422.606 10 0],[430.776 80 0],[433.578 7 0],[434.96 100 0],[443.505 40 0],[445.925 50 0],[450.848 50 0],[457.772 50 0],[460.938 50 0],[472.176 30 0],[572.258 6 0],[606.192 10 0],[620.075 6 0],[638.045 6 0],[655.749 10 0],[660.643 10 0],[662.723 15 0],[666.96 6 0],[670.428 8 0],[675.181 20 0],[680.679 6 0],[683.695 8 0],[683.757 8 0],[689.116 10 0],[699.89 10 0],[705.542 200 0],[726.811 100 0],[729.1 20 0],[732.098 6 0],[741.904 10 0],[745 300 0],[747.089 8 0],[748.313 8 0],[751.413 8 0],[751.692 8 0],[752.393 6 0],[759.755 6 0],[760.128 8 0],[765.748 10 0],[773.843 10 0],[774.664 20 0]}{300}% +\wl@elt@search{#1}{Ra}{[381.442 200 1],[419.409 8 1],[424.472 8 1],[434.064 100 1],[443.627 20 1],[453.311 30 1],[464.129 8 0],[468.228 100 1],[469.928 8 0],[482.591 100 0],[485.607 10 0],[485.941 10 1],[492.753 10 1],[509.756 10 0],[520.593 10 0],[528.328 10 0],[532.029 10 0],[539.98 10 0],[540.023 20 0],[540.681 20 0],[548.213 8 0],[550.198 10 0],[555.357 10 0],[555.585 20 0],[561.666 10 0],[566.081 50 0],[581.363 20 1],[620.03 30 0],[633.69 10 0],[644.62 20 0],[648.732 20 0],[659.334 10 1],[671.932 10 1],[698.022 20 0],[711.85 20 0],[714.121 50 0],[722.516 20 0],[731.027 10 0]}{200}% +\wl@elt@search{#1}{Ac}{[386.312 2000 1],[391.447 100 1],[406.16 400 1],[408.844 3000 1],[416.84 3000 1],[417.998 100 0],[418.312 20 0],[419.44 20 0],[420.969 300 1],[435.913 300 1],[438.453 20 0],[438.641 1000 1],[439.671 20 0],[446.273 20 0],[450.72 1000 1],[460.545 500 1],[471.658 10 0],[472.016 400 1],[481.222 300 1],[494.518 100 1],[495.823 100 1],[496.087 100 1],[544.638 150 1],[573.205 300 1],[575.897 400 1],[591.085 1000 1],[616.475 600 1],[616.783 200 1],[624.283 400 1],[635.986 20 0],[669.127 20 0],[729.04 6 0],[441.309 2000 2],[456.987 3000 2],[519.321 8 2]}{3000}% +\wl@elt@search{#1}{Th}{[380.0197 50 0],[380.3075 590 0],[380.7273 50 0],[381.3068 340 1],[381.8685 50 0],[382.5133 75 0],[382.8384 450 0],[383.6584 70 0],[383.9746 840 1],[384.196 280 1],[384.6887 100 0],[385.2135 85 0],[385.4511 390 1],[385.984 140 1],[386.3405 450 1],[386.9663 100 0],[387.5374 210 0],[387.9644 140 0],[388.6915 100 0],[389.5419 340 0],[390.1661 50 0],[390.3102 110 0],[390.5186 170 1],[390.875 50 0],[391.1909 85 0],[391.6417 50 0],[391.9023 110 0],[392.5093 140 0],[392.9669 590 1],[393.2911 200 0],[393.704 140 1],[394.2072 50 0],[394.803 50 0],[394.8964 200 1],[395.276 50 0],[395.93 110 0],[396.7392 390 0],[397.2155 200 0],[398.0089 150 0],[399.173 110 0],[399.4549 530 1],[399.8061 50 0],[400.3309 240 1],[400.7021 250 1],[400.821 220 0],[400.9056 220 0],[401.2495 280 0],[401.9129 4200 1],[402.5656 210 1],[402.7009 140 0],[403.0842 250 0],[403.6047 250 0],[403.6565 240 1],[404.1204 240 1],[404.8287 55 0],[405.0887 110 0],[405.9253 140 0],[406.3407 250 0],[406.9201 300 1],[406.9461 100 0],[407.5503 55 0],[408.1368 110 0],[408.5434 85 0],[408.652 700 1],[408.8726 70 0],[409.4747 700 1],[410.0341 150 0],[410.533 270 1],[410.8421 840 1],[411.2754 240 0],[411.5758 280 0],[411.6713 1100 1],[412.36 30 0],[412.7411 200 0],[413.1002 110 0],[413.2753 340 1],[413.4067 200 0],[414.0235 220 1],[414.2701 250 1],[414.8182 200 1],[414.9986 450 1],[415.8535 110 0],[416.5766 140 0],[417.806 620 1],[417.9714 250 1],[418.4138 30 0],[419.3017 130 0],[420.889 620 1],[421.0923 130 0],[421.4828 28 0],[422.0065 55 0],[422.7387 55 0],[423.0824 30 0],[423.5463 85 0],[424.1094 20 0],[424.7989 30 1],[425.3538 110 0],[425.6254 70 0],[426.0333 110 0],[426.9942 28 0],[427.3357 280 1],[427.7313 480 1],[428.2042 700 1],[428.8669 28 0],[429.7306 55 0],[429.9839 85 0],[430.7176 100 0],[430.9991 200 1],[431.5254 55 0],[431.8416 110 0],[432.5274 30 0],[433.0844 28 0],[433.7277 130 0],[434.2256 85 1],[434.4326 130 1],[434.9072 55 0],[435.4484 55 0],[435.9372 85 0],[436.593 85 0],[437.4123 85 0],[438.186 1300 1],[439.111 1100 1],[439.2974 55 0],[440.158 55 0],[440.8882 85 0],[441.2741 210 1],[441.6845 28 0],[442.2048 50 0],[443.2963 250 1],[444.0866 140 1],[445.2565 25 0],[445.8002 85 0],[446.5341 220 1],[447.5221 30 0],[448.2169 75 0],[448.9664 50 0],[449.894 110 0],[450.5216 55 0],[451.0527 280 1],[452.1194 70 0],[453.0319 22 0],[453.5255 40 0],[454.5915 30 1],[455.5812 70 0],[456.366 40 0],[457.0972 65 0],[458.8426 50 0],[459.5421 75 0],[461.2554 26 1],[462.1163 30 0],[463.1761 140 1],[463.1761 140 1],[464.1254 30 0],[465.1558 140 1],[466.3202 23 0],[466.9984 50 0],[467.6056 65 0],[468.6195 50 0],[469.4091 140 1],[470.399 50 0],[471.2841 20 0],[472.3438 90 0],[472.9128 30 0],[474.0529 190 1],[475.2414 140 1],[476.66 13 0],[477.8294 50 0],[478.6531 20 0],[478.9387 40 0],[480.8134 45 0],[481.9193 20 0],[482.2855 26 0],[482.67 40 0],[483.1121 45 0],[484.0843 50 0],[484.8362 30 0],[485.2868 15 0],[485.8333 40 1],[486.3163 280 1],[487.2917 40 0],[487.8733 26 0],[489.4955 45 0],[490.7209 20 0],[491.9816 240 1],[492.778 18 0],[493.9642 40 0],[494.7575 60 1],[495.4659 50 1],[496.5731 30 0],[497.595 35 1],[498.5372 24 0],[500.2097 50 0],[500.2097 50 0],[501.5889 50 1],[501.7255 260 1],[502.9892 20 0],[503.923 24 0],[504.4719 50 0],[504.9796 240 1],[505.5347 85 1],[505.8562 70 1],[506.7974 110 0],[508.1446 30 0],[509.0051 50 0],[509.8043 50 1],[510.113 40 0],[511.0867 50 1],[511.5044 30 0],[512.595 10 0],[513.4746 20 0],[514.3267 95 1],[514.8211 120 1],[515.1612 50 0],[515.4243 50 0],[515.8604 85 0],[516.073 70 0],[516.8922 20 0],[517.6961 50 0],[518.399 35 1],[519.0871 50 1],[519.5814 50 0],[519.88 50 0],[519.9164 95 0],[521.123 50 0],[521.6596 95 1],[521.8528 50 1],[521.911 35 0],[523.116 110 0],[523.3225 85 1],[523.3229 85 1],[524.7654 95 1],[525.5573 10 0],[525.836 35 0],[526.671 12 0],[527.7501 70 1],[528.1069 15 0],[529.4397 10 0],[529.7743 30 0],[530.7466 30 1],[531.2002 35 0],[531.7494 20 0],[532.5145 60 1],[532.6976 50 0],[533.008 20 0],[534.3581 60 0],[535.1126 14 0],[535.8707 30 0],[536.9281 20 0],[537.8836 30 0],[539.0466 70 1],[539.2572 50 0],[539.9175 20 0],[541.7486 24 0],[542.5678 60 1],[543.5893 50 1],[544.9479 40 1],[546.2615 30 1],[547.0759 15 0],[548.4147 24 1],[549.6137 10 0],[550.4302 19 0],[550.9994 35 0],[552.4584 12 0],[553.9262 50 0],[553.9911 70 1],[554.8176 35 0],[555.8342 50 0],[556.4203 60 1],[557.3354 40 0],[558.7026 60 0],[559.5064 24 0],[560.4515 50 1],[561.532 35 0],[563.0297 7 0],[563.9746 70 1],[564.8991 7 0],[565.7925 12 0],[566.7128 15 0],[567.7053 20 0],[568.5192 10 0],[570.0918 65 1],[570.7103 95 1],[572.0183 50 0],[573.2975 30 1],[574.2084 24 1],[574.9388 30 1],[576.0551 70 0],[577.3946 15 0],[578.9645 20 0],[580.4141 35 0],[581.5422 19 1],[583.237 10 0],[584.5919 10 0],[585.4121 15 0],[586.8373 15 0],[587.8933 10 0],[589.1451 8 0],[589.9844 15 0],[591.4387 20 1],[592.5893 19 1],[593.7162 10 0],[594.4648 10 0],[595.7587 8 0],[597.3665 30 0],[598.9044 85 1],[599.4129 24 0],[600.7072 21 0],[601.5426 30 1],[602.1036 17 0],[603.7698 17 0],[604.4431 24 1],[605.3381 10 0],[606.1536 5 0],[607.7106 30 0],[608.7262 30 1],[609.9083 24 0],[610.458 30 0],[611.2837 40 0],[612.0557 30 1],[612.448 10 0],[615.1993 14 0],[616.1354 10 0],[616.9822 60 0],[618.2622 50 0],[619.1906 12 0],[619.3858 24 1],[620.3493 12 0],[622.4528 12 0],[623.4856 24 0],[624.0954 8 0],[625.7424 10 0],[626.1063 21 0],[626.1418 21 0],[627.4116 50 1],[627.4117 50 1],[627.9172 30 1],[629.1192 8 0],[630.3251 10 1],[631.7185 8 0],[632.7278 21 0],[634.286 35 0],[635.5911 50 1],[636.914 14 0],[637.6931 40 0],[641.1899 30 0],[641.3615 24 0],[643.7762 15 0],[645.0005 15 0],[645.7283 60 0],[646.2614 50 0],[646.6717 5 0],[649.0738 14 0],[650.1992 5 0],[651.2364 20 0],[652.2044 5 0],[653.1342 50 0],[655.416 6 0],[655.8876 5 0],[656.507 3 0],[657.7215 5 0],[658.3907 24 0],[658.854 24 0],[659.394 24 0],[660.5416 24 1],[661.9946 24 1],[661.9947 24 1],[664.465 21 1],[665.8678 6 1],[666.2269 30 0],[667.4697 6 0],[668.3367 3 0],[669.2724 8 1],[669.7712 5 0],[672.7459 16 0],[673.5126 3 0],[674.2884 5 0],[675.6453 20 0],[676.5677 6 0],[677.8313 15 0],[678.0413 15 0],[679.1236 6 0],[679.8747 3 0],[680.9511 3 0],[682.3509 5 0],[682.9036 11 0],[683.4925 14 0],[686.2873 4 0],[686.6367 5 0],[687.4754 8 0],[688.9303 20 1],[690.8988 3 0],[691.1227 24 0],[691.6129 5 0],[693.6652 5 0],[694.3611 35 0],[695.4657 5 0],[696.5947 15 0],[698.1086 3 0],[698.9656 55 0],[699.3038 24 1],[700.0806 18 0],[700.0806 18 0],[701.5319 3 0],[701.8569 10 0],[702.6462 3 0],[703.6281 7 0],[704.5795 30 1],[705.3619 15 1],[706.0654 6 0],[707.5333 24 1],[708.4171 30 0],[708.9339 24 1],[710.0512 10 1],[710.9861 3 0],[712.4562 11 0],[713.2613 3 0],[714.856 5 0],[715.4954 10 0],[716.8896 30 0],[717.3373 15 0],[719.1132 40 1],[720.0046 7 0],[720.8006 35 0],[721.269 11 0],[721.7755 10 1],[721.8054 11 0],[724.2355 3 0],[725.5354 5 0],[727.0558 3 0],[728.4904 7 0],[729.8143 5 0],[730.5405 11 1],[731.5067 5 0],[732.4808 7 0],[733.9606 5 0],[734.1152 8 0],[736.1349 5 0],[738.4175 5 0],[738.5501 18 0],[739.3431 3 1],[740.2252 5 0],[741.855 3 0],[742.894 21 0],[743.0254 10 0],[744.4749 3 0],[746.2993 2 0],[748.1355 10 0],[749.3427 2 0],[752.5508 50 1],[754.9314 7 0],[756.774 18 0],[758.569 12 0],[758.5792 12 0],[759.8204 4 0],[760.7824 2 0],[762.7176 5 0],[763.6176 3 0],[764.738 30 0],[765.8324 4 0],[767.6219 7 0],[768.5305 21 0],[771.0269 4 0],[772.8951 4 0],[773.172 10 1],[777.1948 4 0],[778.779 15 1],[778.8937 15 0],[779.836 5 0],[455.573 100 2],[458.928 50 2],[537.613 100 2],[544.718 50 2],[624.295 50 2],[659.939 50 2],[746.159 50 2],[493.709 2 3],[495.252 4 3],[542.038 3 3],[671.187 2 3],[674.037 3 3],[690.116 50 3]}{4200}% +\wl@elt@search{#1}{Pa}{[387.335 3000 0],[393.183 3000 0],[395.262 3000 1],[395.785 10000 1],[397.007 3000 1],[398.182 3000 0],[398.223 10000 0],[401.296 3000 1],[401.821 3000 1],[403.016 3000 1],[404.693 3000 1],[405.62 10000 1],[407.04 10000 1],[411.762 3000 -1],[417.618 3000 1],[421.723 10000 1],[424.808 10000 1],[429.134 3000 1],[440.077 3000 -1],[443.613 3000 -1],[460.143 3000 1],[462.819 3000 -1],[482.034 3000 -1],[486.149 3000 -1],[603.578 3000 0],[616.256 3000 0],[621.635 3000 -1],[635.861 3000 0],[637.925 3000 0],[643.897 3000 0],[679.275 3000 0],[694.572 10000 0],[696.009 3000 0],[696.178 3000 0],[699.273 3000 0],[707.627 3000 0],[710.094 3000 0],[711.489 10000 0],[717.155 3000 0],[722.713 3000 0],[731.879 3000 0],[736.825 10000 0],[747.189 3000 0],[749.315 10000 0],[755.826 3000 0],[760.82 10000 0],[762.679 10000 0],[763.518 10000 0],[766.934 10000 0],[767.92 3000 0],[774.919 10000 0]}{10000}% +\wl@elt@search{#1}{U}{[380.892 380 0],[380.922 380 1],[381.199 1900 0],[381.379 380 1],[381.406 380 1],[382.651 750 1],[383.146 2000 1],[383.963 1200 0],[384.86 490 1],[385.422 620 0],[385.464 2400 1],[385.957 4900 1],[386.117 490 1],[386.592 1900 1],[386.68 380 1],[387.103 1500 0],[387.404 620 1],[387.808 620 1],[388.145 1000 1],[388.236 490 1],[388.328 380 1],[389.036 2200 1],[389.268 620 1],[389.412 490 0],[389.677 490 1],[389.978 620 1],[390.255 410 1],[390.43 460 1],[390.645 380 0],[391.167 330 1],[391.588 380 1],[392.621 330 0],[392.672 330 0],[393.098 430 1],[393.202 2000 1],[393.538 490 1],[394.048 330 1],[394.382 1200 0],[394.844 300 0],[395.358 300 1],[395.467 360 1],[396.421 350 0],[396.652 600 1],[398.579 1200 1],[399.042 460 1],[399.253 380 1],[399.824 350 1],[400.406 350 1],[400.521 430 0],[401.772 570 1],[401.899 300 1],[404.275 1000 0],[404.441 520 1],[404.761 410 0],[405.004 1600 1],[405.191 540 1],[405.43 300 1],[405.819 430 1],[406.254 880 1],[406.775 520 1],[407.112 410 1],[407.448 300 1],[407.669 330 1],[408.06 330 1],[409.013 2200 1],[409.303 460 1],[410.638 380 1],[411.61 810 1],[412.473 410 1],[412.834 410 1],[414.122 460 1],[415.397 880 0],[415.665 380 0],[416.368 350 1],[417.159 1400 1],[418.927 300 1],[422.237 350 0],[424.167 1000 1],[424.437 520 1],[434.169 680 1],[435.574 430 0],[436.205 430 0],[439.359 330 0],[447.233 600 1],[451.528 240 1],[454.363 620 1],[462.021 300 0],[462.707 240 1],[463.162 210 0],[464.66 220 1],[466.685 140 1],[467.14 100 1],[468.907 170 1],[470.251 100 1],[472.272 160 1],[473.159 120 1],[475.574 100 1],[475.681 150 0],[477.27 100 1],[486.099 100 1],[500.821 110 1],[502.738 170 0],[511.724 70 1],[516.032 80 1],[516.414 55 0],[518.457 55 1],[520.431 45 1],[524.775 45 1],[525.704 45 1],[528.038 70 0],[538.619 55 1],[547.57 80 1],[548.026 70 1],[548.12 70 1],[548.253 45 1],[549.295 160 1],[552.782 70 1],[556.417 70 0],[558.159 45 1],[562.078 55 0],[578.059 70 0],[579.853 70 1],[583.602 45 0],[583.768 55 1],[591.539 230 0],[597.15 55 0],[597.632 100 0],[599.731 45 0],[601.738 28 1],[605.174 55 1],[606.722 45 1],[607.729 90 0],[608.734 28 1],[617.186 40 0],[617.539 35 0],[628.018 28 1],[635.929 28 0],[637.246 55 0],[637.852 28 1],[639.277 28 0],[639.542 90 0],[644.916 110 0],[646.498 35 0],[682.692 90 0],[687.674 35 1],[707.479 23 0],[710.161 27 0],[712.89 30 0],[714.789 16 0],[725.445 16 0],[742.55 23 0],[753.393 45 0],[761.935 16 0]}{4900}% +\wl@elt@search{#1}{Np}{[398.689 300 0],[504.466 300 0],[560.17 300 0],[565.275 300 0],[578.439 300 0],[587.804 300 0],[601.122 300 0],[605.609 300 0],[607.39 300 0],[608.005 300 0],[612.049 300 0],[618.859 300 0],[620 300 0],[621.59 300 0],[631.784 300 0],[634.138 300 0],[656.611 300 0],[672.068 300 0],[675.132 300 0],[679.521 300 0],[680.262 300 0],[680.581 300 0],[681.644 300 0],[686.545 300 0],[690.713 300 0],[691.291 300 0],[693.031 1000 0],[696.363 300 0],[697.209 3000 0],[701.402 300 0],[701.891 300 0],[703.914 300 0],[708.001 300 0],[717.483 300 0],[718.493 300 0],[728.428 300 0],[729.229 300 0],[733.252 300 0],[737.06 300 0],[738.103 300 0],[738.165 300 0],[740.27 300 0],[751.222 300 0],[751.515 300 0],[754.605 300 0],[762.483 300 0],[762.685 300 0],[768.101 300 0],[768.525 300 0],[773.514 1000 0],[776.161 300 0],[776.575 1000 0],[777.607 300 0],[778.746 300 0],[779.138 1000 0]}{3000}% +\wl@elt@search{#1}{Pu}{[380.593 10000 0],[381.14 10000 0],[381.23 10000 1],[382.757 10000 0],[383.552 10000 0],[383.696 10000 0],[383.892 10000 0],[384.21 10000 0],[385.101 10000 0],[385.185 10000 0],[387.854 10000 0],[389.589 10000 0],[392.853 10000 0],[397.543 10000 1],[409.712 10000 0],[410.196 10000 0],[410.595 10000 1],[411.107 10000 0],[411.491 10000 0],[412.812 10000 0],[412.993 10000 1],[413.301 10000 0],[413.597 10000 0],[414.004 10000 0],[414.12 10000 1],[415.109 10000 0],[415.145 10000 0],[415.546 10000 0],[415.939 10000 1],[416.777 10000 0],[417.095 10000 0],[417.828 10000 1],[418.99 10000 1],[419.006 10000 1],[419.62 10000 1],[420.648 10000 0],[420.823 10000 0],[422.187 10000 0],[422.42 10000 0],[422.977 10000 1],[425.476 10000 1],[426.188 10000 0],[426.977 10000 0],[427.334 10000 1],[428.117 10000 0],[428.908 10000 1],[433.718 10000 1],[435.271 10000 1],[436.741 10000 0],[437.991 10000 1],[438.535 10000 1],[439.393 10000 1],[440.49 10000 0],[444.165 10000 1],[446.854 10000 1],[447.279 10000 1],[449.378 10000 1],[450.491 10000 1],[453.615 10000 1],[473.54 10000 0],[498.934 10000 0],[526.986 10000 0],[538.102 10000 0],[549.85 10000 0],[551.072 10000 0],[553.759 10000 0],[554.962 10000 0],[559.054 10000 0],[559.233 10000 0],[571.239 10000 0],[577.026 10000 0],[583.905 10000 0],[598.335 10000 0],[601.278 10000 0],[619.28 10000 0],[630.466 10000 0],[644.975 10000 0],[648.671 10000 0],[648.886 10000 0],[648.889 10000 -1],[653.527 10000 0],[654.421 10000 0],[660.895 10000 0],[667.272 10000 0],[678.466 10000 0],[688.016 10000 0],[689.138 10000 0],[705.923 10000 0],[706.89 10000 0],[709.246 10000 0],[711.688 10000 0],[714.166 10000 0],[717.714 10000 0],[723.109 10000 0],[725.806 10000 0],[732.223 10000 0],[732.597 10000 0],[733.181 10000 0],[743.118 10000 0],[744.799 10000 0],[750.78 10000 0],[752.693 10000 0],[754.745 10000 0],[756.45 10000 0],[757.187 10000 0],[757.293 10000 0],[760.977 10000 0],[768.94 10000 0],[775.82 10000 0],[779.854 10000 0]}{10000}% +\wl@elt@search{#1}{Am}{[392.625 5000 1],[395.258 1000 1],[402.025 100 0],[403.581 100 0],[403.637 500 1],[408.929 5000 1],[408.932 100 1],[414.096 100 0],[418.812 1000 1],[426.555 1000 0],[428.926 5000 0],[430.965 200 1],[432.457 2000 1],[444.136 2000 1],[450.945 5000 1],[457.559 5000 1],[459.331 1000 1],[464.912 100 0],[465.345 100 0],[466.279 5000 0],[468.165 2000 0],[469.97 2000 1],[470.68 1000 0],[487.222 2000 1],[499.079 200 0],[500.021 100 0],[502.096 1000 1],[521.599 200 1],[540.262 1000 0],[542.47 1000 0],[558.421 1000 1],[559.813 1000 0],[605.464 10000 0],[640.511 1000 0],[654.416 500 0],[695.558 500 0]}{10000}% +\wl@elt@search{#1}{Cm}{[381.63 10000 0],[382.514 10000 0],[383.332 10000 0],[383.759 10000 0],[384.2 10000 0],[384.992 10000 0],[385.411 10000 0],[390.025 10000 0],[390.406 10000 1],[390.824 10000 1],[393.667 10000 0],[394.203 10000 0],[394.415 10000 0],[394.868 10000 0],[395.336 10000 0],[396.483 10000 0],[399.51 10000 0],[401.617 10000 0],[403.176 10000 0],[404.829 10000 0],[404.965 10000 0],[411.329 10000 0],[412.971 10000 0],[420.766 10000 1],[421.162 10000 0],[426.645 10000 0],[429.3 10000 0],[433.082 10000 0],[434.569 10000 0],[444.777 10000 0],[445.916 10000 0],[460.84 10000 0],[584.607 10000 0],[595.241 10000 0],[605.89 10000 0],[624.335 10000 0],[637.671 10000 0],[651.016 10000 0],[655.441 10000 0],[664.017 10000 0],[666.325 10000 0],[668.687 10000 0],[670.685 10000 0],[672.668 10000 0],[679.315 10000 0],[716.269 10000 0],[757.78 10000 0],[767.379 10000 0],[772.047 10000 0]}{10000}% +\wl@elt@search{#1}{Bk}{[380.108 10000 1],[380.235 10000 0],[380.247 10000 0],[381.529 10000 0],[382.31 10000 1],[382.408 10000 1],[382.519 10000 0],[382.584 10000 1],[382.741 10000 0],[383.055 10000 0],[383.157 10000 1],[383.348 10000 -1],[383.597 10000 1],[384.219 10000 0],[384.662 10000 0],[384.763 10000 0],[385.503 10000 0],[385.989 10000 1],[387.794 10000 1],[388.011 10000 0],[388.26 10000 0],[389.455 10000 1],[390.609 10000 1],[391.216 10000 1],[391.637 10000 1],[392.142 10000 0],[392.805 10000 1],[414.713 10000 1],[418.969 10000 1],[419.744 10000 1],[432.958 10000 0],[435.15 10000 0],[436.364 10000 0],[442.301 10000 0],[446.646 10000 0],[468.57 10000 -1],[476.54 10000 -1],[505.673 10000 0],[511.824 10000 0],[513.553 10000 1],[517.061 10000 0],[519.755 10000 0],[521.253 10000 0],[527.195 10000 0],[539.203 10000 0],[539.424 10000 0],[540.462 10000 0],[544.963 10000 0],[546.747 10000 0],[548.458 10000 0],[551.222 10000 1],[553.793 10000 0],[555.68 10000 0],[555.709 10000 0],[558.121 10000 0],[565.654 10000 0],[565.903 10000 0],[570.224 10000 0],[591.071 10000 0],[704.085 10000 0],[710.785 10000 0],[717.622 10000 0],[724.926 10000 -1],[725.25 10000 0],[725.721 10000 0],[730.694 10000 0],[739.426 10000 -1],[751.126 10000 0],[755.112 10000 0],[757.977 10000 0],[772.993 10000 0]}{10000}% +\wl@elt@search{#1}{Cf}{[389.323 10000 1],[399.357 10000 1],[403.545 10000 -1],[409.912 10000 0],[424.238 10000 0],[432.903 10000 0],[433.522 10000 0],[517.396 10000 0],[517.908 10000 0],[521.924 10000 0],[527.901 10000 -1],[532.009 10000 -1],[533.913 10000 -1],[540.888 10000 0],[572.605 10000 0],[662.283 10000 0],[663.126 10000 0],[667.79 10000 0],[689.459 10000 0],[692.71 10000 1],[707.452 10000 0],[730.79 10000 0]}{10000}% +\wl@elt@search{#1}{Es}{[380.149 10000 -1],[392.91 300 -1],[393.077 3000 -1],[395.719 100 -1],[399.535 100 -1],[407.771 300 -1],[408.224 10000 -1],[410.759 3000 -1],[417.694 1000 -1],[449.625 100 -1],[463.166 100 -1],[465.086 300 -1],[478.993 1000 -1],[480.217 300 -1],[480.221 1000 -1],[495.829 3000 -1],[505.208 10000 -1],[510.293 1000 -1],[515.582 100 -1],[516.174 10000 0],[520.44 10000 0],[561.551 3000 0],[653.971 100 -1]}{10000}% +}% +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgf-spectra.tlpobj new/tlpkg/tlpobj/pgf-spectra.tlpobj --- old/tlpkg/tlpobj/pgf-spectra.tlpobj 2016-04-22 01:25:23.000000000 +0200 +++ new/tlpkg/tlpobj/pgf-spectra.tlpobj 2017-04-14 17:54:06.000000000 +0200 @@ -1,6 +1,6 @@ name pgf-spectra category Package -revision 40656 +revision 42986 shortdesc Draw continuous or discrete spectra using PGF/TikZ relocated 1 longdesc The purpose of this package is to draw the spectra of elements @@ -11,10 +11,11 @@ longdesc available for the spectra of 99 elements and their ions (from longdesc the NASA database). It also allows the user to draw spectra longdesc using their own data. -runfiles size=9 +runfiles size=74 RELOC/tex/latex/pgf-spectra/pgf-spectra.sty + RELOC/tex/latex/pgf-spectra/spectra.data.tex catalogue-ctan /graphics/pgf/contrib/pgf-spectra -catalogue-date 2016-04-21 20:14:44 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics physics pgf-tikz catalogue-version 1.0 ++++++ pgf-umlcd.doc.tar.xz ++++++ ++++++ pgf-umlcd.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgf-umlcd.tlpobj new/tlpkg/tlpobj/pgf-umlcd.tlpobj --- old/tlpkg/tlpobj/pgf-umlcd.tlpobj 2016-04-14 19:34:29.000000000 +0200 +++ new/tlpkg/tlpobj/pgf-umlcd.tlpobj 2017-04-14 17:54:06.000000000 +0200 @@ -8,7 +8,7 @@ RELOC/tex/latex/pgf-umlcd/pgf-umlcd.sty catalogue-also pst-uml uml catalogue-ctan /graphics/pgf/contrib/pgf-umlcd -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics uml pgf-tikz catalogue-version 0.2.1.1 ++++++ pgf-umlsd.doc.tar.xz ++++++ ++++++ pgf-umlsd.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgf-umlsd.tlpobj new/tlpkg/tlpobj/pgf-umlsd.tlpobj --- old/tlpkg/tlpobj/pgf-umlsd.tlpobj 2016-04-14 19:34:30.000000000 +0200 +++ new/tlpkg/tlpobj/pgf-umlsd.tlpobj 2017-04-14 17:54:06.000000000 +0200 @@ -8,7 +8,7 @@ RELOC/tex/latex/pgf-umlsd/pgf-umlsd.sty catalogue-also pst-uml uml catalogue-ctan /graphics/pgf/contrib/pgf-umlsd -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics uml pgf-tikz catalogue-version 0.7 ++++++ pgf.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-r/pgf.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-r.new/pgf.doc.tar.xz differ: char 27, line 1 ++++++ pgf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgf.tlpobj new/tlpkg/tlpobj/pgf.tlpobj --- old/tlpkg/tlpobj/pgf.tlpobj 2016-05-09 03:16:15.000000000 +0200 +++ new/tlpkg/tlpobj/pgf.tlpobj 2017-05-07 02:07:18.000000000 +0200 @@ -1,6 +1,6 @@ name pgf category Package -revision 40966 +revision 44231 shortdesc Create PostScript and PDF graphics in TeX relocated 1 longdesc PGF is a macro package for creating graphics. It is platform- @@ -11,7 +11,7 @@ longdesc PGF works with plain (pdf-)TeX, (pdf-)LaTeX, and ConTeXt. longdesc Unlike pstricks, it can produce either PostScript or PDF longdesc output. -depend xkeyval +depend ms runfiles size=1315 RELOC/tex/context/third/pgf/basiclayer/t-pgf.tex RELOC/tex/context/third/pgf/basiclayer/t-pgfbim.tex @@ -479,7 +479,7 @@ RELOC/tex/plain/pgf/utilities/pgfkeys.tex RELOC/tex/plain/pgf/utilities/pgfrcs.tex catalogue-ctan /graphics/pgf/base -catalogue-date 2015-08-29 20:25:54 +0200 -catalogue-license lppl1.3 +catalogue-date 2017-04-18 05:31:40 +0200 +catalogue-license lppl1.3gpl2 catalogue-topics pgf-tikz graphics-in-tex catalogue-version 3.0.1a ++++++ pgfgantt.doc.tar.xz ++++++ ++++++ pgfgantt.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgfgantt.tlpobj new/tlpkg/tlpobj/pgfgantt.tlpobj --- old/tlpkg/tlpobj/pgfgantt.tlpobj 2016-04-14 19:34:30.000000000 +0200 +++ new/tlpkg/tlpobj/pgfgantt.tlpobj 2017-04-14 17:54:06.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/pgfgantt/pgfgantt.sty catalogue-also pst-gantt catalogue-ctan /graphics/pgf/contrib/pgfgantt -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics diagram gantt catalogue-version 4.0 ++++++ pgfkeyx.doc.tar.xz ++++++ ++++++ pgfkeyx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgfkeyx.tlpobj new/tlpkg/tlpobj/pgfkeyx.tlpobj --- old/tlpkg/tlpobj/pgfkeyx.tlpobj 2016-04-14 19:34:31.000000000 +0200 +++ new/tlpkg/tlpobj/pgfkeyx.tlpobj 2017-04-14 17:54:07.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=8 RELOC/tex/latex/pgfkeyx/pgfkeyx.sty catalogue-ctan /macros/latex/contrib/pgfkeyx -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics keyval catalogue-version 0.0.1 ++++++ pgfmolbio.doc.tar.xz ++++++ ++++++ pgfmolbio.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgfmolbio.tlpobj new/tlpkg/tlpobj/pgfmolbio.tlpobj --- old/tlpkg/tlpobj/pgfmolbio.tlpobj 2016-04-14 19:34:32.000000000 +0200 +++ new/tlpkg/tlpobj/pgfmolbio.tlpobj 2017-04-14 17:54:07.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/lualatex/pgfmolbio/pgfmolbio.domains.tex RELOC/tex/lualatex/pgfmolbio/pgfmolbio.sty catalogue-ctan /macros/luatex/latex/pgfmolbio -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics molbio diagram luatex catalogue-version 0.21 ++++++ pgfopts.doc.tar.xz ++++++ ++++++ pgfopts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgfopts.tlpobj new/tlpkg/tlpobj/pgfopts.tlpobj --- old/tlpkg/tlpobj/pgfopts.tlpobj 2016-04-14 19:34:32.000000000 +0200 +++ new/tlpkg/tlpobj/pgfopts.tlpobj 2017-04-14 17:54:07.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=2 RELOC/tex/latex/pgfopts/pgfopts.sty catalogue-ctan /macros/latex/contrib/pgfopts -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics keyval package-supp catalogue-version 2.1a ++++++ pgfornament.doc.tar.xz ++++++ ++++++ pgfornament.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pgfornament.tlpobj new/tlpkg/tlpobj/pgfornament.tlpobj --- old/tlpkg/tlpobj/pgfornament.tlpobj 2016-04-14 19:34:34.000000000 +0200 +++ new/tlpkg/tlpobj/pgfornament.tlpobj 2017-04-14 17:54:08.000000000 +0200 @@ -211,7 +211,7 @@ RELOC/tex/latex/pgfornament/tikzrput.sty catalogue-also pgf catalogue-ctan /macros/latex/contrib/tkz/pgfornament -catalogue-date 2016-03-22 05:28:47 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics graphics-plot decoration catalogue-version 0.21 ++++++ pgfplots.doc.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-r/pgfplots.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-r.new/pgfplots.doc.tar.xz differ: char 26, line 1 ++++++ pgfplots.tar.xz ++++++ ++++ 16668 lines of diff (skipped) ++++++ phaistos.doc.tar.xz ++++++ ++++++ phaistos.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/phaistos.tlpobj new/tlpkg/tlpobj/phaistos.tlpobj --- old/tlpkg/tlpobj/phaistos.tlpobj 2016-04-14 19:34:53.000000000 +0200 +++ new/tlpkg/tlpobj/phaistos.tlpobj 2017-04-14 17:54:16.000000000 +0200 @@ -21,7 +21,7 @@ RELOC/fonts/type1/public/phaistos/phaistos.pfb RELOC/tex/latex/phaistos/phaistos.sty catalogue-ctan /fonts/archaic/phaistos -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font font-archaic font-type1 font-otf catalogue-version 1.0 ++++++ philex.doc.tar.xz ++++++ ++++++ philex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/philex.tlpobj new/tlpkg/tlpobj/philex.tlpobj --- old/tlpkg/tlpobj/philex.tlpobj 2016-04-14 19:34:53.000000000 +0200 +++ new/tlpkg/tlpobj/philex.tlpobj 2017-04-14 17:54:17.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=11 RELOC/tex/latex/philex/philex.sty catalogue-ctan /macros/latex/contrib/philex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics label-ref catalogue-version 1.3 ++++++ philokalia.doc.tar.xz ++++++ ++++++ philokalia.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/philokalia.tlpobj new/tlpkg/tlpobj/philokalia.tlpobj --- old/tlpkg/tlpobj/philokalia.tlpobj 2016-04-14 19:34:54.000000000 +0200 +++ new/tlpkg/tlpobj/philokalia.tlpobj 2017-04-14 17:54:18.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/xelatex/philokalia/eu1plk.fd RELOC/tex/xelatex/philokalia/philokalia.sty catalogue-ctan /fonts/philokalia -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license ofl catalogue-topics font-greek font-supp catalogue-version 1.1 ++++++ philosophersimprint.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/philosophersimprint/Makefile new/doc/latex/philosophersimprint/Makefile --- old/doc/latex/philosophersimprint/Makefile 2011-11-28 00:14:43.000000000 +0100 +++ new/doc/latex/philosophersimprint/Makefile 2016-11-25 19:29:50.000000000 +0100 @@ -3,7 +3,7 @@ # # This file is in public domain # -# $Id: Makefile,v 1.8 2007-05-16 15:15:32 boris Exp $ +# $Id: Makefile,v 1.9 2016/08/01 18:43:56 boris Exp $ # PACKAGE=philosophersimprint @@ -45,7 +45,7 @@ $(RM) $(PACKAGE).cls *.log *.aux \ *.cfg *.glo *.idx *.toc \ *.ilg *.ind *.out *.lof \ - *.lot *.bbl *.blg *.gls \ + *.lot *.bbl *.blg *.gls *.out \ *.dvi *.ps distclean: clean @@ -55,4 +55,6 @@ # Archive for the distribution. Includes typeset documentation # archive: all clean - tar -czvf $(PACKAGE).tgz --exclude '*~' --exclude '*.tgz' --exclude CVS . + tar -czvf $(PACKAGE).tgz -C .. --exclude '*~' \ + --exclude '*.tgz' --exclude CVS \ + --transform 's/latex/$(PACKAGE)/' latex diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/philosophersimprint/README new/doc/latex/philosophersimprint/README --- old/doc/latex/philosophersimprint/README 2013-01-16 00:01:24.000000000 +0100 +++ new/doc/latex/philosophersimprint/README 2016-11-25 19:29:50.000000000 +0100 @@ -16,6 +16,10 @@ have any commercial fonts installed on their machines. The class uses only freely available and freely distributed fonts. +Changes in version 1.4 + + - Typesetting improvements. + Changes in version 1.3 - Added copyright licensing information Binary files old/doc/latex/philosophersimprint/philosophersimprint.pdf and new/doc/latex/philosophersimprint/philosophersimprint.pdf differ Binary files old/doc/latex/philosophersimprint/sample.pdf and new/doc/latex/philosophersimprint/sample.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/philosophersimprint/sample.tex new/doc/latex/philosophersimprint/sample.tex --- old/doc/latex/philosophersimprint/sample.tex 2013-01-16 00:01:24.000000000 +0100 +++ new/doc/latex/philosophersimprint/sample.tex 2016-11-25 19:29:50.000000000 +0100 @@ -1,5 +1,5 @@ -\documentclass{philosophersimprint} -\usepackage{opcit,lipsum} +\documentclass[noflushend]{philosophersimprint} +\usepackage{opcit,kantlipsum} \usepackage{url} \usepackage[breaklinks,colorlinks,linkcolor=black,citecolor=black, pagecolor=black,urlcolor=black]{hyperref} @@ -175,15 +175,5 @@ \bibliography{philosophersimprint} -\newpage - -\section{Some text with footnotes} -\label{sec:footnotes} - -\lipsum*[1]\footnote{\lipsum[2]}\lipsum*[16-17]\footnote{\lipsum[12]}\par -\lipsum*[3]\footnote{\lipsum[4-6]}\lipsum[15-16] -\lipsum*[5-8]\footnote{\lipsum[6]}\par -\lipsum*[9]\footnote{\lipsum[8-9]} \lipsum[17]\par -\lipsum*[9]\footnote{\lipsum[10]} \lipsum[20] \end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/philosophersimprint.doc.tlpobj new/tlpkg/tlpobj/philosophersimprint.doc.tlpobj --- old/tlpkg/tlpobj/philosophersimprint.doc.tlpobj 2016-04-14 19:34:54.000000000 +0200 +++ new/tlpkg/tlpobj/philosophersimprint.doc.tlpobj 2017-04-14 17:54:18.000000000 +0200 @@ -1,9 +1,9 @@ name philosophersimprint.doc category Package -revision 28845 +revision 41788 shortdesc doc files of philosophersimprint relocated 1 -docfiles size=119 +docfiles size=117 RELOC/doc/latex/philosophersimprint/Makefile RELOC/doc/latex/philosophersimprint/README RELOC/doc/latex/philosophersimprint/philosophersimprint.bib ++++++ philosophersimprint.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/philosophersimprint/philosophersimprint.cls new/tex/latex/philosophersimprint/philosophersimprint.cls --- old/tex/latex/philosophersimprint/philosophersimprint.cls 2013-01-16 00:01:24.000000000 +0100 +++ new/tex/latex/philosophersimprint/philosophersimprint.cls 2016-11-25 19:33:57.000000000 +0100 @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{philosophersimprint} -[2013/01/13 v1.3 Typesetting articles for Philosophers' Imprint] +[2016/07/20 v1.4 Typesetting articles for Philosophers' Imprint] \newif\ifPHIM@titleimage\PHIM@titleimagetrue \DeclareOption{titleimage}{\PHIM@titleimagetrue} \DeclareOption{notitleimage}{\PHIM@titleimagefalse} @@ -37,6 +37,9 @@ \PassOptionsToPackage{\CurrentOption}{mathpazo}} \DeclareOption{noBBpl}{% \PassOptionsToPackage{\CurrentOption}{mathpazo}} +\newif\ifPHIM@flushend\PHIM@flushendfalse +\DeclareOption{flushend}{\PHIM@flushendtrue} +\DeclareOption{noflushend}{\PHIM@flushendfalse} \DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}} \InputIfFileExists{philosophersimprint.cfg}{% \ClassInfo{philosophersimprint}{% @@ -70,6 +73,15 @@ ********************************}% \PHIM@trajantitlefalse} \fi +\ifPHIM@flushend + \IfFileExists{flushend.sty}{\RequirePackage{flushend}}{% + \ClassWarningNoLine{philosophersimprint}{% + ********************************\MessageBreak + * Flushend package not found. \MessageBreak + * Please install sttools bundle.\MessageBreak + ********************************}% + \PHIM@flushendfalse} +\fi \newif\ifPHIM@hyperref \AtBeginDocument{% \@ifpackageloaded{hyperref}{% @@ -371,7 +383,7 @@ \noindent \makebox[\PHIM@baselength][l]{\@thefnmark.}#1\egroup} \settoheight{\footnotesep}{\footnotesize\strut} -\setlength{\skip\footins}{13.5pt plus 1fill} +\setlength{\skip\footins}{\the\PHIM@baselength plus \the\PHIM@baselength} \interfootnotelinepenalty=0 \normalsize \frenchspacing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/philosophersimprint.tlpobj new/tlpkg/tlpobj/philosophersimprint.tlpobj --- old/tlpkg/tlpobj/philosophersimprint.tlpobj 2016-04-14 19:34:54.000000000 +0200 +++ new/tlpkg/tlpobj/philosophersimprint.tlpobj 2017-04-14 17:54:18.000000000 +0200 @@ -1,6 +1,6 @@ name philosophersimprint category Package -revision 28845 +revision 41788 shortdesc Typesetting articles for "Philosophers' Imprint" relocated 1 longdesc In its mission statement we read "Philosophers' Imprint is a @@ -18,7 +18,7 @@ runfiles size=4 RELOC/tex/latex/philosophersimprint/philosophersimprint.cls catalogue-ctan /macros/latex/contrib/philosophersimprint -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-08-01 21:55:51 +0200 catalogue-license lppl catalogue-topics journalpub -catalogue-version 1.3 +catalogue-version 1.4 ++++++ phonetic.doc.tar.xz ++++++ ++++++ phonetic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/phonetic.tlpobj new/tlpkg/tlpobj/phonetic.tlpobj --- old/tlpkg/tlpobj/phonetic.tlpobj 2016-04-14 19:34:54.000000000 +0200 +++ new/tlpkg/tlpobj/phonetic.tlpobj 2017-04-14 17:54:18.000000000 +0200 @@ -39,6 +39,6 @@ RELOC/tex/latex/phonetic/phonetic.sty catalogue-also tipa catalogue-ctan /fonts/phonetic -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font font-mf font-specialist phonetic ++++++ phonrule.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/phonrule/README new/doc/latex/phonrule/README --- old/doc/latex/phonrule/README 2015-11-24 00:06:55.000000000 +0100 +++ new/doc/latex/phonrule/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -PhonRule.sty v1.2.0 - -(c) 2015 Stefano Coretta - -LPPL LaTeX Public Project License - -This packages provides macros for typesetting phonological rules like those in Sound Pattern of English (Chomsky and Halle 1968). It is recommended for linear phonological works. \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/phonrule/README.md new/doc/latex/phonrule/README.md --- old/doc/latex/phonrule/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/phonrule/README.md 2017-04-22 00:17:55.000000000 +0200 @@ -0,0 +1,12 @@ +# phonrule.sty (v1.3.2) + +(c) 2013-2017 Stefano Coretta + +This packages provides macros for typesetting phonological rules like those in Sound Pattern of English (Chomsky and Halle 1968). It is recommended for classical linear phonology. + +## License + +This program can redistributed and/or modified under the terms of the LaTeX +Project Public License Distributed from CTAN archives in directory +macros/latex/base/lppl.txt; either version 1 of the License, or (at your option) +any later version. Binary files old/doc/latex/phonrule/phonrule-doc.pdf and new/doc/latex/phonrule/phonrule-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/phonrule/phonrule-doc.tex new/doc/latex/phonrule/phonrule-doc.tex --- old/doc/latex/phonrule/phonrule-doc.tex 2015-11-24 00:06:55.000000000 +0100 +++ new/doc/latex/phonrule/phonrule-doc.tex 2017-04-22 00:17:55.000000000 +0200 @@ -3,13 +3,16 @@ \usepackage{fontspec} \usepackage{polyglossia} - \setmainlanguage{english} + \setmainlanguage{english} + +\usepackage{listings} + \lstset{basicstyle=\ttfamily} \usepackage{phonrule} \usepackage{gb4e} -\title{The \texttt{phonrule} package (v1.2.0)} -\author{Stefano Coretta \\ \texttt{stefano.coretta \textit{at} me.com}} +\title{The \texttt{phonrule} package (v1.3.2)} +\author{Stefano Coretta \\ \texttt{stefano.coretta \textit{at} postgrad.manchester.ac.uk}} \reversemarginpar @@ -17,17 +20,18 @@ \maketitle \section{Purpose} -This package provides macros for typesetting phonological rules like those in \textit{Sound Pattern of English} (Chomsky, Noam \& Morris Halle. 1968. \textit{The sound pattern of English}. New York, Evanston, and London: Harper \& Row). +This package provides macros for typesetting phonological rules like those in \textit{Sound Pattern of English} (Chomsky, Noam \& Morris Halle. 1968.\textit{The sound pattern of English}. New York, Evanston, and London: Harper \& Row). \section{Usage} \begin{quote} -\begin{verbatim} +\begin{lstlisting} \phon{〈input〉}{〈output〉} -\end{verbatim} +\end{lstlisting} \end{quote} -The command \verb+\phon+ has two arguments: the first one is the input of the rule and the second is its output. Here is an example with the code and the result it produces: +The command \verb+\phon+ has two arguments: the first one is the input of the rule and the second is its output. +Here is an example with the code and the result it produces: \begin{exe} \ex \verb+\phon{z}{r}+ @@ -35,9 +39,9 @@ \end{exe} \begin{quote} -\begin{verbatim} +\begin{lstlisting} \phonc{〈input〉}{〈output〉}{〈context〉} -\end{verbatim} +\end{lstlisting} \end{quote} \verb+\phonc+ adds a third argument for the context: @@ -51,122 +55,176 @@ \begin{exe} \ex - \begin{xlist} - \ex \verb+\phonl{k}{c}{i}+ - \ex \phonl{k}{tʃ}{i} - \end{xlist} -\ex - \begin{xlist} - \ex \verb+\phonr{t}{ts}{u}+ - \ex \phonr{t}{ts}{u} - \end{xlist} -\ex - \begin{xlist} - \ex \verb+\phonb{s}{z}{V}{V}+ - \ex \phonb{s}{z}{V}{V} - \end{xlist} + \begin{xlist} + \ex \verb+\phonl{k}{c}{i}+ + \ex \phonl{k}{tʃ}{i} + \end{xlist} +\ex + \begin{xlist} + \ex \verb+\phonr{t}{ts}{u}+ + \ex \phonr{t}{ts}{u} + \end{xlist} +\ex + \begin{xlist} + \ex \verb+\phonb{s}{z}{V}{V}+ + \ex \phonb{s}{z}{V}{V} + \end{xlist} \end{exe} The \verb+\oneof+ command provides the possibility to compile several contexts, one per line, embraced by a left curly bracket. \begin{exe} \ex -\begin{verbatim} +\begin{lstlisting} \phonc{t}{ts}{ - \oneof{ - \phold i \\ - \phold u} - } -\end{verbatim} + \oneof{ + \phold i \\ + \phold u} + } +\end{lstlisting} \ex \phonc{t}{ts}{ - \oneof{ - \phold i \\ - \phold u} - } -\end{exe} - -The \verb+\phonfeat+ command allows you to insert feature specifications: + \oneof{ + \phold i \\ + \phold u} + } +\end{exe} + +The \verb+\phonfeat+ command allows you to insert feature specifications. +The possible values are \texttt{[c]} for centre (the default), \texttt{[l]} for left-aligned, and \texttt{[r]} for right-aligned. \begin{exe} \ex -\begin{verbatim} -\phonc{t}{ts}{\phold - \phonfeat{ - −consonantal \\ - +high \\ - +front} - } -\end{verbatim} -\ex \phonc{t}{ts}{\phold - \phonfeat{ - −consonantal \\ - +high \\ - +front} - } +\begin{lstlisting} +\phonc{t}{ts}{\phold + \phonfeat[l]{ + −consonantal \\ + +high \\ + +front} + } +\end{lstlisting} +\ex \phonc{t}{ts}{\phold + \phonfeat[l]{ + −consonantal \\ + +high \\ + +front} + } \end{exe} \verb+\phold+ typesets a place holder line. You can nest \verb|oneof| and \verb|phonfeat| commands for complex rules. +The \verb|oneof| command accepts an optional argument which tells the alignment of the context. \begin{exe} \ex -\begin{verbatim} -\phonc{x}{y}{\oneof{ - \phold z \\ - \phonfeat{ - +feature x \\ - −feature y - } \phold - }} -\end{verbatim} +\begin{lstlisting} +\phonc{x}{y}{\oneof[l]{ + \phold z \\ + \phonfeat{ + +feature x \\ + −feature y + } \phold + }} +\end{lstlisting} \ex \phonc{x}{y}{\oneof{ - \phold z \\ - \phonfeat{ - +feature x \\ - −feature y - } \phold - }} + \phold z \\ + \phonfeat{ + +feature x \\ + −feature y + } \phold + }} \end{exe} You can use \verb|\env|, \verb|\envl|, \verb|\envr|, \verb|\envb| for rules with more than one output: these commands typeset only the different outputs with their respective environments. +The possible values are \texttt{[c]} for centre (the default), \texttt{[l]} for left-aligned, and \texttt{[r]} for right-aligned. +The following example shows the use of the optional argument with \texttt{[l]}. +The \verb|\env|, \verb|\envl|, \verb|\envr|, \verb|\envb| have a starred version to be used when an optional argument is set in \verb|\oneof|. \begin{exe} \ex -\begin{verbatim} -\phon{x}{\oneof{ - \envr{w}{z} \\ - \envl{v}{\phonfeat{ - +feature x \\ - −feature y - }}}} -\end{verbatim} -\ex \phon{x}{\oneof{ - \envr{w}{z} \\ - \envl{v}{\phonfeat{ - +feature x \\ - −feature y - }}}} +\begin{lstlisting} +\phon{x}{\oneof[l]{ + \envr*{w}{z} \\ + \envl*{v}{\phonfeat{ + +feature x \\ + −feature y + }}}} +\end{lstlisting} +\ex \phon{x}{\oneof[l]{ + \envr*{w}{z} \\ + \envl*{v}{\phonfeat{ + +feature x \\ + −feature y + }}}} \end{exe} -\section{Changelog} -\subsection{v1.2.0} +\section{Change log} + +\subsection*{v1.3.2 - 2017-04-16} +\subsubsection*{Added} +\begin{itemize} + \item optional argument for text alignment in \verb+\phonfeat+ command +\end{itemize} + +\subsection*{v1.3.1 - 2017-01-02} +\subsubsection*{Added} +\begin{itemize} + \item needs \TeX{} format \LaTeX2e +\end{itemize} +\subsubsection*{Removed} +\begin{itemize} + \item \verb+\makeatletter+ + \item unused definition +\end{itemize} + +\subsection*{v1.3.0 - 2016-12-26} +\subsubsection*{Added} +\begin{itemize} + \item optional argument for text alignment in \verb+\oneof+ command + \item starred version of the \verb+\env+ command family for use with optional argument in \verb+\oneof+ +\end{itemize} +\subsubsection*{Changed} +\begin{itemize} + \item definition of \verb+\phon+ command family + \item header of \texttt{phonrule.sty} + \item extension of README, now \texttt{.md} +\end{itemize} +\subsubsection*{Removed} +\begin{itemize} + \item package \texttt{ragged2e} +\end{itemize} + +\subsection*{v1.2.0} +\subsubsection*{Added} +\begin{itemize} +\item \texttt{ragged2e} package for \verb+\Centering+ command +\end{itemize} +\subsubsection*{Fixed} \begin{itemize} -\item Added: \texttt{ragged2e} package for \verb+\Centering+ command \item Fixed: now the content of the feature matrices is centred and not left aligned \end{itemize} -\subsection{v1.1.0} +\subsection*{v1.1.0} +\subsubsection*{Changed} \begin{itemize} -\item Changed: definition of \verb+\phonfeat+ and \verb+\oneof+ with \verb+\pbox+ (requires package \texttt{pbox}) -\item Fixed: documentation typos +\item definition of \verb+\phonfeat+ and \verb+\oneof+ with \verb+\pbox+ (requires package \texttt{pbox}) +\subsubsection*{Fixed} +\item documentation typos \end{itemize} -\subsection{v1.0.0} +\subsection*{v1.0.0} +\subsubsection*{Added} \begin{itemize} -\item Added: new commands \verb|\env| for personalised outputs -\item Changed: definition of commands with \verb|\ensuremath| -\item Changed: environments to commands -\item Changed: place holder to 1.5ex length, -1.5pt vertical position -\item Changed: curly brackets to only left in \verb|\oneof| command +\item new commands \verb|\env| for personalised outputs \end{itemize} -\end{document} \ No newline at end of file +\subsubsection*{Changed} +\begin{itemize} +\item definition of commands with \verb|\ensuremath| +\item environments to commands +\item place holder to 1.5ex length, -1.5pt vertical position +\item curly brackets to only left in \verb|\oneof| command +\end{itemize} + + + + +\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/phonrule.doc.tlpobj new/tlpkg/tlpobj/phonrule.doc.tlpobj --- old/tlpkg/tlpobj/phonrule.doc.tlpobj 2016-04-14 19:34:55.000000000 +0200 +++ new/tlpkg/tlpobj/phonrule.doc.tlpobj 2017-04-22 02:08:33.000000000 +0200 @@ -1,9 +1,9 @@ name phonrule.doc category Package -revision 38934 +revision 43963 shortdesc doc files of phonrule relocated 1 -docfiles size=11 - RELOC/doc/latex/phonrule/README +docfiles size=14 + RELOC/doc/latex/phonrule/README.md RELOC/doc/latex/phonrule/phonrule-doc.pdf RELOC/doc/latex/phonrule/phonrule-doc.tex ++++++ phonrule.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/phonrule/phonrule.sty new/tex/latex/phonrule/phonrule.sty --- old/tex/latex/phonrule/phonrule.sty 2015-11-24 00:06:55.000000000 +0100 +++ new/tex/latex/phonrule/phonrule.sty 2017-04-22 00:17:55.000000000 +0200 @@ -1,28 +1,65 @@ -% PhonRule -% -% (c) 2015 Stefano Coretta -% LPPL LaTeX Public Project License -% +% phonrule.sty v1.3.2 +% +% (c) 2013-2017 Stefano Coretta +% +% This program can redistributed and/or modified under the terms +% of the LaTeX Project Public License Distributed from CTAN +% archives in directory macros/latex/base/lppl.txt; either +% version 1 of the License, or (at your option) any later version. +\NeedsTeXFormat{LaTeX2e}[1994/06/01] \ProvidesPackage{phonrule} - [2015/07/04 v1.2.0 LaTeX package for typesetting phonological rules] - -\RequirePackage{pbox} -\RequirePackage{ragged2e} - -\let\myDate\date -\newcommand{\phon} [2] {#1 \ensuremath{\rightarrow} #2} -\newcommand{\phonc} [3] {#1 \ensuremath{\rightarrow} #2 \ensuremath{/} #3} -\newcommand{\phonr} [3] {#1 \ensuremath{\rightarrow} #2 \ensuremath{/} \rule[-1.5pt]{1.5ex}{.5pt}#3} -\newcommand{\phonl} [3] {#1 \ensuremath{\rightarrow} #2 \ensuremath{/} #3\rule[-1.5pt]{1.5ex}{.5pt}} -\newcommand{\phonb} [4] {#1 \ensuremath{\rightarrow} #2 \ensuremath{/} #3\rule[-1.5pt]{1.5ex}{.5pt}#4} -\newcommand{\phold}{\rule[-1.5pt]{1.5ex}{.5pt}} % for place holder without spaces -\newcommand{\env} [2] {#1 \ensuremath{/} #2} -\newcommand{\envr} [2] {#1 \ensuremath{/} \rule[-1.5pt]{1.5ex}{.5pt}#2} -\newcommand{\envl} [2] {#1 \ensuremath{/} #2\rule[-1.5pt]{1.5ex}{.5pt}} -\newcommand{\envb} [3] {#1 \ensuremath{/} #2\rule[-1.5pt]{1.5ex}{.5pt}#3} -\newcommand{\phonfeat}[1]{\ensuremath{\left[\begin{array}{c} \pbox{\textwidth}{\Centering #1} \end{array}\right]}} % set environment for feature matrix with square brackets -\newcommand{\oneof}[1]{\ensuremath{\left\{\begin{array}{l} \pbox{\textwidth}{\Centering #1} \end{array}\right.}} % set environment for one of multiple with curly brackets + [2017/04/16 v1.3.2 LaTeX package for typesetting phonological rules] + +\newcommand{\phold}{\rule[-1.5pt]{1.5ex}{.5pt}} +\newcommand{\parrow}{\ensuremath{\rightarrow}} + +\newcommand{\phon} [3][\parrow] {#2 #1 #3} +\newcommand{\phonc} [4][\parrow] {#2 #1 #3~\ensuremath{/}~#4} +\newcommand{\phonr} [4][\parrow] {#2 #1 #3~\ensuremath{/}~\phold#4} +\newcommand{\phonl} [4][\parrow] {#2 #1 #3~\ensuremath{/}~#4\phold} +\newcommand{\phonb} [5][\parrow] {#2 #1 #3~\ensuremath{/}~#4\phold#5} + +\newcommand*{\env}{% + \@ifstar + {\@env{&}} + {\@env{~}}% + } +\newcommand*{\@env}[3]{#2~/#1#3} + +\newcommand*{\envr}{% + \@ifstar + {\@envr{&}} + {\@envr{~}}% + } +\newcommand*{\@envr}[3]{\@env{#1}{#2}{\phold#3}} + +\newcommand*{\envl}{% + \@ifstar + {\@envl{&}} + {\@envl{~}}% + } +\newcommand*{\@envl}[3]{\@env{#1}{#2}{#3\phold}} + +\newcommand*{\envb}{% + \@ifstar + {\@envb{&}} + {\@envb{~}}% + } +\newcommand*{\@envb}[4]{\@env{#1}{#2}{#3\phold#4}} + +\newcommand*{\phonfeat}[2][c]{% + \ensuremath{% + \left[\begin{tabular}{#1}#2\end{tabular}\right]% + }% +} +\newcommand*{\oneof}[2][c]{% + \ensuremath{% + \left\{ + \begin{tabular}{#1#1}#2\end{tabular} + \right. + }% +} \endinput %% -%% End of file `phonrule.sty'. \ No newline at end of file +%% End of file `phonrule.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/phonrule.tlpobj new/tlpkg/tlpobj/phonrule.tlpobj --- old/tlpkg/tlpobj/phonrule.tlpobj 2016-04-14 19:34:55.000000000 +0200 +++ new/tlpkg/tlpobj/phonrule.tlpobj 2017-04-22 02:08:33.000000000 +0200 @@ -1,6 +1,6 @@ name phonrule category Package -revision 38934 +revision 43963 shortdesc Typeset linear phonological rules relocated 1 longdesc The package provides macros for typesetting phonological rules @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/phonrule/phonrule.sty catalogue-ctan /macros/latex/contrib/phonrule -catalogue-date 2015-11-22 14:31:04 +0100 -catalogue-license lppl +catalogue-date 2017-04-21 12:55:41 +0200 +catalogue-license lppl1 catalogue-topics phonetic -catalogue-version 1.2.0 +catalogue-version 1.3.2 ++++++ photo.doc.tar.xz ++++++ ++++++ photo.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/photo.tlpobj new/tlpkg/tlpobj/photo.tlpobj --- old/tlpkg/tlpobj/photo.tlpobj 2016-04-14 19:34:55.000000000 +0200 +++ new/tlpkg/tlpobj/photo.tlpobj 2017-04-14 17:54:19.000000000 +0200 @@ -14,6 +14,6 @@ runfiles size=2 RELOC/tex/latex/photo/photo.sty catalogue-ctan /macros/latex/contrib/photo -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics float ++++++ physics.doc.tar.xz ++++++ ++++++ physics.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/physics.tlpobj new/tlpkg/tlpobj/physics.tlpobj --- old/tlpkg/tlpobj/physics.tlpobj 2016-04-14 19:34:55.000000000 +0200 +++ new/tlpkg/tlpobj/physics.tlpobj 2017-04-14 17:54:19.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=8 RELOC/tex/latex/physics/physics.sty catalogue-ctan /macros/latex/contrib/physics -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics physics maths catalogue-version 1.3 ++++++ piano.doc.tar.xz ++++++ ++++++ piano.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/piano.tlpobj new/tlpkg/tlpobj/piano.tlpobj --- old/tlpkg/tlpobj/piano.tlpobj 2016-04-14 19:34:55.000000000 +0200 +++ new/tlpkg/tlpobj/piano.tlpobj 2017-04-14 17:54:19.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=4 RELOC/tex/latex/piano/piano.sty catalogue-ctan /macros/latex/contrib/piano -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics music catalogue-version 1.0 ++++++ picinpar.doc.tar.xz ++++++ ++++++ picinpar.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/picinpar.tlpobj new/tlpkg/tlpobj/picinpar.tlpobj --- old/tlpkg/tlpobj/picinpar.tlpobj 2016-04-14 19:34:56.000000000 +0200 +++ new/tlpkg/tlpobj/picinpar.tlpobj 2017-04-14 17:54:19.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=4 RELOC/tex/latex/picinpar/picinpar.sty catalogue-ctan /macros/latex209/contrib/picinpar -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics text-flow catalogue-version 1.2a ++++++ pict2e.doc.tar.xz ++++++ ++++++ pict2e.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pict2e.tlpobj new/tlpkg/tlpobj/pict2e.tlpobj --- old/tlpkg/tlpobj/pict2e.tlpobj 2016-04-14 19:34:56.000000000 +0200 +++ new/tlpkg/tlpobj/pict2e.tlpobj 2017-04-14 17:54:19.000000000 +0200 @@ -29,7 +29,7 @@ RELOC/tex/latex/pict2e/pict2e.sty catalogue-also curve2e xpicture catalogue-ctan /macros/latex/contrib/pict2e -catalogue-date 2016-02-05 13:14:44 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics graphics-in-tex catalogue-version 0.3b ++++++ pictex.doc.tar.xz ++++++ ++++++ pictex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pictex.tlpobj new/tlpkg/tlpobj/pictex.tlpobj --- old/tlpkg/tlpobj/pictex.tlpobj 2016-04-14 19:34:57.000000000 +0200 +++ new/tlpkg/tlpobj/pictex.tlpobj 2017-04-14 17:54:19.000000000 +0200 @@ -29,7 +29,7 @@ RELOC/tex/generic/pictex/tree.sty catalogue-also qfig epic pictex2 pictexsum catalogue-ctan /graphics/pictex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics graphics-in-tex catalogue-version 1.1 ++++++ pictex2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pictex2.tlpobj new/tlpkg/tlpobj/pictex2.tlpobj --- old/tlpkg/tlpobj/pictex2.tlpobj 2016-04-14 19:34:57.000000000 +0200 +++ new/tlpkg/tlpobj/pictex2.tlpobj 2017-04-14 17:54:19.000000000 +0200 @@ -11,6 +11,6 @@ runfiles size=4 RELOC/tex/latex/pictex2/pictex2.sty catalogue-ctan /macros/latex/contrib/pictex2/pictex2.sty -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-in-tex ++++++ pictexsum.doc.tar.xz ++++++ ++++++ piechartmp.doc.tar.xz ++++++ ++++++ piechartmp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/piechartmp.tlpobj new/tlpkg/tlpobj/piechartmp.tlpobj --- old/tlpkg/tlpobj/piechartmp.tlpobj 2016-04-14 19:34:57.000000000 +0200 +++ new/tlpkg/tlpobj/piechartmp.tlpobj 2017-04-14 17:54:19.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/metapost/piechartmp/piechartmp.mp catalogue-also piechart catalogue-ctan /graphics/metapost/contrib/macros/piechartmp -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics genchart catalogue-version 0.3.0 ++++++ piff.doc.tar.xz ++++++ ++++++ piff.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/piff.tlpobj new/tlpkg/tlpobj/piff.tlpobj --- old/tlpkg/tlpobj/piff.tlpobj 2016-04-14 19:34:58.000000000 +0200 +++ new/tlpkg/tlpobj/piff.tlpobj 2017-04-14 17:54:20.000000000 +0200 @@ -14,6 +14,6 @@ RELOC/tex/latex/piff/onepagem.sty RELOC/tex/latex/piff/time.sty catalogue-ctan /macros/latex/contrib/piff -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics collection ++++++ pigpen.doc.tar.xz ++++++ ++++++ pigpen.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pigpen.tlpobj new/tlpkg/tlpobj/pigpen.tlpobj --- old/tlpkg/tlpobj/pigpen.tlpobj 2016-04-14 19:34:58.000000000 +0200 +++ new/tlpkg/tlpobj/pigpen.tlpobj 2017-04-14 17:54:20.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/pigpen/pigpen.sty RELOC/tex/latex/pigpen/pigpen.tex catalogue-ctan /fonts/pigpen -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font font-mf font-type1 catalogue-version 0.2 ++++++ pinlabel.doc.tar.xz ++++++ ++++++ pinlabel.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pinlabel.tlpobj new/tlpkg/tlpobj/pinlabel.tlpobj --- old/tlpkg/tlpobj/pinlabel.tlpobj 2016-04-14 19:34:58.000000000 +0200 +++ new/tlpkg/tlpobj/pinlabel.tlpobj 2017-04-14 17:54:20.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/pinlabel/pinlabel.sty catalogue-also psfrag overpic catalogue-ctan /macros/latex/contrib/pinlabel -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-text catalogue-version 1.2 ++++++ pitex.doc.tar.xz ++++++ ++++++ pitex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pitex.tlpobj new/tlpkg/tlpobj/pitex.tlpobj --- old/tlpkg/tlpobj/pitex.tlpobj 2016-04-14 19:34:58.000000000 +0200 +++ new/tlpkg/tlpobj/pitex.tlpobj 2017-04-14 17:54:20.000000000 +0200 @@ -22,6 +22,6 @@ RELOC/tex/plain/pitex/sections.ptx RELOC/tex/plain/pitex/verbatim.ptx catalogue-ctan /macros/plain/contrib/pitex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics doc-supp ++++++ pittetd.doc.tar.xz ++++++ ++++++ pittetd.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pittetd.tlpobj new/tlpkg/tlpobj/pittetd.tlpobj --- old/tlpkg/tlpobj/pittetd.tlpobj 2016-04-14 19:34:59.000000000 +0200 +++ new/tlpkg/tlpobj/pittetd.tlpobj 2017-04-14 17:54:20.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/pittetd/pitetd12.clo RELOC/tex/latex/pittetd/pittetd.cls catalogue-ctan /macros/latex/contrib/pittetd -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics dissertation catalogue-version 1.618 ++++++ pkfix-helper.doc.tar.xz ++++++ ++++++ pkfix-helper.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pkfix-helper.tlpobj new/tlpkg/tlpobj/pkfix-helper.tlpobj --- old/tlpkg/tlpobj/pkfix-helper.tlpobj 2016-04-14 19:35:00.000000000 +0200 +++ new/tlpkg/tlpobj/pkfix-helper.tlpobj 2017-04-14 17:54:21.000000000 +0200 @@ -18,7 +18,7 @@ runfiles size=14 texmf-dist/scripts/pkfix-helper/pkfix-helper catalogue-ctan /support/pkfix-helper -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-util catalogue-version 1.4 ++++++ pkfix.doc.tar.xz ++++++ ++++++ pkfix.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pkfix.tlpobj new/tlpkg/tlpobj/pkfix.tlpobj --- old/tlpkg/tlpobj/pkfix.tlpobj 2016-04-14 19:34:59.000000000 +0200 +++ new/tlpkg/tlpobj/pkfix.tlpobj 2017-04-14 17:54:21.000000000 +0200 @@ -10,7 +10,7 @@ texmf-dist/scripts/pkfix/pkfix.pl catalogue-also pkfix-helper catalogue-ctan /support/pkfix -catalogue-date 2015-12-27 20:31:23 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-util catalogue-version 1.7 ++++++ pkgloader.doc.tar.xz ++++++ ++++++ pkgloader.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pkgloader.tlpobj new/tlpkg/tlpobj/pkgloader.tlpobj --- old/tlpkg/tlpobj/pkgloader.tlpobj 2016-04-14 19:35:01.000000000 +0200 +++ new/tlpkg/tlpobj/pkgloader.tlpobj 2017-04-14 17:54:21.000000000 +0200 @@ -21,7 +21,7 @@ RELOC/tex/latex/pkgloader/pkgloader-true.sty RELOC/tex/latex/pkgloader/pkgloader.sty catalogue-ctan /macros/latex/contrib/pkgloader -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics debug-supp expl3 catalogue-version 0.5.0 ++++++ pkuthss.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/example/chap/copyright.tex new/doc/latex/pkuthss/example/chap/copyright.tex --- old/doc/latex/pkuthss/example/chap/copyright.tex 2016-03-17 22:34:25.000000000 +0100 +++ new/doc/latex/pkuthss/example/chap/copyright.tex 2017-03-02 00:01:04.000000000 +0100 @@ -1,5 +1,5 @@ % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2016 Casper Ti. Vector +% Copyright (c) 2010-2017 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -38,7 +38,7 @@ 否则一旦引起有碍作者著作权之问题，将可能承担法律责任。 % 若需排版二维码，请将二维码图片重命名为“barcode”， -% 转为合适的图片格式，并放在当前目录下，然后去掉下面 3 行的注释。 +% 转为合适的图片格式，并放在当前目录下，然后去掉下面 2 行的注释。 %\vfill\noindent %\includegraphics[height = 5em]{barcode} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/example/chap/originauth.tex new/doc/latex/pkuthss/example/chap/originauth.tex --- old/doc/latex/pkuthss/example/chap/originauth.tex 2016-03-17 22:34:25.000000000 +0100 +++ new/doc/latex/pkuthss/example/chap/originauth.tex 2017-03-02 00:01:04.000000000 +0100 @@ -1,5 +1,5 @@ % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2016 Casper Ti. Vector +% Copyright (c) 2010-2017 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -28,9 +28,9 @@ % SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. { - \CTEXsetup[ + \ctexset{section = { format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp} - ]{section} + }} % 学校书面要求本页面不要页码，但在给出的 Word 模版中又有页码且编入了目录。 % 此处以 Word 模版为实际标准进行设定。 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def new/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def --- old/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def 2016-03-17 22:34:25.000000000 +0100 +++ new/doc/latex/pkuthss/example/misc/ctex-fontset-pkuthss.def 2017-03-02 00:01:04.000000000 +0100 @@ -1,6 +1,6 @@ \ProvidesExplFile{\ExplFileName}{}{}{} -\pdftex_if_engine:TF +\sys_if_engine_pdftex:TF { \ctex_zhmap_case:nnn { Binary files old/doc/latex/pkuthss/example.pdf and new/doc/latex/pkuthss/example.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/ChangeLog.txt new/doc/latex/pkuthss/readme/ChangeLog.txt --- old/doc/latex/pkuthss/readme/ChangeLog.txt 2016-03-24 23:28:18.000000000 +0100 +++ new/doc/latex/pkuthss/readme/ChangeLog.txt 2017-03-02 00:01:04.000000000 +0100 @@ -1,3 +1,34 @@ +2017-03-01, v1.7.4 + + * API changes: + - pkuthss.cls: provide undocumented option for uglification. + + * Changes to example template: + - ctex-fontset-pkuthss.def: follow LaTeX3 change. + - copyright.tex: fix now inaccurate comment. + + * Changes to package code: + - Remove support for ctex < v2.x. + - Replace CJKfntef's `\CJKunderline' with ulem's `\uline'. + - pkuthss.cls: tweak newtxmath setup. + + * Misc: + - Minor fixes and cosmetics. + +2016-05-24, v1.7.3 + + * Changes to package code: + - Replace subfig with subcaption. + - pkuthss.cls: fix `PDF destination not defined' regression. + - pkuthss.cls: add code in case the font size infractions get caught. + + * Changes to documentation: + - pkuthss-chap2.tex: add hint about copying internal files before changes. + - Sanitise the README bibliography. + + * Misc: + - Minor fixes and cosmetics. + 2016-03-22, v1.7.2 * Changes to documentation: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/chap/originauth.tex new/doc/latex/pkuthss/readme/chap/originauth.tex --- old/doc/latex/pkuthss/readme/chap/originauth.tex 2016-03-17 22:34:25.000000000 +0100 +++ new/doc/latex/pkuthss/readme/chap/originauth.tex 2017-03-02 00:01:04.000000000 +0100 @@ -1,5 +1,5 @@ % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2016 Casper Ti. Vector +% Copyright (c) 2010-2017 Casper Ti. Vector % All rights reserved. % % Redistribution and use in source and binary forms, with or without @@ -28,9 +28,9 @@ % SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. { - \CTEXsetup[ + \ctexset{section = { format+ = {\centering}, beforeskip = {40bp}, afterskip = {15bp} - ]{section} + }} % 学校书面要求本页面不要页码，但在给出的 Word 模版中又有页码且编入了目录。 % 此处以 Word 模版为实际标准进行设定。 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex new/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex --- old/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex 2016-03-24 23:28:18.000000000 +0100 +++ new/doc/latex/pkuthss/readme/chap/pkuthss-chap1.tex 2016-11-25 19:29:50.000000000 +0100 @@ -33,7 +33,7 @@ \begin{itemize} \item 一个基本的 \hologo{TeX} 发行版。 \item CJK 或 XeCJK（供 \hologo{XeLaTeX} 使用）宏包。 - \item ctex\supercite{ctex,ctex-faq} 宏包（提供了 ctexbook 文档类）。 + \item ctex\supercite{ctex} 宏包（提供了 ctexbook 文档类）。 \item 中文字体。 \item 如果要使用 biblatex 进行文献列表和引用的排版的话，还需要 biblatex\supercite{biblatex} 宏包； diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex new/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex --- old/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex 2016-03-17 22:34:25.000000000 +0100 +++ new/doc/latex/pkuthss/readme/chap/pkuthss-chap2.tex 2017-03-02 00:01:04.000000000 +0100 @@ -1,7 +1,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2016 Casper Ti. Vector +% Copyright (c) 2010-2017 Casper Ti. Vector % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3 of this license or (at @@ -261,22 +261,15 @@ \section{从其它文档类和宏包继承的功能}\label{sec:thirdparty} pkuthss 文档类建立在 ctexbook\supercite{ctex} 文档类之上， -并调用了 CJKfntef、hyperref\supercite{hyperref}、% -geometry\supercite{geometry}、fancyhdr\supercite{fancyhdr} -和 graphicx\supercite{graphicx} 等几个宏包； -使用 \hologo{pdfLaTeX} 方式编译 GBK 编码的源文件时还会调用 -xCJK2uni\supercite{xCJK2uni} 宏包\footnote{% - ctex 2.x 会自行调用 xCJK2uni 宏包， - 不用在 pkuthss 文档类中重复调用； - 这里调用 xCJK2un 是为了兼容 ctex 1.x 而进行的设定， - 该设定将在 2017 年被去除。% -}。 +并调用了 geometry\supercite{geometry}、fancyhdr\supercite{fancyhdr}、% +hyperref\supercite{hyperref}、graphicx\supercite{graphicx} +和 ulem\supercite{ulem} 等几个宏包。因此，ctexbook 文档类和这些宏包所提供的功能均可以使用。例如，用户如果想将目录的标题改为“目{\quad\quad}录”， -则可以使用 ctexbook 文档类提供的 \verb|\CTEXoptions| 命令： +则可以使用 ctexbook 文档类提供的 \verb|\ctexset| 命令： \begin{Verbatim}[frame = single] -\CTEXoptions[contentsname = {目{\quad\quad}录}] +\ctexset[contentsname = {目{\quad\quad}录}] \end{Verbatim} 在默认的配置下，% @@ -290,7 +283,7 @@ \end{Verbatim} 在本文中将产生“\cite{ctex}，\parencite{ctex}，\supercite{ctex}”。 -就目前而言，在 \myemph{除 3.0--3.3 之外版本的} biblatex 中， +就目前而言，在\myemph{除 3.0--3.3 之外版本的} biblatex 中，通过更复杂的设置，还可以满足例如被引用的文献按照引用顺序排序，而未引用的文献按照英文文献在前、中文文献在后排序这样的需求，详见 biblatex-caspervector 的文档\supercite{biblatex-caspervector}。 @@ -303,8 +296,8 @@ \item 启用 \verb|pkufoot| 选项时会调用 tikz\supercite{tikz} 和 scrextend\supercite{scrextend} 宏包。 \item 启用 \verb|pkuspace| 选项时会调用 - tocloft\supercite{tocloft}、subfig\supercite{subfig} 和 - caption\supercite{caption} 宏包。 + tocloft\supercite{tocloft}、caption\supercite{caption} 和 + subcaption\supercite{subcaption} 宏包。 \item 启用 \verb|spacing| 选项时会调用 setspace 和 enumitem\supercite{enumitem} 宏包。 \end{itemize} @@ -314,7 +307,33 @@ pkuthss 文档模版的实现是简洁、清晰、灵活的。当一些细节的自定义无法通过模版提供的外部接口实现时， -我们鼓励用户（在适当理解相关部分代码的前提下）通过修改模版进行自定义。 +我们鼓励用户（在适当理解相关部分代码的前提下） +通过修改 pkuthss 文档类的源文件进行自定义。 +在目前常用的 \hologo{TeX} 系统中， +假设 pkuthss 的说明文档所在目录具有下述形式的路径： +\begin{Verbatim}[frame = single] +# 说明文档所在目录（$TEXMFDIST 的形式见下面几行）： +$TEXMFDIST/tex/latex/pkuthss/ +# 若用户使用 Windows 下的 TeX Live 系统，则 $TEXMFDIST 一般类似于： +C:\texlive\2015\texmf-dist +# 若用户使用类 Unix 下的 TeX Live 系统，则 $TEXMFDIST 一般类似于： +/usr/local/texlive/2015/texmf-dist +\end{Verbatim} +则其源文件所在目录应该位于以下目录： +\begin{Verbatim}[frame = single] +$TEXMFDIST/doc/latex/pkuthss/ +\end{Verbatim} + +如果的确需要修改 pkuthss 文档类的源文件，\myemph{% + 建议用户将 \texttt{pkuthss.cls} 或其它需要修改的文件 + 复制到被编译的主文件所在的目录， + 然后对此副本进行修改% +}\footnote{% + 能这样做的原因是目前常用的 \hologo{TeX} 系统在读取编译用到的文件时， + 会优先考虑工作目录（即主文件所在目录）中的文件。% +}。这样做的目的主要是使用户不必在每次调整文档类文件时都去上述路径修改； +同时这样也可以在（万一需要）更新 \hologo{TeX} 系统时， +防止用户修改过的文档类文件在更新中被自动覆盖掉。一个常见的需求是封面中部分内容（特别是论文的标题、专业和研究方向）太长，超出了在预设的空间。 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex new/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex --- old/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex 2016-03-17 22:34:25.000000000 +0100 +++ new/doc/latex/pkuthss/readme/chap/pkuthss-chap3.tex 2017-03-02 00:01:04.000000000 +0100 @@ -1,7 +1,7 @@ % Documentation for pkuthss. % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2015 Casper Ti. Vector +% Copyright (c) 2010-2017 Casper Ti. Vector % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3 of this license or (at @@ -55,7 +55,7 @@ \section{上游宏包可能引起的问题} biblatex\supercite{biblatex} 宏包会自行设定 \verb|\bibname|， -故会覆盖通过 \verb|\CTEXoptions| 设定的参考文献列表标题。 +故会覆盖通过 \verb|\ctexset| 设定的参考文献列表标题。使用 biblatex 的用户可以使用 \verb|\printbibliography| 的 \verb|title| 选项来手动设定参考文献列表的标题，例如： \begin{Verbatim}[frame = single] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex new/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex --- old/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex 2016-03-17 22:34:25.000000000 +0100 +++ new/doc/latex/pkuthss/readme/chap/pkuthss-copyright.tex 2017-03-02 00:01:04.000000000 +0100 @@ -31,7 +31,7 @@ 版权所有 \copyright\ 2008--2009 solvethis \par -版权所有 \copyright\ 2010--2016 Casper Ti. Vector +版权所有 \copyright\ 2010--2017 Casper Ti. Vector \vskip 1em pkuthss 文档类及其说明文档均以 \hologo{LaTeX} Project Public License 发布。 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/pkuthss.bib new/doc/latex/pkuthss/readme/pkuthss.bib --- old/doc/latex/pkuthss/readme/pkuthss.bib 2016-03-17 22:34:25.000000000 +0100 +++ new/doc/latex/pkuthss/readme/pkuthss.bib 2017-03-02 00:01:04.000000000 +0100 @@ -13,18 +13,18 @@ title = {The biblatex Package: Programmable Bibliographies and Citations (Ver.\ 2.8a)}, type = {M/OL}, date = {2013-11-25}, - url = {http://mirror.ctan.org/macros/latex/exptl/biblatex/}, - urldate = {2014-05-24}, + url = {http://mirror.ctan.org/macros/latex/contrib/biblatex/}, + urldate = {2016-05-24}, language = {english}, } @online{biblatex-caspervector, author = {Vector, Casper Ti.}, - title = {biblatex 参考文献和引用样式：caspervector v0.2.1}, + title = {biblatex 参考文献和引用样式：caspervector v0.2.5}, type = {M/OL}, - date = {2015-04-28}, - url = {https://gitlab.com/CasperVector/biblatex-caspervector/releases/tag/v0.2.1}, - urldate = {2015-04-28}, + date = {2016-03-31}, + url = {http://mirror.ctan.org/macros/latex/contrib/biblatex-contrib/biblatex-caspervector/}, + urldate = {2016-05-24}, language = {chinese}, } @@ -33,8 +33,8 @@ title = {Customizing captions of floating environments}, type = {M/OL}, date = {2011-11-02}, - url = {http://mirror.ctan.org/macros/latex/contrib/caption}, - urldate = {2013-06-03}, + url = {http://mirror.ctan.org/macros/latex/contrib/caption/}, + urldate = {2016-05-24}, language = {english}, } @@ -48,16 +48,6 @@ language = {chinese}, } -@online{ctex-faq, - author = {吴凌云}, - title = {\CTeX{} FAQ（常见问题集），0.4 beta (89) 版}, - type = {M/OL}, - date = {2007-01-30}, - url = {http://mirror.ctan.org/info/ctex-faq/}, - urldate = {2012-08-01}, - language = {chinese}, -} - @online{enumitem, author = {Bezos, Javier}, title = {Customizing lists with the enumitem package (Version 3.5.2)}, @@ -138,13 +128,13 @@ language = {english}, } -@online{subfig, - author = {Cochran, Steven Douglas}, - title = {The Subfig Package (v1.3)}, +@online{subcaption, + author = {Sommerfeldt, Alex}, + title = {The subcaption package (v1.1-75)}, type = {M/OL}, - date = {2005-07-05}, - url = {http://mirror.ctan.org/macros/latex/contrib/subfig}, - urldate = {2015-04-26}, + date = {2013-04-16}, + url = {http://mirror.ctan.org/macros/latex/contrib/subcaption/}, + urldate = {2016-05-24}, language = {english}, } @@ -160,22 +150,22 @@ @online{tocloft, author = {Robertson, Will}, - title = {The tocloft package}, + title = {The tocloft package (v2.3f)}, type = {M/OL}, - date = {2013-12-20}, + date = {2013-05-02}, url = {http://mirror.ctan.org/macros/latex/contrib/tocloft/}, - urldate = {2013-05-02}, + urldate = {2016-05-24}, language = {english}, } -@online{xCJK2uni, - author = {李清}, - title = {xCJK2uni 宏包（v0.1）}, +@online{ulem, + author = {Arseneau, Donald}, + title = {The ulem package: underlining for emphasis}, type = {M/OL}, - date = {2013-08-17}, - url = {http://mirror.ctan.org/macros/latex/contrib/xcjk2uni/}, - urldate = {2014-05-10}, - language = {chinese}, + date = {2011-03-18}, + url = {http://mirror.ctan.org/macros/latex/contrib/ulem/}, + urldate = {2016-06-22}, + language = {english}, } @online{dypang, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/pkuthss/readme/pkuthss.tex new/doc/latex/pkuthss/readme/pkuthss.tex --- old/doc/latex/pkuthss/readme/pkuthss.tex 2016-03-24 23:28:18.000000000 +0100 +++ new/doc/latex/pkuthss/readme/pkuthss.tex 2017-03-02 00:01:04.000000000 +0100 @@ -27,10 +27,9 @@ % chap/pkuthss-acknowledge.tex \documentclass[UTF8]{pkuthss} - \usepackage[ - backend = biber, style = caspervector, utf8, sorting = ecnty, - giveninits = true, sortgiveninits = true + backend = biber, style = caspervector, utf8, + sorting = ecnty, giveninits = true, sortgiveninits = true ]{biblatex} \usepackage{fancyvrb} \usepackage{hologo} @@ -43,7 +42,7 @@ \hypersetup{colorlinks = true, allcolors = blue} \newcommand{\myemph}[1]{\emph{\textcolor{red}{#1}}} \newcommand{\unemph}[1]{\textup{\textcolor{black}{#1}}} -\newcommand{\docversion}{v1.7.2} +\newcommand{\docversion}{v1.7.4} \pkuthssinfo{ cthesisname = {本科生毕业论文}, ethesisname = {Undergraduate Thesis}, @@ -55,7 +54,7 @@ cauthor = {盖茨波·钛·维克托}, eauthor = {Casper Ti.\ Vector}, studentid = {00910???}, - date = {二〇一六年三月}, + date = {二〇一七年三月}, school = {化学与分子工程学院}, cmajor = {化学（？）}, emajor = {Chemistry ... ?}, direction = {据说 Casper 自己也不知道}, Binary files old/doc/latex/pkuthss/readme.pdf and new/doc/latex/pkuthss/readme.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pkuthss.doc.tlpobj new/tlpkg/tlpobj/pkuthss.doc.tlpobj --- old/tlpkg/tlpobj/pkuthss.doc.tlpobj 2016-04-14 19:35:01.000000000 +0200 +++ new/tlpkg/tlpobj/pkuthss.doc.tlpobj 2017-04-14 17:54:21.000000000 +0200 @@ -1,6 +1,6 @@ name pkuthss.doc category Package -revision 40127 +revision 43374 shortdesc doc files of pkuthss relocated 1 docfiles size=160 ++++++ pkuthss.tar.xz ++++++ Binary files old/tex/latex/pkuthss/pkulogo.pdf and new/tex/latex/pkuthss/pkulogo.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pkuthss/pkuthss-gbk.def new/tex/latex/pkuthss/pkuthss-gbk.def --- old/tex/latex/pkuthss/pkuthss-gbk.def 2016-03-24 23:28:18.000000000 +0100 +++ new/tex/latex/pkuthss/pkuthss-gbk.def 2017-03-02 00:01:05.000000000 +0100 @@ -22,7 +22,7 @@ % pkuword.eps \ProvidesFile{pkuthss-gbk.def} - [2016/03/22 v1.7.2 Labels and captions in GBK encoding + [2017/03/01 v1.7.4 Labels and captions in GBK encoding for the pkuthss document class] \def\label@ctitle{��Ŀ��} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pkuthss/pkuthss-utf8.def new/tex/latex/pkuthss/pkuthss-utf8.def --- old/tex/latex/pkuthss/pkuthss-utf8.def 2016-03-24 23:28:18.000000000 +0100 +++ new/tex/latex/pkuthss/pkuthss-utf8.def 2017-03-02 00:01:05.000000000 +0100 @@ -22,7 +22,7 @@ % pkuword.eps \ProvidesFile{pkuthss-utf8.def} - [2016/03/22 v1.7.2 Labels and captions in UTF-8 encoding + [2017/03/01 v1.7.4 Labels and captions in UTF-8 encoding for the pkuthss document class] \def\label@ctitle{题目：} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/pkuthss/pkuthss.cls new/tex/latex/pkuthss/pkuthss.cls --- old/tex/latex/pkuthss/pkuthss.cls 2016-03-24 23:28:18.000000000 +0100 +++ new/tex/latex/pkuthss/pkuthss.cls 2017-03-02 00:01:05.000000000 +0100 @@ -1,7 +1,7 @@ % Peking University dissertation document class % % Copyright (c) 2008-2009 solvethis -% Copyright (c) 2010-2016 Casper Ti. Vector +% Copyright (c) 2010-2017 Casper Ti. Vector % % This work may be distributed and/or modified under the conditions of the % LaTeX Project Public License, either version 1.3 of this license or (at @@ -23,7 +23,7 @@ \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesClass{pkuthss} - [2016/03/22 v1.7.2 Peking University dissertation document class] + [2017/03/01 v1.7.4 Peking University dissertation document class] % eg. `\pkuthss@int@boolopt{spacing}{true}' will expand to: % \newif\ifpkuthss@opt@spacing \pkuthss@opt@spacingtrue @@ -56,6 +56,8 @@ % Whether to automatically set up properties for generated PDF from user % defined document information (author, title, etc.). \pkuthss@int@boolopt{pdfprop}{true} +% Whether to disable some infractions intended to make the style less ugly. +\pkuthss@int@boolopt{ugly}{false} % Pass all other options to `ctexbook' document class. \DeclareOption*{\PassOptionsToClass{\CurrentOption}{ctexbook}} % Process all class options now. @@ -64,9 +66,7 @@ % Prevent fontspec (loaded by xeCJK) from interfering with newtxmath. \ifpkuthss@opt@pkufont\PassOptionsToPackage{no-math}{fontspec}\fi % pkuthss is based on ctexbook; we use `xiao 4' as default font size. -% CJKfntef provides `\CJKunderline' used in `\maketitle'. -% fancyhdr provides utilities for setting up headers and footers. -\LoadClass[hyperref, cs4size, fntef, fancyhdr]{ctexbook}[2011/03/11] +\LoadClass[zihao = -4]{ctexbook}[2014/03/06] % ctex 2.x no longer loads ifpdf and ifxetex by itself. \RequirePackage{ifpdf, ifxetex} % Provides support for `key = val' grammar. @@ -75,10 +75,12 @@ \RequirePackage{graphicx}[1999/02/16] % Provides utilities for setting up page layout. \RequirePackage{geometry} -% `hyperref', `fntef', `fancyhdr' and `cs4size' are deprecated in ctex 2.x. -% hyperref now does not make citation hyperlinks if not explicitly loaded. -% All compatibility support for ctex 1.x is scheduled for removal in 2017. -\RequirePackage{hyperref} +% fancyhdr provides utilities for setting up headers and footers. +\RequirePackage{fancyhdr} +% Provides `\uline' used in `\maketitle'. +\RequirePackage{ulem} +% `\AtEndOfClass' used to avoid `PDF destination not defined' with setspace. +\AtEndOfClass{\RequirePackage{hyperref}} \ifpkuthss@opt@gbk \input{pkuthss-gbk.def} @@ -90,12 +92,7 @@ XeLaTeX compilation without UTF-8 is very problematic.\MessageBreak Therefore please use UTF-8 encoding for the LaTeX code.% } - \else\ifpdf - % Fix garbled text in bookmarks for pdfLaTeX compilation in GBK. - % Compatibility settings for ctex 1.x, to be removed in 2017; ctex 2.x - % loads xCJK2uni by itself when necessary. - \RequirePackage{xCJK2uni} - \fi\fi + \fi \else \input{pkuthss-utf8.def} \fi @@ -104,7 +101,7 @@ % Use Times New Roman / Arial according to school regulation. % Option used to prevent newtxtext from manipulating footnote marks. \RequirePackage[defaultsups]{newtxtext} - \RequirePackage{newtxmath} + \RequirePackage[cmintegrals, varg]{newtxmath} \else % Provides `\Box' for originauth.tex if newtx is absent. \RequirePackage{latexsym} @@ -139,27 +136,23 @@ \ifpkuthss@opt@pkuspace % lineskip / baselineskip = 20 bp / (12 bp * (6 / 5)). \linespread{1.39}\selectfont - % Quite harmless and frequently used package. Loaded together with `tocloft' - % plus a compatibility option to avoid package clash. - \RequirePackage{subfig} % Provides utilities for setting TOC format; `titles' applied to avoid % interfering with LaTeX's own title mechanism. - \RequirePackage[subfigure, titles]{tocloft} + \RequirePackage[titles]{tocloft} \setlength{\cftbeforechapskip}{6bp plus 1bp} \setlength{\cftsecindent}{\ccwd} \setlength{\cftsubsecindent}{2\ccwd} - % Modify font size and separator of captions. - \RequirePackage{caption} + % `caption' modifies font size and separator of captions. `subcaption' + % provides functions similar to `subfigure'/`subfig' but does not clash with + % `tocloft'; it clashes with `subfigure'/`subfig', but the error message will + % say they cannot be used simultaneously. + \RequirePackage{caption, subcaption} \DeclareCaptionFont{cfive}{\zihao{5}} \DeclareCaptionLabelSeparator{quad}{\quad} \captionsetup{font = cfive, labelsep = quad} \fi \ifpkuthss@opt@spacing - % Automatically ignore spaces between CJK characters, or otherwise preserve - % spaces. XeCJK itself will handle this issue, therefore we do not use - % `CJKspace' when using XeLaTeX. - \unless\ifxetex\RequirePackage{CJKspace}\fi % Make spacing nicer in some situations (eg. footnotes and verbatims). \RequirePackage{setspace} % Lists often appear to be too sparse when items are just one or two lines @@ -266,26 +259,37 @@ \setlength{\belowdisplayskip}{6bp plus 1.5bp minus 3.5bp} % Set up chapter/section/... captions. -\CTEXsetup[ - nameformat = {\zihao{-2}\bfseries}, - titleformat = {\zihao{-2}\bfseries}, - beforeskip = {0bp}, afterskip = {18bp} -]{chapter} -\CTEXsetup[ - format = {\zihao{-3}\bfseries}, - beforeskip = {20bp plus 1ex minus 0.2ex}, - afterskip = {6bp plus 0.2ex} -]{section} -\CTEXsetup[ - format = {\zihao{4}\bfseries}, - beforeskip = {12bp plus 1ex minus 0.2ex}, - afterskip = {6bp plus 0.2ex} -]{subsection} -\CTEXsetup[ - format = {\bfseries}, - beforeskip = {12bp plus 1ex minus 0.2ex}, - afterskip = {6bp plus 0.2ex} -]{subsubsection} +% The `*skip' values are not supposed to be modified by the `ugly' option: +% the actual style of the school's guide and Word template seem to be different +% from the written specification (when applied verbatim in LaTeX), and here the +% actual style is used. +\ctexset{ + chapter = {beforeskip = {0bp}, afterskip = {18bp}}, + section = + {beforeskip = {20bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}}, + subsection = + {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}}, + subsubsection = + {beforeskip = {12bp plus 1ex minus 0.2ex}, afterskip = {6bp plus 0.2ex}} +} +\ifpkuthss@opt@ugly + \ctexset{ + chapter = + {nameformat = {\zihao{3}\bfseries}, titleformat = {\zihao{3}\bfseries}}, + section = {format = {\zihao{4}\bfseries}}, + subsection = + {format = {\fontsize{13bp}{15.6bp}\selectfont\bfseries}}, + subsubsection = {format = {\zihao{-4}\bfseries}} + } +\else + \ctexset{ + chapter = + {nameformat = {\zihao{-2}\bfseries}, titleformat = {\zihao{-2}\bfseries}}, + section = {format = {\zihao{-3}\bfseries}}, + subsection = {format = {\zihao{4}\bfseries}}, + subsubsection = {format = {\bfseries}} + } +\fi % Internal command to set up headers and footers. \def\pkuthss@int@setpagestyle{ @@ -338,11 +342,11 @@ \loop\ifnum\pkuthss@tmp@linecount>0 % Fill specified space with underline on the bottom line. `\underline' % draws line on the baseline (not the bottom line), and this is why - % `\CJKunderline' is used here instead. + % `\uline' is used here instead. \ifnum\pkuthss@tmp@linecount=1 - \CJKunderline{\makebox[#2]{}} + \uline{\makebox[#2]{}} \else - \CJKunderline{\makebox[#2]{}}\\ + \uline{\makebox[#2]{}}\\ \fi \advance\pkuthss@tmp@linecount by -1\relax \repeat% Binary files old/tex/latex/pkuthss/pkuword.pdf and new/tex/latex/pkuthss/pkuword.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pkuthss.tlpobj new/tlpkg/tlpobj/pkuthss.tlpobj --- old/tlpkg/tlpobj/pkuthss.tlpobj 2016-04-14 19:35:01.000000000 +0200 +++ new/tlpkg/tlpobj/pkuthss.tlpobj 2017-04-14 17:54:22.000000000 +0200 @@ -1,6 +1,6 @@ name pkuthss category Package -revision 40127 +revision 43374 shortdesc LaTeX template for dissertations in Peking University relocated 1 longdesc The package provides a simple, clear and flexible LaTeX @@ -14,7 +14,7 @@ RELOC/tex/latex/pkuthss/pkuword.eps RELOC/tex/latex/pkuthss/pkuword.pdf catalogue-ctan /macros/latex/contrib/pkuthss -catalogue-date 2016-03-22 10:57:36 +0100 +catalogue-date 2017-03-01 13:52:26 +0100 catalogue-license other-free catalogue-topics dissertation class chinese -catalogue-version 1.7.2 +catalogue-version 1.7.4 ++++++ pl.doc.tar.xz ++++++ ++++++ pl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/pl.tlpobj new/tlpkg/tlpobj/pl.tlpobj --- old/tlpkg/tlpobj/pl.tlpobj 2016-04-14 19:35:01.000000000 +0200 +++ new/tlpkg/tlpobj/pl.tlpobj 2017-04-14 17:54:22.000000000 +0200 @@ -432,7 +432,7 @@ RELOC/fonts/type1/public/pl/plvtt10.pfb RELOC/fonts/type1/public/pl/plvtt10.pfm catalogue-ctan /language/polish/pl-mf.zip -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics font font-mf polish catalogue-version 1.09 ++++++ placeat.doc.tar.xz ++++++ ++++++ placeat.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/placeat.tlpobj new/tlpkg/tlpobj/placeat.tlpobj --- old/tlpkg/tlpobj/placeat.tlpobj 2016-04-14 19:35:05.000000000 +0200 +++ new/tlpkg/tlpobj/placeat.tlpobj 2017-04-14 17:54:23.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/lualatex/placeat/placeat.sty catalogue-also textpos catalogue-ctan /macros/luatex/latex/placeat -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics layout luatex catalogue-version 0.1 ++++++ placeins.doc.tar.xz ++++++ ++++++ placeins.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/placeins.tlpobj new/tlpkg/tlpobj/placeins.tlpobj --- old/tlpkg/tlpobj/placeins.tlpobj 2016-04-14 19:35:05.000000000 +0200 +++ new/tlpkg/tlpobj/placeins.tlpobj 2017-04-14 17:54:23.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/placeins/placeins.sty catalogue-ctan /macros/latex/contrib/placeins -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics layout float catalogue-version 2.2

1 0

commit texlive-specs-p for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-p for openSUSE:Factory checked in at 2017-06-25 19:23:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-p (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-p.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-p" Sun Jun 25 19:23:27 2017 rev:27 rq:505688 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-p/texlive-specs-p.changes 2017-06-08 14:55:36.429651902 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-p.new/texlive-specs-p.changes 2017-06-25 19:32:10.923091967 +0200 @@ -1,0 +2,58 @@ +Thu Jun 22 12:50:00 UTC 2017 - werner(a)suse.de + +- Avoid to depend on optional milog.cfg +- texlive-milog does replace mathgl-tex + +------------------------------------------------------------------- +Wed Jun 21 10:20:17 UTC 2017 - werner(a)suse.de + +- Do not require own provided perl modules for latexindent + +------------------------------------------------------------------- +Tue Jun 20 06:39:06 UTC 2017 - werner(a)suse.de + +- Change left over texlive-pdftex-def for texlive-latex-bin + +------------------------------------------------------------------- +Mon Jun 19 13:31:54 UTC 2017 - werner(a)suse.de + +- Fix texlive-pdftex-def dependency as now texlive-graphics-def does + provide pdftex.def +- Fix texlive-rotating dependency as now texlive-graphics does + provide rotating.sty + +------------------------------------------------------------------- +Fri Jun 16 12:14:49 UTC 2017 - werner(a)suse.de + +- Notive: Some patches have been moved + * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c + * context_fourier-map.dif from texlive-specs-e to texlive-specs-f + * dvips_config.dif from texlive-specs-g to texlive-specs-h + * jadetex_ini.dif from texlive-specs-l to texlive-specs-m + * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w + * texdraw_info.dif from texlive-specs-v to texlive-specs-w + this entry exists only to silent the auto factory bot + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 +- Remove patch fontspec_emph.dif as now upstream +- Update patches + * kpathsea_cnf.dif + * latex2man_tmphandling.dif + * latexdiff_perl.dif + * latexpand_perl.dif + * luaotfload_varfonts.dif + * luatex_cnf.dif + * musixtex_various.dif + * tetex_scripts.dif + * tex4ht_env.dif + * texconfig_scripts.dif + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- mwcls.doc.tar.xz mwcls.tar.xz mwe.doc.tar.xz mwe.tar.xz mweights.doc.tar.xz mweights.tar.xz mxedruli.doc.tar.xz mxedruli.tar.xz mychemistry.doc.tar.xz mychemistry.tar.xz mycv.doc.tar.xz mycv.tar.xz mylatexformat.doc.tar.xz mylatexformat.tar.xz mynsfc.doc.tar.xz mynsfc.tar.xz nag.doc.tar.xz nag.tar.xz nameauth.doc.tar.xz nameauth.tar.xz namespc.doc.tar.xz namespc.tar.xz nanumtype1.doc.tar.xz nanumtype1.tar.xz nar.tar.xz natbib.doc.tar.xz natbib.tar.xz natded.doc.tar.xz natded.tar.xz nath.doc.tar.xz nath.tar.xz nature.doc.tar.xz nature.tar.xz navigator.doc.tar.xz navigator.tar.xz ncclatex.doc.tar.xz ncclatex.tar.xz ncctools.doc.tar.xz ncctools.tar.xz ncntrsbk.tar.xz nddiss.doc.tar.xz nddiss.tar.xz ndsu-thesis.doc.tar.xz ndsu-thesis.tar.xz needspace.doc.tar.xz needspace.tar.xz nestquot.tar.xz neuralnetwork.doc.tar.xz neuralnetwork.tar.xz nevelok.doc.tar.xz nevelok.tar.xz newcommand.doc.tar.xz newenviron.doc.tar.xz newenviron.tar.xz newfile.doc.tar.xz newfile.tar.xz newlfm.doc.tar.xz newlfm.tar.xz newpx.doc.tar.xz newpx.tar.xz newsletr.doc.tar.xz newsletr.tar.xz newspaper.doc.tar.xz newspaper.tar.xz newtx.doc.tar.xz newtx.tar.xz newtxsf.doc.tar.xz newtxsf.tar.xz newtxtt.doc.tar.xz newtxtt.tar.xz newunicodechar.doc.tar.xz newunicodechar.tar.xz newvbtm.doc.tar.xz newvbtm.tar.xz newverbs.doc.tar.xz newverbs.tar.xz nextpage.tar.xz nfssext-cfr.doc.tar.xz nfssext-cfr.tar.xz nicefilelist.doc.tar.xz nicefilelist.tar.xz niceframe.doc.tar.xz niceframe.tar.xz nicetext.doc.tar.xz nicetext.tar.xz nih.doc.tar.xz nih.tar.xz nihbiosketch.doc.tar.xz nihbiosketch.tar.xz nimbus15.doc.tar.xz nimbus15.tar.xz nkarta.doc.tar.xz nkarta.tar.xz nlctdoc.doc.tar.xz nlctdoc.tar.xz New: ---- medstarbeamer.doc.tar.xz medstarbeamer.tar.xz meetingmins.doc.tar.xz meetingmins.tar.xz memdesign.doc.tar.xz memexsupp.doc.tar.xz memexsupp.tar.xz memoir.doc.tar.xz memoir.tar.xz memory.doc.tar.xz memory.tar.xz mendex-doc.doc.tar.xz mentis.doc.tar.xz mentis.tar.xz menu.doc.tar.xz menu.tar.xz menukeys.doc.tar.xz menukeys.tar.xz merriweather.doc.tar.xz merriweather.tar.xz metafont-beginners.doc.tar.xz metafont.doc.tar.xz metafont.tar.xz metago.doc.tar.xz metago.tar.xz metalogo.doc.tar.xz metalogo.tar.xz metaobj.doc.tar.xz metaobj.tar.xz metaplot.doc.tar.xz metaplot.tar.xz metapost-examples.doc.tar.xz metapost.doc.tar.xz metapost.tar.xz metatex.doc.tar.xz metatex.tar.xz metatype1.source.tar.xz metauml.doc.tar.xz metauml.tar.xz method.doc.tar.xz method.tar.xz metre.doc.tar.xz metre.tar.xz metrix.doc.tar.xz metrix.tar.xz mex.doc.tar.xz mex.tar.xz mf2pt1.doc.tar.xz mf2pt1.tar.xz mfirstuc.doc.tar.xz mfirstuc.tar.xz mflogo-font.doc.tar.xz mflogo-font.tar.xz mflogo.doc.tar.xz mflogo.tar.xz mflua.tar.xz mfnfss.doc.tar.xz mfnfss.tar.xz mfpic.doc.tar.xz mfpic.tar.xz mfpic4ode.doc.tar.xz mfpic4ode.tar.xz mftinc.doc.tar.xz mftinc.tar.xz mfware.doc.tar.xz mfware.tar.xz mgltex.doc.tar.xz mgltex.tar.xz mhchem.doc.tar.xz mhchem.tar.xz mhequ.doc.tar.xz mhequ.tar.xz miama.doc.tar.xz miama.tar.xz microtype-de.doc.tar.xz microtype.doc.tar.xz microtype.tar.xz midnight.doc.tar.xz midnight.tar.xz midpage.doc.tar.xz midpage.tar.xz miller.doc.tar.xz miller.tar.xz milog.doc.tar.xz milog.tar.xz minibox.doc.tar.xz minibox.tar.xz minidocument.doc.tar.xz minidocument.tar.xz missaali.doc.tar.xz missaali.tar.xz modular.doc.tar.xz modular.tar.xz montserrat.doc.tar.xz montserrat.tar.xz mpostinl.doc.tar.xz mpostinl.tar.xz mptrees.doc.tar.xz mptrees.tar.xz mucproc.doc.tar.xz mucproc.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-p.spec ++++++ ++++ 40784 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-p/texlive-specs-p.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-p.new/texlive-specs-p.spec ++++++ mychemistry.doc.tar.xz -> metre.doc.tar.xz ++++++ ++++ 3896 lines of diff (skipped) ++++++ mychemistry.doc.tar.xz -> metre.tar.xz ++++++ ++++ 4864 lines of diff (skipped) ++++++ minifp.doc.tar.xz ++++++ ++++++ minifp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minifp.tlpobj new/tlpkg/tlpobj/minifp.tlpobj --- old/tlpkg/tlpobj/minifp.tlpobj 2016-04-14 19:27:49.000000000 +0200 +++ new/tlpkg/tlpobj/minifp.tlpobj 2017-04-14 17:51:15.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/generic/minifp/mfpextra.tex RELOC/tex/generic/minifp/minifp.sty catalogue-ctan /macros/generic/minifp -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics arithmetic calculation random catalogue-version 0.96 ++++++ minipage-marginpar.doc.tar.xz ++++++ ++++++ minipage-marginpar.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minipage-marginpar.tlpobj new/tlpkg/tlpobj/minipage-marginpar.tlpobj --- old/tlpkg/tlpobj/minipage-marginpar.tlpobj 2016-04-14 19:27:50.000000000 +0200 +++ new/tlpkg/tlpobj/minipage-marginpar.tlpobj 2017-04-14 17:51:15.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/minipage-marginpar/minipage-marginpar.sty RELOC/tex/latex/minipage-marginpar/mpgmpar.sty catalogue-ctan /macros/latex/contrib/minipage-marginpar -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics notes boxing catalogue-version 0.2 ++++++ miniplot.doc.tar.xz ++++++ ++++++ miniplot.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/miniplot.tlpobj new/tlpkg/tlpobj/miniplot.tlpobj --- old/tlpkg/tlpobj/miniplot.tlpobj 2016-04-14 19:27:50.000000000 +0200 +++ new/tlpkg/tlpobj/miniplot.tlpobj 2017-04-14 17:51:15.000000000 +0200 @@ -15,6 +15,6 @@ runfiles size=11 RELOC/tex/latex/miniplot/miniplot.sty catalogue-ctan /macros/latex/contrib/miniplot -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics graphics-use ++++++ minitoc.doc.tar.xz ++++++ ++++++ minitoc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minitoc.tlpobj new/tlpkg/tlpobj/minitoc.tlpobj --- old/tlpkg/tlpobj/minitoc.tlpobj 2016-04-14 19:27:58.000000000 +0200 +++ new/tlpkg/tlpobj/minitoc.tlpobj 2017-04-14 17:51:18.000000000 +0200 @@ -236,7 +236,7 @@ RELOC/tex/latex/minitoc/xalx2.mld RELOC/tex/latex/minitoc/xalx3.mld catalogue-ctan /macros/latex/contrib/minitoc -catalogue-date 2016-02-07 10:49:28 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics toc-etc catalogue-version 61 ++++++ minorrevision.doc.tar.xz ++++++ ++++++ minorrevision.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minorrevision.tlpobj new/tlpkg/tlpobj/minorrevision.tlpobj --- old/tlpkg/tlpobj/minorrevision.tlpobj 2016-04-14 19:27:59.000000000 +0200 +++ new/tlpkg/tlpobj/minorrevision.tlpobj 2017-04-14 17:51:18.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=1 RELOC/tex/latex/minorrevision/minorrevision.sty catalogue-ctan /macros/latex/contrib/minorrevision -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics editorial catalogue-version 1.1 ++++++ minted.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minted/README new/doc/latex/minted/README --- old/doc/latex/minted/README 2015-02-03 00:29:53.000000000 +0100 +++ new/doc/latex/minted/README 2016-11-25 19:29:31.000000000 +0100 @@ -1,4 +1,4 @@ -minted highlighted source code for LaTeX +minted - highlighted source code for LaTeX minted is a package that facilitates expressive syntax highlighting in LaTeX using the Pygments library. The package also provides options to customize Binary files old/doc/latex/minted/minted.pdf and new/doc/latex/minted/minted.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minted.doc.tlpobj new/tlpkg/tlpobj/minted.doc.tlpobj --- old/tlpkg/tlpobj/minted.doc.tlpobj 2016-04-14 19:27:59.000000000 +0200 +++ new/tlpkg/tlpobj/minted.doc.tlpobj 2017-04-14 17:51:19.000000000 +0200 @@ -1,9 +1,9 @@ name minted.doc category Package -revision 38339 +revision 42418 shortdesc doc files of minted relocated 1 -docfiles size=167 +docfiles size=198 RELOC/doc/latex/minted/Makefile RELOC/doc/latex/minted/README RELOC/doc/latex/minted/minted.pdf ++++++ minted.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/minted/minted.sty new/tex/latex/minted/minted.sty --- old/tex/latex/minted/minted.sty 2015-09-10 22:56:54.000000000 +0200 +++ new/tex/latex/minted/minted.sty 2016-11-25 19:33:55.000000000 +0100 @@ -5,7 +5,7 @@ %% The original source files were: %% %% minted.dtx (with options: `package') -%% Copyright 2013--2015 Geoffrey M. Poore +%% Copyright 2013--2016 Geoffrey M. Poore %% Copyright 2010--2011 Konrad Rudolph %% %% This work may be distributed and/or modified under the @@ -27,19 +27,26 @@ %% and the derived file minted.sty. \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{minted} - [2015/09/09 v2.1 Yet another Pygments shim for LaTeX] + [2016/10/31 v2.4.1 Yet another Pygments shim for LaTeX] \RequirePackage{keyval} \RequirePackage{kvoptions} -\RequirePackage{fancyvrb} +\RequirePackage{fvextra} \RequirePackage{float} \RequirePackage{ifthen} \RequirePackage{calc} +\IfFileExists{shellesc.sty} + {\RequirePackage{shellesc} + \@ifpackagelater{shellesc}{2016/04/29} + {} + {\protected\def\ShellEscape{\immediate\write18 }}} + {\protected\def\ShellEscape{\immediate\write18 }} \RequirePackage{ifplatform} \RequirePackage{pdftexcmds} \RequirePackage{etoolbox} \RequirePackage{xstring} \RequirePackage{lineno} -\AtBeginDocument{% +\RequirePackage{framed} +\AtEndPreamble{% \@ifpackageloaded{color}{}{% \@ifpackageloaded{xcolor}{}{\RequirePackage{xcolor}}}% } @@ -50,11 +57,14 @@ \StrSubstitute{\jobname}{ }{_}[\minted@jobname] \StrSubstitute{\minted@jobname}{*}{_}[\minted@jobname] \StrSubstitute{\minted@jobname}{"}{}[\minted@jobname] +\StrSubstitute{\minted@jobname}{'}{_}[\minted@jobname] \newcommand{\minted@cachedir}{\detokenize{_}minted-\minted@jobname} \let\minted@cachedir@windows\minted@cachedir \define@key{minted}{cachedir}{% \@namedef{minted@cachedir}{#1}% \StrSubstitute{\minted@cachedir}{/}{\@backslashchar}[\minted@cachedir@windows]} +\DeclareBoolOption{finalizecache} +\DeclareBoolOption{frozencache} \let\minted@outputdir\@empty \let\minted@outputdir@windows\@empty \define@key{minted}{outputdir}{% @@ -67,13 +77,27 @@ \DeclareComplementaryOption{final}{draft} \ProcessKeyvalOptions* \ifthenelse{\boolean{minted@newfloat}}{\RequirePackage{newfloat}}{} -\ifcsname tikzexternalrealjob\endcsname - \minted@drafttrue - \minted@cachefalse +\ifcsname tikzifexternalizing\endcsname + \tikzifexternalizing{\minted@drafttrue\minted@cachefalse}{} \else + \ifcsname tikzexternalrealjob\endcsname + \minted@drafttrue + \minted@cachefalse + \else + \fi \fi -\ifthenelse{\boolean{minted@cache}}{% - \AtEndOfPackage{\ProvideDirectory{\minted@outputdir\minted@cachedir}}}{} +\ifthenelse{\boolean{minted@finalizecache}}% + {\ifthenelse{\boolean{minted@frozencache}}% + {\PackageError{minted}% + {Options "finalizecache" and "frozencache" are not compatible}% + {Options "finalizecache" and "frozencache" are not compatible}}% + {}}% + {} +\ifthenelse{\boolean{minted@cache}}% + {\ifthenelse{\boolean{minted@frozencache}}% + {}% + {\AtEndOfPackage{\ProvideDirectory{\minted@outputdir\minted@cachedir}}}}% + {} \newcommand{\minted@input}[1]{% \IfFileExists{#1}% {\input{#1}}% @@ -81,11 +105,12 @@ was^^Jprobably given a file that does not exist--otherwise, you may need ^^Jthe outputdir package option, or may be using an incompatible build tool\ifwindows,^^Jor may be using the kpsewhich option without having - PowerShell installed\fi}% + PowerShell installed\fi,^^Jor may be using frozencache with a missing file}% {This could be caused by using -output-directory or -aux-directory ^^Jwithout setting minted's outputdir, or by using a build tool that ^^Jchanges paths in ways minted cannot detect\ifwindows, or by using the - ^^Jkpsewhich option without PowerShell\fi.}}% + ^^Jkpsewhich option without PowerShell\fi, + ^^Jor using frozencache with a missing file.}}% } \newcommand{\minted@infile}{\minted@jobname.out.pyg} \newcommand{\minted@cachelist}{} @@ -116,43 +141,49 @@ \fi } \ifthenelse{\boolean{minted@draft}}% - {\AtEndDocument{% + {\AtEndDocument{% + \ifcsname minted@oldcachelist\endcsname + \StrSubstitute{\minted@oldcachelist}{,}{,^^J }[\minted@cachelist] + \minted@savecachelist + \fi}}% + {\ifthenelse{\boolean{minted@frozencache}}% + {\AtEndDocument{% \ifcsname minted@oldcachelist\endcsname - \let\minted@cachelist\minted@oldcachelist + \StrSubstitute{\minted@oldcachelist}{,}{,^^J }[\minted@cachelist] \minted@savecachelist \fi}}% - {\AtEndDocument{% - \minted@savecachelist - \minted@cleancache}}% + {\AtEndDocument{% + \minted@savecachelist + \minted@cleancache}}}% \ifwindows \providecommand{\DeleteFile}[2][]{% \ifthenelse{\equal{#1}{}}% - {\IfFileExists{#2}{\immediate\write18{del "#2"}}{}}% + {\IfFileExists{#2}{\ShellEscape{del #2}}{}}% {\IfFileExists{#1/#2}{% \StrSubstitute{#1}{/}{\@backslashchar}[\minted@windir] - \immediate\write18{del "\minted@windir\@backslashchar #2"}}{}}} + \ShellEscape{del \minted@windir\@backslashchar #2}}{}}} \else \providecommand{\DeleteFile}[2][]{% \ifthenelse{\equal{#1}{}}% - {\IfFileExists{#2}{\immediate\write18{rm "#2"}}{}}% - {\IfFileExists{#1/#2}{\immediate\write18{rm "#1/#2"}}{}}} + {\IfFileExists{#2}{\ShellEscape{rm #2}}{}}% + {\IfFileExists{#1/#2}{\ShellEscape{rm #1/#2}}{}}} \fi \ifwindows \newcommand{\ProvideDirectory}[1]{% \StrSubstitute{#1}{/}{\@backslashchar}[\minted@windir] - \immediate\write18{if not exist "\minted@windir" mkdir "\minted@windir"}} + \ShellEscape{if not exist \minted@windir\space mkdir \minted@windir}} \else \newcommand{\ProvideDirectory}[1]{% - \immediate\write18{mkdir -p "#1"}} + \ShellEscape{mkdir -p #1}} \fi \newboolean{AppExists} \newread\minted@appexistsfile \newcommand{\TestAppExists}[1]{ \ifwindows \DeleteFile{\minted(a)jobname.aex} - \immediate\write18{for \string^\@percentchar i in (#1.exe #1.bat #1.cmd) - do set >"\minted(a)jobname.aex" <nul: /p - x=\string^\@percentchar \string~$PATH:i>>"\minted(a)jobname.aex"} + \ShellEscape{for \string^\@percentchar i in (#1.exe #1.bat #1.cmd) + do set > \minted(a)jobname.aex <nul: /p + x=\string^\@percentchar \string~$PATH:i>> \minted(a)jobname.aex} %$ <- balance syntax highlighting \immediate\openin\minted@appexistsfile\minted@jobname.aex \expandafter\def\expandafter\@tmp@cr\expandafter{\the\endlinechar} @@ -165,7 +196,7 @@ \immediate\closein\minted@appexistsfile \DeleteFile{\minted(a)jobname.aex} \else - \immediate\write18{which "#1" && touch "\minted(a)jobname.aex"} + \ShellEscape{which #1 && touch \minted(a)jobname.aex} \IfFileExists{\minted(a)jobname.aex} {\AppExiststrue \DeleteFile{\minted(a)jobname.aex}} @@ -345,17 +376,17 @@ \newcommand{\minted@def@optfv}[1]{% \define@key{minted@opt@g}{#1}{% \expandafter\def\expandafter\minted@optlistfv@g\expandafter{% - \minted@optlistfv@g#1=##1,}% + \minted@optlistfv@g#1={##1},}% \@namedef{minted@opt@g:#1}{##1}} \define@key{minted@opt@g@i}{#1}{% \expandafter\def\expandafter\minted@optlistfv@g@i\expandafter{% - \minted@optlistfv@g@i#1=##1,}% + \minted@optlistfv@g@i#1={##1},}% \@namedef{minted@opt@g@i:#1}{##1}} \define@key{minted@opt@lang}{#1}{% \expandafter\let\expandafter\minted@tmp% \csname minted@optlistfv@lang\minted@lang\endcsname \expandafter\def\expandafter\minted@tmp\expandafter{% - \minted@tmp#1=##1,}% + \minted@tmp#1={##1},}% \expandafter\let\csname minted@optlistfv@lang\minted@lang\endcsname% \minted@tmp \@namedef{minted@opt@lang\minted@lang:#1}{##1}} @@ -363,13 +394,13 @@ \expandafter\let\expandafter\minted@tmp% \csname minted@optlistfv@lang\minted@lang @i\endcsname \expandafter\def\expandafter\minted@tmp\expandafter{% - \minted@tmp#1=##1,}% + \minted@tmp#1={##1},}% \expandafter\let\csname minted@optlistfv@lang\minted@lang @i\endcsname% \minted@tmp \@namedef{minted@opt@lang\minted@lang @i:#1}{##1}} \define@key{minted@opt@cmd}{#1}{% \expandafter\def\expandafter\minted@optlistfv@cmd\expandafter{% - \minted@optlistfv@cmd#1=##1,}% + \minted@optlistfv@cmd#1={##1},}% \@namedef{minted@opt@cmd:#1}{##1}} } \newcommand{\minted@def@optfv@switch}[1]{% @@ -450,90 +481,77 @@ \@namedef{minted@opt@lang\minted@lang @i:#2}{##1}} \define@key{minted@opt@cmd}{#2}{% \@namedef{minted@opt@cmd:#2}{##1}} -} -\newcommand{\minted@def@opt@style}{% - \define@key{minted@opt@g}{style}{% - \minted@checkstyle{##1}% - \@namedef{minted@opt@g:style}{##1}}% - \define@key{minted@opt@g@i}{style}{% - \minted@checkstyle{##1}% - \@namedef{minted@opt@g@i:style}{##1}}% - \define@key{minted@opt@lang}{style}{% - \minted@checkstyle{##1}% - \@namedef{minted@opt@lang\minted@lang:style}{##1}}% - \define@key{minted@opt@lang@i}{style}{% - \minted@checkstyle{##1}% - \@namedef{minted@opt@lang\minted@lang @i:style}{##1}}% - \define@key{minted@opt@cmd}{style}{% - \minted@checkstyle{##1}% - \@namedef{minted@opt@cmd:style}{##1}}% + \ifstrempty{#1}{}{\@namedef{minted@opt@g:#2}{#1}}% } \newcommand{\minted@checkstyle}[1]{% \ifcsname minted@styleloaded@\ifstrempty{#1}{default-pyg-prefix}{#1}\endcsname\else + \ifstrempty{#1}{}{\ifcsname PYG\endcsname\else\minted@checkstyle{}\fi}% \expandafter\gdef% \csname minted@styleloaded@\ifstrempty{#1}{default-pyg-prefix}{#1}\endcsname{}% \ifthenelse{\boolean{minted@cache}}% - {\IfFileExists + {\IfFileExists {\minted@outputdir\minted@cachedir/\ifstrempty{#1}{default-pyg-prefix}{#1}.pygstyle}% {}% {% - \ifwindows - \immediate\write18{% - \MintedPygmentize\space -S \ifstrempty{#1}{default}{#1} -f latex - -P commandprefix=PYG#1 - > "\minted@outputdir@windows\minted@cachedir@windows\@backslashchar% - \ifstrempty{#1}{default-pyg-prefix}{#1}.pygstyle"}% - \else - \immediate\write18{% - \MintedPygmentize\space -S \ifstrempty{#1}{default}{#1} -f latex - -P commandprefix=PYG#1 - > "\minted@outputdir\minted@cachedir/% - \ifstrempty{#1}{default-pyg-prefix}{#1}.pygstyle"}% - \fi + \ifthenelse{\boolean{minted@frozencache}}% + {\PackageError{minted}% + {Missing style definition for #1 with frozencache}% + {Missing style definition for #1 with frozencache}}% + {\ifwindows + \ShellEscape{% + \MintedPygmentize\space -S \ifstrempty{#1}{default}{#1} -f latex + -P commandprefix=PYG#1 + > \minted@outputdir@windows\minted@cachedir@windows\@backslashchar% + \ifstrempty{#1}{default-pyg-prefix}{#1}.pygstyle}% + \else + \ShellEscape{% + \MintedPygmentize\space -S \ifstrempty{#1}{default}{#1} -f latex + -P commandprefix=PYG#1 + > \minted@outputdir\minted@cachedir/% + \ifstrempty{#1}{default-pyg-prefix}{#1}.pygstyle}% + \fi}% }% \begingroup \let\def\gdef + \catcode`\_=11 + \catcode`\-=11 \endlinechar=-1\relax \minted@input{% \minted@outputdir\minted@cachedir/\ifstrempty{#1}{default-pyg-prefix}{#1}.pygstyle}% \endgroup \minted(a)addcachefile{\ifstrempty{#1}{default-pyg-prefix}{#1}.pygstyle}}% - {\ifwindows - \immediate\write18{% + {% + \ifwindows + \ShellEscape{% \MintedPygmentize\space -S \ifstrempty{#1}{default}{#1} -f latex - -P commandprefix=PYG#1 > "\minted@outputdir@windows\minted@jobname.out.pyg"}% + -P commandprefix=PYG#1 > \minted@outputdir@windows\minted@jobname.out.pyg}% \else - \immediate\write18{% + \ShellEscape{% \MintedPygmentize\space -S \ifstrempty{#1}{default}{#1} -f latex - -P commandprefix=PYG#1 > "\minted@outputdir\minted@jobname.out.pyg"}% + -P commandprefix=PYG#1 > \minted@outputdir\minted@jobname.out.pyg}% \fi \begingroup \let\def\gdef + \catcode`\_=11 + \catcode`\-=11 \endlinechar=-1\relax \minted@input{\minted@outputdir\minted@jobname.out.pyg}% \endgroup}% + \ifstrempty{#1}{\minted@patch@PYGZsq}{}% \fi } \ifthenelse{\boolean{minted@draft}}{\renewcommand{\minted@checkstyle}[1]{}}{} -\AtBeginDocument{\minted@checkstyle{}} \newcommand{\minted@patch@PYGZsq}{% \ifcsname PYGZsq\endcsname - \ifx\upquote@cmtt\minted@undefined\else - \ifx\encodingdefault\upquote@OTone - \ifx\ttdefault\upquote@cmtt - \expandafter\ifdefstring\expandafter{\csname PYGZsq\endcsname}{\char`\'}% - {\expandafter\gdef\csname PYGZsq\endcsname{\char13 }}{}% - \else - \expandafter\ifdefstring\expandafter{\csname PYGZsq\endcsname}{\char`\'}% - {\expandafter\gdef\csname PYGZsq\endcsname{\textquotesingle}}{}% - \fi - \else - \expandafter\ifdefstring\expandafter{\csname PYGZsq\endcsname}{\char`\'}% - {\expandafter\gdef\csname PYGZsq\endcsname{\textquotesingle}}{}% - \fi - \fi + \expandafter\ifdefstring\expandafter{\csname PYGZsq\endcsname}{\char`\'}% + {\minted@patch@PYGZsq@i}% + {}% \fi } +\begingroup +\catcode`\'=\active +\gdef\minted@patch@PYGZsq@i{\gdef\PYGZsq{'}} +\endgroup \ifthenelse{\boolean{minted@draft}}{}{\AtBeginDocument{\minted@patch@PYGZsq}} \newcommand{\minted@def@opt@switch}[2][false]{% \define@booleankey{minted@opt@g}{#2}% @@ -605,7 +623,7 @@ \minted@def@optcl@switch{texcomments}{-P texcomments} \minted@def@optcl@switch{mathescape}{-P mathescape} \minted@def@optfv@switch{linenos} -\minted@def@opt@style +\minted@def@opt{style} \minted@def@optfv{frame} \minted@def@optfv{framesep} \minted@def@optfv{framerule} @@ -627,13 +645,27 @@ \minted@def@optfv{fontseries} \minted@def@optfv{formatcom} \minted@def@optfv{label} +\minted@def@optfv{labelposition} +\minted@def@optfv{highlightlines} +\minted@def@optfv{highlightcolor} +\minted@def@optfv{space} +\minted@def@optfv{spacecolor} +\minted@def@optfv{tab} +\minted@def@optfv{tabcolor} +\minted@def@optfv{highlightcolor} +\minted@def@optfv@switch{curlyquotes} +\minted@def@optfv@switch{numberfirstline} \minted@def@optfv@switch{numberblanklines} +\minted@def@optfv@switch{stepnumberfromfirst} +\minted@def@optfv@switch{stepnumberoffsetvalues} \minted@def@optfv@switch{showspaces} \minted@def@optfv@switch{resetmargins} \minted@def@optfv@switch{samepage} \minted@def@optfv@switch{showtabs} \minted@def@optfv@switch{obeytabs} \minted@def@optfv@switch{breaklines} +\minted@def@optfv@switch{breakbytoken} +\minted@def@optfv@switch{breakbytokenanywhere} \minted@def@optfv{breakindent} \minted@def@optfv@switch{breakautoindent} \minted@def@optfv{breaksymbol} @@ -645,6 +677,10 @@ \minted@def@optfv{breaksymbolright} \minted@def@optfv{breaksymbolsepright} \minted@def@optfv{breaksymbolindentright} +\minted@def@optfv{breakbefore} +\minted@def@optfv{breakbeforesymbolpre} +\minted@def@optfv{breakbeforesymbolpost} +\minted@def@optfv@switch{breakbeforegroup} \minted@def@optfv{breakafter} \minted@def@optfv@switch{breakaftergroup} \minted@def@optfv{breakaftersymbolpre} @@ -652,347 +688,20 @@ \minted@def@optfv@switch{breakanywhere} \minted@def@optfv{breakanywheresymbolpre} \minted@def@optfv{breakanywheresymbolpost} -\minted@def@opt@switch{breakbytoken} -\minted@def@opt@switch{breakbytokenanywhere} \minted@def@opt{bgcolor} \minted@def@opt@switch{autogobble} \newcommand{\minted@encoding}{\minted@get@opt{encoding}{UTF8}} -\ifcsname KV@FV@breaklines\endcsname\else -\newboolean{FV@BreakLines} -\let\FV@ListProcessLine@Orig\FV@ListProcessLine -\define@booleankey{FV}{breaklines}% - {\FV@BreakLinestrue - \let\FV@ListProcessLine\FV@ListProcessLine@Break}% - {\FV@BreakLinesfalse - \let\FV@ListProcessLine\FV@ListProcessLine@Orig} -\newdimen\FV@BreakIndent -\define@key{FV}{breakindent}{\FV@BreakIndent=#1} -\fvset{breakindent=0pt} -\newboolean{FV@BreakAutoIndent} -\define@booleankey{FV}{breakautoindent}% - {\FV@BreakAutoIndenttrue}{\FV@BreakAutoIndentfalse} -\fvset{breakautoindent=true} -\define@key{FV}{breaksymbolleft}{\def\FancyVerbBreakSymbolLeft{#1}} -\define@key{FV}{breaksymbol}{\fvset{breaksymbolleft=#1}} -\fvset{breaksymbolleft=\tiny\ensuremath{\hookrightarrow}} -\define@key{FV}{breaksymbolright}{\def\FancyVerbBreakSymbolRight{#1}} -\fvset{breaksymbolright={}} -\newdimen\FV@BreakSymbolSepLeft -\define@key{FV}{breaksymbolsepleft}{\FV@BreakSymbolSepLeft=#1} -\define@key{FV}{breaksymbolsep}{\fvset{breaksymbolsepleft=#1}} -\fvset{breaksymbolsepleft=1em} -\newdimen\FV@BreakSymbolSepRight -\define@key{FV}{breaksymbolsepright}{\FV@BreakSymbolSepRight=#1} -\fvset{breaksymbolsepright=1em} -\newdimen\FV@BreakSymbolIndentLeft -\settowidth{\FV@BreakSymbolIndentLeft}{\ttfamily xxxx} -\define@key{FV}{breaksymbolindentleft}{\FV@BreakSymbolIndentLeft=#1} -\define@key{FV}{breaksymbolindent}{\fvset{breaksymbolindentleft=#1}} -\newdimen\FV@BreakSymbolIndentRight -\settowidth{\FV@BreakSymbolIndentRight}{\ttfamily xxxx} -\define@key{FV}{breaksymbolindentright}{\FV@BreakSymbolIndentRight=#1} -\newcommand{\FancyVerbFormatBreakSymbolLeft}[1]{% - \ifnum\value{linenumber}=1\relax\else{#1}\fi} -\newcounter{FancyVerbLineBreakLast} -\newcommand{\FV@SetLineBreakLast}{% - \setcounter{FancyVerbLineBreakLast}{\value{linenumber}}} -\newcommand{\FancyVerbFormatBreakSymbolRight}[1]{% - \ifnum\value{linenumber}=\value{FancyVerbLineBreakLast}\relax\else{#1}\fi} -\newboolean{FV@BreakAnywhere} -\define@booleankey{FV}{breakanywhere}% - {\FV@BreakAnywheretrue - \let\FancyVerbBreakStart\FV@Break - \let\FancyVerbBreakStop\FV@EndBreak - \let\FV@Break@Token\FV@Break@AnyToken}% - {\FV@BreakAnywherefalse - \let\FancyVerbBreakStart\relax - \let\FancyVerbBreakStop\relax} -\fvset{breakanywhere=false} -\let\FancyVerbBreakStart\relax -\let\FancyVerbBreakStop\relax -\edef\FV@hashchar{\string#} -\edef\FV@dollarchar{\string$} -\edef\FV@ampchar{\string&} -\edef\FV@underscorechar{\string_} -\edef\FV@tildechar{\string~} -\edef\FV@leftsquarebracket{\string[} -\edef\FV@rightsquarebracket{\string]} -\newcommand{\FV@EscChars}{% - \let\#\FV@hashchar - \let\%\@percentchar - \let\{\@charlb - \let\}\@charrb - \let\$\FV@dollarchar - \let\&\FV@ampchar - \let\_\FV@underscorechar - \let\\\@backslashchar - \let~\FV@tildechar - \let\~\FV@tildechar - \let\[\FV@leftsquarebracket - \let\]\FV@rightsquarebracket -} %$ <- highlighting -\define@key{FV}{breakafter}{% - \ifstrempty{#1}% - {\let\FV@BreakAfter\@empty - \let\FancyVerbBreakStart\relax - \let\FancyVerbBreakStop\relax}% - {\def\FV@BreakAfter{#1}% - \let\FancyVerbBreakStart\FV@Break - \let\FancyVerbBreakStop\FV@EndBreak - \let\FV@Break@Token\FV@Break@AfterToken}% -} -\fvset{breakafter={}} -\newboolean{FV@BreakAfterGroup} -\define@booleankey{FV}{breakaftergroup}% - {\FV@BreakAfterGrouptrue}% - {\FV@BreakAfterGroupfalse}% -\fvset{breakaftergroup=true} -\def\FV@BreakAfterPrep{% - \ifx\FV@BreakAfter\@empty\relax - \else - \gdef\FV@BreakAfter@Def{}% - \begingroup - \def\FV@BreakAfter@Process##1##2\FV@Undefined{% - \expandafter\FV@BreakAfter@Process@i\expandafter{##1}% - \expandafter\ifx\expandafter\relax\detokenize{##2}\relax - \else - \FV@BreakAfter@Process##2\FV@Undefined - \fi - }% - \def\FV@BreakAfter@Process@i##1{% - \g@addto@macro\FV@BreakAfter@Def{% - \@namedef{FV@BreakAfter@Token\detokenize{##1}}{}}% - }% - \FV@EscChars - \expandafter\FV@BreakAfter@Process\FV@BreakAfter\FV@Undefined - \endgroup - \FV@BreakAfter@Def - \fi -} -\expandafter\def\expandafter\FV@FormattingPrep\expandafter{% - \expandafter\FV@BreakAfterPrep\FV@FormattingPrep} -\define@key{FV}{breakanywheresymbolpre}{% - \ifstrempty{#1}% - {\def\FancyVerbBreakAnywhereSymbolPre{}}% - {\def\FancyVerbBreakAnywhereSymbolPre{\hbox{#1}}}} -\fvset{breakanywheresymbolpre={\,\footnotesize\ensuremath{_\rfloor}}} -\define@key{FV}{breakanywheresymbolpost}{% - \ifstrempty{#1}% - {\def\FancyVerbBreakAnywhereSymbolPost{}}% - {\def\FancyVerbBreakAnywhereSymbolPost{\hbox{#1}}}} -\fvset{breakanywheresymbolpost={}} -\define@key{FV}{breakaftersymbolpre}{% - \ifstrempty{#1}% - {\def\FancyVerbBreakAfterSymbolPre{}}% - {\def\FancyVerbBreakAfterSymbolPre{\hbox{#1}}}} -\fvset{breakaftersymbolpre={\,\footnotesize\ensuremath{_\rfloor}}} -\define@key{FV}{breakaftersymbolpost}{% - \ifstrempty{#1}% - {\def\FancyVerbBreakAfterSymbolPost{}}% - {\def\FancyVerbBreakAfterSymbolPost{\hbox{#1}}}} -\fvset{breakaftersymbolpost={}} -\newcommand{\FancyVerbBreakAnywhereBreak}{% - \discretionary{\FancyVerbBreakAnywhereSymbolPre}% - {\FancyVerbBreakAnywhereSymbolPost}{}} -\newcommand{\FancyVerbBreakAfterBreak}{% - \discretionary{\FancyVerbBreakAfterSymbolPre}% - {\FancyVerbBreakAfterSymbolPost}{}} -\newsavebox{\FV@LineBox} -\newsavebox{\FV@LineIndentBox} -\let\FV@LineIndentChars\@empty -\def\FV@GetNextChar{\let\FV@NextChar=} -\def\FV@CleanRemainingChars#1\FV@Undefined{} -\def\FV@GetLineIndent{\afterassignment\FV@CheckIndentChar\FV@GetNextChar} -\def\FV@CheckIndentChar{% - \ifx\FV@NextChar\FV@Undefined - \let\FV@Next=\relax - \else - \expandafter\ifx\FV@NextChar\FV@Space - \g@addto@macro{\FV@LineIndentChars}{\FV@Space}% - \let\FV@Next=\FV@GetLineIndent - \else - \expandafter\ifx\FV@NextChar\FV@Tab - \g@addto@macro{\FV@LineIndentChars}{\FV@Tab}% - \let\FV@Next=\FV@GetLineIndent - \else - \let\FV@Next=\FV@CleanRemainingChars - \fi - \fi - \fi - \FV@Next -} -\def\FV@Break{% - \def\FV@Tmp{}% - \FV@Break@Scan -} -\def\FV@EndBreak{\FV@Tmp} -\begingroup -\catcode`\$=3% -\gdef\FV@Break@Scan{% - \@ifnextchar\FV@EndBreak% - {}% - {\ifx\@let@token$\relax - \let\FV@Break@Next\FV@Break@Math - \else - \ifx\@let@token\bgroup\relax - \let\FV@Break@Next\FV@Break@Group - \else - \let\FV@Break@Next\FV@Break@Token - \fi - \fi - \FV@Break@Next}% -} -\endgroup -\begingroup -\catcode`\$=3% -\gdef\FV@Break@Math$#1${% - \g@addto@macro{\FV@Tmp}{$#1$}% - \FV@Break@Scan} -\endgroup -\def\FV@Break@Group#1{% - \g@addto@macro{\FV@Tmp}{{#1}}% - \FV@Break@Scan} -\def\FV@Break@AnyToken#1{% - \g@addto@macro{\FV@Tmp}{\FancyVerbBreakAnywhereBreak#1}% - \FV@Break@Scan} -\def\FV@Break@AfterToken#1{% - \ifcsname FV@BreakAfter@Token\detokenize{#1}\endcsname - \let\FV@Break@Next\FV@Break@AfterTokenBreak - \else - \let\FV@Break@Next\FV@Break@AfterTokenNoBreak - \fi - \FV@Break@Next{#1}% -} -\def\FV@Break@AfterTokenNoBreak#1{% - \g@addto@macro{\FV@Tmp}{#1}% - \FV@Break@Scan} -\def\FV@Break@AfterTokenBreak#1{% - \@ifnextchar\FV@Space% - {\g@addto@macro{\FV@Tmp}{#1}\FV@Break@Scan}% - {\ifthenelse{\boolean{FV@BreakAfterGroup}}% - {\ifx\@let@token#1\relax - \g@addto@macro{\FV@Tmp}{#1}% - \let\FV@Break@Next\FV@Break@Scan - \else - \ifx\@let@token\bgroup\relax - \g@addto@macro{\FV@Tmp}{#1}% - \let\FV@TmpToken#1% - \let\FV@Break@Next\FV@Break@AfterTokenBreak@Group - \else - \g@addto@macro{\FV@Tmp}{#1\FancyVerbBreakAfterBreak}% - \let\FV@Break@Next\FV@Break@Scan - \fi - \fi}% - {\g@addto@macro{\FV@Tmp}{#1\FancyVerbBreakAfterBreak}% - \let\FV@Break@Next\FV@Break@Scan}% - \FV@Break@Next}% -} -\def\FV@Break@AfterTokenBreak@Group#1{% - \g@addto@macro{\FV@Tmp}{{#1}}% - \ifstrempty{#1}% - {\let\FV@Break@Next\FV@Break@AfterTokenBreak@Group@i}% - {\let\FV@Break@Next\FV@Break@Scan}% - \FV@Break@Next} -\def\FV@Break@AfterTokenBreak@Group@i{% - \@ifnextchar\FV@TmpToken% - {\FV@Break@Scan}% - {\g@addto@macro{\FV@Tmp}{\FancyVerbBreakAfterBreak}% - \FV@Break@Scan}} -\def\FV@makeLineNumber{% - \hss - \FancyVerbFormatBreakSymbolLeft{\FancyVerbBreakSymbolLeft}% - \hbox to \FV@BreakSymbolSepLeft{\hfill}% - \rlap{\hskip\linewidth - \hbox to \FV@BreakSymbolSepRight{\hfill}% - \FancyVerbFormatBreakSymbolRight{\FancyVerbBreakSymbolRight}% - \FV@SetLineBreakLast - }% -} -\def\FV@SaveLineBox#1{% - \savebox{\FV@LineBox}{% - \advance\linewidth by -\FV@BreakIndent - \hbox to \FV@BreakIndent{\hfill}% - \ifthenelse{\boolean{FV@BreakAutoIndent}}% - {\let\FV@LineIndentChars\@empty - \FV@GetLineIndent#1\FV@Undefined - \savebox{\FV@LineIndentBox}{\FV@LineIndentChars}% - \hbox to \wd\FV@LineIndentBox{\hfill}% - \advance\linewidth by -\wd\FV@LineIndentBox}% - {}% - \ifdefempty{\FancyVerbBreakSymbolLeft}{}% - {\hbox to \FV@BreakSymbolIndentLeft{\hfill}% - \advance\linewidth by -\FV@BreakSymbolIndentLeft}% - \ifdefempty{\FancyVerbBreakSymbolRight}{}% - {\advance\linewidth by -\FV@BreakSymbolIndentRight}% - \parbox[t]{\linewidth}{% - \raggedright - \leftlinenumbers* - \begin{internallinenumbers*}% - \let\makeLineNumber\FV@makeLineNumber - \noindent\hspace*{-\FV@BreakIndent}% - \ifdefempty{\FancyVerbBreakSymbolLeft}{}{% - \hspace*{-\FV@BreakSymbolIndentLeft}}% - \ifthenelse{\boolean{FV@BreakAutoIndent}}% - {\hspace*{-\wd\FV@LineIndentBox}}% - {}% - \strut#1\nobreak\strut - \end{internallinenumbers*} - }% - \ifdefempty{\FancyVerbBreakSymbolRight}{}% - {\hbox to \FV@BreakSymbolIndentRight{\hfill}}% - }% -} -\def\FancyVerbFormatText#1{#1} -\def\FV@ListProcessLine@Break#1{% - \hbox to \hsize{% - \kern\leftmargin - \hbox to \linewidth{% - \ifx\FV@RightListFrame\relax\else - \advance\linewidth by -\FV@FrameSep - \advance\linewidth by -\FV@FrameRule - \fi - \ifx\FV@LeftListFrame\relax\else - \advance\linewidth by -\FV@FrameSep - \advance\linewidth by -\FV@FrameRule - \fi - \sbox{\FV@LineBox}{\FancyVerbFormatLine{\FancyVerbFormatText{#1}}}% - \ifdim\wd\FV@LineBox>\linewidth - \setcounter{FancyVerbLineBreakLast}{0}% - \FV@SaveLineBox{\FancyVerbFormatText{% - \FancyVerbBreakStart#1\FancyVerbBreakStop}}% - \ifdefempty{\FancyVerbBreakSymbolRight}{}{% - \let\FV@SetLineBreakLast\relax - \FV@SaveLineBox{\FancyVerbFormatText{% - \FancyVerbBreakStart#1\FancyVerbBreakStop}}}% - \FV@LeftListNumber - \FV@LeftListFrame - \FancyVerbFormatLine{\usebox{\FV@LineBox}}% - \FV@RightListFrame - \FV@RightListNumber - \else - \FV@LeftListNumber - \FV@LeftListFrame - \FancyVerbFormatLine{% - \parbox[t]{\linewidth}{\noindent\strut\FancyVerbFormatText{#1}\strut}}% - \FV@RightListFrame - \FV@RightListNumber - \fi}% - \hss}\baselineskip\z@\lineskip\z@} -\ifcsname KV@FV@linenos\endcsname\else -\define@booleankey{FV}{linenos}% - {\@nameuse{FV@Numbers@left}}{\@nameuse{FV@Numbers@none}} -\fi -\fi \newsavebox{\minted@bgbox} -\newenvironment{minted@colorbg}[1]{ - %\setlength{\fboxsep}{-\fboxrule} - \def\minted@bgcol{#1} - \noindent - \begin{lrbox}{\minted@bgbox} - \begin{minipage}{\linewidth-2\fboxsep}} - {\end{minipage} - \end{lrbox}% - \colorbox{\minted@bgcol}{\usebox{\minted@bgbox}}} +\newenvironment{minted@colorbg}[1]{% + \setlength{\OuterFrameSep}{0pt}% + \colorlet{shadecolor}{#1}% + \let\minted@tmp\FV@NumberSep + \edef\FV@NumberSep{% + \the\numexpr\dimexpr\minted@tmp+\number\fboxsep\relax sp\relax}% + \medskip + \begin{snugshade*}} + {\end{snugshade*}% + \medskip\noindent} \newwrite\minted@code \newcommand{\minted@savecode}[1]{ \immediate\openout\minted@code\minted@jobname.pyg\relax @@ -1020,7 +729,10 @@ \ifcsname MintedPygmentize\endcsname\else \newcommand{\MintedPygmentize}{pygmentize} \fi +\newcounter{minted@pygmentizecounter} \newcommand{\minted@pygmentize}[2][\minted@outputdir\minted@jobname.pyg]{% + \minted@checkstyle{\minted@get@opt{style}{default}}% + \stepcounter{minted@pygmentizecounter}% \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}% {\def\minted@codefile{\minted@outputdir\minted@jobname.pyg}}% {\def\minted@codefile{#1}}% @@ -1035,206 +747,166 @@ -f latex -P commandprefix=PYG -F tokenmerge \minted@optlistcl@g \csname minted@optlistcl@lang\minted@lang\endcsname \minted@optlistcl@inlines - \minted@optlistcl@cmd -o "\minted@outputdir\minted@infile" + \minted@optlistcl@cmd -o \minted@outputdir\minted@infile\space \ifminted@kpsewhich \ifwindows - \detokenize{$}(kpsewhich "\minted@codefile")% + \detokenize{$}(kpsewhich \minted@codefile)% \else - \detokenize{`}kpsewhich "\minted@codefile" - \detokenize{||} "\minted@codefile"\detokenize{`}% + \detokenize{`}kpsewhich \minted@codefile\space + \detokenize{||} \minted@codefile\detokenize{`}% \fi \else - "\minted@codefile" + \minted@codefile \fi}% % For debugging, uncomment: %%%% % \immediate\typeout{\minted@cmd}% % %%%% \ifthenelse{\boolean{minted@cache}}% {% - \ifx\XeTeXinterchartoks\minted@undefined - \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}% - {\edef\minted@hash{\pdf@filemdfivesum{#1}% - \pdf@mdfivesum{\minted@cmd autogobble}}}% - {\edef\minted@hash{\pdf@filemdfivesum{#1}% - \pdf@mdfivesum{\minted@cmd}}}% + \ifminted@frozencache \else - \immediate\openout\minted@code\minted@jobname.mintedcmd\relax - \immediate\write\minted@code{\minted@cmd}% - \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}% - {\immediate\write\minted@code{autogobble}}{}% - \immediate\closeout\minted@code - %Cheating a little here by using ASCII codes to write `{` and `}` - %in the Python code - \def\minted@hashcmd{% - \detokenize{python -c "import hashlib; - hasher = hashlib.sha1(); - f = open(\"}\minted@outputdir\minted@jobname.mintedcmd\detokenize{\", \"rb\"); - hasher.update(f.read()); - f.close(); - f = open(\"}#1\detokenize{\", \"rb\"); - hasher.update(f.read()); - f.close(); - f = open(\"}\minted@outputdir\minted@jobname.mintedmd5\detokenize{\", \"w\"); - macro = \"\\edef\\minted@hash\" + chr(123) + hasher.hexdigest() + chr(125) + \"\"; - f.write(\"\\makeatletter\" + macro + \"\\makeatother\\endinput\n\"); - f.close();"}}% - \immediate\write18{\minted@hashcmd}% - \minted@input{\minted@outputdir\minted@jobname.mintedmd5}% + \ifx\XeTeXinterchartoks\minted@undefined + \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}% + {\edef\minted@hash{\pdf@filemdfivesum{#1}% + \pdf@mdfivesum{\minted@cmd autogobble(\ifx\FancyVerbStartNum\z@ 0\else\FancyVerbStartNum\fi-\ifx\FancyVerbStopNum\z@ 0\else\FancyVerbStopNum\fi)}}}% + {\edef\minted@hash{\pdf@filemdfivesum{#1}% + \pdf@mdfivesum{\minted@cmd}}}% + \else + \ifx\mdfivesum\minted@undefined + \immediate\openout\minted@code\minted@jobname.mintedcmd\relax + \immediate\write\minted@code{\minted@cmd}% + \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}% + {\immediate\write\minted@code{autogobble(\ifx\FancyVerbStartNum\z@ 0\else\FancyVerbStartNum\fi-\ifx\FancyVerbStopNum\z@ 0\else\FancyVerbStopNum\fi)}}{}% + \immediate\closeout\minted@code + \edef\minted@argone@esc{#1}% + \StrSubstitute{\minted@argone@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@argone@esc]% + \StrSubstitute{\minted@argone@esc}{"}{\@backslashchar"}[\minted@argone@esc]% + \edef\minted@tmpfname@esc{\minted@outputdir\minted@jobname}% + \StrSubstitute{\minted@tmpfname@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@tmpfname@esc]% + \StrSubstitute{\minted@tmpfname@esc}{"}{\@backslashchar"}[\minted@tmpfname@esc]% + %Cheating a little here by using ASCII codes to write `{` and `}` + %in the Python code + \def\minted@hashcmd{% + \detokenize{python -c "import hashlib; import os; + hasher = hashlib.sha1(); + f = open(os.path.expanduser(os.path.expandvars(\"}\minted@tmpfname@esc.mintedcmd\detokenize{\")), \"rb\"); + hasher.update(f.read()); + f.close(); + f = open(os.path.expanduser(os.path.expandvars(\"}\minted@argone@esc\detokenize{\")), \"rb\"); + hasher.update(f.read()); + f.close(); + f = open(os.path.expanduser(os.path.expandvars(\"}\minted@tmpfname@esc.mintedmd5\detokenize{\")), \"w\"); + macro = \"\\edef\\minted@hash\" + chr(123) + hasher.hexdigest() + chr(125) + \"\"; + f.write(\"\\makeatletter\" + macro + \"\\makeatother\\endinput\n\"); + f.close();"}}% + \ShellEscape{\minted@hashcmd}% + \minted@input{\minted@outputdir\minted@jobname.mintedmd5}% + \else + \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}% + {\edef\minted@hash{\mdfivesum file {#1}% + \mdfivesum{\minted@cmd autogobble(\ifx\FancyVerbStartNum\z@ 0\else\FancyVerbStartNum\fi-\ifx\FancyVerbStopNum\z@ 0\else\FancyVerbStopNum\fi)}}}% + {\edef\minted@hash{\mdfivesum file {#1}% + \mdfivesum{\minted@cmd}}}% + \fi + \fi + \edef\minted@infile{\minted@cachedir/\minted@hash.pygtex}% + \IfFileExists{\minted@infile}{}{% + \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}{% + \edef\minted@argone@esc{#1}% + \StrSubstitute{\minted@argone@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@argone@esc]% + \StrSubstitute{\minted@argone@esc}{"}{\@backslashchar"}[\minted@argone@esc]% + \edef\minted@tmpfname@esc{\minted@outputdir\minted@jobname}% + \StrSubstitute{\minted@tmpfname@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@tmpfname@esc]% + \StrSubstitute{\minted@tmpfname@esc}{"}{\@backslashchar"}[\minted@tmpfname@esc]% + %Need a version of open() that supports encoding under Python 2 + \edef\minted@autogobblecmd{% + \detokenize{python -c "import sys; import os; + import textwrap; + from io import open; + f = open(os.path.expanduser(os.path.expandvars(\"}\minted@argone@esc\detokenize{\")), \"r\", encoding=\"}\minted@encoding\detokenize{\"); + t = f.readlines(); + f.close(); + f = open(os.path.expanduser(os.path.expandvars(\"}\minted@tmpfname@esc.pyg\detokenize{\")), \"w\", encoding=\"}\minted@encoding\detokenize{\"); + fvstartnum = }\ifx\FancyVerbStartNum\z@ 0\else\FancyVerbStartNum\fi\detokenize{; + fvstopnum = }\ifx\FancyVerbStopNum\z@ 0\else\FancyVerbStopNum\fi\detokenize{; + s = fvstartnum-1 if fvstartnum != 0 else 0; + e = fvstopnum if fvstopnum != 0 else len(t); + [f.write(textwrap.dedent(\"\".join(x))) for x in (t[0:s], t[s:e], t[e:]) if x]; + f.close();"}% + }% + \ShellEscape{\minted@autogobblecmd}}{}% + \ShellEscape{\minted@cmd}}% \fi - \edef\minted@infile{\minted@cachedir/\minted@hash.pygtex}% - \IfFileExists{\minted@infile}{}{% - \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}{% - %Need a version of open() that supports encoding under Python 2 - \edef\minted@autogobblecmd{% - \detokenize{python -c "import sys; - import textwrap; - from io import open; - f = open(\"}#1\detokenize{\", \"r\", encoding=\"}\minted@encoding\detokenize{\"); - t = f.read(); - f.close(); - f = open(\"}\minted@outputdir\minted@jobname.pyg\detokenize{\", \"w\", encoding=\"}\minted@encoding\detokenize{\"); - f.write(textwrap.dedent(t)); - f.close();"}% - }% - \immediate\write18{\minted@autogobblecmd}}{}% - \immediate\write18{\minted@cmd}}% - \expandafter\minted@addcachefile\expandafter{\minted@hash.pygtex}% + \ifthenelse{\boolean{minted@finalizecache}}% + {% + \edef\minted@cachefilename{listing\arabic{minted@pygmentizecounter}.pygtex}% + \edef\minted@actualinfile{\minted@cachedir/\minted@cachefilename}% + \ifwindows + \StrSubstitute{\minted@infile}{/}{\@backslashchar}[\minted@infile@windows] + \StrSubstitute{\minted@actualinfile}{/}{\@backslashchar}[\minted@actualinfile@windows] + \ShellEscape{move /y \minted@infile@windows\space\minted@actualinfile@windows}% + \else + \ShellEscape{mv -f \minted@infile\space\minted@actualinfile}% + \fi + \let\minted@infile\minted@actualinfile + \expandafter\minted@addcachefile\expandafter{\minted@cachefilename}% + }% + {\ifthenelse{\boolean{minted@frozencache}}% + {% + \edef\minted@cachefilename{listing\arabic{minted@pygmentizecounter}.pygtex}% + \edef\minted@infile{\minted@cachedir/\minted@cachefilename}% + \expandafter\minted@addcachefile\expandafter{\minted@cachefilename}}% + {\expandafter\minted@addcachefile\expandafter{\minted@hash.pygtex}}% + }% \minted@inputpyg}% {% \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}{% + \edef\minted@argone@esc{#1}% + \StrSubstitute{\minted@argone@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@argone@esc]% + \StrSubstitute{\minted@argone@esc}{"}{\@backslashchar"}[\minted@argone@esc]% + \edef\minted@tmpfname@esc{\minted@outputdir\minted@jobname}% + \StrSubstitute{\minted@tmpfname@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@tmpfname@esc]% + \StrSubstitute{\minted@tmpfname@esc}{"}{\@backslashchar"}[\minted@tmpfname@esc]% %Need a version of open() that supports encoding under Python 2 \edef\minted@autogobblecmd{% - \detokenize{python -c "import sys; + \detokenize{python -c "import sys; import os; import textwrap; from io import open; - f = open(\"}#1\detokenize{\", \"r\", encoding=\"}\minted@encoding\detokenize{\"); - t = f.read(); + f = open(os.path.expanduser(os.path.expandvars(\"}\minted@argone@esc\detokenize{\")), \"r\", encoding=\"}\minted@encoding\detokenize{\"); + t = f.readlines(); f.close(); - f = open(\"}\minted@outputdir\minted@jobname.pyg\detokenize{\", \"w\", encoding=\"}\minted@encoding\detokenize{\"); - f.write(textwrap.dedent(t)); + f = open(os.path.expanduser(os.path.expandvars(\"}\minted@tmpfname@esc.pyg\detokenize{\")), \"w\", encoding=\"}\minted@encoding\detokenize{\"); + fvstartnum = }\ifx\FancyVerbStartNum\z@ 0\else\FancyVerbStartNum\fi\detokenize{; + fvstopnum = }\ifx\FancyVerbStopNum\z@ 0\else\FancyVerbStopNum\fi\detokenize{; + s = fvstartnum-1 if fvstartnum != 0 else 0; + e = fvstopnum if fvstopnum != 0 else len(t); + [f.write(textwrap.dedent(\"\".join(x))) for x in (t[0:s], t[s:e], t[e:]) if x]; f.close();"}% }% - \immediate\write18{\minted@autogobblecmd}}{}% - \immediate\write18{\minted@cmd}% + \ShellEscape{\minted@autogobblecmd}}{}% + \ShellEscape{\minted@cmd}% \minted@inputpyg}% } -\def\FV@SpaceMMode{ } -\def\minted@BreakAfterPrep@extension{% - \ifcsname FV@BreakAfter@Token\@backslashchar\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZbs}}{}% - \fi - \ifcsname FV@BreakAfter@Token\FV@underscorechar\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZus}}{}% - \fi - \ifcsname FV@BreakAfter@Token\@charlb\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZob}}{}% - \fi - \ifcsname FV@BreakAfter@Token\@charrb\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZcb}}{}% - \fi - \ifcsname FV@BreakAfter@Token\detokenize{^}\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZca}}{}% - \fi - \ifcsname FV@BreakAfter@Token\FV@ampchar\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZam}}{}% - \fi - \ifcsname FV@BreakAfter@Token\detokenize{<}\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZlt}}{}% - \fi - \ifcsname FV@BreakAfter@Token\detokenize{>}\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZgt}}{}% - \fi - \ifcsname FV@BreakAfter@Token\FV@hashchar\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZsh}}{}% - \fi - \ifcsname FV@BreakAfter@Token\@percentchar\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZpc}}{}% - \fi - \ifcsname FV@BreakAfter@Token\FV@dollarchar\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZdl}}{}% - \fi - \ifcsname FV@BreakAfter@Token\detokenize{-}\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZhy}}{}% - \fi - \ifcsname FV@BreakAfter@Token\detokenize{'}\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZsq}}{}% - \fi - \ifcsname FV@BreakAfter@Token\detokenize{"}\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZdq}}{}% - \fi - \ifcsname FV@BreakAfter@Token\FV@tildechar\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZti}}{}% - \fi - \ifcsname FV@BreakAfter@Token\detokenize{@}\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZat}}{}% - \fi - \ifcsname FV@BreakAfter@Token\detokenize{[}\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZlb}}{}% - \fi - \ifcsname FV@BreakAfter@Token\detokenize{]}\endcsname - \@namedef{FV@BreakAfter@Token\detokenize{\PYGZrb}}{}% - \fi -} \newcommand{\minted@inputpyg}{% - \let\FV@BreakAfterPrep@orig\FV@BreakAfterPrep - \def\FV@BreakAfterPrep{% - \FV@BreakAfterPrep@orig\minted@BreakAfterPrep@extension}% - \everymath\expandafter{\the\everymath\let\FV@Space\FV@SpaceMMode}% - \ifthenelse{\equal{\minted@get@opt{breakbytokenanywhere}{false}}{true}}% - {\setkeys{minted@opt@cmd}{breakbytoken=true}}{}% - \ifthenelse{\boolean{FV@BreakAnywhere}}% - {\expandafter\let\expandafter\minted@orig@PYG@breakanywhere% - \csname PYG\minted@get@opt{style}{default}\endcsname - \expandafter\def\csname PYG\minted@get@opt{style}{default}\endcsname##1##2{% - \minted@orig@PYG@breakanywhere{##1}% - {\FancyVerbBreakStart##2\FancyVerbBreakStop}}}{}% - \ifx\FV@BreakAfter\@empty - \else - \expandafter\let\expandafter\minted@orig@PYG@breakafter% - \csname PYG\minted@get@opt{style}{default}\endcsname - \expandafter\def\csname PYG\minted@get@opt{style}{default}\endcsname##1##2{% - \minted@orig@PYG@breakafter{##1}% - {\FancyVerbBreakStart##2\FancyVerbBreakStop}}% - \fi + \expandafter\let\expandafter\minted@PYGstyle% + \csname PYG\minted@get@opt{style}{default}\endcsname + \VerbatimPygments{\PYG}{\minted@PYGstyle}% \ifthenelse{\boolean{minted@isinline}}% {\ifthenelse{\equal{\minted@get@opt{breaklines}{false}}{true}}% {\let\FV@BeginVBox\relax \let\FV@EndVBox\relax \def\FV@BProcessLine##1{\FancyVerbFormatLine{##1}}% - \ifthenelse{\equal{\minted@get@opt{breakbytoken}{false}}{true}}% - {\minted@inputpyg@breakbytoken - \minted@inputpyg@inline}% - {\minted@inputpyg@inline}}% + \minted@inputpyg@inline}% {\minted@inputpyg@inline}}% - {\ifthenelse{\equal{\minted@get@opt{breaklines}{false}}{true}}% - {\ifthenelse{\equal{\minted@get@opt{breakbytoken}{false}}{true}}% - {\minted@inputpyg@breakbytoken - \minted@inputpyg@block}% - {\minted@inputpyg@block}}% - {\minted@inputpyg@block}}% -} -\def\minted@inputpyg@breakbytoken{% - \expandafter\let\expandafter\minted@orig@PYG@breakbytoken% - \csname PYG\minted@get@opt{style}{default}\endcsname - \ifthenelse{\equal{\minted@get@opt{breakbytokenanywhere}{false}}{true}}% - {\let\minted@orig@allowbreak\allowbreak - \def\allowbreak{\let\allowbreak\minted@orig@allowbreak}% - \expandafter\def\csname PYG\minted@get@opt{style}{default}\endcsname##1##2{% - \allowbreak{}\leavevmode\hbox{\minted@orig@PYG@breakbytoken{##1}{##2}}}}% - {\expandafter\def\csname PYG\minted@get@opt{style}{default}\endcsname##1##2{% - \leavevmode\hbox{\minted@orig@PYG@breakbytoken{##1}{##2}}}}% + {\minted@inputpyg@block}% } \def\minted@inputpyg@inline{% - \expandafter\let\expandafter\PYG% - \csname PYG\minted@get@opt{style}{default}\endcsname \ifthenelse{\equal{\minted@get@opt{bgcolor}{}}{}}% {\minted@input{\minted@outputdir\minted@infile}}% {\colorbox{\minted@get@opt{bgcolor}{}}{% \minted@input{\minted@outputdir\minted@infile}}}% } \def\minted@inputpyg@block{% - \expandafter\let\expandafter\PYG% - \csname PYG\minted@get@opt{style}{default}\endcsname \ifthenelse{\equal{\minted@get@opt{bgcolor}{}}{}}% {\minted@input{\minted@outputdir\minted@infile}}% {\begin{minted@colorbg}{\minted@get@opt{bgcolor}{}}% @@ -1266,6 +938,7 @@ {\minted@configlang{#1}% \setkeys{minted@opt@lang@i}{#2}}} \setmintedinline[php]{startinline=true} +\setminted{tabcolor=black} \newcommand{\usemintedstyle}[2][]{\setminted[#1]{style=#2}} \begingroup \catcode`\ =\active @@ -1469,37 +1142,48 @@ \providecommand{\listoflistings}{\listof{listing}{\listoflistingscaption}} \fi \AtEndOfPackage{% - \ifthenelse{\boolean{minted@draft}}{}{% - \ifnum\pdf@shellescape=1\relax\else - \PackageError{minted}% - {You must invoke LaTeX with the - -shell-escape flag}% - {Pass the -shell-escape flag to LaTeX. Refer to the minted.sty - documentation for more information.}% - \fi - \setminted{style=default}% - }% + \ifthenelse{\boolean{minted@draft}}% + {}% + {% + \ifthenelse{\boolean{minted@frozencache}}{}{% + \ifnum\pdf@shellescape=1\relax\else + \PackageError{minted}% + {You must invoke LaTeX with the + -shell-escape flag}% + {Pass the -shell-escape flag to LaTeX. Refer to the minted.sty + documentation for more information.}% + \fi}% + }% } \AtEndPreamble{% - \ifthenelse{\boolean{minted@draft}}{}{% - \TestAppExists{pygmentize}% - \ifAppExists\else - \PackageError{minted}% - {You must have `pygmentize' installed - to use this package}% - {Refer to the installation instructions in the minted - documentation for more information.}% - \fi + \ifthenelse{\boolean{minted@draft}}% + {}% + {% + \ifthenelse{\boolean{minted@frozencache}}{}{% + \TestAppExists{\MintedPygmentize}% + \ifAppExists\else + \PackageError{minted}% + {You must have `pygmentize' installed + to use this package}% + {Refer to the installation instructions in the minted + documentation for more information.}% + \fi}% }% } -\AtEndDocument{ - \ifx\XeTeXinterchartoks\minted@undefined - \else - \DeleteFile[\minted@outputdir]{\minted@jobname.mintedcmd}% - \DeleteFile[\minted@outputdir]{\minted@jobname.mintedmd5}% - \fi - \DeleteFile[\minted@outputdir]{\minted@jobname.pyg}% - \DeleteFile[\minted@outputdir]{\minted@jobname.out.pyg}% +\AfterEndDocument{% + \ifthenelse{\boolean{minted@draft}}% + {}% + {\ifthenelse{\boolean{minted@frozencache}}% + {} + {\ifx\XeTeXinterchartoks\minted@undefined + \else + \DeleteFile[\minted@outputdir]{\minted@jobname.mintedcmd}% + \DeleteFile[\minted@outputdir]{\minted@jobname.mintedmd5}% + \fi + \DeleteFile[\minted@outputdir]{\minted@jobname.pyg}% + \DeleteFile[\minted@outputdir]{\minted@jobname.out.pyg}% + }% + }% } \endinput %% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/minted/minted1.sty new/tex/latex/minted/minted1.sty --- old/tex/latex/minted/minted1.sty 2015-02-03 00:29:53.000000000 +0100 +++ new/tex/latex/minted/minted1.sty 2016-11-25 19:33:55.000000000 +0100 @@ -5,7 +5,7 @@ %% The original source files were: %% %% minted.dtx (with options: `packageone') -%% Copyright 2013--2015 Geoffrey M. Poore +%% Copyright 2013--2016 Geoffrey M. Poore %% Copyright 2010--2011 Konrad Rudolph %% %% This work may be distributed and/or modified under the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minted.tlpobj new/tlpkg/tlpobj/minted.tlpobj --- old/tlpkg/tlpobj/minted.tlpobj 2016-04-14 19:28:00.000000000 +0200 +++ new/tlpkg/tlpobj/minted.tlpobj 2017-04-14 17:51:19.000000000 +0200 @@ -1,18 +1,18 @@ name minted category Package -revision 38339 +revision 42418 shortdesc Highlighted source code for LaTeX relocated 1 longdesc The package that facilitates expressive syntax highlighting in longdesc LaTeX using the powerful Pygments library. The package also longdesc provides options to customize the highlighted source code longdesc output using fancyvrb. -runfiles size=17 +runfiles size=15 RELOC/tex/latex/minted/minted.sty RELOC/tex/latex/minted/minted1.sty catalogue-also texments verbments catalogue-ctan /macros/latex/contrib/minted -catalogue-date 2015-09-09 23:19:24 +0200 +catalogue-date 2016-11-01 08:52:52 +0100 catalogue-license lppl1.3 catalogue-topics listing -catalogue-version 2.1 +catalogue-version 2.4.1 ++++++ mintspirit.doc.tar.xz ++++++ ++++++ mintspirit.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mintspirit.tlpobj new/tlpkg/tlpobj/mintspirit.tlpobj --- old/tlpkg/tlpobj/mintspirit.tlpobj 2016-04-14 19:28:00.000000000 +0200 +++ new/tlpkg/tlpobj/mintspirit.tlpobj 2017-04-14 17:51:19.000000000 +0200 @@ -559,6 +559,6 @@ RELOC/tex/latex/mintspirit/mintspirit.sty RELOC/tex/latex/mintspirit/mintspirit2.sty catalogue-ctan /fonts/mintspirit -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license ofl catalogue-topics font font-sans font-otf font-type1 ++++++ minutes.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minutes/MinStyGd.tex new/doc/latex/minutes/MinStyGd.tex --- old/doc/latex/minutes/MinStyGd.tex 2009-12-11 02:05:25.000000000 +0100 +++ new/doc/latex/minutes/MinStyGd.tex 2016-11-25 19:29:32.000000000 +0100 @@ -1,5 +1,5 @@ -\def\minfileversion{V1.8d} %^^Aof minutes.sty -\def\minfiledate{2009/12/04} %^^Aof minutes.sty +\def\minfileversion{V1.8f} %^^Aof minutes.sty +\def\minfiledate{2010/03/11} %^^Aof minutes.sty %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minutes/README new/doc/latex/minutes/README --- old/doc/latex/minutes/README 2009-12-11 02:05:25.000000000 +0100 +++ new/doc/latex/minutes/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,55 +0,0 @@ -Name of contribution: minutes -Name and email: Knut Lickert <knut(a)lickert.net> -Location on CTAN: tex-archive/macros/latex/contrib/minutes - http://tex.lickert.net/packages/minutes/index.html -Summary description: Package for writing (collection of) minutes -German Information: Paket zum Erstellen von Protokollen - to take minutes = Protokoll schreiben - protocoll = diplomatische Protokoll -License type: Free (LaTeX Project Public License) - -Announcement text: ----------------------------------------------------------------------- -minutes.sty provides the creation of a collection of minutes. -Special features: -- Support of tasks (who, schedule, what, date of finishing), - possibility of creating a list of open tasks - inclusion of open tasks from other minutes ('open last year tasks') - (also possible as task.sty) -- Support of attachments -- Support of schedule dates (support of calendar.sty) -- Different versions (`secret parts') -- Macros for votes and decisions (list of decisions) - -The minutes package contains: -- minutes.dtx -- minutes.ins -- protokol.tex German description -- Overview.tex Include for minutes.dtx and protokol.tex - Also stand-alone document -- Tagesordnung.tex - A template for a "Mitgliederversammlung" -To run the examples, you need blindtext.sty. - -After running minutes.ins this package include: -- minutes.sty The style itself -- minutes.cfg A configuration file -- Sample.tex A file, including an English, Dutch and German minute -- SampleEN.tex An English minutes (loaded by Sample.tex) -- SampleDE.tex A German minutes (loaded by Sample.tex) -- SampleNL.tex A Dutch minutes (loaded by Sample.tex) -- MinStyGd.tex A file to check the behavior with other classes, - test different layouts... - -==================================== -Version 2.8b. -Solves some incompatibility with other packages. - -Version 2.8c: -Minor changes. - -Version 2.8d: -*Add Polish texts -*Correction French texts -*Correction in example file Protokol.tex (after error message in d.c.t.t.) -*Extend samples with attachments with label. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minutes/README.md new/doc/latex/minutes/README.md --- old/doc/latex/minutes/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/minutes/README.md 2016-11-25 19:29:32.000000000 +0100 @@ -0,0 +1,64 @@ +Name of contribution: minutes +Name and email: Knut Lickert <knut(a)lickert.net> +Location on CTAN: tex-archive/macros/latex/contrib/minutes + http://tex.lickert.net/packages/minutes/index.html +Summary description: Package for writing (collection of) minutes +German Information: Paket zum Erstellen von Protokollen + to take minutes = Protokoll schreiben + protocoll = diplomatische Protokoll +License type: Free (LaTeX Project Public License) + +Announcement text: +---------------------------------------------------------------------- +minutes.sty provides the creation of a collection of minutes. +Special features: +- Support of tasks (who, schedule, what, date of finishing), + possibility of creating a list of open tasks + inclusion of open tasks from other minutes ('open last year tasks') + (also possible as task.sty) +- Support of attachments +- Support of schedule dates (support of calendar.sty) +- Different versions (`secret parts') +- Macros for votes and decisions (list of decisions) + +The minutes package contains: +- minutes.dtx +- minutes.ins +- protokol.tex German description +- Overview.tex Include for minutes.dtx and protokol.tex + Also stand-alone document +- Tagesordnung.tex + A template for a "Mitgliederversammlung" +To run the examples, you need blindtext.sty. + +After running minutes.ins this package include: +- minutes.sty The style itself +- minutes.cfg A configuration file +- Sample.tex A file, including an English, Dutch and German minute +- SampleEN.tex An English minutes (loaded by Sample.tex) +- SampleDE.tex A German minutes (loaded by Sample.tex) +- SampleNL.tex A Dutch minutes (loaded by Sample.tex) +- MinStyGd.tex A file to check the behavior with other classes, + test different layouts... + +==================================== +Version 1.8b. +Solves some incompatibility with other packages. + +Version 1.8c: +*Minor corrections (space around -- at time) +*Corrected documentation (previous pdf was uncomplete) + +Version 1.8d (2009-12-04) +*Add Polish texts +*Correction French texts +*Correction in example file Protokol.tex (after error message in d.c.t.t.) +*Extend samples with attachments with label. + +Version 1.8e: +Minor corrections Polish + +Version 1.8f (2010-10-03/2016-10-01): +*corrections for optional minutes-title +*correction in texts (avoid unwanted spaces) +*Adaption version numbering in this readme diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minutes/Sample.tex new/doc/latex/minutes/Sample.tex --- old/doc/latex/minutes/Sample.tex 2009-12-11 02:05:25.000000000 +0100 +++ new/doc/latex/minutes/Sample.tex 2016-11-25 19:29:32.000000000 +0100 @@ -1,5 +1,5 @@ -\def\minfileversion{V1.8d} %^^Aof minutes.sty -\def\minfiledate{2009/12/04} %^^Aof minutes.sty +\def\minfileversion{V1.8f} %^^Aof minutes.sty +\def\minfiledate{2010/03/11} %^^Aof minutes.sty %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minutes/SampleDE.tex new/doc/latex/minutes/SampleDE.tex --- old/doc/latex/minutes/SampleDE.tex 2009-12-11 02:05:25.000000000 +0100 +++ new/doc/latex/minutes/SampleDE.tex 2016-11-25 19:29:32.000000000 +0100 @@ -1,5 +1,5 @@ -\def\minfileversion{V1.8d} %^^Aof minutes.sty -\def\minfiledate{2009/12/04} %^^Aof minutes.sty +\def\minfileversion{V1.8f} %^^Aof minutes.sty +\def\minfiledate{2010/03/11} %^^Aof minutes.sty %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minutes/SampleEN.tex new/doc/latex/minutes/SampleEN.tex --- old/doc/latex/minutes/SampleEN.tex 2009-12-11 02:05:25.000000000 +0100 +++ new/doc/latex/minutes/SampleEN.tex 2016-11-25 19:29:32.000000000 +0100 @@ -1,5 +1,5 @@ -\def\minfileversion{V1.8d} %^^Aof minutes.sty -\def\minfiledate{2009/12/04} %^^Aof minutes.sty +\def\minfileversion{V1.8f} %^^Aof minutes.sty +\def\minfiledate{2010/03/11} %^^Aof minutes.sty %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minutes/SampleNL.tex new/doc/latex/minutes/SampleNL.tex --- old/doc/latex/minutes/SampleNL.tex 2009-12-11 02:05:25.000000000 +0100 +++ new/doc/latex/minutes/SampleNL.tex 2016-11-25 19:29:32.000000000 +0100 @@ -1,5 +1,5 @@ -\def\minfileversion{V1.8d} %^^Aof minutes.sty -\def\minfiledate{2009/12/04} %^^Aof minutes.sty +\def\minfileversion{V1.8f} %^^Aof minutes.sty +\def\minfiledate{2010/03/11} %^^Aof minutes.sty %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z Binary files old/doc/latex/minutes/minutes.pdf and new/doc/latex/minutes/minutes.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minutes.doc.tlpobj new/tlpkg/tlpobj/minutes.doc.tlpobj --- old/tlpkg/tlpobj/minutes.doc.tlpobj 2016-04-14 19:28:03.000000000 +0200 +++ new/tlpkg/tlpobj/minutes.doc.tlpobj 2017-04-14 17:51:20.000000000 +0200 @@ -1,13 +1,13 @@ name minutes.doc category Package -revision 16350 +revision 42186 shortdesc doc files of minutes relocated 1 -docfiles size=91 +docfiles size=110 RELOC/doc/latex/minutes/MinStyGd.tex RELOC/doc/latex/minutes/Overview.tex RELOC/doc/latex/minutes/Protokol.tex - RELOC/doc/latex/minutes/README + RELOC/doc/latex/minutes/README.md RELOC/doc/latex/minutes/Sample.tex RELOC/doc/latex/minutes/SampleDE.tex RELOC/doc/latex/minutes/SampleEN.tex ++++++ minutes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/minutes/minutes.sty new/tex/latex/minutes/minutes.sty --- old/tex/latex/minutes/minutes.sty 2009-12-11 02:05:25.000000000 +0100 +++ new/tex/latex/minutes/minutes.sty 2016-11-25 19:33:55.000000000 +0100 @@ -52,8 +52,8 @@ %% - MinStyGd.tex A file to check the behavior with other classes, %% test different layouts... %% ---------------------------------------------------------------------- -\def\minfileversion{V1.8d} %^^Aof minutes.sty -\def\minfiledate{2009/12/04} %^^Aof minutes.sty +\def\minfileversion{V1.8f} %^^Aof minutes.sty +\def\minfiledate{2010/03/11} %^^Aof minutes.sty %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -288,7 +288,7 @@ \let\protokollKopf\maketitle \let\notulenkop\maketitle \def\min@title{#2} -\ifx#1\relax +\ifx{#1}\relax \def\min@titleshort{#2} \else \def\min@titleshort{#1} @@ -879,194 +879,194 @@ \let\naschrift\postscript \newenvironment{Naschrift}{\begin{Postscript}}{\end{Postscript}} \@ifundefined{addto}{\newcommand{\addto}[2]{#2}}{\relax} -\addto\extrasenglish{ -\def\min@textModerator{Moderation} -\def\min@textMinutesTaker{Minutes taker} -\def\min@textPresent{Those present} %Participiant: -\def\min@textAbsent{Absent} -\def\min@textAbsentExcused{\min@textAbsent\xspace (excused)} -\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (not excused)} -\def\min@textGuest{Guest} -\def\min@textDate{Date} -\def\min@textStarttime{Begin of the meeting} -\def\min@textEndtime{End of the meeting} -\def\min@textLocation{Location of the meeting} -\def\min@textCc{Distribution} -\def\min@textPostscript{Postscript} -\def\min@textEnclosure{Enclosure} -\def\min@textforeignMinutes{Foreign minutes} -\def\min@textSecret{including non-public informations} -\def\min@textPage{page} +\addto\extrasenglish{% +\def\min@textModerator{Moderation}% +\def\min@textMinutesTaker{Minutes taker}% +\def\min@textPresent{Those present}%Participiant: +\def\min@textAbsent{Absent}% +\def\min@textAbsentExcused{\min@textAbsent\xspace (excused)}% +\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (not excused)}% +\def\min@textGuest{Guest}% +\def\min@textDate{Date}% +\def\min@textStarttime{Begin of the meeting}% +\def\min@textEndtime{End of the meeting}% +\def\min@textLocation{Location of the meeting}% +\def\min@textCc{Distribution}% +\def\min@textPostscript{Postscript}% +\def\min@textEnclosure{Enclosure}% +\def\min@textforeignMinutes{Foreign minutes}% +\def\min@textSecret{including non-public informations}% +\def\min@textPage{page}% \def\min@toptext{}%Text before Topic -\def\min@textForeign{(no \LaTeXe -minute)} -\def\min@textYes{Yes} -\def\min@textNo{No} -\def\min@textNoVote{no vote} -\def\min@textDecision{Decision} -\def\min@textTask{Task} -\def\min@textResponsible{Responsible} -\def\min@textAnybody{Anybody} -\@ifundefined{chapter}{ - \renewcommand{\partname}{Minutes} - \renewcommand{\ptctitle}{Overview of topics} - }{ - \renewcommand{\chaptername}{Minutes} - \def\mtctitle{List of topics} - } +\def\min@textForeign{(no \LaTeXe -minute)}% +\def\min@textYes{Yes}% +\def\min@textNo{No}% +\def\min@textNoVote{no vote}% +\def\min@textDecision{Decision}% +\def\min@textTask{Task}% +\def\min@textResponsible{Responsible}% +\def\min@textAnybody{Anybody}% +\@ifundefined{chapter}{% + \renewcommand{\partname}{Minutes}% + \renewcommand{\ptctitle}{Overview of topics}% + }{% + \renewcommand{\chaptername}{Minutes}% + \def\mtctitle{List of topics}% + }% } -\addto\extrasdutch{ -\def\min@textModerator{Voorzitter} -\def\min@textMinutesTaker{Notulist} -\def\min@textPresent{Aanwezig} %Participiant: -\def\min@textAbsent{Afwezig} -\def\min@textAbsentExcused{\min@textAbsent\xspace (met bericht)} -\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (zonder bericht)} -\def\min@textGuest{Gasten} -\def\min@textDate{Datum} -\def\min@textStarttime{Begin van de bijeenkomst} -\def\min@textEndtime{Eind van de bijeenkomst} -\def\min@textLocation{Locatie van de bijeenkomst} -\def\min@textCc{Distributie} -\def\min@textPostscript{Naschrift} -\def\min@textEnclosure{Bijlagen} -\def\min@textforeignMinutes{Externe notulen} -\def\min@textSecret{inclusief niet openbare informatie} -\def\min@textPage{pagina} +\addto\extrasdutch{% +\def\min@textModerator{Voorzitter}% +\def\min@textMinutesTaker{Notulist}% +\def\min@textPresent{Aanwezig}%Participiant: +\def\min@textAbsent{Afwezig}% +\def\min@textAbsentExcused{\min@textAbsent\xspace (met bericht)}% +\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (zonder bericht)}% +\def\min@textGuest{Gasten}% +\def\min@textDate{Datum}% +\def\min@textStarttime{Begin van de bijeenkomst}% +\def\min@textEndtime{Eind van de bijeenkomst}% +\def\min@textLocation{Locatie van de bijeenkomst}% +\def\min@textCc{Distributie}% +\def\min@textPostscript{Naschrift}% +\def\min@textEnclosure{Bijlagen}% +\def\min@textforeignMinutes{Externe notulen}% +\def\min@textSecret{inclusief niet openbare informatie}% +\def\min@textPage{pagina}% \def\min@toptext{}%Text before Topic -\def\min@textForeign{(no \LaTeXe -minute)} -\def\min@textYes{Ja} -\def\min@textNo{Nee} -\def\min@textNoVote{Geen Mening} -\def\min@textDecision{Besluit} -\def\min@textTask{Aktie} -\def\min@textResponsible{Verantwoordelijk} -\def\min@textAnybody{Iedereen} -\@ifundefined{chapter}{ - \renewcommand{\partname}{Notulen} - \renewcommand{\ptctitle}{Onderwerpen} - }{ - \renewcommand{\chaptername}{Notulen} - \def\mtctitle{Onderwerpen} - } +\def\min@textForeign{(no \LaTeXe -minute)}% +\def\min@textYes{Ja}% +\def\min@textNo{Nee}% +\def\min@textNoVote{Geen Mening}% +\def\min@textDecision{Besluit}% +\def\min@textTask{Aktie}% +\def\min@textResponsible{Verantwoordelijk}% +\def\min@textAnybody{Iedereen}% +\@ifundefined{chapter}{% + \renewcommand{\partname}{Notulen}% + \renewcommand{\ptctitle}{Onderwerpen}% + }{% + \renewcommand{\chaptername}{Notulen}% + \def\mtctitle{Onderwerpen}% + }% } -\def\min@frenchText{ +\def\min@frenchText{% \def\min@textModerator{Animateur}%ou (Animateuse) -\def\min@textMinutesTaker{Secr\'{e}taire de s\'{e}ance} -\def\min@textPresent{Participant} -\def\min@textAbsent{Absent} -\def\min@textAbsentExcused{\min@textAbsent\xspace (annonc\'{e})} -\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (pas annonc\'{e})} -\def\min@textGuest{Visiteur} -\def\min@textDate{Date} -\def\min@textStarttime{Commencement} -\def\min@textEndtime{Fin} -\def\min@textLocation{Lieu} -\def\min@textCc{Distribution} -\def\min@textPostscript{Suppl\'{e}ment} -\def\min@textEnclosure{Appendice} -\def\min@textforeignMinutes{proc\`{e}s--verbal \'{e}trang\`{e}re} -\def\min@textSecret{avec des informations secret} -\def\min@textPage{page} +\def\min@textMinutesTaker{Secr\'{e}taire de s\'{e}ance}% +\def\min@textPresent{Participant}% +\def\min@textAbsent{Absent}% +\def\min@textAbsentExcused{\min@textAbsent\xspace (annonc\'{e})}% +\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (pas annonc\'{e})}% +\def\min@textGuest{Visiteur}% +\def\min@textDate{Date}% +\def\min@textStarttime{Commencement}% +\def\min@textEndtime{Fin}% +\def\min@textLocation{Lieu}% +\def\min@textCc{Distribution}% +\def\min@textPostscript{Suppl\'{e}ment}% +\def\min@textEnclosure{Appendice}% +\def\min@textforeignMinutes{proc\`{e}s--verbal \'{e}trang\`{e}re}% +\def\min@textSecret{avec des informations secret}% +\def\min@textPage{page}% \def\min@toptext{}%Text before Topic -\def\min@textForeign{proc\`{e}s--verbal sans \LaTeX} -\def\min@textYes{Oui} -\def\min@textNo{Non} -\def\min@textNoVote{Sans d\'{e}cision} -\def\min@textDecision{D\'{e}cision} -\def\min@textTask{Devoir} -\def\min@textResponsible{R\'{e}sponsible} -\def\min@textAnybody{Quelqu'un} -\@ifundefined{chapter}{ - \renewcommand{\partname}{Proc\`{e}s--verbal} - \renewcommand{\ptctitle}{Table des proc\`{e}s--verbal} - }{ - \renewcommand{\chaptername}{Proc\`{e}s--verbal} - \def\mtctitle{Table des proc\`{e}s--verbal} - } +\def\min@textForeign{proc\`{e}s--verbal sans \LaTeX}% +\def\min@textYes{Oui}% +\def\min@textNo{Non}% +\def\min@textNoVote{Sans d\'{e}cision}% +\def\min@textDecision{D\'{e}cision}% +\def\min@textTask{Devoir}% +\def\min@textResponsible{R\'{e}sponsible}% +\def\min@textAnybody{Quelqu'un}% +\@ifundefined{chapter}{% + \renewcommand{\partname}{Proc\`{e}s--verbal}% + \renewcommand{\ptctitle}{Table des proc\`{e}s--verbal}% + }{% + \renewcommand{\chaptername}{Proc\`{e}s--verbal}% + \def\mtctitle{Table des proc\`{e}s--verbal}% + }% } -\addto\extrasfrench{ - \min@frenchText +\addto\extrasfrench{% + \min@frenchText% } -\addto\extrasfrenchb{ - \min@frenchText +\addto\extrasfrenchb{% + \min@frenchText% } -\addto\extraspolish{ -\def\min@textModerator{Przewodnicz\k{a}cy} -\def\min@textMinutesTaker{Sekretarz} -\def\min@textPresent{Obecni} %Participiant: -\def\min@textAbsent{Nieobecni} -\def\min@textAbsentExcused{\min@textAbsent (nieusprawiedliwieni)} -\def\min@textAbsentNoExcuse{\min@textAbsent (usprawiedliwieni)} -\def\min@textGuest{Go\'{s}cie} -\def\min@textDate{Data} -\def\min@textStarttime{Pocz\k{a}tek zebrania} -\def\min@textEndtime{Koniec zebrania} -\def\min@textLocation{Miejsce:} -\def\min@textCc{Do wiadomo\'{s}ci} -\def\min@textPostscript{PS} -\def\min@textEnclosure{Za{\l}\k{a}cznik} -\def\min@textforeignMinutes{Foreign minutes} -\def\min@textSecret{Poufne} -\def\min@textPage{strona} +\addto\extraspolish{% +\def\min@textModerator{Przewodnicz\k{a}cy}% +\def\min@textMinutesTaker{Sekretarz}% +\def\min@textPresent{Obecni}%Participiant: +\def\min@textAbsent{Nieobecni}% +\def\min@textAbsentExcused{\min@textAbsent\xspace (nieusprawiedliwieni)}% +\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (usprawiedliwieni)}% +\def\min@textGuest{Go\'{s}cie}% +\def\min@textDate{Data}% +\def\min@textStarttime{Pocz\k{a}tek zebrania}% +\def\min@textEndtime{Koniec zebrania}% +\def\min@textLocation{Miejsce:}% +\def\min@textCc{Do wiadomo\'{s}ci}% +\def\min@textPostscript{PS}% +\def\min@textEnclosure{Za{\l}\k{a}cznik}% +\def\min@textforeignMinutes{Protoko{\l}y zewn\k{e}trzne}% +\def\min@textSecret{Poufne}% +\def\min@textPage{strona}% \def\min@toptext{}%Text before Topic -\def\min@textForeign{(no \LaTeXe -minute)} -\def\min@textYes{Tak} -\def\min@textNo{Nie} -\def\min@textNoVote{Wstrzyma{\l}o si\k{e}} -\def\min@textDecision{Decyzja} -\def\min@textTask{Zadanie} -\def\min@textResponsible{Osoba odpowiedzialna} -\def\min@textAnybody{Ktokolwiek} -\@ifundefined{chapter}{ - \renewcommand{\partname}{Protok\'{o}{\l}} - \renewcommand{\ptctitle}{Lista spraw} - }{ - \renewcommand{\chaptername}{Protok\'{o}{\l}} - \def\mtctitle{Lista spraw} - } +\def\min@textForeign{(no \LaTeXe -minute)}% +\def\min@textYes{Tak}% +\def\min@textNo{Nie}% +\def\min@textNoVote{Wstrzyma{\l}o si\k{e}}% +\def\min@textDecision{Decyzja}% +\def\min@textTask{Zadanie}% +\def\min@textResponsible{Osoba odpowiedzialna}% +\def\min@textAnybody{Ktokolwiek}% +\@ifundefined{chapter}{% + \renewcommand{\partname}{Protok\'{o}{\l}}% + \renewcommand{\ptctitle}{Lista spraw}% + }{% + \renewcommand{\chaptername}{Protok\'{o}{\l}}% + \def\mtctitle{Lista spraw}% + }% } -\def\min@germanText{ -\def\min@textModerator{Moderation} -\def\min@textMinutesTaker{Protokollant} -\def\min@textPresent{Anwesend} -\def\min@textAbsent{Abwesend} -\def\min@textAbsentExcused{\min@textAbsent\xspace (entschuldigt)} -\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (unentschuldigt)} -\def\min@textGuest{G\"aste} -\def\min@textDate{Datum} -\def\min@textStarttime{Beginn der Sitzung} -\def\min@textEndtime{Ende der Sitzung} -\def\min@textLocation{Sitzungsort} -\def\min@textCc{Verteiler} -\def\min@textPostscript{Nachtrag} -\def\min@textEnclosure{Anhang} -\def\min@textforeignMinutes{Fremdes Protokoll} -\def\min@textSecret{mit nicht\"offentlichen Informationen} -\def\min@textPage{Seite} -\def\min@textForeign{(kein \LaTeXe -Protokoll)} -\def\min@textYes{Ja} -\def\min@textNo{Nein} -\def\min@textNoVote{Enthaltung} +\def\min@germanText{% +\def\min@textModerator{Moderation}% +\def\min@textMinutesTaker{Protokollant}% +\def\min@textPresent{Anwesend}% +\def\min@textAbsent{Abwesend}% +\def\min@textAbsentExcused{\min@textAbsent\xspace (entschuldigt)}% +\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (unentschuldigt)}% +\def\min@textGuest{G\"aste}% +\def\min@textDate{Datum}% +\def\min@textStarttime{Beginn der Sitzung}% +\def\min@textEndtime{Ende der Sitzung}% +\def\min@textLocation{Sitzungsort}% +\def\min@textCc{Verteiler}% +\def\min@textPostscript{Nachtrag}% +\def\min@textEnclosure{Anhang}% +\def\min@textforeignMinutes{Fremdes Protokoll}% +\def\min@textSecret{mit nicht\"offentlichen Informationen}% +\def\min@textPage{Seite}% +\def\min@textForeign{(kein \LaTeXe -Protokoll)}% +\def\min@textYes{Ja}% +\def\min@textNo{Nein}% +\def\min@textNoVote{Enthaltung}% %%\def\min@textDecision{Beschlu{\ss}}% diff new/old spelling -\def\min@textTask{Aufgabe} -\def\min@textResponsible{Verantwortlich} -\def\min@textAnybody{Irgendwer} +\def\min@textTask{Aufgabe}% +\def\min@textResponsible{Verantwortlich}% +\def\min@textAnybody{Irgendwer}% \def\min@toptext{}%Top} %-> ugly table of contents -\@ifundefined{chapter}{ - \renewcommand{\partname}{Protokoll} - \renewcommand{\ptctitle}{Tagesordnung} - }{ - \renewcommand{\chaptername}{Protokoll} - \renewcommand{\mtctitle}{Tagesordnung} - } +\@ifundefined{chapter}{% + \renewcommand{\partname}{Protokoll}% + \renewcommand{\ptctitle}{Tagesordnung}% + }{% + \renewcommand{\chaptername}{Protokoll}% + \renewcommand{\mtctitle}{Tagesordnung}% + }% } -\addto\extrasgerman{ - \min@germanText - \def\min@textDecision{Beschlu{\ss}} - } -\addto\extrasngerman{ - \min@germanText - \def\min@textDecision{Beschluss} +\addto\extrasgerman{% + \min@germanText% + \def\min@textDecision{Beschlu{\ss}}% + } +\addto\extrasngerman{% + \min@germanText% + \def\min@textDecision{Beschluss}% } \ProcessOptions\relax \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minutes.tlpobj new/tlpkg/tlpobj/minutes.tlpobj --- old/tlpkg/tlpobj/minutes.tlpobj 2016-04-14 19:28:03.000000000 +0200 +++ new/tlpkg/tlpobj/minutes.tlpobj 2017-04-14 17:51:20.000000000 +0200 @@ -1,6 +1,6 @@ name minutes category Package -revision 16350 +revision 42186 shortdesc Typeset the minutes of meetings relocated 1 longdesc Supports the creation of a collection of minutes. Features @@ -14,7 +14,7 @@ runfiles size=9 RELOC/tex/latex/minutes/minutes.sty catalogue-ctan /macros/latex/contrib/minutes -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-09-30 11:34:18 +0200 catalogue-license lppl catalogue-topics meeting-admin -catalogue-version 1.8d +catalogue-version 1.8f ++++++ mkgrkindex.doc.tar.xz ++++++ ++++++ mkgrkindex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mkgrkindex.tlpobj new/tlpkg/tlpobj/mkgrkindex.tlpobj --- old/tlpkg/tlpobj/mkgrkindex.tlpobj 2016-04-14 19:28:04.000000000 +0200 +++ new/tlpkg/tlpobj/mkgrkindex.tlpobj 2017-04-14 17:51:23.000000000 +0200 @@ -14,7 +14,7 @@ texmf-dist/makeindex/mkgrkindex/uppercase-headers.ist texmf-dist/scripts/mkgrkindex/mkgrkindex catalogue-ctan /language/greek/mkgrkindex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics index-proc greek catalogue-version 2.0 ++++++ mkjobtexmf.doc.tar.xz ++++++ ++++++ mkjobtexmf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mkjobtexmf.tlpobj new/tlpkg/tlpobj/mkjobtexmf.tlpobj --- old/tlpkg/tlpobj/mkjobtexmf.tlpobj 2016-04-14 19:28:04.000000000 +0200 +++ new/tlpkg/tlpobj/mkjobtexmf.tlpobj 2017-04-14 17:51:24.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=6 texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl catalogue-ctan /support/mkjobtexmf -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license artistic catalogue-topics archival catalogue-version 0.8 ++++++ mkpattern.doc.tar.xz ++++++ ++++++ mkpattern.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mkpattern.tlpobj new/tlpkg/tlpobj/mkpattern.tlpobj --- old/tlpkg/tlpobj/mkpattern.tlpobj 2016-04-14 19:28:04.000000000 +0200 +++ new/tlpkg/tlpobj/mkpattern.tlpobj 2017-04-14 17:51:24.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=4 RELOC/tex/plain/mkpattern/mkpatter.tex catalogue-ctan /language/hyphenation/utils/mkpattern -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics hyphenation catalogue-version 1.2 ++++++ mkpic.doc.tar.xz ++++++ ++++++ mkpic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mkpic.tlpobj new/tlpkg/tlpobj/mkpic.tlpobj --- old/tlpkg/tlpobj/mkpic.tlpobj 2016-04-14 19:28:05.000000000 +0200 +++ new/tlpkg/tlpobj/mkpic.tlpobj 2017-04-14 17:51:24.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=7 texmf-dist/scripts/mkpic/mkpic catalogue-ctan /support/mkpic -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics graphics catalogue-version 1.02 ++++++ mla-paper.doc.tar.xz ++++++ ++++++ mla-paper.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mla-paper.tlpobj new/tlpkg/tlpobj/mla-paper.tlpobj --- old/tlpkg/tlpobj/mla-paper.tlpobj 2016-04-14 19:28:05.000000000 +0200 +++ new/tlpkg/tlpobj/mla-paper.tlpobj 2017-04-14 17:51:24.000000000 +0200 @@ -10,6 +10,6 @@ runfiles size=2 RELOC/tex/latex/mla-paper/mla.sty catalogue-ctan /macros/latex/contrib/mla-paper -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics gen-paper ++++++ mlist.doc.tar.xz ++++++ ++++++ mlist.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mlist.tlpobj new/tlpkg/tlpobj/mlist.tlpobj --- old/tlpkg/tlpobj/mlist.tlpobj 2016-04-14 19:28:05.000000000 +0200 +++ new/tlpkg/tlpobj/mlist.tlpobj 2017-04-14 17:51:24.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/mlist/mlist.cfg RELOC/tex/latex/mlist/mlist.sty catalogue-ctan /macros/latex/contrib/mlist -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths catalogue-version 0.6a ++++++ mltex.doc.tar.xz ++++++ ++++++ mltex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mltex.tlpobj new/tlpkg/tlpobj/mltex.tlpobj --- old/tlpkg/tlpobj/mltex.tlpobj 2016-04-14 19:28:05.000000000 +0200 +++ new/tlpkg/tlpobj/mltex.tlpobj 2017-04-14 17:51:24.000000000 +0200 @@ -7,6 +7,14 @@ longdesc Computer Modern (CM) fonts. The system is distributed as a TeX longdesc change file. depend latex +depend cm +depend hyphen-base +depend babel +depend latexconfig +depend latex-fonts +depend knuth-lib +depend mltex +depend plain depend mltex.ARCH execute AddFormat name=mllatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx -mltex *mllatex.ini" fmttriggers=cm,hyphen-base,babel,latex,latexconfig,latex-fonts execute AddFormat name=mltex engine=pdftex options="-translate-file=cp227.tcx -mltex mltex.ini" fmttriggers=cm,hyphen-base,knuth-lib,mltex,plain @@ -16,7 +24,7 @@ texmf-dist/tex/latex/mltex/mltex.sty texmf-dist/tex/mltex/config/mltex.ini catalogue-ctan /systems/generic/mltex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license knuth catalogue-topics engine multilingual catalogue-version 2.2 ++++++ mmap.doc.tar.xz ++++++ ++++++ mmap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mmap.tlpobj new/tlpkg/tlpobj/mmap.tlpobj --- old/tlpkg/tlpobj/mmap.tlpobj 2016-04-14 19:28:05.000000000 +0200 +++ new/tlpkg/tlpobj/mmap.tlpobj 2017-04-14 17:51:25.000000000 +0200 @@ -55,7 +55,7 @@ RELOC/tex/latex/mmap/upzd.cmap catalogue-also cmap catalogue-ctan /macros/latex/contrib/mmap -catalogue-date 2015-08-03 08:55:55 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics pdf-feat catalogue-version 1.03 ++++++ mnotes.doc.tar.xz ++++++ ++++++ mnotes.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mnotes.tlpobj new/tlpkg/tlpobj/mnotes.tlpobj --- old/tlpkg/tlpobj/mnotes.tlpobj 2016-04-14 19:28:06.000000000 +0200 +++ new/tlpkg/tlpobj/mnotes.tlpobj 2017-04-14 17:51:25.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/latex/mnotes/mnotes.sty catalogue-ctan /macros/latex/contrib/mnotes -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics marginal catalogue-version 0.8 ++++++ mnras.doc.tar.xz ++++++ ++++++ mnras.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mnras.tlpobj new/tlpkg/tlpobj/mnras.tlpobj --- old/tlpkg/tlpobj/mnras.tlpobj 2016-04-14 19:28:06.000000000 +0200 +++ new/tlpkg/tlpobj/mnras.tlpobj 2017-04-14 17:51:25.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/bibtex/bst/mnras/mnras.bst RELOC/tex/latex/mnras/mnras.cls catalogue-ctan /macros/latex/contrib/mnras -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics journalpub catalogue-version 3.0 ++++++ mnsymbol.doc.tar.xz ++++++ ++++++ mnsymbol.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mnsymbol.tlpobj new/tlpkg/tlpobj/mnsymbol.tlpobj --- old/tlpkg/tlpobj/mnsymbol.tlpobj 2016-04-14 19:28:07.000000000 +0200 +++ new/tlpkg/tlpobj/mnsymbol.tlpobj 2017-04-14 17:51:25.000000000 +0200 @@ -277,7 +277,7 @@ RELOC/fonts/type1/public/mnsymbol/MnSymbol9.pfb RELOC/tex/latex/mnsymbol/MnSymbol.sty catalogue-ctan /fonts/mnsymbol -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics font font-mf font-type1 font-symbol-maths catalogue-version 1.4 ++++++ moderncv.doc.tar.xz ++++++ ++++++ moderncv.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moderncv.tlpobj new/tlpkg/tlpobj/moderncv.tlpobj --- old/tlpkg/tlpobj/moderncv.tlpobj 2016-04-14 19:28:13.000000000 +0200 +++ new/tlpkg/tlpobj/moderncv.tlpobj 2017-04-14 17:51:27.000000000 +0200 @@ -44,7 +44,7 @@ RELOC/tex/latex/moderncv/moderncvstyleoldstyle.sty RELOC/tex/latex/moderncv/tweaklist.sty catalogue-ctan /macros/latex/contrib/moderncv -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics cv class catalogue-version 2.0.0 ++++++ moderntimeline.doc.tar.xz ++++++ ++++++ moderntimeline.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moderntimeline.tlpobj new/tlpkg/tlpobj/moderntimeline.tlpobj --- old/tlpkg/tlpobj/moderntimeline.tlpobj 2016-04-14 19:28:13.000000000 +0200 +++ new/tlpkg/tlpobj/moderntimeline.tlpobj 2017-04-14 17:51:28.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/moderntimeline/moderntimeline.sty catalogue-ctan /macros/latex/contrib/moderntimeline -catalogue-date 2015-08-31 18:43:19 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics cv diagram catalogue-version 0.9 ++++++ modiagram.doc.tar.xz ++++++ ++++++ modiagram.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/modiagram.tlpobj new/tlpkg/tlpobj/modiagram.tlpobj --- old/tlpkg/tlpobj/modiagram.tlpobj 2016-04-14 19:28:14.000000000 +0200 +++ new/tlpkg/tlpobj/modiagram.tlpobj 2017-04-14 17:51:28.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=20 RELOC/tex/latex/modiagram/modiagram.sty catalogue-ctan /macros/latex/contrib/modiagram -catalogue-date 2015-09-23 13:04:31 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics chemistry diagram expl3 catalogue-version 0.2g ++++++ modref.doc.tar.xz ++++++ ++++++ modref.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/modref.tlpobj new/tlpkg/tlpobj/modref.tlpobj --- old/tlpkg/tlpobj/modref.tlpobj 2016-04-14 19:28:14.000000000 +0200 +++ new/tlpkg/tlpobj/modref.tlpobj 2017-04-14 17:51:28.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/modref/modref.sty catalogue-also refstyle catalogue-ctan /macros/latex/contrib/modref -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics label-ref catalogue-version 1.0 ++++++ modroman.doc.tar.xz ++++++ ++++++ modroman.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/modroman.tlpobj new/tlpkg/tlpobj/modroman.tlpobj --- old/tlpkg/tlpobj/modroman.tlpobj 2016-04-14 19:28:15.000000000 +0200 +++ new/tlpkg/tlpobj/modroman.tlpobj 2017-04-14 17:51:28.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=2 RELOC/tex/latex/modroman/modroman.sty catalogue-ctan /macros/latex/contrib/modroman -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics numbers catalogue-version 1 ++++++ mongolian-babel.doc.tar.xz ++++++ ++++++ mongolian-babel.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mongolian-babel.tlpobj new/tlpkg/tlpobj/mongolian-babel.tlpobj --- old/tlpkg/tlpobj/mongolian-babel.tlpobj 2016-04-14 19:28:16.000000000 +0200 +++ new/tlpkg/tlpobj/mongolian-babel.tlpobj 2017-04-14 17:51:28.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/mongolian-babel/mongolian.ldf RELOC/tex/latex/mongolian-babel/mongolian.sty catalogue-ctan /language/mongolian/babel -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics mongolian multilingual-addon catalogue-version 1.2 ++++++ monofill.doc.tar.xz ++++++ ++++++ monofill.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/monofill.tlpobj new/tlpkg/tlpobj/monofill.tlpobj --- old/tlpkg/tlpobj/monofill.tlpobj 2016-04-14 19:28:16.000000000 +0200 +++ new/tlpkg/tlpobj/monofill.tlpobj 2017-04-14 17:51:29.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/monofill/monofill.RLS RELOC/tex/latex/monofill/monofill.sty catalogue-ctan /macros/latex/contrib/monofill -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2017-02-01 05:25:39 +0100 catalogue-license lppl1.3 catalogue-topics alignment catalogue-version 0.2 ++++++ montex.doc.tar.xz ++++++ ++++++ montex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/montex.tlpobj new/tlpkg/tlpobj/montex.tlpobj --- old/tlpkg/tlpobj/montex.tlpobj 2016-04-14 19:28:18.000000000 +0200 +++ new/tlpkg/tlpobj/montex.tlpobj 2017-04-14 17:51:29.000000000 +0200 @@ -326,7 +326,7 @@ RELOC/tex/latex/montex/russian.def RELOC/tex/latex/montex/xalx.def catalogue-ctan /language/mongolian/montex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics mongolian catalogue-version IVu.04.092 ++++++ moodle.doc.tar.xz ++++++ ++++++ moodle.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moodle.tlpobj new/tlpkg/tlpobj/moodle.tlpobj --- old/tlpkg/tlpobj/moodle.tlpobj 2016-04-14 19:28:21.000000000 +0200 +++ new/tlpkg/tlpobj/moodle.tlpobj 2017-04-14 17:51:40.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=21 RELOC/tex/latex/moodle/moodle.sty catalogue-ctan /macros/latex/contrib/moodle -catalogue-date 2016-02-02 05:57:37 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics exam catalogue-version 0.5 ++++++ moreenum.doc.tar.xz ++++++ ++++++ moreenum.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moreenum.tlpobj new/tlpkg/tlpobj/moreenum.tlpobj --- old/tlpkg/tlpobj/moreenum.tlpobj 2016-04-14 19:28:21.000000000 +0200 +++ new/tlpkg/tlpobj/moreenum.tlpobj 2017-04-14 17:51:40.000000000 +0200 @@ -24,7 +24,7 @@ runfiles size=2 RELOC/tex/latex/moreenum/moreenum.sty catalogue-ctan /macros/latex/contrib/moreenum -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics list-enum numbers catalogue-version 1.03 ++++++ morefloats.doc.tar.xz ++++++ ++++++ morefloats.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/morefloats.tlpobj new/tlpkg/tlpobj/morefloats.tlpobj --- old/tlpkg/tlpobj/morefloats.tlpobj 2016-04-14 19:28:22.000000000 +0200 +++ new/tlpkg/tlpobj/morefloats.tlpobj 2017-04-14 17:51:40.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=10 RELOC/tex/latex/morefloats/morefloats.sty catalogue-ctan /macros/latex/contrib/morefloats -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics float catalogue-version 1.0h ++++++ morehype.doc.tar.xz ++++++ ++++++ morehype.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/morehype.tlpobj new/tlpkg/tlpobj/morehype.tlpobj --- old/tlpkg/tlpobj/morehype.tlpobj 2016-04-14 19:28:24.000000000 +0200 +++ new/tlpkg/tlpobj/morehype.tlpobj 2017-04-14 17:51:41.000000000 +0200 @@ -23,7 +23,7 @@ RELOC/tex/latex/morehype/texblog.fdf RELOC/tex/latex/morehype/texlinks.sty catalogue-ctan /macros/latex/contrib/morehype -catalogue-date 2015-11-16 06:21:29 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics hyper catalogue-version r0.83 ++++++ moresize.doc.tar.xz ++++++ ++++++ moresize.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moresize.tlpobj new/tlpkg/tlpobj/moresize.tlpobj --- old/tlpkg/tlpobj/moresize.tlpobj 2016-04-14 19:28:24.000000000 +0200 +++ new/tlpkg/tlpobj/moresize.tlpobj 2017-04-14 17:51:41.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=1 RELOC/tex/latex/moresize/moresize.sty catalogue-ctan /macros/latex/contrib/moresize -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-supp catalogue-version 1.9 ++++++ moreverb.doc.tar.xz ++++++ ++++++ moreverb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moreverb.tlpobj new/tlpkg/tlpobj/moreverb.tlpobj --- old/tlpkg/tlpobj/moreverb.tlpobj 2016-04-14 19:28:25.000000000 +0200 +++ new/tlpkg/tlpobj/moreverb.tlpobj 2017-04-14 17:51:42.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/moreverb/moreverb.sty catalogue-also vrb fancyvrb catalogue-ctan /macros/latex/contrib/moreverb -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics verbatim catalogue-version 2.3a ++++++ morewrites.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/morewrites/README new/doc/latex/morewrites/README --- old/doc/latex/morewrites/README 2012-08-25 01:40:06.000000000 +0200 +++ new/doc/latex/morewrites/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ ----------------------------------------------------------------- -morewrites --- Always room for a new write -E-mail: blflatex(a)gmail.com -Released under the LaTeX Project Public License v1.3c or later -See http://www.latex-project.org/lppl.txt ----------------------------------------------------------------- - -The morewrites package silently hooks into the TeX primitives -responsible for writing to files to lift the restriction on -the number of files open at the same time (16). Load the package -with "\usepackage{morewrites}" as early as possible. - -This package uses the l3kernel bundle. - -This is work in progress, all suggestions/comments/bug reports are welcome! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/morewrites/README.md new/doc/latex/morewrites/README.md --- old/doc/latex/morewrites/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/morewrites/README.md 2017-04-17 00:19:40.000000000 +0200 @@ -0,0 +1,16 @@ +Provide more writing streams in LaTeX +===================================== +* E-mail: blflatex(a)gmail.com +* Released under the LaTeX Project Public License v1.3c or later + See http://www.latex-project.org/lppl.txt + +The morewrites LaTeX package should be used when encountering the +`No room for a new \write ` error. This is done by redefining a +few TeX primitives related to output. + +This package uses the `l3kernel` bundle. + +This is work in progress, all suggestions/comments/bug reports +are welcome! See https://github.com/blefloch/latex-morewrites + + Binary files old/doc/latex/morewrites/morewrites.pdf and new/doc/latex/morewrites/morewrites.pdf differ Binary files old/doc/latex/morewrites/primargs.pdf and new/doc/latex/morewrites/primargs.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/morewrites.doc.tlpobj new/tlpkg/tlpobj/morewrites.doc.tlpobj --- old/tlpkg/tlpobj/morewrites.doc.tlpobj 2016-04-14 19:28:25.000000000 +0200 +++ new/tlpkg/tlpobj/morewrites.doc.tlpobj 2017-04-21 02:07:49.000000000 +0200 @@ -1,9 +1,9 @@ name morewrites.doc category Package -revision 28767 +revision 43945 shortdesc doc files of morewrites relocated 1 -docfiles size=275 - RELOC/doc/latex/morewrites/README +docfiles size=320 + RELOC/doc/latex/morewrites/README.md RELOC/doc/latex/morewrites/morewrites.pdf RELOC/doc/latex/morewrites/primargs.pdf ++++++ morewrites.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/morewrites/morewrites.sty new/tex/latex/morewrites/morewrites.sty --- old/tex/latex/morewrites/morewrites.sty 2013-01-09 01:39:48.000000000 +0100 +++ new/tex/latex/morewrites/morewrites.sty 2017-04-20 23:10:32.000000000 +0200 @@ -9,7 +9,7 @@ %% Communicate any suggestions for changing this package %% to Bruno Le Floch (blflatex(a)gmail.com). %% -%% File: morewrites.dtx Copyright (C) 2011-2013 Bruno Le Floch +%% File: morewrites.dtx Copyright (C) 2011-2017 Bruno Le Floch %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -19,225 +19,355 @@ %% http://www.latex-project.org/lppl.txt %% %% ----------------------------------------------------------------------- -\RequirePackage {expl3} [2012/08/14] -\RequirePackage {primargs} [2013/01/08] +\RequirePackage {expl3} [2017/03/18] +\RequirePackage {primargs} [2017/04/10] \ProvidesExplPackage - {morewrites} {2013/01/08} {0.2e} {Always room for a new write} -\cs_generate_variant:Nn \prop_gpop:NnNT { NV } + {morewrites} {2017/04/20} {} {Always room for a new write} +\sys_if_engine_luatex:T + { + \cs_new_protected:Npn \morewritessetup #1 { } + \msg_new:nnn { morewrites } { luatex } + { The~morewrites~package~is~unnecessary~in~LuaTeX. } + \msg_warning:nn { morewrites } { luatex } + \tex_endinput:D + }% \cs_new_eq:NN \__morewrites_tex_immediate:w \tex_immediate:D \cs_new_eq:NN \__morewrites_tex_openout:w \tex_openout:D \cs_new_eq:NN \__morewrites_tex_write:w \tex_write:D \cs_new_eq:NN \__morewrites_tex_closeout:w \tex_closeout:D -\cs_new_eq:NN \__morewrites_tex_shipout:w \tex_shipout:D -\int_new:N \g__morewrites_late_write_int -\prop_new:N \g__morewrites_iow_prop +\exp_args:NNf \cs_new_protected:Npn \__morewrites_tex_newwrite:N + { \exp_args:NNc \exp_after:wN \exp_stop_f: { newwrite } } +\cs_generate_variant:Nn \prop_gpop:NnNT { NV } +\cs_generate_variant:Nn \prop_gput:Nnn { NVx } +\cs_generate_variant:Nn \tl_gput_right:Nn { Nv } +\tl_new:N \l__morewrites_internal_tl +\cs_new_eq:NN \__morewrites_tmp:w ? +\int_new:N \g__morewrites_later_int +\seq_new:N \g__morewrites_write_seq +\prop_new:N \g__morewrites_write_prop +\prop_new:N \g__morewrites_write_file_prop +\tl_new:N \l__morewrites_code_tl +\int_new:N \l__morewrites_user_int +\tl_new:N \l__morewrites_tstr_tl +\cs_new_eq:NN \l__morewrites_tstr_token ? +\cs_new_eq:NN \s__morewrites \scan_stop: \newwrite \g__morewrites_iow \newread \g__morewrites_ior \tl_new:N \g__morewrites_tmp_file_tl -\tl_gset:Nn \g__morewrites_tmp_file_tl { \jobname.mw } -\clist_new:N \g__morewrites_reserved_iow_clist -\int_step_inline:nnnn {0} {1} { \g__morewrites_iow - 1 } - { \clist_gput_right:Nn \g__morewrites_reserved_iow_clist {#1} } -\clist_gput_right:Nn \g__morewrites_reserved_iow_clist {18} -\int_new:N \g__morewrites_stream_int -\cs_new_eq:NN \s__morewrites \scan_stop: -\tl_new:N \l__morewrites_internal_tl -\cs_new_protected:Npn \__morewrites_equals_file_name:N #1 +\bool_new:N \g__morewrites_tmp_file_bool +\bool_gset_false:N \g__morewrites_tmp_file_bool +\int_new:N \g__morewrites_group_level_int +\box_new:N \g__morewrites_shipout_box +\cs_new_protected:Npn \__morewrites_set_file:n #1 + { + \bool_gset_false:N \g__morewrites_tmp_file_bool + \tl_gset:Nn \g__morewrites_tmp_file_tl {#1} + } +\cs_new_protected:Npn \__morewrites_empty_file:n #1 + { + \__morewrites_tex_immediate:w \__morewrites_tex_openout:w + \g__morewrites_iow = #1 \scan_stop: + \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w + \g__morewrites_iow + } +\prg_new_conditional:Npnn \__morewrites_if_file_trivial:n #1 { TF } + { + \group_begin: + \tex_openin:D \g__morewrites_ior = #1 \scan_stop: + \if_eof:w \g__morewrites_ior + \cs_gset_eq:NN \__morewrites_tmp:w \prg_return_true: + \else: + \int_set:Nn \tex_endlinechar:D { -1 } + \etex_readline:D \g__morewrites_ior to \l__morewrites_internal_tl + \if_eof:w \g__morewrites_ior + \cs_gset_eq:NN \__morewrites_tmp:w \prg_return_true: + \else: + \cs_gset_eq:NN \__morewrites_tmp:w \prg_return_false: + \fi: + \fi: + \tex_closein:D \g__morewrites_ior + \group_end: + \__morewrites_tmp:w + } +\cs_new_protected:Npn \__morewrites_chk_file: + { + \__morewrites_if_file_trivial:nTF { \g__morewrites_tmp_file_tl } + { \bool_gset_true:N \g__morewrites_tmp_file_bool } + { + \msg_warning:nnxx { morewrites } { file-exists } + { \g__morewrites_tmp_file_tl } + { \g__morewrites_tmp_file_tl .mw } + \tl_gput_right:Nn \g__morewrites_tmp_file_tl { .mw } + \__morewrites_chk_file: + } + } +\msg_new:nnnn { morewrites } { file-exists } + { File~'#1'~exists,~using~'#2'~instead. } + { + The~file~`#1'~exists~and~was~not~created~by~this~version~of~the~ + `morewrites'~package.~Please~move~or~delete~that~file,~or~provide~ + another~file~name~by~adding + \\ \\ + \iow_indent:n { \iow_char:N\\morewritessetup~{~file~=~other-name~} } + \\ \\ + to~your~source~file.~In~the~meantime,~the~file~`#2'~will~be~used. + } +\cs_new_protected:Npn \__morewrites_equals_file:N #1 { \group_begin: + \tex_aftergroup:D \primargs_get_file_name:N \tex_aftergroup:D #1 - \primargs_remove_equals:N \__morewrites_parse_file_name: + \primargs_remove_equals:N \group_end: } -\cs_new_protected_nopar:Npn \__morewrites_parse_file_name: - { \primargs_get_file_name:N \group_end: } -\cs_new_protected_nopar:Npn \__morewrites_immediate:w - { \primargs_read_x_token:N \__morewrites_immediate_ii: } -\cs_new_protected_nopar:Npn \__morewrites_immediate_ii: +\cs_new_protected:Npn \__morewrites_get_user:n #1 { - \token_if_eq_meaning:NNTF \g_primargs_token \s__morewrites - { \__morewrites_immediate_iii:N } - { \__morewrites_tex_immediate:w } + \tl_set:Nn \l__morewrites_code_tl {#1} + \tex_afterassignment:D \l__morewrites_code_tl + \l__morewrites_user_int = + } +\cs_new_protected:Npn \__morewrites_user_to_tstr:NTF #1 + { + \tl_set:NV \l__morewrites_tstr_tl \l__morewrites_user_int + \int_compare:nNnTF { \l__morewrites_user_int } < { 19 } + { \use_i:nn } + { \prop_get:NVNTF #1 \l__morewrites_user_int \l__morewrites_tstr_tl } } -\cs_new_protected:Npn \__morewrites_immediate_iii:N #1 +\int_new:N \l__morewrites_collect_next_int +\cs_new_protected:Npn \__morewrites_collect:x #1 { - \tl_if_eq:nnTF { #1 } { \s__morewrites } - { \__morewrites_immediate_iv:NN } - { #1 } + \tl_set:Nx \l__morewrites_internal_tl {#1} + \__morewrites_collect_aux:cf { l__morewrites_0_tl } { 1 } } -\cs_new_protected:Npn \__morewrites_immediate_iv:NN #1 #2 +\cs_new_protected:Npn \__morewrites_collect_aux:Nn #1#2 { - \exp_args:Nc #1 + \int_compare:nNnT {#2} > \l__morewrites_collect_next_int + { + \tl_clear_new:N #1 + \int_set:Nn \l__morewrites_collect_next_int {#2} + } + \tl_if_empty:NTF #1 + { \tl_set_eq:NN #1 \l__morewrites_internal_tl } { - \exp_after:wN \__morewrites_immediate_v:w - \token_to_str:N #2 + \tl_put_left:No \l__morewrites_internal_tl {#1} + \tl_clear:N #1 + \__morewrites_collect_aux:cf { l__morewrites_#2_tl } + { \int_eval:n { #2 + 1 } } + } + } +\cs_generate_variant:Nn \__morewrites_collect_aux:Nn { cf } +\cs_new_protected:Npn \__morewrites_collect_gput_right:N #1 + { + \int_compare:nNnF \l__morewrites_collect_next_int = 0 + { + \int_decr:N \l__morewrites_collect_next_int + \tl_gput_right:Nv #1 + { + l__morewrites_ + \int_use:N \l__morewrites_collect_next_int + _tl + } + \__morewrites_collect_gput_right:N #1 } } -\use:x +\cs_generate_variant:Nn \__morewrites_collect_gput_right:N { c } +\cs_new:Npn \__morewrites_user_tl_name:n #1 + { g__morewrites_iow_ \int_eval:n {#1} _tl } +\cs_new_protected:Npn \__morewrites_immediate:w + { \primargs_read_x_token:N \__morewrites_immediate_auxii: } +\cs_new_protected:Npn \__morewrites_immediate_auxii: { - \cs_new:Npn \exp_not:N \__morewrites_immediate_v:w - ##1 \tl_to_str:n { __morewrites } { __morewrites_immediate } + \token_if_eq_meaning:NNTF \g_primargs_token \s__morewrites + { \__morewrites_immediate_auxiii:N } + { \__morewrites_tex_immediate:w } } -\cs_new_protected:Npn \__morewrites_immediate_closeout_test:n #1 +\cs_new_protected:Npn \__morewrites_immediate_auxiii:N #1 + { \str_if_eq:nnTF { #1 } { \s__morewrites } { \use_iii:nnn } { #1 } } +\cs_new_protected:Npn \__morewrites_closeout:w { - \int_gset:Nn \g__morewrites_stream_int {#1} - \clist_if_in:NnTF \g__morewrites_reserved_iow_clist {#1} - { \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w \g__morewrites_stream_int } - { \__morewrites_immediate_closeout_aux: } + \s__morewrites + \use_i:nn + { \__morewrites_get_user:n { \__morewrites_closeout_later: } } + { \__morewrites_get_user:n { \__morewrites_closeout_now: } } } -\cs_new_protected_nopar:Npn \__morewrites_immediate_closeout_aux: +\cs_new_protected:Npn \__morewrites_closeout_now: { - \prop_gpop:NVNT \g__morewrites_iow_prop \g__morewrites_stream_int \l__morewrites_internal_tl + \__morewrites_user_to_tstr:NTF \g__morewrites_write_prop { - \__morewrites_immediate_write_and_close:nn - { \g__morewrites_stream_int } { \l__morewrites_internal_tl } + \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w \l__morewrites_tstr_tl \exp_stop_f: + \int_compare:nNnF { \l__morewrites_tstr_tl } = { \l__morewrites_user_int } + { + \prop_gremove:NV \g__morewrites_write_prop \l__morewrites_user_int + \seq_gput_left:NV \g__morewrites_write_seq \l__morewrites_tstr_tl + } + } + { + \prop_gpop:NVNT \g__morewrites_write_file_prop \l__morewrites_user_int \l__morewrites_internal_tl + { \__morewrites_closeout_now:nn { \l__morewrites_user_int } { \l__morewrites_internal_tl } } } } -\cs_new_protected:Npn \__morewrites_immediate_write_and_close:nn #1#2 +\cs_new_protected:Npn \__morewrites_closeout_now:nn #1#2 { - \__morewrites_tex_immediate:w \__morewrites_tex_openout:w - \g__morewrites_iow #2 \scan_stop: + \__morewrites_tex_immediate:w \__morewrites_tex_openout:w \g__morewrites_iow = #2 \scan_stop: \group_begin: - \int_set_eq:NN \tex_newlinechar:D \c_minus_one - \tl_use:c { g__morewrites_iow_ \int_eval:n {#1} _tl } - \tl_gclear:c { g__morewrites_iow_ \int_eval:n {#1} _tl } + \int_set:Nn \tex_newlinechar:D { -1 } + \tl_use:c { \__morewrites_user_tl_name:n {#1} } + \tl_gclear:c { \__morewrites_user_tl_name:n {#1} } \group_end: \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w \g__morewrites_iow } -\cs_new_protected:Npn \__morewrites_immediate_openout_test:n #1 +\cs_new_protected:Npn \__morewrites_openout:w { - \int_gset:Nn \g__morewrites_stream_int {#1} - \clist_if_in:NnTF \g__morewrites_reserved_iow_clist {#1} - { \__morewrites_tex_immediate:w \__morewrites_tex_openout:w \g__morewrites_stream_int } - { \__morewrites_equals_file_name:N \__morewrites_immediate_openout_aux:n } + \s__morewrites + \use_i:nn + { \__morewrites_get_user:n { \__morewrites_openout_later:w } } + { \__morewrites_get_user:n { \__morewrites_equals_file:N \__morewrites_openout_now:n } } } -\cs_new_protected:Npn \__morewrites_immediate_openout_aux:n #1 +\cs_new_protected:Npn \__morewrites_openout_now:n #1 { - \__morewrites_immediate_closeout_aux: - \prop_gput:NVn \g__morewrites_iow_prop \g__morewrites_stream_int {#1} - \tl_gclear_new:c { g__morewrites_iow_ \int_use:N \g__morewrites_stream_int _tl } + \__morewrites_closeout_now: + \int_compare:nNnTF { \l__morewrites_user_int } < { 19 } + { + \__morewrites_tex_immediate:w \__morewrites_tex_openout:w \l__morewrites_user_int + = \tl_to_str:n {#1} \scan_stop: + } + { + \seq_gpop:NNTF \g__morewrites_write_seq \l__morewrites_tstr_tl + { + \prop_gput:NVV \g__morewrites_write_prop \l__morewrites_user_int \l__morewrites_tstr_tl + \__morewrites_tex_immediate:w \__morewrites_tex_openout:w \l__morewrites_tstr_tl \exp_stop_f: + = \tl_to_str:n {#1} \scan_stop: + } + { + \__morewrites_empty_file:n {#1} + \prop_gput:NVx \g__morewrites_write_file_prop \l__morewrites_user_int + { \tl_to_str:n {#1} } + \tl_gclear_new:c { \__morewrites_user_tl_name:n { \l__morewrites_user_int } } + } + } } -\cs_new_protected:Npn \__morewrites_immediate_write_test:n #1 +\cs_new_protected:Npn \__morewrites_write:w { - \int_gset:Nn \g__morewrites_stream_int {#1} - \clist_if_in:NnTF \g__morewrites_reserved_iow_clist {#1} - { \__morewrites_tex_immediate:w \__morewrites_tex_write:w \g__morewrites_stream_int } - { \primargs_get_general_text:N \__morewrites_immediate_write_aux:n } + \s__morewrites + \use_i:nn + { \__morewrites_get_user:n { \__morewrites_write_later:w } } + { \__morewrites_get_user:n { \__morewrites_write_now:w } } } -\cs_new_protected_nopar:Npn \__morewrites_immediate_write_aux:n +\cs_new_protected:Npn \__morewrites_write_now:w { - \prop_get:NVNTF \g__morewrites_iow_prop \g__morewrites_stream_int \l__morewrites_internal_tl - { \__morewrites_immediate_write_open:n } - { \__morewrites_immediate_write_closed:n } + \__morewrites_user_to_tstr:NTF \g__morewrites_write_prop + { \__morewrites_tex_immediate:w \__morewrites_tex_write:w \l__morewrites_tstr_tl \exp_stop_f: } + { \primargs_get_general_text:N \__morewrites_write_now:n } } -\cs_new_protected:Npn \__morewrites_immediate_write_closed:n #1 +\cs_new_protected:Npn \__morewrites_write_now:n { - \__morewrites_tex_immediate:w \__morewrites_tex_write:w - \if_int_compare:w \g__morewrites_stream_int < \c_zero - -1 - \else: - 16 - \fi: - {#1} + \prop_get:NVNTF \g__morewrites_write_file_prop \l__morewrites_user_int \l__morewrites_internal_tl + { \__morewrites_write_now_open:n } + { \__morewrites_tex_immediate:w \__morewrites_tex_write:w 16 } } -\cs_new_protected:Npn \__morewrites_immediate_write_open:n #1 +\cs_new_protected:Npn \__morewrites_write_now_open:n #1 { - \__morewrites_tex_immediate:w \__morewrites_tex_openout:w \g__morewrites_iow - \g__morewrites_tmp_file_tl \scan_stop: - \__morewrites_tex_immediate:w \__morewrites_tex_write:w \g__morewrites_iow {#1} - \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w \g__morewrites_iow + \bool_if:NF \g__morewrites_tmp_file_bool { \__morewrites_chk_file: } + \__morewrites_tex_immediate:w \__morewrites_tex_openout:w + \g__morewrites_iow = \g__morewrites_tmp_file_tl \scan_stop: + \__morewrites_tex_immediate:w \__morewrites_tex_write:w + \g__morewrites_iow {#1} + \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w + \g__morewrites_iow \group_begin: - \int_set_eq:NN \tex_endlinechar:D \c_minus_one - \tex_openin:D \g__morewrites_ior \g__morewrites_tmp_file_tl \scan_stop: - \__morewrites_immediate_write_readlines_loop: + \int_set:Nn \tex_endlinechar:D { -1 } + \tex_openin:D \g__morewrites_ior = \g__morewrites_tmp_file_tl \scan_stop: + \__morewrites_write_now_loop: \tex_closein:D \g__morewrites_ior + \__morewrites_collect_gput_right:c + { \__morewrites_user_tl_name:n { \l__morewrites_user_int } } \group_end: + \__morewrites_empty_file:n { \g__morewrites_tmp_file_tl } } -\cs_new_protected_nopar:Npn \__morewrites_immediate_write_readlines_loop: +\cs_new_protected:Npn \__morewrites_write_now_loop: { \etex_readline:D \g__morewrites_ior to \l__morewrites_internal_tl \ior_if_eof:NF \g__morewrites_ior { - \tl_gput_right:cx - { g__morewrites_iow_ \int_use:N \g__morewrites_stream_int _tl } + \__morewrites_collect:x { - \__morewrites_tex_immediate:w \__morewrites_tex_write:w \g__morewrites_iow - { \l__morewrites_internal_tl } + \__morewrites_tex_immediate:w \__morewrites_tex_write:w + \g__morewrites_iow { \l__morewrites_internal_tl } } - \__morewrites_immediate_write_readlines_loop: + \__morewrites_write_now_loop: } } -\cs_new_protected:Npn \__morewrites_late:n #1 +\cs_new_protected:Npn \__morewrites_later:n #1 { - \int_gincr:N \g__morewrites_late_write_int + \int_gincr:N \g__morewrites_later_int \tl_const:cx { - c__morewrites_late_write_ - \int_use:N \g__morewrites_late_write_int + c__morewrites_later_ + \int_use:N \g__morewrites_later_int _tl } { - \int_gset:Nn \exp_not:N \g__morewrites_stream_int - { \exp_not:V \g__morewrites_stream_int } + \int_set:Nn \exp_not:N \l__morewrites_user_int + { \exp_not:V \l__morewrites_user_int } \exp_not:n {#1} } \exp_args:NNx \__morewrites_tex_write:w \g__morewrites_iow - { `( \int_use:N \g__morewrites_late_write_int ) } + { `( \int_use:N \g__morewrites_later_int ) } } -\cs_new_protected_nopar:Npn \__morewrites_openout:w - { \s__morewrites \primargs_get_number:N \__morewrites_openout_test:n } -\cs_new_protected:Npn \__morewrites_openout_test:n #1 - { - \int_gset:Nn \g__morewrites_stream_int {#1} - \clist_if_in:NnTF \g__morewrites_reserved_iow_clist {#1} - { \__morewrites_tex_openout:w \g__morewrites_stream_int } - { \__morewrites_equals_file_name:N \__morewrites_openout_aux:n } - } -\cs_new_protected:Npn \__morewrites_openout_aux:n #1 - { \__morewrites_late:n { \__morewrites_immediate_openout_aux:n {#1} } } -\cs_new_protected_nopar:Npn \__morewrites_write:w - { \s__morewrites \primargs_get_number:N \__morewrites_write_test:n } -\cs_new_protected:Npn \__morewrites_write_test:n #1 - { - \int_gset:Nn \g__morewrites_stream_int {#1} - \clist_if_in:NnTF \g__morewrites_reserved_iow_clist {#1} - { \__morewrites_tex_write:w \g__morewrites_stream_int } - { \primargs_get_general_text:N \__morewrites_write_aux:n } - } -\cs_new_protected:Npn \__morewrites_write_aux:n #1 - { \__morewrites_late:n { \__morewrites_immediate_write_aux:n {#1} } } -\cs_new_protected_nopar:Npn \__morewrites_closeout:w - { \s__morewrites \primargs_get_number:N \__morewrites_closeout_test:n } -\cs_new_protected:Npn \__morewrites_closeout_test:n #1 - { - \int_gset:Nn \g__morewrites_stream_int {#1} - \clist_if_in:NnTF \g__morewrites_reserved_iow_clist {#1} - { \__morewrites_tex_closeout:w \g__morewrites_stream_int } - { \__morewrites_closeout_aux: } - } -\cs_new_protected_nopar:Npn \__morewrites_closeout_aux: - { \__morewrites_late:n { \__morewrites_immediate_closeout_aux: } } -\cs_new_protected_nopar:Npn \__morewrites_before_shipout: +\cs_new_protected:Npn \__morewrites_later_do:n #1 + { \tl_use:c { c__morewrites_later_ \int_eval:n {#1} _tl } } +\cs_new_protected:Npn \__morewrites_closeout_later: { - \__morewrites_tex_immediate:w \__morewrites_tex_openout:w \g__morewrites_iow - \g__morewrites_tmp_file_tl \scan_stop: + \int_compare:nNnTF \l__morewrites_user_int < { 19 } + { \__morewrites_tex_closeout:w \l__morewrites_user_int } + { \__morewrites_later:n { \__morewrites_closeout_now: } } } -\cs_new_protected_nopar:Npn \__morewrites_after_shipout: +\cs_new_protected:Npn \__morewrites_openout_later:w { - \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w \g__morewrites_iow + \int_compare:nNnTF \l__morewrites_user_int < { 19 } + { \__morewrites_tex_openout:w \l__morewrites_user_int } + { \__morewrites_equals_file:N \__morewrites_openout_later:n } + } +\cs_new_protected:Npn \__morewrites_openout_later:n #1 + { \__morewrites_later:n { \__morewrites_openout_now:n {#1} } } +\cs_new_protected:Npn \__morewrites_write_later:w + { + \int_compare:nNnTF \l__morewrites_user_int < { 19 } + { \__morewrites_tex_write:w \l__morewrites_user_int } + { \primargs_get_general_text:N \__morewrites_write_later:n } + } +\cs_new_protected:Npn \__morewrites_write_later:n #1 + { \__morewrites_later:n { \__morewrites_write_later_aux:n {#1} } } +\cs_new_protected:Npn \__morewrites_write_later_aux:n + { + \__morewrites_user_to_tstr:NTF \g__morewrites_write_prop + { \__morewrites_tex_immediate:w \__morewrites_tex_write:w \l__morewrites_tstr_tl \exp_stop_f: } + { \__morewrites_write_now:n } + } +\cs_new_protected:Npn \__morewrites_before_shipout: + { + \bool_if:NF \g__morewrites_tmp_file_bool { \__morewrites_chk_file: } + \__morewrites_tex_immediate:w \__morewrites_tex_openout:w + \g__morewrites_iow = \g__morewrites_tmp_file_tl \scan_stop: + } +\cs_new_protected:Npn \__morewrites_after_shipout: + { + \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w + \g__morewrites_iow \group_begin: \int_set_eq:NN \tex_endlinechar:D \tex_newlinechar:D \char_set_catcode_other:n { \tex_endlinechar:D } \tl_map_inline:nn { `(0123456789) } { \char_set_catcode_other:n {`##1} } \etex_everyeof:D { `() \exp_not:N } - \tl_gset:Nx \g__morewrites_internal_tl + \tl_set:Nx \l__morewrites_internal_tl { \exp_after:wN \__morewrites_after_shipout_loop:ww \tex_input:D \g__morewrites_tmp_file_tl \c_space_tl } + \__morewrites_empty_file:n { \g__morewrites_tmp_file_tl } + \exp_args:NNo \group_end: - \tl_map_inline:Nn \g__morewrites_internal_tl - { \tl_use:c { c__morewrites_late_write_ ##1 _tl } } + \tl_map_function:nN { \l__morewrites_internal_tl } \__morewrites_later_do:n } \cs_new:Npn \__morewrites_after_shipout_loop:ww #1 `( #2 ) { @@ -247,89 +377,114 @@ \__morewrites_after_shipout_loop:ww } } -\IfFileExists{atbegshi.sty} +\cs_new_protected:Npn \__morewrites_shipout:w { - \RequirePackage{atbegshi} - \tl_replace_once:Nnn \AtBegShi@Output - { \AtBegShi@OrgShipout \box \AtBeginShipoutBox } - { - \__morewrites_before_shipout: - \AtBegShi@OrgShipout \box \AtBeginShipoutBox - \__morewrites_after_shipout: - } - \tl_replace_once:Nnn \AtBegShi@Output - { \AtBeginShipoutOriginalShipout \box \AtBeginShipoutBox } - { - \__morewrites_before_shipout: - \AtBeginShipoutOriginalShipout \box \AtBeginShipoutBox - \__morewrites_after_shipout: - } - } + \int_gset_eq:NN \g__morewrites_group_level_int \etex_currentgrouplevel:D + \tex_afterassignment:D \__morewrites_shipout_i: + \tex_global:D \tex_setbox:D \g__morewrites_shipout_box + } +\cs_new_protected:Npn \__morewrites_shipout_i: + { + \int_compare:nNnTF { \g__morewrites_group_level_int } + = { \etex_currentgrouplevel:D } + { \__morewrites_shipout_ii: } + { \tex_aftergroup:D \__morewrites_shipout_ii: } + } +\cs_new_protected:Npn \__morewrites_shipout_ii: + { + \__morewrites_before_shipout: + \__morewrites_tex_shipout:w \tex_box:D \g__morewrites_shipout_box + \__morewrites_after_shipout: + } +\cs_gset_protected:Npn \__morewrites_tmp:w #1 + { + \cs_if_exist:NF \__morewrites_tex_shipout:w + { \cs_new_eq:NN \__morewrites_tex_shipout:w #1 } + \cs_gset_eq:NN #1 \__morewrites_shipout:w + } +\tl_map_inline:nn + { + \xyrealshipout@ + \org@shipout + \PDFSYNCship@ut@ld + \CROP@shipout + \@soORI + \tex_shipout:D + \zwpl@Hship + \o@shipout@TP + \LL@shipout + \Shipout + \GXTorg@shipout + \AtBegShi@OrgShipout + \AtBeginShipoutOriginalShipout + \minidocument@orig@shipout + \shipout + } + { + \str_if_eq_x:nnT + { \cs_meaning:N #1 } + { \token_to_str:N \shipout } + { \__morewrites_tmp:w #1 } + } +\cs_if_exist:NF \__morewrites_tex_shipout:w + { + \cs_new_eq:NN \__morewrites_tex_shipout:w \shipout + \cs_gset_eq:NN \shipout \__morewrites_shipout:w + } +\cs_new_protected:Npn \__morewrites_close_all: + { + \prop_map_inline:Nn \g__morewrites_write_prop + { \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w ##2 \scan_stop: } + \prop_gclear:N \g__morewrites_write_prop + \prop_map_function:NN \g__morewrites_write_file_prop + \__morewrites_closeout_now:nn + \prop_gclear:N \g__morewrites_write_file_prop + } +\cs_new_protected:Npn \__morewrites_close_all_at_end:nw #1#2 \@@end + { + \int_compare:nNnTF {#1} > \c_zero + { #2 \__morewrites_close_all_at_end:nw { #1 - 1 } } + { \__morewrites_close_all: #2 } + \@@end + } +\AtEndDocument { \__morewrites_close_all_at_end:nw { 5 } } +\int_new:N \g__morewrites_alloc_write_int +\int_set:Nn \g__morewrites_alloc_write_int { 18 } +\cs_new_protected:Npn \__morewrites_newwrite:N #1 { - \int_new:N \g__morewrites_group_level_int - \box_new:N \g__morewrites_shipout_box - \cs_new_protected_nopar:Npn \__morewrites_shipout:w - { - \int_gset_eq:NN \g__morewrites_group_level_int \etex_currentgrouplevel:D - \tex_afterassignment:D \__morewrites_shipout_i: - \tex_global:D \tex_setbox:D \g__morewrites_shipout_box - } - \cs_new_protected_nopar:Npn \__morewrites_shipout_i: - { - \int_compare:nNnTF { \g__morewrites_group_level_int } - = { \etex_currentgrouplevel:D } - { \__morewrites_shipout_ii: } - { \tex_aftergroup:D \__morewrites_shipout_ii: } - } - \cs_new_protected_nopar:Npn \__morewrites_shipout_ii: + \int_gincr:N \g__morewrites_alloc_write_int + \int_set_eq:NN \allocationnumber \g__morewrites_alloc_write_int + \cs_undefine:N #1 + \int_const:Nn #1 { \allocationnumber } + \wlog { - \__morewrites_before_shipout: - \__morewrites_tex_shipout:w \tex_box:D \g__morewrites_shipout_box - \__morewrites_after_shipout: + \token_to_str:N #1 + = \token_to_str:N \write \int_use:N \allocationnumber } - \AtBeginDocument { \cs_gset_eq:NN \shipout \__morewrites_shipout:w } - } -\int_new:N \g__morewrites_at_end_int -\int_gset:Nn \g__morewrites_at_end_int { 10 } -\cs_new_protected_nopar:Npn \__morewrites_close_all: - { - \prop_map_function:NN \g__morewrites_iow_prop - \__morewrites_immediate_write_and_close:nn - \prop_gclear:N \g__morewrites_iow_prop } -\cs_set:Npn \__morewrites_tmp:w #1 +\cs_new_protected:Npn \__morewrites_allocate:n #1 { - \cs_new_protected:Npn \__morewrites_close_all_at_end:w ##1 #1 + \prg_replicate:nn { - \int_gdecr:N \g__morewrites_at_end_int - \int_compare:nNnTF \g__morewrites_at_end_int > \c_zero + \int_max:nn { 0 } { - \tl_if_empty:nTF {##1} - { ##1 \__morewrites_close_all: } - { ##1 \__morewrites_close_all_at_end:w } + (#1) - \seq_count:N \g__morewrites_write_seq + - \prop_count:N \g__morewrites_write_prop } - { \__morewrites_close_all: ##1 } - #1 } - } -\exp_args:Nc \__morewrites_tmp:w { @ @ end } -\AtEndDocument { \__morewrites_close_all_at_end:w } -\tex_countdef:D \g__morewrites_alloc_int 17 \scan_stop: -\cs_new:Npn \__morewrites_newwrite:N #1 - { - \int_gincr:N \g__morewrites_alloc_int - \if_int_compare:w \g__morewrites_alloc_int = \c_sixteen - \int_gset:Nn \g__morewrites_alloc_int { 20 } - \fi: - \int_set_eq:NN \allocationnumber \g__morewrites_alloc_int - \cs_undefine:N #1 - \int_const:Nn #1 { \allocationnumber } - \wlog { - \token_to_str:N #1 - = \token_to_str:N \write \int_use:N \allocationnumber + \__morewrites_tex_newwrite:N \l__morewrites_tstr_token + \seq_put_right:NV \g__morewrites_write_seq \l__morewrites_tstr_token } } +\cs_new_protected:Npn \morewritessetup #1 + { \keys_set:nn { __morewrites } {#1} } +\keys_define:nn { __morewrites } + { + allocate .code:n = \__morewrites_allocate:n {#1} , + file .code:n = \__morewrites_set_file:n {#1} , + file .initial:n = \c_sys_jobname_str .mw + } \cs_gset_eq:NN \immediate \__morewrites_immediate:w \cs_gset_eq:NN \openout \__morewrites_openout:w \cs_gset_eq:NN \write \__morewrites_write:w diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/morewrites/primargs.sty new/tex/latex/morewrites/primargs.sty --- old/tex/latex/morewrites/primargs.sty 2013-01-09 01:39:48.000000000 +0100 +++ new/tex/latex/morewrites/primargs.sty 2017-04-17 00:19:40.000000000 +0200 @@ -9,7 +9,7 @@ %% Communicate any suggestions for changing this package %% to Bruno Le Floch (blflatex(a)gmail.com). %% -%% File: primargs.dtx Copyright (C) 2012-2013 Bruno Le Floch +%% File: primargs.dtx Copyright (C) 2012-2017 Bruno Le Floch %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -19,49 +19,58 @@ %% http://www.latex-project.org/lppl.txt %% %% ----------------------------------------------------------------------- -\RequirePackage {expl3} [2012/08/14] +\RequirePackage {expl3} [2017/03/18] \ProvidesExplPackage - {primargs} {2013/01/08} {0.2e} {Parsing arguments of primitives} -\cs_new_protected_nopar:Npn \g__primargs_code_tl { } -\cs_new_protected_nopar:Npn \__primargs_no_afterassignment: - { \tex_afterassignment:D \tex_relax:D } -\cs_new_protected_nopar:Npn \__primargs_no_localdefs: + {primargs} {2017/04/10} {} {Parsing arguments of primitives} +\tl_new:N \g__primargs_code_tl +\tl_new:N \g__primargs_file_name_tl +\tl_new:N \g__primargs_file_name_level_tl +\cs_new_protected:Npn \__primargs_safe: { - \__primargs_no_afterassignment: - \int_compare:nNnF \tex_globaldefs:D > \c_zero - { \tex_globaldefs:D = \c_zero } + \tex_afterassignment:D \tex_relax:D + \if_int_compare:w 0 > \tex_globaldefs:D + \int_zero:N \tex_globaldefs:D + \fi: } -\cs_new_protected_nopar:Npn \primargs_read_x_token:N +\cs_new_protected:Npn \primargs_read_x_token:N { \group_begin: - \__primargs_no_localdefs: + \__primargs_safe: \__primargs_read_x_token:N } -\cs_new_protected_nopar:Npn \__primargs_read_x_token:N +\cs_new_protected:Npn \__primargs_read_x_token:N { - \tex_afterassignment:D \__primargs_read_x_token_ii:N + \tex_afterassignment:D \__primargs_read_x_token_aux:N \tex_global:D \tex_futurelet:D \g_primargs_token } -\cs_new_protected_nopar:Npn \__primargs_read_x_token_ii:N +\cs_new_protected:Npn \__primargs_read_x_token_std:N { \exp_after:wN \if_meaning:w \exp_not:N \g_primargs_token \g_primargs_token - \group_end: - \exp_after:wN \use_none:nnn + \group_end: \use_i:nnnn \fi: \exp_after:wN \__primargs_read_x_token:N \exp_after:wN } -\cs_new_protected_nopar:Npn \primargs_read_token:N +\cs_new_eq:NN \__primargs_read_x_token_aux:N + \__primargs_read_x_token_std:N +\cs_new_protected:Npn \__primargs_read_x_token_file:N + { + \if_meaning:w \tex_input:D \g_primargs_token + \use_i_ii:nnn \group_end: + \fi: + \__primargs_read_x_token_std:N + } +\cs_new_protected:Npn \primargs_read_token:N { \group_begin: - \__primargs_no_localdefs: + \__primargs_safe: \tex_afterassignment:D \group_end: \tex_global:D \tex_futurelet:D \g_primargs_token } \cs_new_protected:Npn \primargs_remove_token:N #1 { \group_begin: - \__primargs_no_localdefs: + \__primargs_safe: \tex_aftergroup:D #1 \tex_afterassignment:D \group_end: \tex_global:D \tex_let:D \g_primargs_token = ~ @@ -69,13 +78,13 @@ \cs_new_protected:Npn \primargs_remove_one_optional_space:N #1 { \group_begin: - \__primargs_no_localdefs: + \__primargs_safe: \tex_aftergroup:D #1 \primargs_read_x_token:N \__primargs_remove_one_optional_space: } -\exp_args:NNo \cs_new_protected_nopar:Npn \__primargs_remove_one_optional_space: +\cs_new_protected:Npn \__primargs_remove_one_optional_space: { - \use:n { \if_catcode:w } ~ \exp_not:N \g_primargs_token + \if_catcode:w \c_space_token \exp_not:N \g_primargs_token \exp_after:wN \primargs_remove_token:N \fi: \group_end: @@ -83,15 +92,15 @@ \cs_new_protected:Npn \primargs_remove_optional_spaces:N #1 { \group_begin: - \__primargs_no_localdefs: + \__primargs_safe: \tex_aftergroup:D #1 \__primargs_remove_optional_spaces: } -\cs_new_protected_nopar:Npn \__primargs_remove_optional_spaces: - { \primargs_read_x_token:N \__primargs_remove_optional_spaces_ii: } -\exp_args:NNo \cs_new_protected_nopar:Npn \__primargs_remove_optional_spaces_ii: +\cs_new_protected:Npn \__primargs_remove_optional_spaces: + { \primargs_read_x_token:N \__primargs_remove_optional_spaces_aux: } +\cs_new_protected:Npn \__primargs_remove_optional_spaces_aux: { - \use:n { \if_catcode:w } ~ \exp_not:N \g_primargs_token + \if_catcode:w \c_space_token \exp_not:N \g_primargs_token \exp_after:wN \primargs_remove_token:N \exp_after:wN \__primargs_remove_optional_spaces: \else: @@ -104,19 +113,45 @@ \tex_aftergroup:D #1 \primargs_remove_optional_spaces:N \__primargs_remove_equals: } -\cs_new_protected_nopar:Npn \__primargs_remove_equals: +\cs_new_protected:Npn \__primargs_remove_equals: { \if_meaning:w = \g_primargs_token - \exp_after:wN \__primargs_remove_equals_ii:NN + \exp_after:wN \__primargs_remove_equals_aux:NN \fi: \group_end: } -\cs_new_protected:Npn \__primargs_remove_equals_ii:NN #1#2 +\cs_new_protected:Npn \__primargs_remove_equals_aux:NN #1#2 { \tl_if_eq:nnTF { #2 } { = } { #1 } { #1 #2 } } +\cs_new_protected:Npn \primargs_remove_filler:N #1 + { + \group_begin: + \__primargs_safe: + \tex_aftergroup:D #1 + \__primargs_remove_filler: + } +\cs_new_protected:Npn \__primargs_remove_filler: + { \primargs_read_x_token:N \__primargs_remove_filler_aux: } +\cs_new_protected:Npn \__primargs_remove_filler_aux: + { + \if_catcode:w \c_space_token \exp_not:N \g_primargs_token + \else: + \if_meaning:w \tex_relax:D \g_primargs_token + \else: + \exp_after:wN + \if_meaning:w \exp_not:N \prg_do_nothing: \g_primargs_token + \else: + \__primargs_remove_filler_end:NNNNN + \fi: + \fi: + \fi: + \primargs_remove_token:N \__primargs_remove_filler: + } +\cs_new_protected:Npn \__primargs_remove_filler_end:NNNNN #1#2#3#4#5 + { #1 #2 #3 \group_end: } \cs_new_protected:Npn \__primargs_get_rhs:NnN #1#2#3 { \group_begin: - \__primargs_no_localdefs: + \__primargs_safe: \tex_aftergroup:D #3 \tl_gset:Nn \g__primargs_code_tl { @@ -130,58 +165,103 @@ #1 = } \cs_generate_variant:Nn \__primargs_get_rhs:NnN { No } -\cs_new_protected_nopar:Npn \primargs_get_number:N +\cs_new_protected:Npn \primargs_get_number:N { \__primargs_get_rhs:NoN \tex_deadcycles:D { \tex_the:D \tex_deadcycles:D } } -\cs_new_protected_nopar:Npn \primargs_get_dimen:N +\cs_new_protected:Npn \primargs_get_dimen:N { \__primargs_get_rhs:NoN \tex_hoffset:D { \tex_the:D \tex_hoffset:D } } -\cs_new_protected_nopar:Npn \primargs_get_glue:N +\cs_new_protected:Npn \primargs_get_glue:N { \__primargs_get_rhs:NoN \tex_topskip:D { \tex_the:D \tex_topskip:D } } -\cs_new_protected_nopar:Npn \primargs_get_mudimen:N +\cs_new_protected:Npn \primargs_get_mudimen:N { \msg_warning:nn { primargs } { get-mudimen } \primargs_get_muglue:N } \msg_new:nnn { primargs } { get-mudimen } { The~\iow_char:N\\primargs_get_mudimen:N~function~is~buggy. } -\cs_new_protected_nopar:Npn \primargs_get_muglue:N +\cs_new_protected:Npn \primargs_get_muglue:N { \__primargs_get_rhs:NoN \tex_thinmuskip:D { \tex_the:D \tex_thinmuskip:D } } -\cs_new_protected_nopar:Npn \primargs_get_general_text:N - { \__primargs_get_rhs:NoN \tex_errhelp:D { { } } } -\tl_new:N \g__primargs_file_name_tl +\cs_new_protected:Npn \primargs_get_general_text:N #1 + { + \group_begin: + \__primargs_safe: + \tex_aftergroup:D #1 + \tex_aftergroup:D { \if_false: } \fi: + \primargs_remove_filler:N \__primargs_get_general_text: + } +\cs_new_protected:Npn \__primargs_get_general_text: + { + \if_catcode:w \c_group_begin_token \g_primargs_token + \exp_after:wN \primargs_remove_token:N + \else: + \group_begin: + \tex_aftergroup:D \__primargs_get_general_text_error:n + \if_catcode:w \c_group_end_token \g_primargs_token + \tex_aftergroup:D { + \tex_aftergroup:D } + \fi: + \fi: + \group_end: + } +\cs_new_protected:Npn \__primargs_get_general_text_error:n #1 + { + \exp_after:wN \group_end: + \etex_unexpanded:D \if_int_compare:w `{ = \c_zero \fi: #1 } + } \cs_new_protected:Npn \primargs_get_file_name:N #1 { \group_begin: - \__primargs_no_localdefs: + \__primargs_safe: + \cs_gset_eq:NN \__primargs_read_x_token_aux:N + \__primargs_read_x_token_file:N \tex_aftergroup:D #1 \tl_gclear:N \g__primargs_file_name_tl + \tl_gset:Nn \g__primargs_file_name_level_tl { 0 } \primargs_remove_optional_spaces:N \__primargs_get_file_name_test: } -\cs_new_protected_nopar:Npn \__primargs_get_file_name_test: +\cs_new_protected:Npn \__primargs_get_file_name_test: { \token_if_cs:NTF \g_primargs_token { \__primargs_get_file_name_end: } { \token_if_eq_charcode:NNTF \c_space_token \g_primargs_token - { \primargs_remove_token:N \__primargs_get_file_name_end: } + { \primargs_remove_token:N \__primargs_get_file_name_space: } { \primargs_remove_token:N \__primargs_get_file_name_char: } } } -\cs_new_protected_nopar:Npn \__primargs_get_file_name_end: - { \exp_args:No \group_end: \g__primargs_file_name_tl } -\cs_new_protected_nopar:Npn \__primargs_get_file_name_char: +\cs_new_protected:Npn \__primargs_get_file_name_end: + { + \cs_gset_eq:NN \__primargs_read_x_token_aux:N + \__primargs_read_x_token_std:N + \exp_args:No \group_end: \g__primargs_file_name_tl + } +\cs_new_protected:Npn \__primargs_get_file_name_space: + { + \int_if_odd:nTF { \g__primargs_file_name_level_tl } + { + \tl_gput_right:Nn \g__primargs_file_name_tl { ~ } + \primargs_read_x_token:N \__primargs_get_file_name_test: + } + { \__primargs_get_file_name_end: } + } +\cs_new_protected:Npn \__primargs_get_file_name_char: { + \token_if_eq_charcode:NNT " \g_primargs_token + { + \tl_set:Nx \g__primargs_file_name_level_tl + { \int_eval:n { 1 - \g__primargs_file_name_level_tl } } + } \tl_gput_right:Nx \g__primargs_file_name_tl { \exp_after:wN \__primargs_get_file_name_char_ii:w @@ -193,6 +273,76 @@ \cs_new:Npn \__primargs_get_file_name_char_ii:w #1 ~ #2 ~ #3 \q_stop { \__primargs_get_file_name_char_iii:w #3 ~ #3 ~ \q_stop } \cs_new:Npn \__primargs_get_file_name_char_iii:w #1 ~ #2 ~ #3 \q_stop {#2} +\sys_if_engine_luatex:TF + { + \cs_new_protected:Npn \primargs_get_input_file_name:N #1 + { + \group_begin: + \__primargs_safe: + \tex_aftergroup:D #1 + \tl_gclear:N \g__primargs_file_name_tl + \tl_gset:Nn \g__primargs_file_name_level_tl { 1 } + \primargs_remove_filler:N \__primargs_get_input_file_name_first: + } + \cs_new_protected:Npn \__primargs_get_input_file_name_first: + { + \token_if_eq_catcode:NNTF \g_primargs_token \c_group_begin_token + { \primargs_remove_token:N \__primargs_get_input_file_name_loop: } + { \primargs_get_file_name:N \group_end: } + } + \cs_new_protected:Npn \__primargs_get_input_file_name_loop: + { \primargs_read_x_token:N \__primargs_get_input_file_name_test: } + \cs_new_protected:Npn \__primargs_get_input_file_name_test: + { + \token_if_eq_catcode:NNTF \g_primargs_token \c_group_begin_token + { + \tl_gset:Nx \g__primargs_file_name_level_tl + { \int_eval:n { \g__primargs_file_name_level_tl + 1 } } + \primargs_remove_token:N \__primargs_get_input_file_name_brace: + } + { + \token_if_eq_catcode:NNTF \g_primargs_token \c_group_end_token + { + \tl_gset:Nx \g__primargs_file_name_level_tl + { \int_eval:n { \g__primargs_file_name_level_tl - 1 } } + \int_compare:nNnTF { \g__primargs_file_name_level_tl } > 0 + { \primargs_remove_token:N \__primargs_get_input_file_name_brace: } + { \primargs_remove_token:N \__primargs_get_file_name_end: } + } + { + \token_if_eq_meaning:NNTF \g_primargs_token \c_space_token + { + \tl_gput_right:Nn \g__primargs_file_name_tl { ~ } + \primargs_remove_token:N \__primargs_get_input_file_name_loop: + } + { \exp_after:wN \__primargs_get_input_file_name_aux:N \exp_not:N } + } + } + } + \cs_new_protected:Npn \__primargs_get_input_file_name_brace: + { + \tl_gput_right:Nx \g__primargs_file_name_tl + { + \exp_after:wN \__primargs_get_file_name_char_ii:w + \token_to_meaning:N \g_primargs_token + \q_stop + } + \__primargs_get_input_file_name_loop: + } + \cs_new_protected:Npn \__primargs_get_input_file_name_aux:N #1 + { + \exp_after:wN \str_if_eq_x:nnT + \exp_after:wN { \token_to_str:N #1 } { \token_to_str:N \par } + { \use_none:nnn } + \tex_xdef:D \g__primargs_file_name_tl + { + \g__primargs_file_name_tl + \exp_after:wN \tl_to_str:n \exp_after:wN { \exp_not:N #1 } + } + \__primargs_get_input_file_name_loop: + } + } + { \cs_new_eq:NN \primargs_get_input_file_name:N \primargs_get_file_name:N } %% %% %% End of file `primargs.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/morewrites.tlpobj new/tlpkg/tlpobj/morewrites.tlpobj --- old/tlpkg/tlpobj/morewrites.tlpobj 2016-04-14 19:28:25.000000000 +0200 +++ new/tlpkg/tlpobj/morewrites.tlpobj 2017-04-21 02:07:49.000000000 +0200 @@ -1,22 +1,21 @@ name morewrites category Package -revision 28767 +revision 43945 shortdesc Always room for a new write stream relocated 1 longdesc The package aims to solve the error "No room for a new \write", longdesc which occurs when the user, or when the user's packages have -longdesc 'allocated too many streams using \newwrite (TeX has a fixed +longdesc 'allocated too many streams' using \newwrite (TeX has a fixed longdesc maximum number - 16 - such streams built-in to its code). The longdesc package hooks into TeX primitive commands associated with longdesc writing to files; it should be loaded near the beginning of the longdesc sequence of loading packages for a document. The package uses longdesc the l3kernel bundle. -runfiles size=6 +runfiles size=8 RELOC/tex/latex/morewrites/morewrites.sty RELOC/tex/latex/morewrites/primargs.sty catalogue-also rvwrite catalogue-ctan /macros/latex/contrib/morewrites -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl1.3 +catalogue-date 2017-04-20 21:01:46 +0200 +catalogue-license lppl1.3c catalogue-topics io-mgmt -catalogue-version 0.2e ++++++ movie15.doc.tar.xz ++++++ ++++++ movie15.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/movie15.tlpobj new/tlpkg/tlpobj/movie15.tlpobj --- old/tlpkg/tlpobj/movie15.tlpobj 2016-04-14 19:28:26.000000000 +0200 +++ new/tlpkg/tlpobj/movie15.tlpobj 2017-04-14 17:51:42.000000000 +0200 @@ -14,6 +14,6 @@ RELOC/tex/latex/movie15/movie15.sty catalogue-also flashmovie catalogue-ctan /macros/latex/contrib/movie15 -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics multimedia obsolete ++++++ mp3d.doc.tar.xz ++++++ ++++++ mp3d.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mp3d.tlpobj new/tlpkg/tlpobj/mp3d.tlpobj --- old/tlpkg/tlpobj/mp3d.tlpobj 2016-04-14 19:28:27.000000000 +0200 +++ new/tlpkg/tlpobj/mp3d.tlpobj 2017-04-14 17:51:42.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/metapost/mp3d/3dutil.mp RELOC/metapost/mp3d/animpoly.mp catalogue-ctan /graphics/metapost/contrib/macros/mp3d -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics mp-use graphics-3d catalogue-version 1.34 ++++++ mparhack.doc.tar.xz ++++++ ++++++ mparhack.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mparhack.tlpobj new/tlpkg/tlpobj/mparhack.tlpobj --- old/tlpkg/tlpobj/mparhack.tlpobj 2016-04-14 19:28:27.000000000 +0200 +++ new/tlpkg/tlpobj/mparhack.tlpobj 2017-04-14 17:51:43.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/latex/mparhack/mparhack.sty catalogue-ctan /macros/latex/contrib/mparhack -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics marginal catalogue-version 1.4 ++++++ mparrows.doc.tar.xz ++++++ ++++++ mparrows.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mparrows.tlpobj new/tlpkg/tlpobj/mparrows.tlpobj --- old/tlpkg/tlpobj/mparrows.tlpobj 2016-04-14 19:28:28.000000000 +0200 +++ new/tlpkg/tlpobj/mparrows.tlpobj 2017-04-14 17:51:43.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/metapost/mparrows/mparrows.mp catalogue-ctan /graphics/metapost/contrib/macros/mparrows -catalogue-date 2016-02-21 05:08:42 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics mp-supp catalogue-version 0.1 ++++++ mpattern.doc.tar.xz ++++++ ++++++ mpattern.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mpattern.tlpobj new/tlpkg/tlpobj/mpattern.tlpobj --- old/tlpkg/tlpobj/mpattern.tlpobj 2016-04-14 19:28:28.000000000 +0200 +++ new/tlpkg/tlpobj/mpattern.tlpobj 2017-04-14 17:51:43.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=2 RELOC/metapost/mpattern/mpattern.mp catalogue-ctan /graphics/metapost/contrib/macros/mpattern -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics graphics-use ++++++ mpcolornames.doc.tar.xz ++++++ ++++++ mpcolornames.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mpcolornames.tlpobj new/tlpkg/tlpobj/mpcolornames.tlpobj --- old/tlpkg/tlpobj/mpcolornames.tlpobj 2016-04-14 19:28:28.000000000 +0200 +++ new/tlpkg/tlpobj/mpcolornames.tlpobj 2017-04-14 17:51:43.000000000 +0200 @@ -18,7 +18,7 @@ RELOC/metapost/mpcolornames/mpcolornames-spec-xcolor-sty.mp RELOC/metapost/mpcolornames/mpcolornames.mp catalogue-ctan /graphics/metapost/contrib/macros/mpcolornames -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics colour catalogue-version 0.20 ++++++ mpgraphics.doc.tar.xz ++++++ ++++++ mpgraphics.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mpgraphics.tlpobj new/tlpkg/tlpobj/mpgraphics.tlpobj --- old/tlpkg/tlpobj/mpgraphics.tlpobj 2016-04-14 19:28:28.000000000 +0200 +++ new/tlpkg/tlpobj/mpgraphics.tlpobj 2017-04-14 17:51:43.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/tex/latex/mpgraphics/mpgraphics.sty catalogue-also emp catalogue-ctan /macros/latex/contrib/mpgraphics -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics graphics-inline catalogue-version 0.3 ++++++ mpman-ru.doc.tar.xz ++++++ ++++++ mptopdf.doc.tar.xz ++++++ ++++++ mptopdf.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mptopdf.tlpobj new/tlpkg/tlpobj/mptopdf.tlpobj --- old/tlpkg/tlpobj/mptopdf.tlpobj 2016-05-23 00:06:07.000000000 +0200 +++ new/tlpkg/tlpobj/mptopdf.tlpobj 2017-04-14 17:51:44.000000000 +0200 @@ -10,6 +10,8 @@ longdesc pull them out to this separate package for the benefit of LaTeX longdesc users who do not install the rest of ConTeXt. This can be longdesc found on CTAN in macros/pdftex/graphics. +depend mptopdf +depend plain depend mptopdf.ARCH execute AddFormat name=mptopdf engine=pdftex options="-translate-file=cp227.tcx mptopdf.tex" fmttriggers=mptopdf,plain runfiles size=43 ++++++ ms.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ms.doc.tlpobj new/tlpkg/tlpobj/ms.doc.tlpobj --- old/tlpkg/tlpobj/ms.doc.tlpobj 2016-04-14 19:28:30.000000000 +0200 +++ new/tlpkg/tlpobj/ms.doc.tlpobj 2017-04-14 17:51:44.000000000 +0200 @@ -1,6 +1,6 @@ name ms.doc category Package -revision 29849 +revision 42428 shortdesc doc files of ms relocated 1 docfiles size=629 ++++++ ms.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ms.tlpobj new/tlpkg/tlpobj/ms.tlpobj --- old/tlpkg/tlpobj/ms.tlpobj 2016-04-14 19:28:32.000000000 +0200 +++ new/tlpkg/tlpobj/ms.tlpobj 2017-04-14 17:51:45.000000000 +0200 @@ -1,6 +1,6 @@ name ms category Package -revision 29849 +revision 42428 shortdesc Various LaTeX packages by Martin Schroder relocated 1 longdesc A bundle of LaTeX packages by Martin Schroder; the collection @@ -18,6 +18,6 @@ RELOC/tex/latex/ms/prelim2e.sty RELOC/tex/latex/ms/ragged2e.sty catalogue-ctan /macros/latex/contrib/ms -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics collection ++++++ msc.doc.tar.xz ++++++ ++++++ msc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/msc.tlpobj new/tlpkg/tlpobj/msc.tlpobj --- old/tlpkg/tlpobj/msc.tlpobj 2016-04-14 19:28:33.000000000 +0200 +++ new/tlpkg/tlpobj/msc.tlpobj 2017-04-14 17:51:45.000000000 +0200 @@ -13,7 +13,7 @@ RELOC/bibtex/bib/msc/biblio.bib RELOC/tex/latex/msc/msc.sty catalogue-ctan /macros/latex/contrib/msc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics comp-net catalogue-version 1.16 ++++++ msg.doc.tar.xz ++++++ ++++++ msg.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/msg.tlpobj new/tlpkg/tlpobj/msg.tlpobj --- old/tlpkg/tlpobj/msg.tlpobj 2016-04-14 19:28:34.000000000 +0200 +++ new/tlpkg/tlpobj/msg.tlpobj 2017-04-14 17:51:45.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/msg/msg.sty RELOC/tex/latex/msg/norsk_msg-msg.tex catalogue-ctan /macros/latex/contrib/msg -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics multilingual catalogue-version 0.40 ++++++ mslapa.doc.tar.xz ++++++ ++++++ mslapa.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mslapa.tlpobj new/tlpkg/tlpobj/mslapa.tlpobj --- old/tlpkg/tlpobj/mslapa.tlpobj 2016-04-14 19:28:34.000000000 +0200 +++ new/tlpkg/tlpobj/mslapa.tlpobj 2017-04-14 17:51:45.000000000 +0200 @@ -11,6 +11,6 @@ RELOC/tex/latex/mslapa/mslapa.sty catalogue-also apacite apa catalogue-ctan /macros/latex/contrib/mslapa -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics psychology journalpub bibtex-sty ++++++ msu-thesis.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/msu-thesis/README new/doc/latex/msu-thesis/README --- old/doc/latex/msu-thesis/README 2016-05-10 23:31:55.000000000 +0200 +++ new/doc/latex/msu-thesis/README 2016-11-25 19:29:34.000000000 +0100 @@ -1,4 +1,4 @@ -MSU Thesis Class Version 2.6 2016/05/09 +MSU Thesis Class Version 2.6b 2016/06/08 Copyright 2011,2012,2013,2014,2015,2016 by Alan Munn <amunn(a)msu.edu> Binary files old/doc/latex/msu-thesis/msu-thesis.pdf and new/doc/latex/msu-thesis/msu-thesis.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/msu-thesis/msu-thesis.tex new/doc/latex/msu-thesis/msu-thesis.tex --- old/doc/latex/msu-thesis/msu-thesis.tex 2016-05-10 23:31:55.000000000 +0200 +++ new/doc/latex/msu-thesis/msu-thesis.tex 2016-11-25 19:29:34.000000000 +0100 @@ -2,8 +2,8 @@ \documentclass[11pt]{article} -\def\msuversion{2.6} -\def\msudate{2016/05/09} +\def\msuversion{2.6b} +\def\msudate{2016/06/08} \title{\textbf{Using the MSU Thesis Class}} \author{\textbf{Alan Munn}\\Department of Linguistics and Languages\\\texttt{\href{mailto:amunn@msu.edu}{amunn@msu.edu}}} \date{Version \msuversion\\\msudate} @@ -190,6 +190,17 @@ \end{lstlisting} \end{quote} +Another common kind of List is a List of Abbreviations. The thesis office seems to want to call this "Key to Abbreviations". To add such a list, you need to do the following: + +\begin{quote} +\begin{lstlisting} +\clearpage +\chapter*{Key to Abbreviations} +\addcontentsline{toc}{chapter}{Key to Abbreviations} +Your list of abbreviations here. +\end{lstlisting} +\end{quote} + \subsection{Landscape figures and tables} If you have large figures and tables that must be rotated, you should use the |[lscape]| class option. This enables a pagestyle |lscape| and places the page numbers correctly on the long edge of the page. The option loads the \pkg{pdflscape} package which provides a |landscape| environment to place the landscape figure in. Before the landscape environment, you need to issue a |\clearpage| command and change the pagestyle to |lscape|, and afterwards, change it back to |plain|. Schematically, then, any landscape pages should be created in the following way. @@ -275,7 +286,7 @@ \subsection{Version history} Previous versions of \pkg{msu-thesis} (versions 1.0--1.4b) were created for non-electronic submission and should not be used. Versions 1.5--1.6 (the first electronic submission versions) contained a |\makeabstract| command and a separate |msuabstract| environment. These have been removed as of version 1.7. Users who are upgrading from earlier versions to version 1.7 do not need to change these commands however but their use will trigger a warning.) Version 2.0 implemented landscape pages; version 2.1 added support for \pkg{hyperref}. Versions 2.2--2.5 mainly accommodated to the ever changing whims of the MSU Graduate School. Version 2.6 fixed some appendix bugs introduced by the previous whim accommodation. \section{Acknowledgements} -Thanks to Lars Madsen, Ulrike Fischer and Peter Wilson for help with setting up parts of the memoir code for versions 1.0-1.4 (now eliminated due to changed requirements). Thanks to Wolfgang Sternefeld for supplying the \pkg{linguex} spacing fix code, Leo Liu for the landscape page numbering code, which greatly simplified my original version, and Florent Chervet for the hyperref code. Thanks also to the following students who have reported problems over the years: Matt Husband, Irina Agafonova, Dmitriy Bryndin, Greg Christian, Changkuk Jung, Yisu Zhou, Neil ver Planck, Michael Wojcik, Kyle Crayne, Adam Soliman and Adam Liter. +Thanks to Lars Madsen, Ulrike Fischer and Peter Wilson for help with setting up parts of the memoir code for versions 1.0-1.4 (now eliminated due to changed requirements). Thanks to Wolfgang Sternefeld for supplying the \pkg{linguex} spacing fix code, Leo Liu for the landscape page numbering code, which greatly simplified my original version, and Florent Chervet for the hyperref code. Thanks also to the following students who have reported problems over the years: Matt Husband, Irina Agafonova, Dmitriy Bryndin, Greg Christian, Changkuk Jung, Yisu Zhou, Neil ver Planck, Michael Wojcik, Kyle Crayne, Adam Soliman, Adam Liter and Ali Al-jiboory. \appendix \renewcommand{\thesection}{Appendix \Alph{section}} Binary files old/doc/latex/msu-thesis/samples/MSU-thesis-template.pdf and new/doc/latex/msu-thesis/samples/MSU-thesis-template.pdf differ Binary files old/doc/latex/msu-thesis/samples/MSU-thesis-testfile.pdf and new/doc/latex/msu-thesis/samples/MSU-thesis-testfile.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/msu-thesis/samples/MSU-thesis-testfile.tex new/doc/latex/msu-thesis/samples/MSU-thesis-testfile.tex --- old/doc/latex/msu-thesis/samples/MSU-thesis-testfile.tex 2016-05-10 23:31:55.000000000 +0200 +++ new/doc/latex/msu-thesis/samples/MSU-thesis-testfile.tex 2016-11-25 19:29:34.000000000 +0100 @@ -60,6 +60,13 @@ \listoffigures \clearpage \listoflistings +\clearpage +\chapter*{Key to Abbreviations} +\addcontentsline{toc}{chapter}{Key to Abbreviations} +\begin{description} +\item[foo] This is a foo +\item[bar] This is a bar +\end{description} \mainmatter % The next command changes chapters in the TOC to have no dotted leader %\addtocontents{toc}{\protect\renewcommand{\protect\cftchapterdotsep}{\cftnodots}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/msu-thesis.doc.tlpobj new/tlpkg/tlpobj/msu-thesis.doc.tlpobj --- old/tlpkg/tlpobj/msu-thesis.doc.tlpobj 2016-05-10 23:46:04.000000000 +0200 +++ new/tlpkg/tlpobj/msu-thesis.doc.tlpobj 2017-04-14 17:51:45.000000000 +0200 @@ -1,6 +1,6 @@ name msu-thesis.doc category Package -revision 41013 +revision 41345 shortdesc doc files of msu-thesis relocated 1 docfiles size=102 ++++++ msu-thesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/msu-thesis/msu-thesis.cls new/tex/latex/msu-thesis/msu-thesis.cls --- old/tex/latex/msu-thesis/msu-thesis.cls 2016-05-10 23:31:55.000000000 +0200 +++ new/tex/latex/msu-thesis/msu-thesis.cls 2016-11-25 19:33:55.000000000 +0100 @@ -117,12 +117,15 @@ % also fix bookmarks in the PDF when hyperref is loaded. % Made default caption delimiter a space so that captions in LOT/LOF look better % Removed old commented out code and older backwards compatibility code. -% +% Version 2.6b 2016/06/08 Reworked some vertical spacing after complaints from the thesis office +% despite the fact that people successfully submitted theses in May with +% the previous spacing. This is getting ridiculous. +% Also updated documentation to show how to add list of abbreviations % Use at your own risk! % Report bugs/problems/questions to <amunn(a)msu.edu> % -\def\msu(a)version{2.6} -\def\msu@date{2016/05/09} +\def\msu(a)version{2.6b} +\def\msu@date{2016/06/08} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{msu-thesis}[\msu@date\space Michigan State University Thesis Class version \msu@version] \newif\ifmsu@lscape\msu@lscapefalse @@ -207,7 +210,7 @@ % set up the chapter titles \chapterstyle{thatcher} \setlength{\beforechapskip}{0pt} -%\setlength{\afterchapskip}{28pt} % Thesis office didn't like this +\setlength{\afterchapskip}{18pt} % 2016/06/08 because of thesis office complaints \renewcommand*{\chapnamefont}{\centering\bfseries} \renewcommand*{\chapnumfont}{\bfseries} \renewcommand*{\chaptitlefont}{\SingleSpacing\bfseries} @@ -321,11 +324,12 @@ \renewenvironment{abstract}{% \chapter*{\abstractname} \thispagestyle{empty} - \plainbreak{-1.5} + \plainbreak{-.5} % changed 2016/06/08 after complaints \begin{center} \MakeUppercase{\thetitle}\plainbreak{1}By\plainbreak{1}\theauthor \end{center} - \DoubleSpacing + \plainbreak{-.5} % changed 2016/06/08 after complaints + \DoubleSpacing }{\par} @@ -356,17 +360,20 @@ \clearpage} % make the dedication page +% changed 2016/06/08 for vertical centering \newcommand*{\makededicationpage}{% \clearpage \pagestyle{plain} - \chapter*{\ } - \vspace{.35\textheight}\begin{center} - \msu@dedication - \end{center}} + {\centering + \null\vfill + \msu@dedication\par + \vfill}} \renewcommand{\mainmatter}{% \DoubleSpacing\pagestyle{plain}\@ifstar{\@smemmain}{\@memmain}} +% This should probably be changed to {\null\vfill} + \afterpartskip +% But we'll worry about this later. \renewcommand{\beforepartskip}{\vspace*{.35\textheight}} % This code patches the memoir appendix code to automatically add @@ -374,19 +381,34 @@ % TOC format that the Grad School requires correct. % Also, since the Grad School doesn't allow a single appendix to have a letter name % we remove it for the title, but not for the section headings. +% Redefining \@apppage as well to get the spacing right 2016/06/08 % +\def\msu@apppage{% + \@setuppart + \mempreaddapppagetotochook + \addappheadtotoc + \mempostaddapppagetotochook + \partmark{\appendixpagename}% + \memapppageinfo{\appendixpagename}% + {\centering + \interlinepenalty \@M + \normalfont + \vfil + \printparttitle{\appendixpagename}\par\vfil}% + \@endpart} + \let\orig@appendix\appendix \let\orig@appendices\appendices \renewcommand*{\appendix}{ \renewcommand\appendixpagename{Appendix} \renewcommand\appendixtocname{Appendix} - \appendixpage + \msu@apppage \settocdepth{part} \orig@appendix \renewcommand\thechapter{} \renewcommand\thesection{A.\arabic{section}}} \renewcommand*{\appendices}{ - \appendixpage + \msu@apppage \cftinserthook{toc}{APP} \settocdepth{chapter} \orig@appendices} @@ -405,7 +427,8 @@ {\centering \interlinepenalty \@M \normalfont - \printparttitle{\bibpagename}\par}% + \vfil + \printparttitle{\bibpagename}\par\vfil}% \@endpart} \newcommand\msu@preaddbibpagetotochook{} \newcommand\msu@postaddbibpagetotochook{} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/msu-thesis.tlpobj new/tlpkg/tlpobj/msu-thesis.tlpobj --- old/tlpkg/tlpobj/msu-thesis.tlpobj 2016-05-10 23:46:04.000000000 +0200 +++ new/tlpkg/tlpobj/msu-thesis.tlpobj 2017-04-14 17:51:45.000000000 +0200 @@ -1,6 +1,6 @@ name msu-thesis category Package -revision 41013 +revision 41345 shortdesc Class for Michigan State University Master's and PhD theses relocated 1 longdesc This is a class file for producing dissertations and theses @@ -14,7 +14,7 @@ RELOC/tex/latex/msu-thesis/gb4e-compat.tex RELOC/tex/latex/msu-thesis/msu-thesis.cls catalogue-ctan /macros/latex/contrib/msu-thesis -catalogue-date 2016-05-10 18:02:59 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics dissertation -catalogue-version 2.6 +catalogue-version 2.6b ++++++ mtgreek.doc.tar.xz ++++++ ++++++ mtgreek.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mtgreek.tlpobj new/tlpkg/tlpobj/mtgreek.tlpobj --- old/tlpkg/tlpobj/mtgreek.tlpobj 2016-04-14 19:28:35.000000000 +0200 +++ new/tlpkg/tlpobj/mtgreek.tlpobj 2017-04-14 17:51:46.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=1 RELOC/tex/latex/mtgreek/mtgreek.sty catalogue-ctan /macros/latex/contrib/mtgreek -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font-supp greek catalogue-version 1.1+ ++++++ mugsthesis.doc.tar.xz ++++++ ++++++ mugsthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mugsthesis.tlpobj new/tlpkg/tlpobj/mugsthesis.tlpobj --- old/tlpkg/tlpobj/mugsthesis.tlpobj 2016-04-14 19:28:35.000000000 +0200 +++ new/tlpkg/tlpobj/mugsthesis.tlpobj 2017-04-14 17:51:46.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=2 RELOC/tex/latex/mugsthesis/mugsthesis.cls catalogue-ctan /macros/latex/contrib/mugsthesis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics dissertation ++++++ multenum.doc.tar.xz ++++++ ++++++ multenum.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multenum.tlpobj new/tlpkg/tlpobj/multenum.tlpobj --- old/tlpkg/tlpobj/multenum.tlpobj 2016-04-14 19:28:36.000000000 +0200 +++ new/tlpkg/tlpobj/multenum.tlpobj 2017-04-14 17:51:46.000000000 +0200 @@ -12,6 +12,6 @@ RELOC/tex/latex/multenum/multienum.sty catalogue-also shortlst paralist catalogue-ctan /macros/latex/contrib/multenum -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1 catalogue-topics list list-enum ++++++ multiaudience.doc.tar.xz ++++++ ++++++ multiaudience.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multiaudience.tlpobj new/tlpkg/tlpobj/multiaudience.tlpobj --- old/tlpkg/tlpobj/multiaudience.tlpobj 2016-04-14 19:28:36.000000000 +0200 +++ new/tlpkg/tlpobj/multiaudience.tlpobj 2017-04-14 17:51:46.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=1 RELOC/tex/latex/multiaudience/multiaudience.sty catalogue-ctan /macros/latex/contrib/multiaudience -catalogue-date 2015-08-05 05:51:16 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics cond-comp catalogue-version 1.03 ++++++ multibbl.doc.tar.xz ++++++ ++++++ multibbl.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multibbl.tlpobj new/tlpkg/tlpobj/multibbl.tlpobj --- old/tlpkg/tlpobj/multibbl.tlpobj 2016-04-14 19:28:36.000000000 +0200 +++ new/tlpkg/tlpobj/multibbl.tlpobj 2017-04-14 17:51:46.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/multibbl/multibbl.sty catalogue-ctan /macros/latex/contrib/multibbl -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics bibtex-multi bibtex-supp catalogue-version 1.1 ++++++ multibib.doc.tar.xz ++++++ ++++++ multibib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multibib.tlpobj new/tlpkg/tlpobj/multibib.tlpobj --- old/tlpkg/tlpobj/multibib.tlpobj 2016-04-14 19:28:37.000000000 +0200 +++ new/tlpkg/tlpobj/multibib.tlpobj 2017-04-14 17:51:46.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/makeindex/multibib/mbgind.ist RELOC/tex/latex/multibib/multibib.sty catalogue-ctan /macros/latex/contrib/multibib -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics bibtex-multi bibtex-supp catalogue-version 1.4 ++++++ multibibliography.doc.tar.xz ++++++ ++++++ multibibliography.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multibibliography.tlpobj new/tlpkg/tlpobj/multibibliography.tlpobj --- old/tlpkg/tlpobj/multibibliography.tlpobj 2016-04-14 19:28:37.000000000 +0200 +++ new/tlpkg/tlpobj/multibibliography.tlpobj 2017-04-14 17:51:47.000000000 +0200 @@ -16,7 +16,7 @@ texmf-dist/tex/latex/multibibliography/multibibliography.sty catalogue-also nmbib catalogue-ctan /macros/latex/contrib/multibibliography -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics bibtex-supp catalogue-version 1.03 ++++++ multicap.doc.tar.xz ++++++ ++++++ multicap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multicap.tlpobj new/tlpkg/tlpobj/multicap.tlpobj --- old/tlpkg/tlpobj/multicap.tlpobj 2016-04-14 19:28:38.000000000 +0200 +++ new/tlpkg/tlpobj/multicap.tlpobj 2017-04-14 17:51:47.000000000 +0200 @@ -12,6 +12,6 @@ RELOC/tex/latex/multicap/multicap.sty catalogue-also caption catalogue-ctan /macros/latex/contrib/multicap -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics caption ++++++ multidef.doc.tar.xz ++++++ ++++++ multidef.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multidef.tlpobj new/tlpkg/tlpobj/multidef.tlpobj --- old/tlpkg/tlpobj/multidef.tlpobj 2016-04-21 03:14:38.000000000 +0200 +++ new/tlpkg/tlpobj/multidef.tlpobj 2017-04-14 17:51:47.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=2 RELOC/tex/latex/multidef/multidef.sty catalogue-ctan /macros/latex/contrib/multidef -catalogue-date 2016-04-20 06:02:38 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macro-supp catalogue-version 1.10 ++++++ multido.doc.tar.xz ++++++ ++++++ multido.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multido.tlpobj new/tlpkg/tlpobj/multido.tlpobj --- old/tlpkg/tlpobj/multido.tlpobj 2016-04-14 19:28:39.000000000 +0200 +++ new/tlpkg/tlpobj/multido.tlpobj 2017-04-14 17:51:47.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/generic/multido/multido.tex RELOC/tex/latex/multido/multido.sty catalogue-ctan /macros/generic/multido -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics macro-supp catalogue-version 1.42 ++++++ multienv.doc.tar.xz ++++++ ++++++ multienv.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multienv.tlpobj new/tlpkg/tlpobj/multienv.tlpobj --- old/tlpkg/tlpobj/multienv.tlpobj 2016-04-14 19:28:39.000000000 +0200 +++ new/tlpkg/tlpobj/multienv.tlpobj 2017-04-14 17:51:47.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/multienv/multienv.sty catalogue-ctan /macros/latex/contrib/multienv -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macro-supp catalogue-version 1.0 ++++++ multiexpand.doc.tar.xz ++++++ ++++++ multiexpand.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multiexpand.tlpobj new/tlpkg/tlpobj/multiexpand.tlpobj --- old/tlpkg/tlpobj/multiexpand.tlpobj 2016-04-14 19:28:40.000000000 +0200 +++ new/tlpkg/tlpobj/multiexpand.tlpobj 2017-04-14 17:51:47.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=1 RELOC/tex/generic/multiexpand/multiexpand.sty catalogue-ctan /macros/generic/multiexpand -catalogue-date 2016-02-07 10:49:28 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macro-supp catalogue-version 1.4 ++++++ multiobjective.doc.tar.xz ++++++ ++++++ multiobjective.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multiobjective.tlpobj new/tlpkg/tlpobj/multiobjective.tlpobj --- old/tlpkg/tlpobj/multiobjective.tlpobj 2016-04-14 19:28:40.000000000 +0200 +++ new/tlpkg/tlpobj/multiobjective.tlpobj 2017-04-14 17:51:47.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/multiobjective/multiobjective.sty catalogue-ctan /macros/latex/contrib/multiobjective -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths-symbol catalogue-version 1.0 ++++++ multirow.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/multirow/README new/doc/latex/multirow/README --- old/doc/latex/multirow/README 2006-01-09 01:44:40.000000000 +0100 +++ new/doc/latex/multirow/README 2016-11-27 00:09:03.000000000 +0100 @@ -1,15 +1,30 @@ - multirow.sty V1.6 version (5-May-2004) +multirow.sty 2016/11/25 v2.2 +bigstruts.sty 2016/11/25 v2.2 +bigdelim.sty 2016/11/25 v2.2 - Author: Jerry Leichter <jerrold.leichter(a)smarts.com> - Piet van Oostrum <piet(a)cs.uu.nl> +Original Author: Jerry Leichter +Current Author: Piet van Oostrum <piet(a)vanoostrum.org> This file may be distributed under the terms of the LaTeX Project Public License, as described in lppl.txt in the base LaTeX distribution. - Either version 1 or, at your option, any later version. + Either version 1.3 or, at your option, any later version. + +Installation: + +To generate the .sty files, run the command + tex multirow.ins +and move the resulting .sty files to a place where LaTeX can find them, preferably +..../tex/latex/multirow + +Usage: + +multirow.sty: Make an entry that will span multiple rows of a table. -\multirow{nrows}[bigstruts]{width}[fixup]{text} +\multirow[vpos]{nrows}[bigstruts]{width}[vmove]{text} + +vpos is the vertical positioning: t. c. or b. nrows is the number of rows to span. It's up to you to leave the other rows empty, or the stuff created by \multirow will over-write it. @@ -24,18 +39,24 @@ width is the width to which the text is to be set, or * to indicate that the text argument's natural width is to be used. - text is the actual text. If the width was set explicitly, the text will +text is the actual text. If the width was set explicitly, the text will be set in a parbox of that width; you can use \\ to force linebreaks where you like. - If the width was given as * the text will be set in LR mode. If you + If the width was given as * the text will be set in LR mode. If you want a multiline entry in this case you should use a tabular or array in the text parameter. - The text is centered vertically within the range spanned by nrows. + If the width is given as = the width will be taken from the + tabular column in which it appears. This only works for p{} + columns and similar, for example X columns in tabularx, and LCRJ + columns in tabulary. -fixup is a length used for fine tuning: The text will be raised (or - lowered, if fixup is negative) by that length above (below) wherever + The text is centered vertically within the range spanned by nrows, + unless a vpos argument is given. + +vmove is a length used for fine tuning: The text will be raised (or + lowered, if vmove is negative) by that length above (below) wherever it would otherwise have gone. For example (using both multirow and bigstrut) @@ -67,47 +88,24 @@ If any of the spanned rows are unusually large, or if you're using bigstrut.sty and \bigstrut's are used assymetrically about the centerline of the spanned rows, the vertical centering may not come out right. Use the -fixup argument in this case. +vmove argument in this case. Just before "text" is expanded, the \multirowsetup macro is expanded to set up any special environment. Initially, \multirowsetup contains just \raggedright. It can be redefined with \renewcommand. + +bigstrut.sty: + +\bigstrut[pos] where pos is t or b + + Add a bit of space above, below, or both a tabular row. The amount + is determined by \bigstrutjot. + +bigdelim.sty: + +\ldelim({n}{width}[text] +\rdelim){n}{width}[text] -Bugs: It's just about impossible to deal correctly with descenders. The -text will be set up centered, but it may then have a baseline that doesn't -match the baseline of the stuff beside it, in particular if the stuff -beside it has descenders and "text" does not. This may result in a small -missalignment. About all that can be done is to do a final touchup on -"text", using the fixup optional argument. (Hint: If you use a measure -like .1ex, there's a reasonable chance that the fixup will still be correct -if you change the point size.) - -\multirow is mainly designed for use with table, as opposed to array, -environments. It will not work well in an array environment since the lines -have an extra \jot of space between them which it won't account for. Fixing -this is difficult in general, and doesn't seem worth it. The bigstruts -argument can be used to provide a semi-automatic fix: First set -\bigstrutjot to .5\jot. Then simply repeat nrows as the bigstruts argument. -This will be close, but probably not exact; you can use the fixup argument -to refine the result. (If you do this repeatedly, you'll probably want to -wrap these steps up in a simple macro. Note that the modified \bigstrutjot -value will not give reasonable results if you have bigstruts and use this -argument for its intended purpose elsewhere. In that case, you might want -to set it locally.) - -If you use \multirow with the colortbl package you have to take -precautions if you want to color the column that has the \multirow in it. -colortbl works by coloring each cell separately. So if you use \multirow -with a positive nrows value, colortbl will first color the top cell, then -\multirow will typeset nrows cells starting with this cell, and later -colortbl will color the other cells, effectively hiding the text in that -area. This can be solved by putting the \multirow is the last row with a -negative nrows value. -Example: - - \begin{tabular}{l>{\columncolor{yellow}}l} - aaaa & \\ - cccc & \\ - dddd & \multirow{-3}*{bbbb}\\ - \end{tabular} - \ No newline at end of file +Put a big delimiter over n rows in a tabular, optionally preceded +(\ldelim) or followed (rdelim) by text. + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/multirow/miscdoc.sty new/doc/latex/multirow/miscdoc.sty --- old/doc/latex/multirow/miscdoc.sty 2010-03-01 19:57:28.000000000 +0100 +++ new/doc/latex/multirow/miscdoc.sty 1970-01-01 01:00:00.000000000 +0100 @@ -1,108 +0,0 @@ -\ProvidesPackage{miscdoc}[2010/01/20 v1.2 documentation macros misc latex pkgs] - -% miscdoc.sty -% Copyright 2010 Robin Fairbairns -% -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainer of this work is Robin Fairbairns. -% -% This work consists of the file miscdoc.sty (only) - -\setcounter{errorcontextlines}{1274} - -% The package arose from a small exercise to document packages whose -% previous documentation consisted solely of comments in the package files. -% The macros here defined are lifted from the author's faq.sty -% (written for the UK TeX FAQ, CTAN:help/uk-tex-faq) or are inspired -% by others' work (credited where the author is known) ... except -% where they came as a flash of inspiration while actually writing the -% documentation. - -% this option suggested by Heiko Oberdiek, 2010-01-29 -\DeclareOption{hyper}{% - \AtEndOfPackage{% - \RequirePackage[pdfusetitle]{hyperref} - \RequirePackage{bookmark} - \bookmarksetup{numbered,open,openlevel=1} - } -} -\ProcessOptions\relax - -% note: T1 encoding assumed -\usepackage{lmodern} -\usepackage[T1]{fontenc} -\usepackage{booktabs} - -% from faq.sty -\newcommand\cs[1]{\texttt{\char`\\#1}} -\let\csx\cs -\def\bsbs{\cs{\char`\\}} - -% \cmdinvoke\cs<argument sequence> -% \cs typeset as above -% <argument sequence> may consist of optional or mandatory arguments; -% -% the `arguments' are simply typesett \texttt, as yet -- if something -% fancier is needed, there's a bunch of code needs rewriting here... -\DeclareRobustCommand\cmdinvoke{\@ifstar - {\let\@tempa\emph\@scmdinvoke}% - {\let\@tempa\relax\@scmdinvoke}% -} -\def\@scmdinvoke#1{\texttt{\symbol{92}#1}% - \futurelet\@let@token\@cmdinvoke -} -\def\@cmdinvoke{\ifx\@let@token\bgroup - \let\@tempb\@cmdinvoke@lbrace - \else - \ifx\@let@token[% ] - \let\@tempb\@cmdinvoke@lbrack - \else - \ifx\@let@token(% ) - \let\@tempb\@cmdinvoke@lparen - \else - \let\@tempb\@empty - \fi - \fi - \fi - \@tempb -} -\def\@cmdinvoke@lbrace#1{\penalty0\hskip0pt\relax - \texttt{\symbol{123}\@tempa{#1}\symbol{125}}% - \futurelet\@let@token\@cmdinvoke -} -\def\@cmdinvoke@lbrack[#1]{\penalty-150\hskip0pt\relax - \texttt{[\@tempa{#1}]}% - \futurelet\@let@token\@cmdinvoke -} -\def\@cmdinvoke@lparen(#1){\penalty-150\hskip0pt\relax - \texttt{(\@tempa{#1})}% - \futurelet\@let@token\@cmdinvoke -} -% and extension -- versions that take a single extra (delimiter) -% argument, such as \delcmdinvoke{lscrunge}( ... awful syntax, but... -\DeclareRobustCommand\delcmdinvoke{\@ifstar - {\let\@tempa\emph\@sdelcmdinvoke}% - {\let\@tempa\relax\@sdelcmdinvoke}% -} -\def\@sdelcmdinvoke#1#2{\texttt{\symbol{92}#1#2}% - \futurelet\@let@token\@cmdinvoke -} - -% sui generis -\newcommand\newitem{\par\addvspace{1ex}\noindent} - -% inspired by doc.sty in latex distribution -\newcommand\meta[1]{\ensuremath{\langle}\emph{#1}\ensuremath{\rangle}} - -% meaningful names, as in faq.sty -\let\environment\texttt -\let\Package\textsf Binary files old/doc/latex/multirow/multirow.pdf and new/doc/latex/multirow/multirow.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/multirow/multirow.tex new/doc/latex/multirow/multirow.tex --- old/doc/latex/multirow/multirow.tex 2010-03-01 19:57:28.000000000 +0100 +++ new/doc/latex/multirow/multirow.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,242 +0,0 @@ -\documentclass[a4paper]{article} -\usepackage[a4paper]{geometry} -\usepackage{miscdoc,multirow,bigstrut,bigdelim,colortbl} -\newcommand{\minitab}[2][l]{\begin{tabular}{#1}#2\end{tabular}} - -\begin{document} -\title{The \Package{multirow}, - \Package{bigstrut} and - \Package{bigdelim} packages} -\author{Piet van Oostrum\thanks{catalogued ``active author''}\\ - \O{}ystein Bache\\ - Jerry Leichter\thanks{Documentation put together by Robin - Fairbairns}} -\maketitle - -\section{Introduction} -These packages offer a series of extensions to the standard \LaTeX{} -\texttt{tabular} environment. Their respective functions are: -\begin{description} -\item[\Package{multirow}] which provides a construction for table cells - that span more than one row of the table; -\item[\Package{bigdelim}] which creates an appropriately-sized - delimiter (for example, brace, parenthesis or bracket) to fit in a - single multirow, to indicate a relationship between other rows; and -\item[\Package{bigstrut}] which creates struts which (slightly) stretch - the table row in which they sit. -\end{description} - -\section{Using \Package{multirow}}\label{sec:multirow} - -The basic syntax is: -\begin{quote} - \cmdinvoke*{multirow}{nrows}[bigstruts]{width}[fixup]{text} -\end{quote} -where -\begin{description} -\item[\emph{nrows}] is the number of rows to span. It's up to you to - leave the other rows empty, or the stuff created by \cs{multirow} - will over-write it. With a positive value of \emph{nrows} the - spanned columns are this row and (\emph{nrows}-1) rows below - it. With a negative value of \emph{nrows} they are this row and - (1-\emph{nrows}) above it. -\item[\emph{bigstruts}] is mainly used if you've used the - \Package{bigstrut}. In that case it is the total number of uses of - \cs{bigstrut} within the rows being spanned. Count 2 uses for each - \cs{bigstrut}, 1 for each \cmdinvoke*{bigstrut}[x] where \emph{x} is - either \texttt{t} or \texttt{b}. The default is 0. -\item[\emph{width}] is the width to which the text is to be set, or - \texttt{*} to indicate that the text argument's natural width is to - be used. -\item[\emph{text}] is the actual text of the construct. If the width - was set explicitly, the text will be set in a \cs{parbox} of that - width; you can use \bsbs{} to force linebreaks where you like. - - If the width was given as \texttt{*} the text will be set in LR - mode. If you want a multiline entry in this case you should use a - \texttt{tabular} or \texttt{array} environment in the text - parameter. -\item[\emph{fixup}] is a length used for fine tuning: the text will be - raised (or lowered, if \emph{fixup} is negative) by that length - above (below) wherever it would otherwise have gone. -\end{description} -For example (using both multirow and bigstrut): -\begin{quote} -\begin{verbatim} -\newcommand{\minitab}[2][l]{\begin{tabular}{#1}#2\end{tabular}} -\begin{tabular}{|c|c|} -\hline -\multirow{4}{1in}{Common g text} & Column g2a\\ - & Column g2b \\ - & Column g2c \\ - & Column g2d \\ -\hline -\multirow{3}[6]*{Common g text} & Column g2a\bigstrut\\\cline{2-2} - & Column g2b \bigstrut\\\cline{2-2} - & Column g2c \bigstrut\\ -\hline -\multirow{4}[8]{1in}{Common g text} & Column g2a\bigstrut\\\cline{2-2} - & Column g2b \bigstrut\\\cline{2-2} - & Column g2c \bigstrut\\\cline{2-2} - & Column g2d \bigstrut\\ -\hline -\multirow{4}*{\minitab[c]{Common \\ g text}} & Column g2a\\ - & Column g2b \\ - & Column g2c \\ - & Column g2d \\ -\hline -\end{tabular} -\end{verbatim} -\end{quote} -which will appear as: -\begin{quote} - \begin{tabular}{|c|c|} - \hline - \multirow{4}{1in}{Common g text} & Column g2a\\ - & Column g2b \\ - & Column g2c \\ - & Column g2d \\ - \hline - \multirow{3}[6]*{Common g text} & Column g2a\bigstrut\\\cline{2-2} - & Column g2b \bigstrut\\\cline{2-2} - & Column g2c \bigstrut\\ - \hline - \multirow{4}[8]{1in}{Common g text} & Column g2a\bigstrut\\\cline{2-2} - & Column g2b \bigstrut\\\cline{2-2} - & Column g2c \bigstrut\\\cline{2-2} - & Column g2d \bigstrut\\ - \hline - \multirow{4}*{\minitab[c]{Common \\ g text}} & Column g2a\\ - & Column g2b \\ - & Column g2c \\ - & Column g2d \\ - \hline - \end{tabular} -\end{quote} - -If any of the spanned rows are unusually large, or if you're using the -\Package{bigstrut} and \cs{bigstrut}s are used asymetrically about the -centerline of the spanned rows, the vertical centering may not come -out right. Use the fixup argument in this case. - -Just before \emph{text} is expanded, the \cs{multirowsetup} macro is -expanded to set up any special environment. Initially, -\cs{multirowsetup} contains just \cs{raggedright}. It may be -redefined with \cs{renewcommand}. - -It's just about impossible to deal correctly with descenders. The -text will be set up centred, but it may then have a baseline that -doesn't match the baseline of the stuff beside it, in particular if -the stuff beside it has descenders and \emph{text} does not. This may -result in a small misalignment. About all that can be done is to do a -final touchup on \emph{text}, using the fixup optional argument. -(Hint: If you use a measure like \texttt{.1ex}, there's a reasonable -chance that the fixup will still be correct if you change the point -size.) - -\cs{multirow} is mainly designed for use with \environment{table}, as -opposed to \environment{array}, environments. It will not work well in an -array environment since the lines have an extra \texttt{jot} of space -between them which it won't account for. Fixing this is difficult in -general, and doesn't seem worth it. The \emph{bigstruts} argument may -be used to provide a semi-automatic fix: First set \cs{bigstrutjot} to -\texttt{.5}\cs{jot}. Then simply repeat \emph{nrows} as the bigstruts -argument. This will be close, but probably not exact; you can use the -fixup argument to refine the result. (If you do this repeatedly, -you'll probably want to wrap these steps up in a simple macro. Note -that the modified \cs{bigstrutjot} value will not give reasonable -results if you have bigstruts and use this argument for its intended -purpose elsewhere. In that case, you might want to set it locally.) - -If you use \cs{multirow} with the \Package{colortbl} package you have -to take precautions if you want to colour the column that has the -\cs{multirow} in it. \Package{colortbl} works by colouring each cell -separately. So if you use \cs{multirow} with a positive \emph{nrows} -value, \Package{colortbl} will first color the top cell, then -\cs{multirow} will typeset \emph{nrows} cells starting with this cell, -and later \Package{colortbl} will color the other cells, effectively -hiding the text in that area. This can be solved by putting the -\cs{multirow} in the last row with a negative \emph{nrows} value. -See, for example: -\begin{quote} -\begin{verbatim} -\begin{tabular}{l>{\columncolor{yellow}}l} - aaaa & \\ - cccc & \\ - dddd & \multirow{-3}*{bbbb}\\ -\end{tabular} -\end{verbatim} -\end{quote} -which will produce: -\begin{quote} - \begin{tabular}{l>{\columncolor{yellow}}l} - aaaa & \\ - cccc & \\ - dddd & \multirow{-3}*{bbbb}\\ - \end{tabular} -\end{quote} - -\section{Using \Package{bigstrut}} - -\cmdinvoke*{bigstrut}[x] produces a strut which is \cs{bigstrutjot} -(\texttt{2pt} by default) higher, lower, or both than the standard -array/table strut. Use it in table entries that are adjacent to -\cs{hline}s to leave an extra bit of space\,---\,according to the -TeXbook (page 246), ``This is a little touch that improves the -appearance of boxed tables; look for it as a mark of quality.'' - -Although you could use \cs{bigstrut} in an array, there isn't normally -much point since arrays are `opened up' by \cs{jot} anyway. - -\cmdinvoke{bigstrut}[t] adds height; \cmdinvoke{bigstrut}[b] adds -depth. Just \cs{bigstrut} adds both. So: Use -\cmdinvoke{bigstrut}[t] in the row just \emph{after} an \cs{hline}; -\cmdinvoke{bigstrut}[b] in the row just \emph{before}; and -\cs{bigstrut} if there are \cs{hline}s both before and after. - -Spaces after the \cs{bigstrut} are ignored, even if it has an optional -argument. Spaces before the \cs{bigstrut} are generally ignored (by a -single \unskip). - -Note: The \Package{multirow} package makes use of \cs{bigstrutjot}. If -both styles are used, they can be used in either order, as each checks -to see if the other has already defined \cs{bigstrutjot}. However, -the default values they set are different: if only \Package{multirow} -is used, \cs{bigstrutjot} will be set to \texttt{3pt}. If -\Package{bigstrut} is used, with or without \Package{multirow}, -\cs{bigstrutjot} will be \texttt{2pt}. - -\section{Using \Package{bigdelim}} - -The package is for working in a \environment{table} or \environment{array} -environment, in which the \Package{multirow} packages is also used. - -Syntax of use is -\begin{quote} - \delcmdinvoke*{ldelim}({n}{width}[text]\\ - \delcmdinvoke*{rdelim}){n}{width}[text] -\end{quote} -The commands are used in a column of a \environment{tabular} or -\environment{array}; they create a big parenthesis, brace or whatever -delimiter that extends over the \emph{n} rows starting at the one -containing the command. Corresponding cells in the following rows -must be explicitly given (as empty cells). - -The first parameter is a delimiter to be used, e.g., \cs{\char`\{} -\cs{\char`\}} \texttt{[} \texttt{]} \texttt{(} \texttt{)}\,---\,in fact, -anything that can be used with \cs{left} or \cs{right}, as appropriate. - -The optional \emph{text} is set centred to the left of \cs{ldelim} or -to the right of \cs{rdelim}. The \emph{width} is that reserved for -the delimiter and its text; with a current copy of the -\Package{multirow} package, the \emph{width} may be given as -\texttt{*}, but that may cause the delimiters to be too small. - -Also with a recent version of \Package{multirow} the commands may be -used in the last row of the extension with a negative \emph{n} -parameter. This is useful in combination with \Package{colortbl} (see -the discussion in section \ref{sec:multirow} on \Package{multirow}). -If there are unusually tall rows you may have to enlarge \emph{n} (you -can use non-integral values). - -\end{document} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multirow.doc.tlpobj new/tlpkg/tlpobj/multirow.doc.tlpobj --- old/tlpkg/tlpobj/multirow.doc.tlpobj 2016-04-14 19:28:40.000000000 +0200 +++ new/tlpkg/tlpobj/multirow.doc.tlpobj 2017-04-14 17:51:48.000000000 +0200 @@ -1,10 +1,8 @@ name multirow.doc category Package -revision 17256 +revision 42588 shortdesc doc files of multirow relocated 1 -docfiles size=77 +docfiles size=150 RELOC/doc/latex/multirow/README - RELOC/doc/latex/multirow/miscdoc.sty RELOC/doc/latex/multirow/multirow.pdf - RELOC/doc/latex/multirow/multirow.tex ++++++ multirow.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/multirow/bigdelim.sty new/tex/latex/multirow/bigdelim.sty --- old/tex/latex/multirow/bigdelim.sty 2006-01-13 01:00:01.000000000 +0100 +++ new/tex/latex/multirow/bigdelim.sty 2016-11-27 00:09:04.000000000 +0100 @@ -1,68 +1,43 @@ -% bigdelim.sty -% version 1.0 -% Nov 5, 1999 -% Piet van Oostrum <piet(a)cs.uu.nl> -% From bigbrace.sty : Oct 2, 1994 \Oystein Bache <bache(a)kjemi.unit.no> -% from: \dobrace by piet(a)cs.ruu.nl (Piet van Oostrum): %% -%% This file may be distributed under the terms of the LaTeX Project Public -%% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1 or, at your option, any later version. +%% This is file `bigdelim.sty', +%% generated with the docstrip utility. %% -% -% Usage in a tabular or array: -% \usepackage{multirow} -% \usepackage{bigdelim} -% \ldelim({n}{w}[text] -% \rdelim){n}{w}[text] -% Use these commands in a column of a tabular or array. They generate a big -% parenthesis/brace extending over the next n rows (including this one). -% The corresponding entries in the next rows must explicitely be given as -% empty cells. The first parameter must be the delimiter to be used, e.g. -% \{ \} [ ] ( ), in fact any parameter that can be used with \left and -% \right. The text is optional and is set centered to the left of -% \ldelim and to the right of \rdelim. w must be the width reserved for -% the brace and text. If you have a recent version of multirow.sty {w} may -% be given as {*}, but this may cause the braces to be too small. Also with -% a recent version of multirow.sty the commands may be used in the last row -% of the extension with a negative n parameter. This is useful in -% combination with the colortbl package (see multirow.sty) -% If there are unusually large rows you may have to enlarge n (you can use -% non-integral values). -% If you have horizontal lines that interact with the braces you are -% advised to use the hhline package to make the lines. - -\def\ldelim#1#2#3{\@ifnextchar[{\@ldelim{#1}{#2}{#3}}{\@ldelim{#1}{#2}{#3}[\null]}} +%% The original source files were: +%% +%% multirow.dtx (with options: `bigdelim') +%% +%% This is a generated file. +%% +%% This file may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, either version 1.3 of this license +%% or (at your option) any later version. The latest version of this +%% license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.3 or later is part of all distributions of LaTeX version +%% 2005/12/01 or later. +%% +%% Copyright (C) 1994 by \O ystein Bache +%% Copyright (C) 2016 by Piet van Oostrum <piet(a)vanoostrum.org> +%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{bigdelim} + [2016/11/25 v2.2 + Create big delimiters in tabular or array] +\RequirePackage{multirow} +\newcommand\ldelim[3]{\@ifnextchar[{\@ldelim{#1}{#2}{#3}}{\@ldelim{#1}{#2}{#3}[\null]}} \def\@ldelim#1#2#3[#4]% {\multirow{#2}{#3}{% \ensuremath - {\left.\vcenter{\hsize=0pt\vrule height - \ifnum #2<0 -\fi#2\baselineskip width 0pt}% + {\left.\vcenter{\hsize=0pt\vrule height \multirow@dima width 0pt}% \textrm{#4}\right#1}}} -% -\def\rdelim#1#2#3{\@ifnextchar[{\@rdelim{#1}{#2}{#3}}{\@rdelim{#1}{#2}{#3}[\null]}} +\newcommand\rdelim[3]{\@ifnextchar[{\@rdelim{#1}{#2}{#3}}{\@rdelim{#1}{#2}{#3}[\null]}} \def\@rdelim#1#2#3[#4]% {\multirow{#2}{#3}{% \ensuremath - {\left#1\vcenter{\hsize=0pt\vrule height - \ifnum #2<0 -\fi#2\baselineskip width 0pt}% + {\left#1\vcenter{\hsize=0pt\vrule height \multirow@dima width 0pt}% \textrm{#4}\right.}}} -% \endinput -% -% Example: -\documentclass{article} -\usepackage{multirow} -\usepackage{bigdelim} -\begin{document} - -\begin{equation} - \begin{array}{ccccccc} - \ldelim({4}{4mm}& x & x & x & x &\rdelim){4}{4mm} \\ - & x & x & x & x & & i\\ - & x & x & x & x & & j\\ - & x & x & x & x & \\ - & & u & v & & - \end{array} -\end{equation} -\end{document} +%% +%% End of file `bigdelim.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/multirow/bigstrut.sty new/tex/latex/multirow/bigstrut.sty --- old/tex/latex/multirow/bigstrut.sty 2006-01-13 01:00:01.000000000 +0100 +++ new/tex/latex/multirow/bigstrut.sty 2016-11-27 00:09:04.000000000 +0100 @@ -1,41 +1,36 @@ %% -%% bigstrut.sty V1.0 (31-May-94) +%% This is file `bigstrut.sty', +%% generated with the docstrip utility. %% -%% Author: Jerry Leichter <jerrold.leichter(a)smarts.com> +%% The original source files were: %% -%% V1.0 Split out as a separate style file. +%% multirow.dtx (with options: `bigstrut') +%% +%% This is a generated file. +%% +%% This file may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, either version 1.3 of this license +%% or (at your option) any later version. The latest version of this +%% license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.3 or later is part of all distributions of LaTeX version +%% 2005/12/01 or later. +%% +%% Copyright (C) 1994 by Jerry Leichter +%% Copyright (C) 2016 by Piet van Oostrum <piet(a)vanoostrum.org> %% -%% This file may be distributed under the terms of the LaTeX Project Public -%% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1 or, at your option, any later version. -%% -% \bigstrut[x] produces a strut which is \bigstrutjot (2pt by default) higher, -% lower, or both than the standard array/table strut. Use it in table entries -% that are adjacent to \hline's to leave an extra bit of space - according to -% the TeXbook (page 246), "This is a little touch that improves the appearance -% of boxed tables; look for it as a mark of quality." -% -% Although you could use \bigstrut in an array, there isn't normally much -% point since arrays are "opened up" by \jot anyway. -% -% \bigstrut[t] adds height; \bigstrut[b] adds depth. Just \bigstrut adds -% both. So: Use \bigstrut[t] in the row just *after* an \hline; \bigstrut[b] -% in the row just *before*; and \bigstrut if there are \hline's both before -% and after. -% -% Spaces after the \bigstrut are ignored, even if it has an optional argument. -% Spaces before the \bigstrut are generally ignored (by a single \unskip). -% -% Note: The multirow style file makes use of \bigstrutjot. If both styles -% are used, they can be used in either order, as each checks to see if the -% other has already defined \bigstrutjot. However, the default values they -% set are different: If only multirow is used, \bigstrutjot will be set to -% 3pt. If bigstrut is used, with or without multirow, \bigstrutjot will be -% 2pt. - -\@ifundefined{bigstrutjot}{\newdimen\bigstrutjot}{}\bigstrutjot2pt -\def\bigstrut{\relax\@ifnextchar [{\@bigstrut}{\@bigstrut[x]}} -\def\@bigstrut[#1]{\unskip\@tempdima\ht\@arstrutbox \@tempdimb\dp\@arstrutbox - \ifx #1b\else \advance\@tempdima by \bigstrutjot\fi - \ifx #1t\else \advance\@tempdimb by \bigstrutjot\fi +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{bigstrut} + [2016/11/25 v2.2 + Provide larger struts in tabulars] +\@ifundefined{bigstrutjot}{\newdimen\bigstrutjot}{}\bigstrutjot=2pt +\newcommand\bigstrut[1][x]{% + \unskip\@tempdima=\ht\@arstrutbox \@tempdimb=\dp\@arstrutbox + \ifx #1b\relax \else \advance\@tempdima by \bigstrutjot\fi + \ifx #1t\relax \else \advance\@tempdimb by \bigstrutjot\fi \hbox{\vrule \@height\@tempdima \@depth\@tempdimb \@width\z@}\ignorespaces} +\endinput +%% +%% End of file `bigstrut.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/multirow/multirow.sty new/tex/latex/multirow/multirow.sty --- old/tex/latex/multirow/multirow.sty 2006-01-13 01:00:01.000000000 +0100 +++ new/tex/latex/multirow/multirow.sty 2016-11-27 00:09:04.000000000 +0100 @@ -1,159 +1,154 @@ %% -%% multirow.sty V1.6 version (5-May-2004) +%% This is file `multirow.sty', +%% generated with the docstrip utility. %% -%% Author: Jerry Leichter <jerrold.leichter(a)smarts.com> -%% Piet van Oostrum <piet(a)cs.uu.nl> +%% The original source files were: %% -%% This file may be distributed under the terms of the LaTeX Project Public -%% License, as described in lppl.txt in the base LaTeX distribution. -%% Either version 1 or, at your option, any later version. +%% multirow.dtx (with options: `multirow') +%% +%% This is a generated file. +%% +%% This file may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, either version 1.3 of this license +%% or (at your option) any later version. The latest version of this +%% license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.3 or later is part of all distributions of LaTeX version +%% 2005/12/01 or later. +%% +%% Copyright (C) 1994 by Jerry Leichter +%% Copyright (C) 2016 by Piet van Oostrum <piet(a)vanoostrum.org> %% -%% V1.0 was distributed anonymously, based on a Usenet posting that was -%% not intended for stand-alone use. -%% V1.1 was modified by Piet van Oostrum <piet(a)cs.uu.nl> to allow it to -%% work without bigstrut.sty. -%% V1.2 was modified by Jerry Leichter for the same goal, but using a -%% different approach which will work properly in conjunction with -%% bigstrut.sty. -%% V1.2a was modified by Piet van Oostrum <piet(a)cs.uu.nl> to use \vskip -%% instead of \raise in positioning, avoiding making rows too high -%% when the adjustment is large. -%% V1.3 was modified by Piet van Oostrum to work properly in a p{} column -%% (\leavevmode added) -%% V1.4 was modified by Piet van Oostrum to check for the special case that -%% the width is given as an *. In this case the natural -%% width of the text argument will be used and the argument -%% is processed in LR-mode. -%% V1.5 was modified by Piet van Oostrum: Added a % after \hbox{#5}\vfill}. -%% Added \struts around #5 for better vertical positioning. -%% Additional coding for negative value of nrows. -%% V1.6 was modified by Piet van Oostrum: Replace a space by \relax after -%% \advance\@tempdima#4. -%% -% Make an entry that will span multiple rows of a table. -% -% \multirow{nrows}[bigstruts]{width}[fixup]{text} -% -% nrows is the number of rows to span. It's up to you to leave the other -% rows empty, or the stuff created by \multirow will over-write it. -% With a positive value of nrows the spanned colomns are this row and -% (nrows-1) rows below it. With a negative value of nrows they are -% this row and (1-nrows) above it. -% -% bigstruts is mainly used if you've used bigstrut.sty. In that case it -% is the total number of uses of \bigstrut within the rows being -% spanned. Count 2 uses for each \bigstrut, 1 for each \bigstrut[x] -% where x is either t or b. The default is 0. -% width is the width to which the text is to be set, or * to indicate that -% the text argument's natural width is to be used. -% -% text is the actual text. If the width was set explicitly, the text will -% be set in a parbox of that width; you can use \\ to force linebreaks -% where you like. -% -% If the width was given as * the text will be set in LR mode. If you -% want a multiline entry in this case you should use a tabular or array -% in the text parameter. -% -% The text is centered vertically within the range spanned by nrows. -% -% fixup is a length used for fine tuning: The text will be raised (or -% lowered, if fixup is negative) by that length above (below) wherever -% it would otherwise have gone. -% -% For example (using both multirow and bigstrut) -% -% \newcommand{\minitab}[2][l]{\begin{tabular}{#1}#2\end{tabular}} -% \begin{tabular}{|c|c|} -% \hline -% \multirow{4}{1in}{Common g text} & Column g2a\\ -% & Column g2b \\ -% & Column g2c \\ -% & Column g2d \\ -% \hline -% \multirow{3}[6]*{Common g text} & Column g2a\bigstrut\\\cline{2-2} -% & Column g2b \bigstrut\\\cline{2-2} -% & Column g2c \bigstrut\\ -% \hline -% \multirow{4}[8]{1in}{Common g text} & Column g2a\bigstrut\\\cline{2-2} -% & Column g2b \bigstrut\\\cline{2-2} -% & Column g2c \bigstrut\\\cline{2-2} -% & Column g2d \bigstrut\\ -% \hline -% \multirow{4}*{\minitab[c]{Common \\ g text}} & Column g2a\\ -% & Column g2b \\ -% & Column g2c \\ -% & Column g2d \\ -% \hline -% \end{tabular} -% -% If any of the spanned rows are unusually large, or if you're using -% bigstrut.sty and \bigstrut's are used assymetrically about the centerline of -% the spanned rows, the vertical centering may not come out right. Use the -% fixup argument in this case. -% -% Just before "text" is expanded, the \multirowsetup macro is expanded to -% set up any special environment. Initially, \multirowsetup contains just -% \raggedright. It can be redefined with \renewcommand. -% -% Bugs: It's just about impossible to deal correctly with descenders. The -% text will be set up centered, but it may then have a baseline that doesn't -% match the baseline of the stuff beside it, in particular if the stuff -% beside it has descenders and "text" does not. This may result in a small -% missalignment. About all that can be done is to do a final touchup on -% "text", using the fixup optional argument. (Hint: If you use a measure -% like .1ex, there's a reasonable chance that the fixup will still be correct -% if you change the point size.) -% -% \multirow is mainly designed for use with table, as opposed to array, -% environments. It will not work well in an array environment since the lines -% have an extra \jot of space between them which it won't account for. Fixing -% this is difficult in general, and doesn't seem worth it. The bigstruts -% argument can be used to provide a semi-automatic fix: First set -% \bigstrutjot to .5\jot. Then simply repeat nrows as the bigstruts argument. -% This will be close, but probably not exact; you can use the fixup argument -% to refine the result. (If you do this repeatedly, you'll probably want to -% wrap these steps up in a simple macro. Note that the modified \bigstrutjot -% value will not give reasonable results if you have bigstruts and use this -% argument for its intended purpose elsewhere. In that case, you might want -% to set it locally.) -% -% If you use \multirow with the colortbl package you have to take -% precautions if you want to color the column that has the \multirow in it. -% colortbl works by coloring each cell separately. So if you use \multirow -% with a positive nrows value, colortbl will first color the top cell, then -% \multirow will typeset nrows cells starting with this cell, and later -% colortbl will color the other cells, effectively hiding the text in that -% area. This can be solved by putting the \multirow is the last row with a -% negative nrows value. -% Example: -% -% \begin{tabular}{l>{\columncolor{yellow}}l} -% aaaa & \\ -% cccc & \\ -% dddd & \multirow{-3}*{bbbb}\\ -% \end{tabular} -% -\def\multirowsetup{\raggedright} -\def\multirow#1{\relax\@ifnextchar - [{\@multirow{#1}}{\@multirow{#1}[0]}} -\def\@multirow#1[#2]#3{\@ifnextchar [{\@xmultirow{#1}[#2]{#3}}% - {\@xmultirow{#1}[#2]{#3}[0pt]}} -\def\@xmultirow#1[#2]#3[#4]#5{\@tempcnta=#1% - \@tempdima\@tempcnta\ht\@arstrutbox - \advance\@tempdima\@tempcnta\dp\@arstrutbox - \ifnum\@tempcnta<0\@tempdima=-\@tempdima\fi - \advance\@tempdima#2\bigstrutjot - \if*#3\setbox0\vtop to \@tempdima{\vfill\multirowsetup - \hbox{\strut#5\strut}\vfill}% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{multirow}% + [2016/11/25 v2.2 + Span multiple rows of a table]% +\newif\ifmultirowdebug +\DeclareOption{debug}{\multirowdebugtrue} +\DeclareOption{longtable}{% +\AtBeginDocument{% +\def\@cline#1-#2\@nil{% + \omit + \@multicnt#1% + \advance\@multispan\m@ne + \ifnum\@multicnt=\@ne\@firstofone{&\omit}\fi + \@multicnt#2% + \advance\@multicnt-#1% + \advance\@multispan\@ne + \leaders\hrule\@height\arrayrulewidth\hfill + \cr + \noalign{\nobreak\vskip-\arrayrulewidth}} +}} +\DeclareOption{supertabular}{% +\AtBeginDocument{% +\def\ST@tabularcr{% + {\ifnum0=`}\fi + \@ifstar{\MRST@xtabularcr}{\ST@xtabularcr}} +\def\MRST@xtabularcr{% + \@ifnextchar[%] + {\MRST@argtabularcr}% + {\ifnum0=`{\fi}\cr\MRST@cr}} +\def\MRST@argtabularcr[#1]{% + \ifnum0=`{\fi}% + \ifdim #1>\z@ + \unskip\MRST@xargarraycr{#1} \else - \setbox0\vtop to \@tempdima{\hsize#3\@parboxrestore - \vfill \multirowsetup \strut#5\strut\par\vfill}% - \fi - \ht0\z@\dp0\z@ - \ifnum\@tempcnta<0\advance\@tempdima-\dp\@arstrutbox - \else\@tempdima=\ht\@arstrutbox - \ifnum#2>0 \advance\@tempdima\bigstrutjot \fi + \MRST@yargarraycr{#1}% + \fi} +\def\MRST@xargarraycr#1{% + \@tempdima #1\advance\@tempdima \dp \@arstrutbox + \vrule \@height\z@ \@depth\@tempdima \@width\z@ \cr + \noalign{\global\ST@toadd=#1}\MRST@cr} +\def\MRST@yargarraycr#1{% + \cr\noalign{\vskip #1\global\MRST@toadd=#1}\MRST@cr} +\def\MRST@cr{% + \noalign{% + \ifnum\ST@pboxht<\ST@lineht + \global\advance\ST@pageleft -\ST@lineht + \global\ST@prevht\ST@lineht + \else + \global\advance\ST@pageleft -\ST@pboxht + \global\advance\ST@pageleft -0.1\ST@pboxht + \global\advance\ST@pageleft -\ST@stretchht + \global\ST@prevht\ST@pboxht + \global\ST@pboxht\z@ + \fi + \global\advance\ST@pageleft -\ST@toadd + \global\ST@toadd=\z@}} +} +\def\STneed#1{\ifdim\ST@pageleft<#1\ST@newpage\ST@next\fi} +} +\ProcessOptions +\newlength{\multirow@colwidth} +\newcount\multirow@cntb +\newlength\multirow@dima +\def\multirow@setcolwidth#1{% + \ifx\TY@final\multirow@undefined \multirow@colwidth=\hsize + \else + \ifx\TY@box\TY@box@v\multirow@colwidth=\hsize + \else \setbox0\hbox + {\let\\\space\let\newline\space #1}\multirow@colwidth=\wd0 + \fi + \fi} +\newcommand\multirowsetup{\raggedright} +\long\def\multirow@vbox#1#2#3{\setbox0\vtop to \multirow@dima{#2% + \if #1t\relax\else\vfill\fi + \multirowsetup #3\if #1b\relax\else\vfill\fi}} +%% \multirow [vpos] {nrows} [bigstruts] {width} [vmove] {text} +\newcommand\multirow[2][c]{\@multirow[#1]{#2}} +\def\@multirow[#1]#2{\@ifnextchar[{\@@multirow[#1]#2}{\@@multirow[#1]#2[0]}} +\def\@@multirow[#1]#2[#3]#4{\@ifnextchar[{\@xmultirow[#1]{#2}[#3]{#4}}% + {\@xmultirow[#1]{#2}[#3]{#4}[0pt]}} +\newif\ifmultirow@prefixt +\newif\ifmultirow@prefixb +\def\multirow@piii#1#2#3\end{\multirow@prefixtfalse\multirow@prefixbfalse + \if t#1\multirow@prefixttrue + \if b#2\multirow@prefixbtrue \multirow@cntb=#3% + \else \multirow@cntb=#2#3% + \fi + \else + \if b#1\multirow@prefixbtrue \multirow@cntb=#2#3% + \else \multirow@cntb=#1#2#3% + \fi + \fi} +\def\@xmultirow[#1]#2[#3]#4[#5]#6{% + \expandafter\multirow@piii#3\relax\end% + \multirow@dima=#2\ht\@arstrutbox + \advance\multirow@dima#2\dp\@arstrutbox + \ifdim#2pt<\z@\multirow@dima=-\multirow@dima\fi + \advance\multirow@dima \multirow@cntb\bigstrutjot + \if*#4\multirow@vbox{#1}{}{\hbox{\strut#6\strut}}% + \else \if=#4\multirow@setcolwidth{#6}% + \multirow@vbox{#1}{\hsize\multirow@colwidth\@parboxrestore}{\strut#6\strut\par}% + \else \multirow@vbox{#1}{\hsize#4\@parboxrestore}{\strut#6\strut\par}% + \fi \fi + \ifdim#2pt>\z@ + \if#1t\relax\multirow@dima=\ht0\else + \multirow@dima=\ht\@arstrutbox + \ifmultirow@prefixt \advance\multirow@dima\bigstrutjot\fi + \if#1b\relax \advance\multirow@dima\dp\@arstrutbox + \ifmultirow@prefixb \advance\multirow@dima\bigstrutjot\fi + \fi + \fi + \else + \if#1b\relax\else + \advance\multirow@dima-\dp\@arstrutbox + \ifmultirow@prefixb \advance\multirow@dima-\bigstrutjot\fi + \if#1t\relax\advance\multirow@dima-\ht\@arstrutbox + \ifmultirow@prefixt \advance\multirow@dima-\bigstrutjot\fi + \advance\multirow@dima\ht0 + \fi + \fi \fi - \advance\@tempdima#4\relax\leavevmode\vtop{\vskip-\@tempdima\box0\vss}} -\@ifundefined{bigstrutjot}{\newdimen\bigstrutjot \bigstrutjot\jot}{} + \advance\multirow@dima#5\relax + \leavevmode + \setbox0\vtop{\vskip-\multirow@dima\box0\vss}\dp0=\z@ + \ifmultirowdebug{\showboxdepth=5 \showboxbreadth=10 \showbox0}\fi + \box0 +} +\@ifundefined{bigstrutjot}{\newdimen\bigstrutjot \bigstrutjot=\jot}{} +\endinput +%% +%% End of file `multirow.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multirow.tlpobj new/tlpkg/tlpobj/multirow.tlpobj --- old/tlpkg/tlpobj/multirow.tlpobj 2016-04-14 19:28:40.000000000 +0200 +++ new/tlpkg/tlpobj/multirow.tlpobj 2017-04-14 17:51:48.000000000 +0200 @@ -1,6 +1,6 @@ name multirow category Package -revision 17256 +revision 42588 shortdesc Create tabular cells spanning multiple rows relocated 1 longdesc The package has a lot of flexibility, including an option for @@ -13,7 +13,7 @@ RELOC/tex/latex/multirow/multirow.sty catalogue-also bigstrut bigdelim catalogue-ctan /macros/latex/contrib/multirow -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl1 +catalogue-date 2016-11-25 20:42:27 +0100 +catalogue-license lppl1.3 catalogue-topics table -catalogue-version 1.6 +catalogue-version 2.2 ++++++ munich.doc.tar.xz ++++++ ++++++ munich.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/munich.tlpobj new/tlpkg/tlpobj/munich.tlpobj --- old/tlpkg/tlpobj/munich.tlpobj 2016-04-14 19:28:41.000000000 +0200 +++ new/tlpkg/tlpobj/munich.tlpobj 2017-04-14 17:51:48.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=8 RELOC/bibtex/bst/munich/munich.bst catalogue-ctan /biblio/bibtex/contrib/munich -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics bibtex-sty ++++++ musixguit.doc.tar.xz ++++++ ++++++ musixguit.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musixguit.tlpobj new/tlpkg/tlpobj/musixguit.tlpobj --- old/tlpkg/tlpobj/musixguit.tlpobj 2016-04-14 19:28:41.000000000 +0200 +++ new/tlpkg/tlpobj/musixguit.tlpobj 2017-04-14 17:51:48.000000000 +0200 @@ -8,7 +8,7 @@ runfiles size=3 RELOC/tex/latex/musixguit/musixguit.sty catalogue-ctan /macros/latex/contrib/musixguit -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics music catalogue-version 1.2.2 ++++++ musixtex-fonts.doc.tar.xz ++++++ ++++++ musixtex-fonts.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musixtex-fonts.tlpobj new/tlpkg/tlpobj/musixtex-fonts.tlpobj --- old/tlpkg/tlpobj/musixtex-fonts.tlpobj 2016-04-14 19:28:46.000000000 +0200 +++ new/tlpkg/tlpobj/musixtex-fonts.tlpobj 2017-04-14 17:51:50.000000000 +0200 @@ -267,6 +267,6 @@ RELOC/fonts/type1/public/musixtex-fonts/xslz20d.pfb RELOC/fonts/type1/public/musixtex-fonts/xtie20.pfb catalogue-ctan /fonts/musixtex-fonts -catalogue-date 2015-12-30 19:19:47 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font font-type1 font-music ++++++ musixtex.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/ChangeLog-123.txt new/texmf-dist/doc/generic/musixtex/ChangeLog-123.txt --- old/texmf-dist/doc/generic/musixtex/ChangeLog-123.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/generic/musixtex/ChangeLog-123.txt 2016-11-25 19:27:45.000000000 +0100 @@ -0,0 +1,6 @@ + +Changes from MusiXTeX 122 to 123: + + + added \xtr and \ptr ornaments + + adjusted spacing of \tr + + corrected definition of \C@Inter for \nblines > 6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/ChangeLog-124.txt new/texmf-dist/doc/generic/musixtex/ChangeLog-124.txt --- old/texmf-dist/doc/generic/musixtex/ChangeLog-124.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/texmf-dist/doc/generic/musixtex/ChangeLog-124.txt 2017-03-02 00:01:03.000000000 +0100 @@ -0,0 +1,10 @@ + +Changes from MusiXTeX 123 to 124: + + + preserve changes to \transpose in an hboxed tremolo command + + test that musixtex.tex has already been loaded in some extensions: + + musixps, musixec, musixhv, musixplt, musixtmr, musixppff + + changed from \it to \ppff in several places + + support new command \setinterstaff{n}{m} + + define \largenotesize, \Largenotesize + + corrected typos \twtybf[g] \svtbf[g] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt new/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt --- old/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt 2015-02-28 23:49:36.000000000 +0100 +++ new/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt 2017-03-02 00:01:03.000000000 +0100 @@ -1,3 +1,11 @@ +2016-11-12 RDT + + Expanded treatment of big cautionary accidentals + +2016-06-06 RDT + + Revised the material on page layout. + 2015-02-20 RDT Clean up title page and preface(s). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/README new/texmf-dist/doc/generic/musixtex/README --- old/texmf-dist/doc/generic/musixtex/README 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/doc/generic/musixtex/README 2017-03-02 00:01:03.000000000 +0100 @@ -1,4 +1,4 @@ -This is MusiXTeX, version 1.22 (2016-02-25). +This is MusiXTeX, version 1.24 (2017-02-28). MusiXTeX is a TeX-based system for typesetting music. The main author was Daniel Taupin, who died in a climbing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/accidentals.tex new/texmf-dist/doc/generic/musixtex/musixdoc/accidentals.tex --- old/texmf-dist/doc/generic/musixtex/musixdoc/accidentals.tex 2015-02-28 23:49:36.000000000 +0100 +++ new/texmf-dist/doc/generic/musixtex/musixdoc/accidentals.tex 2017-03-02 00:01:03.000000000 +0100 @@ -49,10 +49,9 @@ \vspace*{-2ex} It also possible to introduce \ital{\ixem{cautionary accidental}s}, -i.e.,~small accidentals enclosed in parentheses. This done by preceding -the name of the accidental keyword with ``\verb|c|'',\label{cautionary} -e.g.,~\keyindex{cfl}\pitchp~for a cautionary flat. - Available cautionary accidentals are \keyindex{csh}, \keyindex{cfl}, +i.e.,~small accidentals enclosed in parentheses. This is done by preceding +the name of the accidental keyword with ``\verb|c|''\label{cautionary}. +Available cautionary accidentals are \keyindex{csh}, \keyindex{cfl}, \keyindex{cna}, \keyindex{cdfl} and \keyindex{cdsh}, which give @@ -71,3 +70,5 @@ \keyindex{accshift}\verb|=|\ital{any \TeX\ dimension}, where positive values shift to the left and negative to right, with a default of~\verb|0pt|. +For ``big'' cautionary accidentals, use, for example, +\verb|{|\keyindex{largenotesize}\verb|\csh|\pitchp\verb|}| or see Section~\ref{brapar}. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex new/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex --- old/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex 2017-03-02 00:01:03.000000000 +0100 @@ -1,7 +1,10 @@ \chapter{Extension Library} -All of the following files are invoked by saying \keyindex{input} \ital{filename}\ . -Most of them are fully compatible with \musixtex\ in that they do not redefine -any existing macros but rather provide additional functionality. In future +All of the following files are invoked by saying \keyindex{input} \ital{filename}. +In some cases, +\verb\musixtex\ must be input \emph{before} the extension, +but most of them are fully compatible with \verb\musixtex.tex\ in that they do not redefine +any existing macros and just provide additional functionality. +In future versions of \musixtex\ we may very well incorporate many of them directly into \verb|musixtex.tex|, but for now we leave them separate. @@ -1466,18 +1469,22 @@ using (for instrument 2 as an example): \verb|\settrebleclefsymbol2\oldGclef| - \item\keyindex{cqu} $p$ provides a square headed quarter note with stem up at + \item\keyindex{cqu} $p$ provides a square-headed quarter note with stem up at pitch $p$. - \item\keyindex{cql} $p$ provides a square headed quarter note with stem down at + \item\keyindex{cql} $p$ provides a square-headed quarter note with stem down at pitch $p$. - \item\keyindex{chu} $p$ provides a square headed half note with stem up at + \item\keyindex{chu} $p$ provides a square-headed half note with stem up at pitch $p$. - \item\keyindex{chl} $p$ provides a square headed half note with stem down at + \item\keyindex{chl} $p$ provides a square-headed half note with stem down at pitch $p$. + \item\keyindex{cqb} $n$ $p$ provides a square-headed beam note for beam $n$ at pitch $p$. + + \item\keyindex{zcqb} $n$ $p$ provides a non-spacing square-headed beam note for beam $n$ at pitch $p$. + \item\keyindex{cnqu} $p$ and \keyindex{cnql} $p$ provide a stemless square headed quarter note at pitch $p$. @@ -1873,6 +1880,12 @@ \section{musixps}\label{musixps}\index{musixps@{\tt musixps.tex}} Activates type K Postscript slurs, ties, and hairpins; see Chapter~\ref{PostscriptSlurs}. +Use as follows: +\begin{quote}\begin{verbatim} +\input musixtex +\input musixps +... +\end{verbatim}\end{quote} \section{musixstr}\label{musixstr}\index{musixstr@{\tt musixstr.tex}} Provides bowing and other symbols for \itxem{string instruments}\footnote{provided @@ -1910,7 +1923,7 @@ %\check - \section{musixsty}\index{musixsty@{\tt musixsty.tex}} + \section{musixsty}\index{musixsty@{\tt musixsty.tex}}\label{musixsty} Provides certain text-handling facilities for titles, footnotes, and other items not related to lyrics. It should not be used with \LaTeX. It includes @@ -1918,6 +1931,8 @@ \item definitions of \keyindex{hsize}, \keyindex{vsize}, \keyindex{hoffset}, \keyindex{voffset} suitable for A$4$ paper; those using other sizes may wish to modify it once and for all; + \item a \keyindex{rectoverso}\verb|{|\emph{dimension}\verb|}| command to set up even/odd-page + asymmetric margins; \item a set of text size commands: \begin{description}\setlength{\itemsep}{0ex} @@ -1931,7 +1946,7 @@ \item[\keyindex{twtypoint}] to get $20.74$ point font size; \item[\keyindex{twfvpoint}] to get $24.88$ point font size; \end{description} - \item commands for creating titles: + \item commands for creating title-page headings: \begin{itemize}\setlength{\itemsep}{0ex} \item \keyindex{author} or \keyindex{fullauthor} to be put at the right of the first page, below the title of the piece; the calling sequence is, for example @@ -1949,6 +1964,9 @@ \item \keyindex{othermention} which is displayed on the left of the page, vertically aligned with author's name. It may contain \verb|\\| to display it on several lines; + \item \keyindex{headline} which displays the argument at the top of the title page (use + \verb|\hss| after or before the argument text or both to left-align or + right-align or center the text); \item \keyindex{maketitle} which displays all the previous stuff; \end{itemize} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex new/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex --- old/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex 2017-03-02 00:01:03.000000000 +0100 @@ -1,6 +1,6 @@ \title{\Huge\bfseries\musixtex\\[\bigskipamount] \LARGE\bfseries Using \TeX{} to write polyphonic\\or -instrumental music\\\Large\itshape Version 1.22} +instrumental music\\\Large\itshape Version 1.24} %\author{\Large\rm Daniel \sc Taupin\\\large\sl @@ -67,7 +67,7 @@ takes advantage of the greater capacity of the e\TeX\ version of \TeX. This manual is the definitive reference to all features of -\musixtex\ version~1.22. +\musixtex\ version~1.24. Novice users need not start here. Most diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex new/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex --- old/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex 2015-07-27 00:48:40.000000000 +0200 +++ new/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex 2017-03-02 00:01:03.000000000 +0100 @@ -48,26 +48,81 @@ so that the first staff on the page is all the way at the top and the last staff all the way at the bottom. - The macro \keyindex{musicparskip} will allow the existing space between systems to increase by up to \verb|5\Interligne|. -The following values of page layout parameters will allow the maximum material -to fit on each page, provided the printer allows the margins that are implied. +The following values of page-layout parameters will allow as much material +as possible +on a page, provided the printer supports these dimensions which +imply approximately half-inch margins: \begin{center} -\begin{tabular}{|l|l|l|}\hline -\multicolumn{1}{|c|}{A4}&\multicolumn{1}{|c|}{letter}&\multicolumn{1}{|c|}{A4 or letter}\\\hline -\multicolumn{3}{|c|}{\tt\Bslash parindent= 0pt}\\\hline -\multicolumn{3}{|c|}{\tt\Bslash hoffset= -15.4mm}\\\hline -\multicolumn{3}{|c|}{\tt\Bslash voffset= -10mm}\\\hline -\verb+\hsize= 190mm+&\verb+\hsize= 196mm+&\verb+\hsize= 190mm+\\\hline -\verb+\vsize= 260mm+&\verb+\vsize= 247mm+&\verb+\vsize= 247mm+\\\hline +\begin{tabular}{|l|l|}\hline +\multicolumn{1}{|c|}{A$4$}&\multicolumn{1}{|c|}{letter}\\\hline +\verb+\hsize=190mm+&\verb+\hsize=7.5in+\\\hline +\verb+\vsize=270mm+&\verb+\vsize=10in+\\\hline \end{tabular} \end{center} -%avre \zkeyindex{parindent}\zkeyindex{hoffset}\zkeyindex{voffset} \zkeyindex{hsize}\zkeyindex{vsize} +You may have to be more conservative if you have headlines or footlines +or want +even/odd-page asymmetry, such as with the \keyindex{rectoverso} +command in \verb|musixsty.tex| (Section~\ref{musixsty}). +If a score is going to be ``published'' at a public repository (such as +\mbox{\textsc{imslp}}), you may want to allow for \emph{either} +A$4$ \emph{or} letter paper, for example by setting the \verb|\hsize| to~190~mm +and the \verb|\vsize| to~10~in. + +To generate a score in ``landscape''\index{landscape mode} mode, adjust the +text-size parameters above accordingly (e.g., \verb+\hsize=10in+ and \verb+\vsize=7.5in+) +and add a suitable \verb\papersize\ ``special'' to the \TeX\ output, as in +\verb+\special{papersize=11in,8.5in}+. + + +For \emph{any} values of +\verb|\hsize| and \verb|\vsize|, +material will normally be centered on the page by using +command sequences such as the following, which simply split the difference between the page size and the text size, +and then subtract one inch because of \TeX\ conventions: +\begin{enumerate} +\item[For A$4$ paper, portrait mode (210~mm $\times$ 297~mm):]\quad\\[-2ex] +\begin{verbatim} +\hoffset=210mm\advance\hoffset-\hsize\divide\hoffset2 +\advance\hoffset-1.0in +\voffset=297mm\advance\voffset-\vsize\divide\voffset2 +\advance\voffset-1.0in +\end{verbatim} +\item[For letter-size paper, portrait mode (8.5~in $\times$ 11~in):] \quad\\[-2ex] +\begin{verbatim} +\hoffset=8.5in\advance\hoffset-\hsize\divide\hoffset2 +\advance\hoffset-1.0in +\voffset=11in\advance\voffset-\vsize\divide\voffset2 +\advance\voffset-1.0in +\end{verbatim} +\end{enumerate} + +To determine the maximal dimensions that \emph{your} printer is capable of, +process the standard file \verb|testpage.tex| with \LaTeX\ and +print the result. The ``rulers'' on four sides will indicate +how much of the one-inch ``margin'' material outside the frame can actually be printed. +Your \verb|\hsize| and \verb|\vsize| parameters can be increased, or, if necessary, decreased +accordingly. If your score is going to be printed by a publisher or a colleague, you can send +\verb|testpage.pdf| to them to determine what margins are necessary for their +printer. + +However, if the margins on the \verb|testpage| output are \emph{not} +symmetric, +the printer is mis-aligned. +If this can't be corrected, the margin offsets will +have to be adjusted. Ideally, this should be done in the \TeX\ configuration +so all \TeX\ output will be corrected, but offsets can be adjusted +for just \verb|musixtex| output using +\verb|\advance\hoffset ...| and/or +\verb|\advance\voffset ...| +after the ``normal'' settings given above. + + \section{Page numbering, headers and footers}\index{page diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex new/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex --- old/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex 2017-03-02 00:01:03.000000000 +0100 @@ -79,7 +79,8 @@ \item \keyindex{flageolett}\pitchp~to put a small circle above a note head at pitch $p$. \end{itemize} -These marks are horizontally centered relative to solid note heads. To +These marks are horizontally centered relative to solid note heads. +To compensate for the fact that whole notes are wider, you should use \keyindex{wholeshift}\verb|{|\ital{Any nonspacing macro}\verb|}| to center accents and other items (e.g.,~\verb|\Fermataup|) above a whole note. @@ -272,7 +273,17 @@ \item \keyindex{backturn}\pitchp\ for \hbox to 1.5em{\kern 0.6em\backturn 0\hss} \item \keyindex{tr}\pitchp\ for \hbox to 1.5em{\kern 0.6em\tr 0\hss} \item \keyindex{trt}\pitchp\ for \hbox to 1.5em{\kern 0.6em\trt 0\hss}\quad (J. S.~Bach's \textit{trillo und mordant}) + \item \keyindex{xtr}\pitchp\ for \hbox to 1.5em{\kern 0.5em\xtr 0\hss} + \item \keyindex{ptr}\pitchp\ for \hbox to 1.5em{\kern 0.5em\ptr 0\hss} \end{itemize} +To +compensate for the fact that whole notes are wider, you may use +\begin{quote} +\keyindex{wholeshift}\verb|{|\mbox{\ital{Any nonspacing macro}}\verb|}| +\end{quote} +to center any of these ornaments +above a whole note. + In the following macros for fermatas, the argument $p$ is the pitch of the notehead on which the fermata rests, assuming no additional vertical @@ -508,7 +519,6 @@ in combination with \keyindex{zchar} or \keyindex{zcharnote}. Since the \hbox to .7cm{ \Ped\hss} symbol is rather wide, it might collide with adjacent bass notes. To shift it horizontally, you could use \verb|\loff{\PED}|. -\vfill The following excerpt from \textit{Liebestr\"aume} by Franz Liszt illustrates a more modern approach to specifying piano-pedal usage: @@ -546,13 +556,13 @@ \bar% \Notes\pdlud\ql B\sk\qpl\sk\qpl|% \zhl{.c}\ds\ibu1i0\qb1{^d^hjh}\tqu1d\en -\Notes\zqu{M}\hppl\sk\qpu\sk\qu M|% +\Notes\zqu{M}\hppl\sk\sk\qpu\sk\qu M|% \ds\ibu1i0\qb1{dhjh}\tqu1d\en \bar% \Notes\zmidstaff{$\cdots$}\sk\pdlu\sk|\en \endpiece% \end{music} -\pagebreak +\vspace*{2ex}\par\noindent This has been coded using the following commands: \begin{quote} \begin{tabular}{lll} @@ -596,7 +606,7 @@ \bar% \Notes\pdlud\ql B\sk\qpl\sk\qpl|% \zhl{c}\ds\ibu1i0\qb1{^d^hjh}\tqu1d\en -\Notes\zqu{M}\hppl\sk\qpu\sk\qu M|% +\Notes\zqu{M}\hppl\sk\sk\qpu\sk\qu M|% \ds\ibu1i0\qb1{dhjh}\tqu1d\en \bar% \Notes\zmidstaff{$\cdots$}\sk\pdlu\sk|\en @@ -605,6 +615,7 @@ \end{footnotesize} \end{quote} +\pagebreak \noindent The following ``mixed'' patterns are also supported: \begin{quote} @@ -665,29 +676,31 @@ \section{Brackets, parentheses, oblique lines and slides}\label{brapar} -Several varieties of brackets, parentheses and oblique lines are provided for +Several varieties of brackets\index{brackets}, parentheses\index{parentheses} and oblique lines\index{oblique lines} are provided for use within a score. \begin{itemize}\setlength{\itemsep}{0ex} \item \keyindex{lpar}\verb|{|$p$\verb|}| and \keyindex{rpar}\verb|{|$p$\verb|}| yield left and right -parentheses at pitch $p$. They could be used to enclose notes or to build -\ital{cautionary} accidentals, although the latter are more easily -obtained with predefined macros (see Chapter~\ref{cautionary}). - -%avrb -For example, - +parentheses at pitch $p$. They can be used to enclose notes or to build +``big'' cautionary\index{cautionary accidental} accidentals. For example, +\\ +\begin{center} \begin{tabular}{ll} -\raisebox{-1.5ex}[0ex][0ex]{\musicintextnoclefn{\notes\bsk\lpar{g}\rpar{g}\hu{g}\sk% -\loffset{1.5}{\lpar{g}}\loffset{1.5}{\rpar{g}}\loffset{.4}{\sh g}\hu{g}\en}} -&\begin{tabular}{ll} -&\verb+\notes\lpar{g}\rpar{g}\hu{g}\sk%+\\ -is coded as&\verb+\loffset{1.5}{\lpar{g}}\loffset{1.5}{\rpar{g}}%+\\ -&\verb+\loffset{.4}{\sh g}\hu{g}\en}+ +\raisebox{-1.5ex}[0ex][0ex]{\musicintextnoclefn{\NOtes\qsk\lpar g\rpar g\hu g\sk% +\loffset{1.5}{\lpar g\rpar g}\loffset{.4}{\sh g}\hu g\sk% +\loffset{2.1}{\lpar g}\loffset{1.5}{\rpar g}\loffset{.4}{\dfl g}\hu g\en}} \end{tabular} +\end{center} +is coded as +\end{itemize} +\begin{center}\small +\begin{tabular}{l} +\verb+\NOtes\lpar g\rpar g\hu g\sk%+\\ +\verb+\loffset{1.5}{\lpar g\rpar g}\loffset{.4}{\sh g}\hu g\sk%+\\ +\verb+\loffset{2.1}{\lpar g}\loffset{1.5}{\rpar g}\loffset{.4}{\dfl g}\hu g\en+ \end{tabular} -%avre - +\end{center} +\begin{itemize} \item \keyindex{bracket}\verb|{|$p$\verb|}{|$n$\verb|}| posts a square bracket to the left of a chord, vertically spanning $n$ \verb|internote|s. @@ -731,7 +744,7 @@ \endextract \end{music} \noindent is coded as -\begin{quote}\begin{verbatim} +\begin{quote}\small\begin{verbatim} \begin{music} \setstaffs1{2} \setclef1{\bass} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex new/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex --- old/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex 2015-02-28 23:49:36.000000000 +0100 +++ new/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex 2017-03-02 00:01:03.000000000 +0100 @@ -19,6 +19,8 @@ \item[\keyindex{internote} :]vertical spacing between notes one scale step apart in the current instrument, taking account of a possible alteration by \keyindex{setsize}; \nochange. +Note that each distinct instrument may have a different +\verb|\internote| (see Chapter~\ref{staffspacing}). \item[\keyindex{Internote} :]vertical spacing between notes one scale step apart in any instrument whose \keyindex{setsize} has the default value \keyindex{normalvalue} ($1.0$), equal to \verb|0.5\Interligne|; \nochange. @@ -32,15 +34,22 @@ \item[\keyindex{interstaff} :]a very important macro with a single numerical argument representing the factor that multiplies \verb|2\internote| to give the distance between the bottom of one staff and the bottom of the next one. In -fact the macro redefines the parameter \verb|\interfacteur|. +fact the macro redefines the parameter \verb|\interfacteur|. Default is 9. +\verb|\interstaff| applies to all the +instruments; to set the inter-staff spacing for a single instrument, +use \keyindex{setinterstaff}\itbrace{n}\itbrace{m}, +$n$ is the instrument and $m$ is the replacement factor for that instrument. +Note that +after you have used \keyindex{setinterstaff}, +you cannot reset the distances for that instrument with +\keyindex{interstaff}; you must subsequently use +\keyindex{setinterstaff} for that purpose. \item[\keyindex{interportee} :]distance between the bottom of one staff and the bottom of the next one. It is always reset to -\verb|2|\keyindex{interfacteur}\verb|\internote| at the next system. +2 times \keyindex{internote} times the \keyindex{interfacteur} for the current +instrument at the next system. Therefore, trying to change \verb|\interportee| will have no effect. Change -\verb|\interstaff| instead. Further, note that \verb|\interstaff| applies to all the -instruments, but each distinct instrument may have a different -\verb|\internote| (see Chapter~\ref{staffspacing}). - +\verb|\interstaff| or use \keyindex{setinterstaff} instead. \item[\keyindex{interinstrument} :]additional vertical distance between two consecutive instruments. This means that the distance between the lowest line of the previous instrument and the lowest line of the top staff of the current @@ -53,7 +62,8 @@ with the macro \keyindex{setinterinstrument}\itbrace{n}\itbrace{s}, where $n$ is the instrument and $s$ is the replacement value of the space to be added. The \verb|\setinterinstrument| macro may be useful in some vocal -scores to provide vertical space for lyrics. Note that +scores to provide vertical space for lyrics. +Note that after you have used \keyindex{setinterinstrument}, you cannot reset the distances for that instrument with \keyindex{interinstrument}; you must subsequently use diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex new/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex --- old/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex 2017-03-02 00:01:03.000000000 +0100 @@ -269,7 +269,9 @@ the spacing in single-instrument parts extracted from a multi-instrument score; see Section~\ref{musixtnt}. -The \texttt{autosp} package can be found at +The \texttt{autosp} package is available in +\href{https://www.tug.org/texlive/}{\underline{TeXLive}} (from 2016) and +can also be found at the \href{http://icking-music-archive.org/software/autosp/autosp.zip} {\underline{Werner Icking Music Archive}} or at diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex new/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex --- old/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex 2015-02-28 23:49:36.000000000 +0100 +++ new/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex 2017-03-02 00:01:03.000000000 +0100 @@ -219,6 +219,13 @@ This will place the name in the space to the left of the first staff or group of staves for instrument $n$. To specify the amount of space available, use \verb|\parindent|$d$ where $d$ is any hard \TeX\ dimension. +For multi-line instrument names, use \TeX\ commands as in the following: +\begin{verbatim} + \setname1{\vbox{% + \hbox to\parindent{\hss Bass\hss}% + \hbox to\parindent{\hss Recorder\hss}}} +\end{verbatim} + \section{Groupings of instruments}\label{curlybrackets} By default, all staves in a system will be joined at the left by a thin, vertical rule. In addition, if an instrument has more than diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex new/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex --- old/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex 2017-03-02 00:01:03.000000000 +0100 @@ -24,7 +24,7 @@ Once the software mentioned in the prior two paragraphs is installed and the \TeX\ filename database is refreshed, the type~K package can be invoked by including the command \verb|\input musixps| -near the beginning of your source file. +near the beginning of your source file (but after loading \verb\musixtex.tex\). The resulting dvi file should then be converted into Postscript using \textbf{dvips}. If desired, a PDF file can then be generated with \textbf{ps2pdf}, \textbf{ghostscript}, or \textbf{Adobe Acrobat} (see Section~\ref{using} for more information on this). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/smaller.tex new/texmf-dist/doc/generic/musixtex/musixdoc/smaller.tex --- old/texmf-dist/doc/generic/musixtex/musixdoc/smaller.tex 2015-02-28 23:49:36.000000000 +0100 +++ new/texmf-dist/doc/generic/musixtex/musixdoc/smaller.tex 2017-03-02 00:01:03.000000000 +0100 @@ -1,5 +1,5 @@ -\chapter{Smaller Notes in Normal-Sized Staves} -Here we describe how to reduce the size of note symbols without changing the +\chapter{Smaller (or Larger) Notes in Normal-Sized Staves} +Here we describe how to change the size of note symbols without changing the size of the staff itself. Changing overall staff size will be treated in Chapter~\ref{staffspacing}. @@ -69,6 +69,8 @@ \notes&\sk\tbbl0\tbl0\qb0J|\tbl1\zq c\qb1e\en \endextract \end{verbatim}\end{quote} +Similarly, you may use +\keyindex{largenotesize} or \keyindex{Largenotesize} to get \emph{larger} notes. \section{Grace notes} Grace notes are a special case of small and tiny notes, namely single-stemmed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/transposition.tex new/texmf-dist/doc/generic/musixtex/musixdoc/transposition.tex --- old/texmf-dist/doc/generic/musixtex/musixdoc/transposition.tex 2015-02-28 23:49:36.000000000 +0100 +++ new/texmf-dist/doc/generic/musixtex/musixdoc/transposition.tex 2017-03-02 00:01:03.000000000 +0100 @@ -9,43 +9,39 @@ \section{Logical transposition and octaviation} Logical transposition is controlled by an integer-valued \TeX\ register -\keyindex{transpose}. Its default value is 0. If you enter -\verb|\transpose=|$n$, then all subsequent pitches specified by +\keyindex{transpose}. Its default value is $0$. If you enter +\verb|\transpose=|$n$ outside of notes commands, then all subsequent pitches specified by letters will be transposed by $n$ positions. Normally this method would be used to transpose an entire piece. Pitches specified with numbers will not be affected, so if you think you will ever want to transpose a piece, you should enter all note pitches with letters. -One way to transpose up or down by one octave would be to set -\keyindex{transpose} to $7$ or $-7$. For example, to make a quarter note -octave as a chord, you could define a macro as -\verb|\def\soqu#1{\zq{#1}{\transpose=7 \qu{#1}}}|. -Note that because \verb|\transpose| is altered inside a pair of braces, the -effect of the alteration is only local and does not reach outside the braces. - - Another more convenient way to transpose locally up or down by one octave +One way to transpose up or down by one octave would be to increase or decrease +\keyindex{transpose} by $7$. +A more convenient way to transpose locally up or down by one octave makes use respectively of the characters \verb|'| (close-quote, interpreted as an \itxem{acute accent}) and \verb|`| (open-quote, interpreted as a \itxem{grave accent}), placed immediately before the letter specifying the pitch. So for example \verb|\qu{'ab}| is equivalent to \verb|\qu{hi}| and \verb|\qu{`kl}| is equivalent to \verb|\qu{de}|. These characters have -cumulative effects but in a somewhat restricted sense. They will alter the value of -\verb|\transpose|, but only until changing to a different staff or -instrument or encountering \verb|\en|, at which time it will be reset to the +cumulative effects; thus, +for example, \verb|\qu{''A'A}| and \verb|\qu{''A}\qu{'A}| are both equivalent to \verb|\qu{ah}|. +Alterations to the value of +\verb|\transpose| in notes commands are \emph{local}: when changing to a different staff or +instrument or encountering \verb|\en|, \verb|\transpose| will be reset to the value it had before the accents were used. (That value is stored in -another register called \keyindex{normaltranspose}). Thus for example -\verb|\qu{''A'A}| and \verb|\qu{''A}\qu{'A}| -are both equivalent to \verb|\qu{ah}|. +another register called \keyindex{normaltranspose}). Another way to localize +changes to \verb|\transpose| is to create an explicit \TeX\ ''group'' by enclosing commands in \verb|{...}| braces. At any point it is possible to reset the \verb|\transpose| register -explicitly to the value it had -when entering \verb|\notes|, by prefacing a pitch indication with +explicitly to the \verb|\normaltranspose| value +by prefacing a pitch indication with ``\verb|!|''. Thus \verb|\qu{!a'a}| always gives the note \verb|a| and its upper octave \verb|h|, shifted by the -value of {\Bslash transpose} at the beginning of the current -\verb|\notes...\en| group, regardless of the number of grave and -acute accents occurring previously within that group. +value of {\Bslash normaltranspose}, +regardless of the number of grave and +acute accents earlier in that group. \section{Behavior of accidentals under logical transposition}\label{transposeaccids} The above processes indeed change the vertical position of the note heads Binary files old/texmf-dist/doc/generic/musixtex/musixdoc.pdf and new/texmf-dist/doc/generic/musixtex/musixdoc.pdf differ Binary files old/texmf-dist/doc/generic/musixtex/musixtex-install.pdf and new/texmf-dist/doc/generic/musixtex/musixtex-install.pdf differ Binary files old/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf and new/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/musixtex.1 new/texmf-dist/doc/man/man1/musixtex.1 --- old/texmf-dist/doc/man/man1/musixtex.1 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/doc/man/man1/musixtex.1 2017-03-02 00:01:04.000000000 +0100 @@ -1,5 +1,5 @@ .\" This manpage is licensed under the GNU Public License -.TH MUSIXTEX 1 2016-02-20 "musixtex version 0.16" "" +.TH MUSIXTEX 1 2017-01-08 "musixtex version 0.17" "" .SH NAME musixtex \- processes MusiXTeX files, using pre-processors prepmx, pmxab and autosp as necessary, @@ -71,46 +71,48 @@ output usage summary and quit .TP .B -l -assumes LaTeX source; +assume LaTeX source; implied if the file has .ltx extension .TP .B -p -changes the TeX processor to +change the TeX processor to .BR pdfetex (1) or .BR pdflatex (1) -(and doesn't run -.BR dvips (1) -and -.BR ps2pdf (1) -or -.BR dvipdfm (1) -) +(and doesn't run a dvi processor) .TP .B -c preprocess pmx file using .BR pmxchords (1) .TP .B -d -changes the dvi processor to +don't generate a .ps file and change the dvi processor to .BR dvipdfm (1) +.TP +.B -D dvix +use +.B dvix +as the dvi processor; e.g., -D "dvipdfm -m 0.9". +Use -d +.I before +-D to suppress .ps generation. .TP .B -F fmt -uses +use .B fmt as the TeX processor; e.g., -F "luatex --output-format=dvi" .TP .B -m -stops processing at the pmx file +stop processing at the pmx file .TP .B -t -stops processing at the tex/mid files +stop processing at the tex/mid files .TP .B -s -stops processing at the dvi file +stop processing at the dvi file .TP .B -g -stops processing at the ps file +stop processing at the ps file .TP .B -i retain intermediate and log files Binary files old/texmf-dist/doc/man/man1/musixtex.man1.pdf and new/texmf-dist/doc/man/man1/musixtex.man1.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musixtex.doc.tlpobj new/tlpkg/tlpobj/musixtex.doc.tlpobj --- old/tlpkg/tlpobj/musixtex.doc.tlpobj 2016-04-19 17:46:11.000000000 +0200 +++ new/tlpkg/tlpobj/musixtex.doc.tlpobj 2017-04-14 17:51:48.000000000 +0200 @@ -1,8 +1,8 @@ name musixtex.doc category Package -revision 40612 +revision 43375 shortdesc doc files of musixtex -docfiles size=1017 +docfiles size=1036 texmf-dist/doc/generic/musixtex/ChangeLog-114.txt texmf-dist/doc/generic/musixtex/ChangeLog-115.txt texmf-dist/doc/generic/musixtex/ChangeLog-116.txt @@ -12,6 +12,8 @@ texmf-dist/doc/generic/musixtex/ChangeLog-120.txt texmf-dist/doc/generic/musixtex/ChangeLog-121.txt texmf-dist/doc/generic/musixtex/ChangeLog-122.txt + texmf-dist/doc/generic/musixtex/ChangeLog-123.txt + texmf-dist/doc/generic/musixtex/ChangeLog-124.txt texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt texmf-dist/doc/generic/musixtex/README texmf-dist/doc/generic/musixtex/examples/8bitchar.tex ++++++ musixtex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/musixtex/musixtex.lua new/texmf-dist/scripts/musixtex/musixtex.lua --- old/texmf-dist/scripts/musixtex/musixtex.lua 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/scripts/musixtex/musixtex.lua 2017-03-02 00:01:04.000000000 +0100 @@ -1,6 +1,6 @@ #!/usr/bin/env texlua -VERSION = "0.16c" +VERSION = "0.17a" --[[ musixtex.lua: processes MusiXTeX files using prepmx and/or pmxab and/or @@ -29,6 +29,16 @@ ChangeLog: + version 0.17a 2017-01-08 RDT + Added -D option. + Avoid writing or concatenating a nil value. + + version 0.16e 2016-03-02 DL + missing version information (caused by batchmode in 0.16c) fixed + + version 0.16d 2016-03-02 RDT + filename argument in autosp failure message fixed + version 0.16c 2016-02-24 RDT -interaction batchmode for -q report_error reports only the first error @@ -115,7 +125,8 @@ -l latex source -p direct tex-pdf (pdftex etc) -F fmt use fmt as the TeX processor - -d tex-dvi-pdf (dvipdfm) + -d tex-dvi-pdf (using dvipdfm if -D not used) + -D dvixx use dvixx as the dvi processor -c preprocess pmx file using pmxchords -m stop at pmx -t stop at tex/mid @@ -156,9 +167,9 @@ end end --- The global variables below may be changed by set_options(). System --- commands for the various programs are mostly set to nil if the step --- is to be omitted, which can be tested by a simple "if" statement. +-- System commands for the various programs are mostly +-- set to nil if the step is to be omitted, which can be +-- tested by a simple "if" statement. -- Exceptions: -- 'tex' is the command for processing a TeX file, but it is important -- to know whether the user has explicitly specified an option that @@ -176,7 +187,7 @@ function defaults() prepmx = "prepmx" pmx = "pmxab" - tex = "etex" + tex = "etex" musixflx = "musixflx" dvi = dvips ps2pdf = "ps2pdf" @@ -273,6 +284,9 @@ override = override .. 'p' elseif this_arg == "-d" then dvi = "dvipdfm"; ps2pdf = nil + elseif this_arg == "-D" then + narg = narg+1 + dvi = arg[narg] elseif this_arg == "-c" then pmx = "pmxchords" elseif this_arg == "-F" then @@ -311,7 +325,14 @@ function find_file(this_arg) basename, extension = this_arg:match"(.*)%.(.*)" - if not extension then + if extension then + extensions = {["mtx"] = true, ["pmx"] = true, ["aspc"] = true, ["tex"] = true, ["ltx"] = true} + if not extensions[extension] then + print("!! extension " .. extension .. " unrecognized; valid extensions are mtx|pmx|aspc|tex|ltx.") + exit_code = exit_code+1 + return + end + else basename = this_arg for ext in ("mtx,pmx,aspc,tex,ltx"):gmatch"[^,]+" do if exists (basename .. "." .. ext) then @@ -320,7 +341,7 @@ end end if not extension then - print("!! No file " .. basename .. "[.mtx|.pmx|.aspc|.tex|.ltx]") + print("!! No file " .. basename .. ".[mtx|pmx|aspc|tex|ltx]") exit_code = exit_code+1 return end @@ -385,7 +406,7 @@ if execute ("autosp " .. basename .. ".aspc" ) == 0 then extension = "tex" else - print ("!! autosp preprocessing of " .. filename .. " fails.") + print ("!! autosp preprocessing of " .. basename .. ".aspc fails.") exit_code = exit_code+1 return end @@ -447,59 +468,80 @@ end end --- Extracting version and path information from tempname. --- The targets below rely on the exact output format used by various --- programs and TeX files. -targets = { -mtxtex = "%(([^(]+mtx%.tex)%s*$", -mtxlatex = "%(([^(]+mtxlatex%.sty)", -mtxLaTeX = ".*mtxLaTeX.*", -pmxtex = "%(([^(]+pmx%.tex)", -musixtex = "%(([^(]+musixtex%.tex)", -musixltx = "%(([^(]+musixltx%.tex)", -musixlyr = "%(([^(]+musixlyr%.tex)", +---- Report version information on musixtex.log + +-- File names and message signatures to be looked for in a TeX log file. +logtargets = { +mtxtex = {"mtx%.tex","mtxTeX"}, +mtxlatex = {"mtxlatex%.sty","mtxLaTeX"}, +pmxtex = {"pmx%.tex","PMX"}, +musixtex = {"musixtex%.tex","MusiXTeX"}, +musixltx = {"musixltx%.tex","MusiXLaTeX"}, +musixlyr = {"musixlyr%.tex","MusiXLYR"} +} + +-- Signatures of messages displayed on standard output by programs +capturetargets = { MTx = "This is (M%-Tx.->)", PMX = "This is (PMX[^\n]+)", pdftex = "This is (pdfTeX[^\n]+)", musixflx = "Musixflx%S+", autosp = "This is autosp.*$", -index = "autosp,MTx,mtxtex,mtxlatex,mtxLaTeX,PMX,pmxtex,".. - "musixtex,musixltx,musixlyr,musixflx,pdftex" +index = "autosp,MTx,PMX,musixflx,pdftex" } -extra_line = { mtxtex=true, musixtex=true, musixltx=true, pmxtex=true, - musixlyr=true } +function report_texfiles(logname) + local log = logname and io.open(logname) + if not log then return end + local lines = + {"--- TeX files actually included according to "..logname.." ---"} + log = log:read"*a" +-- The following pattern matches filenames input by TeX, even if +-- interrupted by a line break. It may include the first word of +-- an \immediate\write10 message emitted by the file. + for pos,filename in log:gmatch"%(()(%.?[/]%a[%-/%.%w\n]+)" do + local hit + repeat + local oldfilename = filename + filename = oldfilename:match"[^\n]+" -- up to next line break + hit = io.open(filename) -- success if the file exists + if hit then break end + filename = oldfilename:gsub("\n","",1) -- remove line break + until filename==oldfilename + if hit then + for target,sig in pairs(logtargets) do + if filename:match(sig[1]) then + local i,j = log:find(sig[2].."[^\n]+",pos) + if j then lines[#lines+1] = filename.."\n "..log:sub(i,j) end + end + end + end + end + return table.concat(lines,'\n').."\n" +end function report_versions(tempname) if not tempname then return end -- only available with -q local logs = io.open(tempname) if not logs then - print ("No version information: could not open "..tempname) + musixlog:write ("No version information: could not open "..tempname) return end local versions = {} - local extra - musixlog:write("--- Packages actually used according to ".. - tempname.." ---\n") + musixlog:write("--- Programs actually executed according to "..tempname.." ---\n") for line in logs:lines() do - if extra then - versions[extra] = versions[extra] .. "\n " ..line - extra = false - else for target, pattern in pairs(targets) do + for target in capturetargets.index:gmatch"[^,]+" do if not versions[target] then - local found = line:match(pattern) + local found = line:match(capturetargets[target]) if found then - extra = extra_line[target] and target versions[target] = found + musixlog:write(found,"\n") end end - end end + end end logs:close() - for target in targets.index:gmatch"[^,]+" do if versions[target] then - if target=="mtxLaTeX" then musixlog:write" " end - musixlog:write(versions[target],"\n") - end end + return end ------------------------------------------------------------------------ @@ -517,8 +559,11 @@ if this_arg:match"^%-" then process_option(this_arg) else basename, extension = find_file(this_arg) -- nil,nil if not found - extension = preprocess(basename,extension) + extension = preprocess(basename, extension) tex_process(tex,basename,extension) + if basename and io.open(basename..".log") then -- to be printed later + versions = report_texfiles(basename..".log") + end if basename and cleanup then remove("pmxaerr.dat") for ext in ("mx1,mx2,dvi,ps,idx,log,ilg,pml"):gmatch"[^,]+" do @@ -531,6 +576,7 @@ narg = narg+1 until narg > #arg +if versions then musixlog:write(versions) end report_versions(tempname) musixlog:close() os.exit( exit_code ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixec.tex new/texmf-dist/tex/generic/musixtex/musixec.tex --- old/texmf-dist/tex/generic/musixtex/musixec.tex 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/tex/generic/musixtex/musixec.tex 2017-03-02 00:01:05.000000000 +0100 @@ -21,9 +21,10 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -% Copyright 2015-2016 Bob Tennent rdt(a)cs.queensu.ca +% Copyright 2015-2017 Bob Tennent rdt(a)cs.queensu.ca % -\immediate\write16{MusiXec\space<2016/02/22>} +\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixec.tex}\fi +\immediate\write16{MusiXec\space<2017/02/10>} % \longECfontnamestrue @@ -131,11 +132,11 @@ \font\twfvsl=ecsl2488 % -% Redefine accented characters for etex +% Redefine accented characters for 8-bit font % -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 \ifx\documentclass\undefined +\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 \def\ProvidesFile#1[#2]{} \def\DeclareFontEncoding#1#2#3{} \def\DeclareTextAccent#1#2#3{% @@ -160,9 +161,9 @@ \def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1% \else{\ooalign{\unhbox\z@\crcr \hidewidth\char11\hidewidth}}\fi\fi} +\catcode`\@=\catcodeat \fi -\catcode`\@=\catcodeat \normtype \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixhv.tex new/texmf-dist/tex/generic/musixtex/musixhv.tex --- old/texmf-dist/tex/generic/musixtex/musixhv.tex 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/tex/generic/musixtex/musixhv.tex 2017-03-02 00:01:05.000000000 +0100 @@ -21,9 +21,10 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -% Copyright 2015-2016 Bob Tennent rdt(a)cs.queensu.ca +% Copyright 2015-2017 Bob Tennent rdt(a)cs.queensu.ca % -\immediate\write16{MusiXhv\space<2016/02/22>} +\immediate\write16{MusiXhv\space<2017/02/10>} +\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixhv.tex}\fi % % 7pt "Roman" (sans serif), bold, "italic" (oblique), "bold-italic" (bold-oblique), and small-cap \font\sevenrm=phvr8t at 7pt @@ -133,7 +134,8 @@ \font\twfvsl=phvro8t scaled \magstep5 % % -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 +\edef\catcodeat{\the\catcode`\@} +\catcode`\@=11 % \def\sF{{\ppff s\p@kern f}} \def\sfz{{\ppff s\p@kern f\f@kern z}} @@ -147,6 +149,7 @@ % Redefine accented characters for etex, suggested by David Carlisle: % \ifx\documentclass\undefined +\catcode`\@=11 \def\ProvidesFile#1[#2]{} \def\DeclareFontEncoding#1#2#3{} \def\DeclareTextAccent#1#2#3{% @@ -167,7 +170,6 @@ \input t1enc.def -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 \def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1% \else{\ooalign{\unhbox\z@\crcr \hidewidth\char11\hidewidth}}\fi\fi} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixlit.tex new/texmf-dist/tex/generic/musixtex/musixlit.tex --- old/texmf-dist/tex/generic/musixtex/musixlit.tex 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/tex/generic/musixtex/musixlit.tex 2017-03-02 00:01:05.000000000 +0100 @@ -17,7 +17,7 @@ % Boston, MA 02111-1307, USA. % -\immediate\write16{MusiXLITurgical 0.37\space<23 Dec 2015>}% +\immediate\write16{MusiXLITurgical 0.38\space<17 Dec 2016>}% \ifx\undefined\oldGclef \else \endinput \fi @@ -34,6 +34,8 @@ \def\cnql{\def\q@u{\musixfont\@c}\@nq} \def\cnhu{\def\q@u{\musixchar101}\@nq} \def\cnhl{\def\q@u{\musixchar102}\@nq} +\def\cqb{\def\q@u{\musixchar99}\@qb} % RDT 2016-12-17 +\def\zcqb{\advancefalse\cqb} % RDT 2016-12-17 % Moved to musixtex.tex. RDT 2015-12-23 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixplt.tex new/texmf-dist/tex/generic/musixtex/musixplt.tex --- old/texmf-dist/tex/generic/musixtex/musixplt.tex 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/tex/generic/musixtex/musixplt.tex 2017-03-02 00:01:05.000000000 +0100 @@ -21,9 +21,10 @@ % the Free Software Foundation, Inc., 59 Temple Place - Suite 330, % Boston, MA 02111-1307, USA. % -% Copyright 2015-2016 Bob Tennent rdt(a)cs.queensu.ca +% Copyright 2015-2017 Bob Tennent rdt(a)cs.queensu.ca % -\immediate\write16{MusiXplt\space<2016/02/22>} +\immediate\write16{MusiXplt\space<2017/02/10>} +\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixplt.tex}\fi % % 7pt roman, bold, italic, bold italic, slanted and small-cap \font\sevenrm=pplr8t at 7pt @@ -147,9 +148,11 @@ \catcode`\@=\catcodeat % -% Redefine accented characters for etex, suggested by David Carlisle: +% Redefine accented characters for 8-bit font, suggested by David Carlisle: % + \ifx\documentclass\undefined +\catcode`\@=11 \def\ProvidesFile#1[#2]{} \def\DeclareFontEncoding#1#2#3{} \def\DeclareTextAccent#1#2#3{% @@ -170,7 +173,6 @@ \input t1enc.def -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 % \c needs special treatment \def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1% \else{\ooalign{\unhbox\z@\crcr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixppff.tex new/texmf-dist/tex/generic/musixtex/musixppff.tex --- old/texmf-dist/tex/generic/musixtex/musixppff.tex 2015-07-27 00:48:40.000000000 +0200 +++ new/texmf-dist/tex/generic/musixtex/musixppff.tex 2017-03-02 00:01:05.000000000 +0100 @@ -12,7 +12,8 @@ %% ... %% %% -\immediate\write16{MusiXppff \noexpand\ppff font replacement <2015/07/25>}% +\immediate\write16{MusiXppff \noexpand\ppff font replacement <2017/02/10>}% +\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixppff.tex}\fi \font\xppfftwelve=xppff10 at 8pt \font\xppffsixteen=xppff10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixps.tex new/texmf-dist/tex/generic/musixtex/musixps.tex --- old/texmf-dist/tex/generic/musixtex/musixps.tex 2015-02-28 23:49:36.000000000 +0100 +++ new/texmf-dist/tex/generic/musixtex/musixps.tex 2017-03-02 00:01:05.000000000 +0100 @@ -1,6 +1,7 @@ %% PostScript slurs, ties and crescendos % Coded by Stanislav Kneifl +\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixps.tex}\fi \ifx\undefined\liftcresc\else\endinput\fi \immediate\write16{MusiXPS PostScript slurs, ties and crescendos 0.93 (17.2.2015)}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixsty.tex new/texmf-dist/tex/generic/musixtex/musixsty.tex --- old/texmf-dist/tex/generic/musixtex/musixsty.tex 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/tex/generic/musixtex/musixsty.tex 2016-11-25 19:33:35.000000000 +0100 @@ -18,9 +18,10 @@ % \ifx\undefined\Tenpoint \else \endinput\fi -\immediate\write16{MusiXtextSTYle T.116\space<27 February 2015>}% +\immediate\write16{MusiXtextSTYle T.123\space<04 March 2016>}% % modified by RDT to be independent of Computer Modern (other than Math fonts) +% RDT: added \headline{..} in \maketitle \edef\catcodeat{\the\catcode`\@}\catcode`\@=11 \edef\catcode@gt{\the\catcode`\>}\catcode`\>=12 @@ -292,6 +293,9 @@ \let\othert@itremorceau\empty \def\othermention#1{\def\othert@itremorceau{#1}} +\let\headl@ne\undefined +\def\headline#1{\def\headl@ne{#1}} + \let\s@hortauthor\empty \def\shortauthor#1{\def\s@hortauthor{(#1)}} @@ -310,7 +314,9 @@ \output{\outmorceau} -\def\maketitle{\centerline{\BIGfont \ifx\headt@itremorceau\undefined +\def\maketitle{% +\ifx\headl@ne\undefined\else\line{\headl@ne}\bigskip\fi% for version 123 RDT +\centerline{\BIGfont \ifx\headt@itremorceau\undefined \titremorceau\else\headt@itremorceau\fi} \medskip \ifx\subt@itremorceau\undefined\else @@ -353,16 +359,30 @@ \catcode`\<=\catcode@lt \catcode`\@=\catcodeat -\hsize=185mm -\vsize=275mm -\hoffset=210mm -\advance\hoffset -\hsize -\divide\hoffset 2\relax -\advance\hoffset -2.54cm +%%% A4 (210mm x 297mm): +\hsize=190mm %%% adjust to increase/decrease printer margins +\vsize=270mm %%% adjust to increase/decrease printer margins +\hoffset=210mm\advance\hoffset-\hsize\divide\hoffset2 +\advance\hoffset-1.0in % TeX convention +\voffset=297mm\advance\voffset-\vsize\divide\voffset2 +\advance\voffset-1.0in % TeX convention + +%%% letter-size (8.5in x 11.0in): +%\hsize=7.5in %%% adjust to increase/decrease printer margins +%\vsize=10.0in %%% adjust to increase/decrease printer margins +%\hoffset=8.5in\advance\hoffset-\hsize\divide\hoffset2 +%\advance\hoffset-1.0in % TeX convention +%\voffset=11.0in\advance\voffset-\vsize\divide\voffset2 +%\advance\voffset-1.0in % TeX convention + +%%% To determine the *minimal* margins supported by your +%%% printer and check for printer mis-alignment, process +%%% testpage.tex with LaTeX and print the result. + \tenpoint -%%%%%%%%%%%%%%%%%%%%%%%%% local adjust to be tuned %%%%%%%%%%%%%%%%%%%%%%%%%% -\advance\hoffset -5mm -\voffset=-1.54cm -%%%%%%%%%%%%%%%%%%%%%%%%% local adjust to be tuned %%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%% adjust here for a non-centering printer %%%%%%%% +%\advance\hoffset 0mm +%\advance\voffset 0mm \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixtex.tex new/texmf-dist/tex/generic/musixtex/musixtex.tex --- old/texmf-dist/tex/generic/musixtex/musixtex.tex 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/tex/generic/musixtex/musixtex.tex 2017-03-02 00:01:05.000000000 +0100 @@ -25,15 +25,31 @@ \def\mufl(a)x{0.83}% \def\mxmajorvernumber{1} -\def\mxminorvernumber{22} +\def\mxminorvernumber{24} \def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum \def\mxversuffix{}% \edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix} -\def\mxdate{2016-02-24} +\def\mxdate{2017-02-28} \immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}% \everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}% +% version 1.24 + +% preserve changes to \transpose in an hboxed tremolo command +% test that musixtex.tex has already been loaded in some extensions: +% musixps, musixec, musixhv, musixplt, musixtmr, musixppff +% changed from \it to \ppff in several places +% support new command \setinterstaff{n}{m} +% define \largenotesize, \Largenotesize +% correct typos \twtybf[g] \svtbf[g] + +% version 1.23 + +% added \xtr and \ptr ornaments +% adjusted spacing of \tr +% corrected definition of \C@Inter for \nblines > 6 + % version 1.22 % bi and sc font definitions added; sl and tt definitions for musixsty moved @@ -241,7 +257,7 @@ \newcount\n@vi \newcount\n@vii \newcount\n@viii -%\newcount\count@ %=\count255 def'd in plain +\newcount\count@ \newbox\toks@box \newbox\w@rkbox @@ -336,6 +352,7 @@ \advance\count@ by\@ne % \expandafter \let \csname interinstrument\roman@c@\endcsname \interinstrument + \expandafter\def\csname interfacteur\roman@c@\endcsname{\interfacteur} % RDT 1.24 % % altitude \expandafter \noexpand@newskip \csname k@i\roman@c@\endcsname @@ -1562,6 +1579,10 @@ \let\curr@ntsiz@\smallnotesize} \def\tinynotesize{\set@tinynotesize\comput@specifics \let\curr@ntsiz@\tinynotesize} +\def\largenotesize{\set@largenotesize\comput@specifics % v.124 RDT + \let\curr@ntsiz@\largenotesize} +\def\Largenotesize{\set@Largenotesize\comput@specifics % v.124 RDT + \let\curr@ntsiz@\Largenotesize} \def\musickeyfont{% \ifdim\internote<\p@seven6\Internote \musictinyfont @@ -1680,8 +1701,8 @@ \let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty \let\slurud\slurutwentyd \let\slurdd\slurdtwentyd % +ickd \let\hslurud\hslurutwentyd \let\hslurdd\hslurdtwentyd %+ickd - \let\meternorfont\svtbfg \let\metersmallfont\frtbf % version 1.18 RDT - \let\meterbigfont\twtybfg \let\meterlargefont\twfvbf + \let\meternorfont\svtbf \let\metersmallfont\frtbf % version 1.18 RDT + \let\meterbigfont\twtybf \let\meterlargefont\twfvbf % version 1.24 typos corrected \let\meterLargefont\twfvbf \let\tinyppff\ppfftwenty \let\smallppff\ppfftwentyfour @@ -1782,11 +1803,18 @@ \edef\st@ffs{\csname n@p\romannumeral\noinstrum@nt\endcsname}% \edef\nblines{\csname n@l\romannumeral\noinstrum@nt\endcsname}% \edef\internote{\csname i@n\romannumeral\noinstrum@nt\endcsname}% - \interportee\interfacteur\internote \interportee\tw@\interportee} + \edef\int@rf{\csname interfacteur\romannumeral\noinstrum@nt\endcsname}% RDT 1.24 + \interportee\int@rf\internote \interportee\tw@\interportee} % RDT 1.24 -\def\C@Inter{\stem@skip\interportee \advance\stem@skip-\@ight\internote - \ifnum\nblines=\f@ur \advance\stem@skip\tw@\internote \fi - \ifnum\nblines>\fiv@ \advance\stem@skip-\tw@\internote \fi} +\def\C@Inter{% RDT: corrected to work if \nblines > 6 (version 1.23) + \stem@skip\interportee + \ifnum\nblines=\thr@@ + \advance\stem@skip-\@ight\internote + \else + \advance\stem@skip-\nblines\internote + \advance\stem@skip-\nblines\internote + \advance\stem@skip\tw@\internote + \fi} %%% loop over instruments and staffs @@ -1887,6 +1915,9 @@ \def\setinterinstrument#1#2{\n@v#1\relax % select instrument \expandafter\def\csname interinstrument\romannumeral\n@v\endcsname{#2}} +\def\setinterstaff#1#2{\n@v#1\relax % select instrument % RDT 1.24 + \expandafter\def\csname interfacteur\romannumeral\n@v\endcsname{#2}} + %%% portees \newdimen\systemheight @@ -2965,7 +2996,7 @@ \let\rq\rq@ \let\lq\lq@ \let\ds\ds@oup \let\mp\mp@ \locx@skip\x@skip} -\def\@ndstaff{\egroup +\def\@ndstaff{\egroup % this where \transpose gets reset \ifdim\n@skip<\wd\n@otebox \n@skip\wd\n@otebox \fi \raise\altportee\rlap{\unhbox\n@otebox}} @@ -3018,8 +3049,8 @@ \if .\t@ruc \let\@TI\pt \C@GET \fi \if >\t@ruc \let\@TI\dsh \C@GET \fi \if <\t@ruc \let\@TI\dfl \C@GET \fi - \if !\t@ruc \transpose\normaltranspose \C@Get \fi - \if '\t@ruc \advance\transpose\s@v@n \C@Get \fi + \if !\t@ruc \transpose\normaltranspose \C@Get \fi + \if '\t@ruc \advance\transpose\s@v@n \C@Get \fi \if `\t@ruc \advance\transpose-\s@v@n \C@Get \fi \ifnum\n@viii<\maxdimen \n@i#1\fi \else @@ -4090,9 +4121,14 @@ \def\mordent{\n@iv89\@Char} \def\Mordent{\n@iv119\@Char} \def\doublethumb{\n@iv121\@Char} -\def\tr#1{\zcn{#1}{\ppff tr}} \def\trt#1{\loffset{0.65}{\shake{#1}}\roffset{0.65}{\mordent{#1}}} + +\def\tr#1{\loffset{0.15}{\zcn{#1}{\ppff tr}}} % \loffset added version 1.23 RDT +\def\xtr#1{\raise1.25\internote\hbox{\n@iv111\zcn{#1}\C@ChaR}} % added version 1.23 RDT +\def\ptr#1{\raise1.25\internote\hbox{\n@iv117\zcn{#1}\C@ChaR}} % added version 1.23 RDT +%\def\Xtr#1{\wholeshift{\xtr{#1}}} % unnecessary? + %%% accents \def\upbow{{\musixfont\@xxiii}} @@ -4281,7 +4317,7 @@ \def\trilleX{\let\T@i\empty \C@trille} \let\trille\trilleX -\def\TrilleX{\def\T@i{\it tr }\C@trille} +\def\TrilleX{\def\T@i{\ppff tr }\C@trille} % 1.24 changed from \it RDT \let\Trille\TrilleX \def\C@trille#1#2{\zcharnote{#1}{\y@v#2\noteskip \trill@}} @@ -4320,7 +4356,7 @@ \def\tTrill@old#1{\s@l@cttrill#1\relax \message{\noexpand\tr@x=\the\tr@x, No. #1}% \ifdim\tr@x < \maxdimen\else\errmessage{\@mis \noexpand\Itrille \number #1}\fi - \def\T@i{\it tr }\C@tri} + \def\T@i{\ppff tr }\C@tri} % 1.24 changed from \it RDT \def\C@tri#1{\getcurpos\advance\y@v-\tr@y \kernm\y@v \zcharnote{#1}\trill@\kern\y@v\let\T@i\empty\let\@itrille\undefined} @@ -4362,7 +4398,7 @@ \C@T} \def\ITrille#1{\s@l@cttrill#1\relax \ifdim\tr@x < \maxdimen\errmessage{\@mis \noexpand\Ttrille \number #1}\fi - \global\tr@sw={{\it tr }}% + \global\tr@sw={{\ppff tr }}% 1.24 changed from \it RDT \C@T} \def\C@T#1{% @@ -4388,23 +4424,26 @@ %%% version 1.21 %%% RDT changed beam numbers to 5, suggested by JPC %%% RDT adjusted the vertical positions for 16th and 32nd tremolos +%%% version 1.24 +%%% RDT use new counter \tr@nspose to preserve changes to \transpose in an \hbox -\def\trml#1{\raise2\internote\hbox{\loffset{0.5}{\ibl5{#1}9}\roffset{0.5}{\tbl5}}}% -\def\trmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibu5{#1}9}\roffset{0.5}{\tbu5}}}% -\def\trrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbl5{#1}9}\roffset{0.5}{\tbl5}}}% -\def\trrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbu5{#1}9}\roffset{0.5}{\tbu5}}}% -\def\trrrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbbl5{#1}9}\roffset{0.5}{\tbl5}}}% -\def\trrrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbbu5{#1}9}\roffset{0.5}{\tbu5}}}% +\newcount\tr@nspose % used to restore value of \transpose after closing an \hbox +\def\trml#1{\raise2\internote\hbox{\loffset{0.5}{\ibl5{#1}9}\roffset{0.5}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\trmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibu5{#1}9}\roffset{0.5}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\trrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbl5{#1}9}\roffset{0.5}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\trrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbu5{#1}9}\roffset{0.5}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\trrrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbbl5{#1}9}\roffset{0.5}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\trrrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbbu5{#1}9}\roffset{0.5}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}% % whole notes are wider than quarter/half notes: % version 1.21 RDT adjusted the offsets and vertical positions -\def\Trml#1{\raise3\internote\hbox{\ibl5{#1}9\roffset{1.25}{\tbl5}}}% -\def\Trmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibu5{#1}9}\roffset{0.15}{\tbu5}}}% -\def\Trrml#1{\raise3\internote\hbox{\ibbl5{#1}9\roffset{1.25}{\tbl5}}}% -\def\Trrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbu5{#1}9}\roffset{0.15}{\tbu5}}}% -\def\Trrrml#1{\raise3\internote\hbox{\ibbbl5{#1}9\roffset{1.25}{\tbl5}}}% -\def\Trrrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbbu5{#1}9}\roffset{0.15}{\tbu5}}}% +\def\Trml#1{\raise3\internote\hbox{\ibl5{#1}9\roffset{1.25}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\Trmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibu5{#1}9}\roffset{0.15}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\Trrml#1{\raise3\internote\hbox{\ibbl5{#1}9\roffset{1.25}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\Trrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbu5{#1}9}\roffset{0.15}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\Trrrml#1{\raise3\internote\hbox{\ibbbl5{#1}9\roffset{1.25}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}% +\def\Trrrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbbu5{#1}9}\roffset{0.15}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}% %%% octave lines @@ -4683,7 +4722,7 @@ \def\f{{\ppff f}} \def\ff{{\ppff f\f@kern f}} \def\fp{{\ppff f\f@kern p}} -\def\sF{{\it s\ppff \p@kern f}} +\def\sF{{\ppff s\ppff \p@kern f}} % changed \it to \ppff 1.24 RDT \def\fff{{\ppff f\f@kern f\f@kern f}} \def\ffff{{\ppff f\f@kern f\f@kern f\f@kern f}} \def\mf{{\ppff m\p@kern\f@kern f}} @@ -4949,11 +4988,12 @@ %%% standard settings % [115] make them compatible to >12 instruments -\def\resetlayout{\let\interfacteur\nin@ +\def\resetlayout{\def\interfacteur{9}% \stafftopmarg\thr@@\Interligne \staffbotmarg\thr@@\Interligne \count@\z@ \loop \advance\count@ by\@ne \expandafter \let\csname n@l\roman@c@\endcsname \fiv@ + \expandafter\def\csname interfacteur\roman@c@\endcsname{\interfacteur} % RDT 1.24 \ifnum\count@<\maxinstruments\repeat \resetclefsymbols} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixtmr.tex new/texmf-dist/tex/generic/musixtex/musixtmr.tex --- old/texmf-dist/tex/generic/musixtex/musixtmr.tex 2016-04-07 19:14:54.000000000 +0200 +++ new/texmf-dist/tex/generic/musixtex/musixtmr.tex 2017-03-02 00:01:05.000000000 +0100 @@ -20,7 +20,8 @@ %% %% History: see trailer. % -\immediate\write16{MusiXTimesFonts\space<2016/02/22>} +\immediate\write16{MusiXTimesFonts\space<2017/02/10>} +\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixtmr.tex}\fi % % 7pt roman, bold, italic, bold italic, slanted and small-cap \font\sevenrm=ptmr8t at 7pt @@ -146,7 +147,7 @@ \let\mezzopiano\mp@ % -% Redefine accented characters for etex, suggested by David Carlisle: +% Redefine accented characters for 8-bit font, suggested by David Carlisle: % \ifx\documentclass\undefined \def\ProvidesFile#1[#2]{} @@ -166,10 +167,10 @@ \def#1{\char#3\relax}} \def\DeclareTextComposite#1#2#3#4{% \expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}} +\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 \input t1enc.def -\edef\catcodeat{\the\catcode`\@}\catcode`\@=11 % \c needs special treatment \def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1% \else{\ooalign{\unhbox\z@\crcr @@ -196,4 +197,5 @@ %% 8-bit encoding and extensions, similar to musixplt.tex %% 2015-07-25 %% change to ptmr8t fonts and use t1enc.def to re-defined accented characters - +%% 2016-07-11 RDT +%% \catcode`\@=11 before inputting t1enc.def diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musixtex.tlpobj new/tlpkg/tlpobj/musixtex.tlpobj --- old/tlpkg/tlpobj/musixtex.tlpobj 2016-04-19 17:46:14.000000000 +0200 +++ new/tlpkg/tlpobj/musixtex.tlpobj 2017-04-14 17:51:49.000000000 +0200 @@ -1,6 +1,6 @@ name musixtex category Package -revision 40612 +revision 43375 shortdesc Sophisticated music typesetting longdesc MusiXTeX provides a set of macros, based on the earlier longdesc MusicTeX, for typesetting music with TeX. To produce optimal @@ -69,7 +69,7 @@ texmf-dist/tex/latex/musixtex/musixtex.sty catalogue-also pmx catalogue-ctan /macros/musixtex -catalogue-date 2016-02-25 15:24:43 +0100 +catalogue-date 2017-02-28 22:08:33 +0100 catalogue-license gpl2 catalogue-topics music -catalogue-version 1.22 +catalogue-version 1.24 ++++++ musixtex_various.dif ++++++ --- /var/tmp/diff_new_pack.bw8xia/_old 2017-06-25 19:32:32.140094440 +0200 +++ /var/tmp/diff_new_pack.bw8xia/_new 2017-06-25 19:32:32.140094440 +0200 @@ -13,10 +13,10 @@ texmf-dist/doc/generic/musixtex/examples/marcon3.tex | 8 ------ texmf-dist/doc/generic/musixtex/examples/recueil.tex | 5 ++-- texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sh | 10 ++++++++ - texmf-dist/scripts/musixtex/musixtex.lua | 17 +++++++++++-- + texmf-dist/scripts/musixtex/musixtex.lua | 15 +++++++++--- texmf-dist/tex/generic/musixtex/musixtex.ins | 16 +++++++++++++ texmf-dist/tex/generic/musixtex/pdfmusixtex.ins | 16 +++++++++++++ - 17 files changed, 87 insertions(+), 45 deletions(-) + 17 files changed, 85 insertions(+), 45 deletions(-) --- texmf-dist/doc/generic/musixtex/examples/albinoni.tex +++ texmf-dist/doc/generic/musixtex/examples/albinoni.tex 2001-02-28 12:02:52.000000000 +0000 @@ -313,8 +313,8 @@ +makeindx musixdoc.idx +pdflatex musixdoc --- texmf-dist/scripts/musixtex/musixtex.lua -+++ texmf-dist/scripts/musixtex/musixtex.lua 2016-06-08 12:49:39.297232299 +0000 -@@ -172,14 +172,25 @@ end ++++ texmf-dist/scripts/musixtex/musixtex.lua 2017-06-13 16:08:36.651332556 +0000 +@@ -183,14 +183,23 @@ end -- possible by exploiting the the fact that Lua has two false values. -- dvi == nil "do not produce a DVI file" (but maybe PDF) -- dvi == false "do not process the DVI file" (but stop after TeX) @@ -325,15 +325,13 @@ function defaults() prepmx = "prepmx" pmx = "pmxab" -- tex = "etex" +- tex = "etex" + if base == "pdfmusixtex" then -+ tex = "pdfetex" -+ dvips = "" ++ tex = "pdfetex" + dvi = "" + ps2pdf = "" + else -+ tex = "etex" -+ dvips = "dvips -e0" ++ tex = "etex" + dvi = dvips + ps2pdf = "ps2pdf" + end ++++++ musixtnt.doc.tar.xz ++++++ ++++++ musixtnt.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musixtnt.tlpobj new/tlpkg/tlpobj/musixtnt.tlpobj --- old/tlpkg/tlpobj/musixtnt.tlpobj 2016-04-14 19:28:50.000000000 +0200 +++ new/tlpkg/tlpobj/musixtnt.tlpobj 2017-04-14 17:51:51.000000000 +0200 @@ -22,6 +22,6 @@ runfiles size=1 texmf-dist/tex/generic/musixtnt/musixtnt.tex catalogue-ctan /macros/musixtnt -catalogue-date 2016-02-09 07:19:18 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics music ++++++ musuos.doc.tar.xz ++++++ ++++++ musuos.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musuos.tlpobj new/tlpkg/tlpobj/musuos.tlpobj --- old/tlpkg/tlpobj/musuos.tlpobj 2016-04-14 19:28:52.000000000 +0200 +++ new/tlpkg/tlpobj/musuos.tlpobj 2017-04-14 17:51:52.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/musuos/musuos.cls catalogue-also biblatex-musuos catalogue-ctan /macros/latex/contrib/musuos -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics dissertation music catalogue-version 1.1d ++++++ muthesis.doc.tar.xz ++++++ ++++++ muthesis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/muthesis.tlpobj new/tlpkg/tlpobj/muthesis.tlpobj --- old/tlpkg/tlpobj/muthesis.tlpobj 2016-04-14 19:28:52.000000000 +0200 +++ new/tlpkg/tlpobj/muthesis.tlpobj 2017-04-14 17:51:52.000000000 +0200 @@ -10,6 +10,6 @@ RELOC/tex/latex/muthesis/muthesis.cls RELOC/tex/latex/muthesis/third-rep.cls catalogue-ctan /macros/latex/contrib/muthesis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics dissertation ++++++ mversion.doc.tar.xz ++++++ ++++++ mversion.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mversion.tlpobj new/tlpkg/tlpobj/mversion.tlpobj --- old/tlpkg/tlpobj/mversion.tlpobj 2016-04-14 19:28:52.000000000 +0200 +++ new/tlpkg/tlpobj/mversion.tlpobj 2017-04-14 17:51:52.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=1 RELOC/tex/latex/mversion/mVersion.sty catalogue-ctan /macros/latex/contrib/mversion -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics doc-mgmt doc-tool catalogue-version 1.0.1

1 0

commit texlive-specs-n for openSUSE:Factory
by root＠hilbert.suse.de 25 Jun '17

25 Jun '17

Hello community, here is the log from the commit of package texlive-specs-n for openSUSE:Factory checked in at 2017-06-25 19:23:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/texlive-specs-n (Old) and /work/SRC/openSUSE:Factory/.texlive-specs-n.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "texlive-specs-n" Sun Jun 25 19:23:21 2017 rev:26 rq:505267 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/texlive-specs-n/texlive-specs-n.changes 2017-06-08 14:55:23.855426573 +0200 +++ /work/SRC/openSUSE:Factory/.texlive-specs-n.new/texlive-specs-n.changes 2017-06-25 19:31:41.955184519 +0200 @@ -1,0 +2,52 @@ +Wed Jun 21 10:20:17 UTC 2017 - werner(a)suse.de + +- Do not require own provided perl modules for latexindent + +------------------------------------------------------------------- +Tue Jun 20 06:39:06 UTC 2017 - werner(a)suse.de + +- Change left over texlive-pdftex-def for texlive-latex-bin + +------------------------------------------------------------------- +Mon Jun 19 13:31:54 UTC 2017 - werner(a)suse.de + +- Fix texlive-pdftex-def dependency as now texlive-graphics-def does + provide pdftex.def +- Fix texlive-rotating dependency as now texlive-graphics does + provide rotating.sty + +------------------------------------------------------------------- +Fri Jun 16 12:14:49 UTC 2017 - werner(a)suse.de + +- Notive: Some patches have been moved + * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c + * context_fourier-map.dif from texlive-specs-e to texlive-specs-f + * dvips_config.dif from texlive-specs-g to texlive-specs-h + * jadetex_ini.dif from texlive-specs-l to texlive-specs-m + * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w + * texdraw_info.dif from texlive-specs-v to texlive-specs-w + this entry exists only to silent the auto factory bot + +------------------------------------------------------------------- +Tue Jun 13 10:38:52 UTC 2017 - werner(a)suse.de + +- Final TeXLive 2017 20170520 +- Remove patch fontspec_emph.dif as now upstream +- Update patches + * kpathsea_cnf.dif + * latex2man_tmphandling.dif + * latexdiff_perl.dif + * latexpand_perl.dif + * luaotfload_varfonts.dif + * luatex_cnf.dif + * musixtex_various.dif + * tetex_scripts.dif + * tex4ht_env.dif + * texconfig_scripts.dif + +------------------------------------------------------------------- +Thu Jun 1 12:29:31 UTC 2017 - werner(a)suse.de + +- Update to TeXLive 2017 20170520 pretest + +------------------------------------------------------------------- Old: ---- lshort-italian.doc.tar.xz lshort-japanese.doc.tar.xz lshort-korean.doc.tar.xz lshort-mongol.doc.tar.xz lshort-persian.doc.tar.xz lshort-polish.doc.tar.xz lshort-portuguese.doc.tar.xz lshort-russian.doc.tar.xz lshort-slovak.doc.tar.xz lshort-slovenian.doc.tar.xz lshort-spanish.doc.tar.xz lshort-thai.doc.tar.xz lshort-turkish.doc.tar.xz lshort-ukr.doc.tar.xz lshort-vietnamese.doc.tar.xz lstaddons.doc.tar.xz lstaddons.tar.xz lstbayes.doc.tar.xz lstbayes.tar.xz lt3graph.doc.tar.xz lt3graph.tar.xz ltablex.doc.tar.xz ltablex.tar.xz ltabptch.doc.tar.xz ltabptch.tar.xz ltxdockit.doc.tar.xz ltxdockit.tar.xz ltxfileinfo.doc.tar.xz ltxfileinfo.tar.xz ltximg.doc.tar.xz ltximg.tar.xz ltxindex.doc.tar.xz ltxindex.tar.xz ltxkeys.doc.tar.xz ltxkeys.tar.xz ltxmisc.tar.xz ltxnew.doc.tar.xz ltxnew.tar.xz ltxtools.doc.tar.xz ltxtools.tar.xz lua-alt-getopt.doc.tar.xz lua-alt-getopt.tar.xz lua-check-hyphen.doc.tar.xz lua-check-hyphen.tar.xz lua-visual-debug.doc.tar.xz lua-visual-debug.tar.xz lua2dox.doc.tar.xz lua2dox.tar.xz luabibentry.doc.tar.xz luabibentry.tar.xz luabidi.doc.tar.xz luabidi.tar.xz luacode.doc.tar.xz luacode.tar.xz luaindex.doc.tar.xz luaindex.tar.xz luainputenc.doc.tar.xz luainputenc.tar.xz luaintro.doc.tar.xz lualatex-doc-de.doc.tar.xz lualatex-doc.doc.tar.xz lualatex-math.doc.tar.xz lualatex-math.tar.xz New: ---- latex-notes-zh-cn.doc.tar.xz latex-papersize.doc.tar.xz latex-papersize.tar.xz latex-referenz.doc.tar.xz latex-tabellen.doc.tar.xz latex-tds.doc.tar.xz latex-tds.source.tar.xz latex-veryshortguide.doc.tar.xz latex-web-companion.doc.tar.xz latex2e-help-texinfo-fr.doc.tar.xz latex2e-help-texinfo-spanish.doc.tar.xz latex2e-help-texinfo.doc.tar.xz latex2man.doc.tar.xz latex2man.tar.xz latex2man_tmphandling.dif latex2nemeth.doc.tar.xz latex2nemeth.tar.xz latex4wp-it.doc.tar.xz latex4wp.doc.tar.xz latexbangla.doc.tar.xz latexbangla.tar.xz latexbug.doc.tar.xz latexbug.tar.xz latexcheat-de.doc.tar.xz latexcheat-esmx.doc.tar.xz latexcheat-ptbr.doc.tar.xz latexcheat.doc.tar.xz latexconfig.tar.xz latexcourse-rug.doc.tar.xz latexdemo.doc.tar.xz latexdemo.tar.xz latexdiff.doc.tar.xz latexdiff.tar.xz latexdiff_perl.dif latexfileinfo-pkgs.doc.tar.xz latexfileinfo-pkgs.tar.xz latexfileversion.doc.tar.xz latexfileversion.tar.xz latexgit.doc.tar.xz latexgit.tar.xz latexindent.doc.tar.xz latexindent.tar.xz latexmk.doc.tar.xz latexmk.tar.xz latexmp.doc.tar.xz latexmp.tar.xz latexpand.doc.tar.xz latexpand.tar.xz latexpand_perl.dif lato.doc.tar.xz lato.tar.xz layaureo.doc.tar.xz layaureo.tar.xz layouts.doc.tar.xz layouts.tar.xz lazylist.doc.tar.xz lazylist.tar.xz lcd.doc.tar.xz lcd.tar.xz lcdftypetools.doc.tar.xz lcg.doc.tar.xz lcg.tar.xz lcyw.doc.tar.xz lcyw.tar.xz leading.doc.tar.xz leading.tar.xz limap.doc.tar.xz ling-macros.doc.tar.xz ling-macros.tar.xz lion-msc.doc.tar.xz lion-msc.tar.xz listofitems.doc.tar.xz listofitems.tar.xz lni.doc.tar.xz lni.tar.xz longdivision.doc.tar.xz longdivision.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ texlive-specs-n.spec ++++++ ++++ 33774 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/texlive-specs-n/texlive-specs-n.spec ++++ and /work/SRC/openSUSE:Factory/.texlive-specs-n.new/texlive-specs-n.spec ++++++ latex2man_tmphandling.dif ++++++ --- texmf-dist/scripts/latex2man/latex2man | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- texmf-dist/scripts/latex2man/latex2man +++ texmf-dist/scripts/latex2man/latex2man 2012-03-29 09:35:29.180854334 +0000 @@ -20,6 +20,8 @@ require 5.0004_03; use Getopt::Std; +use File::Temp qw/tempfile/; + # use strict 'vars'; $CMD=`basename $0`; chop ($CMD); @@ -29,7 +31,7 @@ sub date2str; $VERSION = "1.25"; $DATE = date2str ('$Date: 2017/04/13 14:25:56 $' =~ m|(\d+/\d+/\d+)|); -$tmp = "/tmp/$CMD.$$"; +(undef, $tmp) = tempfile; ################################################################## # check option and arguments ++++++ ltxdockit.doc.tar.xz -> latexdiff.doc.tar.xz ++++++ ++++ 12111 lines of diff (skipped) ++++++ ltxdockit.doc.tar.xz -> latexdiff.tar.xz ++++++ ++++ 5908 lines of diff (skipped) ++++++ latexdiff_perl.dif ++++++ >From cfe445c4bff997cdc59979a89da8362cbf403e75 Mon Sep 17 00:00:00 2001 From: Frederik Tilmann <ftilmann(a)zedat.fu-berlin.de> Date: Sat, 17 Sep 2016 22:21:08 +0200 Subject: [PATCH] Removed some more unescaped left braces (which triggered depracation warnings) >From a83d9cb865fd0d8ba83ae97ce567035d96b015c7 Mon Sep 17 00:00:00 2001 From: Frederik Tilmann <ftilmann(a)zedat.fu-berlin.de> Date: Tue, 11 Oct 2016 01:01:46 +0200 Subject: [PATCH] Fix further unescaped left brace warnings; fixes issue #61 --- texmf-dist/scripts/latexdiff/latexdiff.pl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) --- texmf-dist/scripts/latexdiff/latexdiff.pl +++ texmf-dist/scripts/latexdiff/latexdiff.pl 2017-06-13 14:00:41.712076413 +0000 @@ -2255,15 +2255,15 @@ sub marktags { sub take_comments_and_enter_from_frac() { ###*************take the \n and % between frac and {}*********** ###notice all of the substitution are made none global - while( m/\\begin{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\frac(([\s]*%[^\n]*?)*[\r\n|\r|\n])+\{(.*?)\\end{\1}/s ) { + while( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\frac(([\s]*%[^\n]*?)*[\r\n|\r|\n])+\{(.*?)\\end\{\1}/s ) { ### if there isn't any % or \n in the pattern $2 then there should be an \\end{...} in $2 - if( $2 !~ m/\\end{$1}/s ) { + if( $2 !~ m/\\end\{$1}/s ) { ### take out % and \n from the next match only (none global) - s/\\begin{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\frac(([\s]*%[^\n]*?)*[\r\n|\r|\n])+\{(.*?)\\end{\1}/\\begin{$1}$2\\frac{$5\\end{$1}/s; + s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\frac(([\s]*%[^\n]*?)*[\r\n|\r|\n])+\{(.*?)\\end\{\1}/\\begin{$1}$2\\frac{$5\\end{$1}/s; } else{ ###there are no more % and \n in $2, we want to find the next one so we clear the begin-end from the pattern - s/\\begin{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\end{\1}/MATHBLOCK$1$2MATHBLOCKEND/s; + s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\end\{\1}/MATHBLOCK$1$2MATHBLOCKEND/s; } } ###cleaning up @@ -2277,18 +2277,18 @@ sub take_comments_and_enter_from_frac() ### from now on CURRFRAC is the frac we are looking at s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)\\frac\{(.*?)\\end\{\1\}/\\begin\{$1\}$2CURRFRAC\{$3\\end\{$1\}/s; while( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)CURRFRAC\{(.*?)\\end\{\1\}/s ) { - if( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)CURRFRAC\{($pat_n)\}([\s]*(%[^\n]*?)*[\r\n|\r|\n])+[\s]*\{(.*?)\\end{\1}/s ) { + if( m/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)CURRFRAC\{($pat_n)\}([\s]*(%[^\n]*?)*[\r\n|\r|\n])+[\s]*\{(.*?)\\end\{\1}/s ) { s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)\}(.*?)CURRFRAC\{($pat_n)\}([\s]*(%[^\n]*?)*[\r\n|\r|\n])+[\s]*\{(.*?)\\end\{\1\}/\\begin\{$1\}$2CURRFRAC\{$3\}\{$6\\end\{$1\}/s; } else { # there is no comment or \n between the two brackets {}{} ### change CURRFRAC to FRACSTART so we can change them all back to //frac{ when we finish - s/\\begin{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)CURRFRAC\{(.*?)\\end{\1}/\\begin{$1}$2FRACSTART\{$3\\end{$1}/s; + s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)CURRFRAC\{(.*?)\\end\{\1}/\\begin{$1}$2FRACSTART\{$3\\end{$1}/s; } } } else{ ###there are no more frac in $2, we want to find the next one so we clear the begin-end from the pattern - s/\\begin{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\end{\1}/MATHBLOCK$1$2MATHBLOCKEND/s; + s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\end\{\1}/MATHBLOCK$1$2MATHBLOCKEND/s; } } @@ -2351,16 +2351,16 @@ sub preprocess { s/(?<!\\)\\\[/\\begin{SQUAREBRACKET}/sg; s/\\\]/\\end{SQUAREBRACKET}/sg; # Convert all picture environmentent (\begin{PICTUREENV} .. \end{PICTUREENV} \PICTUREBLOCKenv - s/\\begin{($PICTUREENV)}(.*?)\\end{\1}/\\PICTUREBLOCK$1\{$2\}/sg; + s/\\begin\{($PICTUREENV)}(.*?)\\end\{\1}/\\PICTUREBLOCK$1\{$2\}/sg; # For --block-math-markup option -convert all \begin{MATH} .. \end{MATH} # into \MATHBLOCKMATH{...} commands, where MATH is any valid math environment # Also convert all array environments into ARRAYBLOCK environments if ( $mathmarkup != FINE ) { - s/\\begin{($ARRENV)}(.*?)\\end{\1}/\\ARRAYBLOCK$1\{$2\}/sg; + s/\\begin\{($ARRENV)}(.*?)\\end\{\1}/\\ARRAYBLOCK$1\{$2\}/sg; take_comments_and_enter_from_frac(); - s/\\begin{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\end{\1}/\\MATHBLOCK$1\{$2\}/sg; + s/\\begin\{($MATHENV|$MATHARRENV|SQUAREBRACKET)}(.*?)\\end\{\1}/\\MATHBLOCK$1\{$2\}/sg; } # add final token " STOP" $_ .= " STOP" @@ -2646,8 +2646,8 @@ sub postprocess { # environments) are between the \begin{$MATHENV} and \end{MATHMODE} commands. This is necessary as the minimal matching # is not globally minimal but only 'locally' (matching is beginning from the left side of the string) if ( $mathmarkup == FINE ) { - 1 while s/\\begin{((?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)}((?:.(?!(?:\\end{(?:(?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)}|\\begin{MATHMODE})))*?)\\end{MATHMODE}/\\begin{$1}$2\\end{$1}/s; - 1 while s/\\begin{MATHMODE}((?:.(?!\\end{MATHMODE}))*?)\\end{((?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)}/\\begin{$2}$1\\end{$2}/s; + 1 while s/\\begin\{((?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)\}((?:.(?!(?:\\end\{(?:(?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)\}|\\begin\{MATHMODE\})))*?)\\end\{MATHMODE\}/\\begin{$1}$2\\end{$1}/s; + 1 while s/\\begin\{MATHMODE\}((?:.(?!\\end\{MATHMODE\}))*?)\\end\{((?:$MATHENV)|(?:$MATHARRENV)|SQUAREBRACKET)\}/\\begin{$2}$1\\end{$2}/s; # convert remaining \begin{MATHMODE} \end{MATHMODE} (and not containing & or \\ )into MATHREPL environments s/\\begin\{MATHMODE\}((?:(.(?!(?<!\\)\&|\\\\))*)?)\\end\{MATHMODE\}/\\begin{$MATHREPL}$1\\end{$MATHREPL}/sg; # others into MATHARRREPL @@ -4430,7 +4430,7 @@ institute \providecommand{\DIFaddend}{\protect\marginpar{]}} \providecommand{\DIFdelbegin}{\protect\marginpar{d[}} \providecommand{\DIFdelend}{\protect\marginpar{]}} -%DIF END BRACKET PREAMBLE +%DIF END MARGIN PREAMBLE %DIF DVIPSCOL PREAMBLE %Note: only works with dvips converter ++++++ latexpand_perl.dif ++++++ ! Fix boo#983823 --- texmf-dist/scripts/latexpand/latexpand | 2 ++ 1 file changed, 2 insertions(+) --- texmf-dist/scripts/latexpand/latexpand +++ texmf-dist/scripts/latexpand/latexpand 2017-06-13 14:06:39.461591189 +0000 @@ -130,6 +130,7 @@ sub process_file return $in_comment; } +no warnings; sub process_line { my ($line, $prefix, $file) = @_; @@ -251,6 +252,7 @@ sub process_line } print; } +use warnings; # search $1 in $TEXINPUTS, with possible extensions in $2 sub find_tex_file ++++++ lshort-italian.doc.tar.xz -> lcd.doc.tar.xz ++++++ ++++ 24585 lines of diff (skipped) ++++++ lshort-italian.doc.tar.xz -> lcd.tar.xz ++++++ ++++ 24653 lines of diff (skipped) ++++++ ltximg.doc.tar.xz -> lcg.doc.tar.xz ++++++ Binary files old/doc/latex/lcg/lcg.pdf and new/doc/latex/lcg/lcg.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/ltximg/CHANGES new/texmf-dist/doc/support/ltximg/CHANGES --- old/texmf-dist/doc/support/ltximg/CHANGES 2015-04-22 23:19:53.000000000 +0200 +++ new/texmf-dist/doc/support/ltximg/CHANGES 1970-01-01 01:00:00.000000000 +0100 @@ -1,7 +0,0 @@ -#------------------------------ CHANGES -------------------------------# -v1.1 2015-04-21 - Change mogrify to gs for image formats - - Create output file - - Rewrite source code and fix regex - - Add more image format - - Change date to iso format -v1.0 2013-12-01 - First public release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/ltximg/README new/texmf-dist/doc/support/ltximg/README --- old/texmf-dist/doc/support/ltximg/README 2015-04-22 23:19:53.000000000 +0200 +++ new/texmf-dist/doc/support/ltximg/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ -ltximg is a Perl script which isolates all Tikz or -PSTricks related parts of the TeX document into single -pdf file, split and convert in eps/pdf/png/jpg/svg format. - -The advantage of "ltximg" is the ability to discuss the -environments that give problems using the "preview" package -as "verbatim" inline (verb|...|) or beginning with %, and -other environments (LTXexample, Verbatim,etc). - -The images files are saved in a subdirectory images. - -Syntax: perl ltximg.pl file.tex [options] - -ltximg create a copy for TeX source whit all PGF|TiKZ|Pstricks environments - and convert all environments into single images (pdf/png/eps/jpg). - By default search and extract environments using (pdf)LaTeX - and ghostscript (gs). - -Environments suports by LTXimg: - - pspicture tikzpicture pgfpicture forest ganttchart - tikzcd circuitikz dependency other postscript - -Options: - - -h,--help - display this help and exit - -l,--license - display license information and exit - -v,--version - display version (current 1.2) and exit - -d,--dpi=<int> - the dots per inch for images (default 150) - -j,--jpg - create .jpg files (need Ghostscript) - -p,--png - create .png files (need Ghostscript) - -e,--eps - create .eps files (need pdftops) - -s,--svg - create .svg files (need pdf2svg) - -P,--ppm - create .ppm files (need pdftoppm) - -a,--all - create .(pdf,eps,jpg,png) images - -c,--clear - delete all temp and aux files - -o,--output - create a file-out.tex whitout PGF|TiKZ|PST code - -m,--margins=<int> - margins in bp for pdfcrop (default 0) - -np,--nopreview - create images files whitout preview package - -ns,--nosource - delete all source for images files - --miktex - use --enable-write18 for MikTeX users - --xetex - using (Xe)LaTeX for create images - --latex - using LaTeX for create images - --luatex - using (Lua)LaTeX for create images - --nopdf - don't create a PDF image files (default off) - --other=<string> - search other environment (default other) - --ignore=<string> - skip verbatim environment (default ignore) - --imgdir=<string> - the folder for images (default images) - - -Pablo González Luengo, 2015-04-21 Binary files old/texmf-dist/doc/support/ltximg/ltximg-doc.pdf and new/texmf-dist/doc/support/ltximg/ltximg-doc.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/ltximg/ltximg-doc.tex new/texmf-dist/doc/support/ltximg/ltximg-doc.tex --- old/texmf-dist/doc/support/ltximg/ltximg-doc.tex 2015-04-22 23:19:53.000000000 +0200 +++ new/texmf-dist/doc/support/ltximg/ltximg-doc.tex 1970-01-01 01:00:00.000000000 +0100 @@ -1,337 +0,0 @@ -\documentclass[10pt]{article} -\usepackage[T1]{fontenc}% -\usepackage{hologo}% -\usepackage{fetamont}% -\usepackage{libertine}% -\usepackage{booktabs}% -\usepackage{tabularx}% -\usepackage{tcolorbox}% -\tcbuselibrary{documentation}% -\usepackage[margin=1.0in,letterpaper]{geometry}% -\usepackage[scaled=0.9]{inconsolata}% -\usepackage{listings}% -% colors -\definecolor{lightgrey}{rgb}{0.9,0.9,0.9} -\definecolor{darkgreen}{rgb}{0,0.6,0} -\definecolor{darkred}{rgb}{0.6,0,0} -\definecolor{myblue}{RGB}{20,105,176} -\definecolor{darkgreen}{rgb}{0,0.6,0} -% languaje -\lstdefinelanguage{mytex}[LaTeX]{TeX}{ -columns=flexible, -frame=single, -framerule=0pt,% -backgroundcolor=\color{gray!10},% -xleftmargin=\fboxsep,% -xrightmargin=\fboxsep, -alsoletter={\\,*,\&}, -morekeywords={\\AtBeginDocument, - \\RequirePackage, - \\PreviewEnvironment, - \&}, -morekeywords=[2]{pspicture, - verbatim, - table, - other, - tikzpicture, - postscript, - preview, - TRICKS, - POSTRICKS, - TIKZPICTURE, - OTHER, - nopreview}, -morekeywords=[3]{\\begin, - \\pspicture, - \\TRICKS, - \\ENDTRICKS, - \\endpspicture, - \\end}, -literate=*{\{}{{\textcolor{myblue}{\{}}}{1} - {\}}{{\textcolor{myblue}{\}}}}{1} - {[}{{\textcolor{myblue}{[}}}{1} - {]}{{\textcolor{myblue}{]}}}{1}, - } -\lstset{language=mytex} - -\lstdefinestyle{mystyle1}{ - basicstyle=\small\ttfamily, - keywordstyle=\bfseries\color{red}, - keywordstyle=[2]{\color{magenta}}, - keywordstyle=[3]{\color{blue}}, - commentstyle=\color{darkgreen}, - stringstyle=\color{orange}, - identifierstyle=\ttfamily, - showstringspaces=true, - breaklines=true, - tabsize=4, - columns=fullflexible, - keepspaces=true, - } -% style -\lstset{style=mystyle1} -\begin{document} -\title{{\Huge\textffm{LTX}\textffmw{img} \normalsize \Large\textffmw{v1.1}}\\\small\textffm{tikz|pgf|pstricks \\to image format}} -\author{Pablo Gonz\'{a}lez Luengo\\ \small \ttfamily pablgonz at yahoo dot com} -\date{\today} -\maketitle -\begin{abstract} -\noindent - -\textsf{ltximg} is a \textsf{Perl} script that automates the process to extract and convert all PGF|TiKZ|Pstricks environments from input file to image formats (pdf,png,jpg,eps,ppm,svg) and source code for environments in individual files using \textsf{Ghostscript} and other software. By default search and extract environments using \hologo{pdfLaTeX}. -\end{abstract} -\tableofcontents -\section{Required Software} - -For the full operation of the \textsf{ltximg} script you need the following opensource programs -(available for windows and linux). - -\begin{itemize} -\item \textsf{Perl} (version 5.18 or higer). - -\item \textsf{Ghostscript} (version 9.16). - -\item \textsf{pdftops} (optional, for images in \textsf{EPS} format). - -\item \textsf{pdftoppm} (optional, for images in \textsf{PPM} format). - -\item \textsf{pdf2svg} (optional, for images in \textsf{SVG} format). -\end{itemize} -\newpage -\section{Run and options} -the syntax for \textsf{ltximg} script is simple: -\noindent -For \TeX Live users: -\begin{lstlisting} -ltximg file.tex --options -\end{lstlisting} -For Mik\TeX\ users: -\begin{lstlisting} -perl ltximg file.tex --miktex --options -\end{lstlisting} - -\begin{table}[htp] -\caption{Options for \textsf{ltximg}} -\begin{tabularx}{\linewidth}{@{}>{\ttfamily} l>{\ttfamily} l >{\ttfamily}l X @{}}\\\toprule -\emph{short} & \emph{long} & \emph{default} & \emph{description}\\\midrule - -h &--help & & Display help from command line and exit.\\ - -l &--license & & Display license information and exit.\\ - -v &--version & 1.1 & Display version of script and exit.\\ - -d &--dpi=<int> & 150 & The dots per inch for images.\\ - -j &--jpg & & Create \textsf{.jpg} files (need \textsf{Ghostscript}).\\ - -p &--png & & Create \textsf{.png}files (need \textsf{Ghostscript}).\\ - -e &--eps & & Create \textsf{.eps} files (need \textsf{pdftops}).\\ - -s &--svg & & Create \textsf{.svg} files (need \textsf{pdf2svg}).\\ - -P &--ppm & & Create \textsf{.ppm} files (need \textsf{pdftoppm}).\\ - -a &--all & & Create \textsf{.(pdf,eps,jpg,png)} images.\\ - -c &--clear & & Delete all temp and aux files.\\ - -o &--output & & Create a \textsf{file-out.tex} whitout \textsf{PGF|TiKZ|PST} code.\\ - -m &--margins=<int>& 0 & Margins in bp for \textsf{pdfcrop}.\\ - -np &--nopreview & off & Create images files whitout \textsf{preview} package.\\ - -ns &--nosource & off & Delete all source for images files\\ - &--miktex &-shell-escape & Use \textsf{--enable-write18} for \hologo{MiKTeX} users.\\ - &--xetex & off & Using \hologo{XeLaTeX} for create images.\\ - &--latex & off & Using \hologo{LaTeX} for create images.\\ - &--luatex & off & Using \hologo{LuaLaTeX} for create images.\\ - &--nopdf & off & Don't create a PDF image files.\\ - &--other=<string> & other & Search \textsf{other} environment for export.\\ - &--ignore=<string> & ignore& Skip verbatim environment.\\ - &--imgdir=<string> & images & The folder for images.\\ - \bottomrule -\end{tabularx} -\end{table} - - - -\section{How it works} - -The script works in two steps for create image, source code and output file \emph{without PGF/TIKZ/PST} environments. - - -\subsection{Environment Suports} - -\textsf{ltximg} export and convert this environment: - -\begin{minipage}[c]{0.25\columnwidth} -\begin{docEnvironment}% -{pspicture}% -{} -\end{docEnvironment} -\end{minipage} -\begin{minipage}[c]{0.25\columnwidth} -\begin{docEnvironment}% -{pspicture*}% -{} -\end{docEnvironment} -\end{minipage} -\begin{minipage}[c]{0.25\columnwidth} -\begin{docEnvironment}% -{postscript}% -{} -\end{docEnvironment} -\end{minipage} -\begin{minipage}[c]{0.25\columnwidth} -\begin{docEnvironment}% -{circuitikz}% -{} -\end{docEnvironment} -\end{minipage} - -\vspace{0.5cm} - -\begin{minipage}[c]{0.25\columnwidth} -\begin{docEnvironment}% -{tikzpicture}% -{} -\end{docEnvironment} -\end{minipage} -\begin{minipage}[c]{0.25\columnwidth} -\begin{docEnvironment}% -{pgfpicture}% -{} -\end{docEnvironment} -\end{minipage} -\begin{minipage}[c]{0.25\columnwidth} -\begin{docEnvironment}% -{ganttchart}% -{} -\end{docEnvironment} -\end{minipage} -\begin{minipage}[c]{0.25\columnwidth} -\begin{docEnvironment}% -{forest}% -{} -\end{docEnvironment} -\end{minipage} -\vspace{0.5cm} - -\begin{minipage}[c]{0.25\columnwidth} -\begin{docEnvironment}% -{tikzcd}% -{} -\end{docEnvironment} -\end{minipage} -\begin{minipage}[c]{0.25\columnwidth} -\begin{docEnvironment}% -{circuitikz}% -{} -\end{docEnvironment} -\end{minipage} -\begin{minipage}[c]{0.25\columnwidth} -\begin{docEnvironment}% -{dependency}% -{} -\end{docEnvironment} -\end{minipage} -\begin{minipage}[c]{0.25\columnwidth} -\begin{docEnvironment}% -{other}% -{} -\end{docEnvironment} -\end{minipage} - - - -\subsection{Comment and ignore} - -The first step \textsf{ltximg } script create a image dir (\textsf{images/}) -and read all input file in memory, processing is as follows, being assumed that our file is \texttt{test.tex}: - -\begin{enumerate} -\item Create a copy file in memory and change problematic environments (verbatim, verbatim\*, lstlisting, - LTXexample, Verbatim, comment, alltt, minted, tcblisting, xcomment and ignore) - -\item Change problematic inline verbatim from varius package (lstlisting,LTXexample, Verbatim, comment, alltt, minted, tcblisting, etc) include line whit \%. -\end{enumerate} - - - -\subsection{Create source and images} -\begin{enumerate} - -\item If script is call whitout \textsf{--nopreview} option (default), adds the following lines to the beginning of the test.tex in memory and save file test-fig.tex in images dir : - -\begin{lstlisting} -\AtBeginDocument{ -\RequirePackage[active,tightpage]{preview} -\renewcommand\PreviewBbAdjust{-60pt -60pt 60pt 60pt}% -\newenvironment{postscript}{}{}% -\PreviewEnvironment{postscript}}% -\end{lstlisting} - -\item If script is call whit \textsf{--nopreview} option, all environment code its put inside the : - -\begin{lstlisting} -\begin{postscript} -... -\end{postscript} -\end{lstlisting} - -and separate in individual files (test-fig-1.tex, test-fig-2.tex, etc) in image dir and join in test-fig.tex. The postscript environment can be used to place any material to be exported if that is not supported or fails the \textsf{--other} option. - - -\item Now, the script call (pdf/lua/xe)latex in \texttt{test-fig.tex} and \textsf{pdfcrop} in -\texttt{test-fig.pdf} and create image files. -\end{enumerate} - -\section{Example} -\begin{lstlisting} -ltximg test.tex -e -p -j -c -o --imgdir=pics -\end{lstlisting} -produce test-out.tex whitout PGF|TiKZ|PST environments and create "pics" dir whit all images (pdf,eps,png,jpg) and source (.tex) for all related parts using \hologo{pdfLaTeX} whit preview package and cleaning all tmp files. - -\noindent -Suport bundling for short options: -\begin{lstlisting} -ltximg test.tex -epjco --imgdir=pics -\end{lstlisting} -\end{document} - - - -LTXimg extract and convert all PGF|TiKZ|Pstricks environments from TeX - source into single images files (pdf/png/eps/jpg/svg) using Ghostscript. - By default search and extract environments using (pdf)LaTeX. - -Environments suports by LTXimg: - - pspicture tikzpicture pgfpicture forest ganttchart - tikzcd circuitikz dependency other postscript - -Options: -\begin{tabularx}{\linewidth}{@{}>{\ttfamily} l>{\ttfamily} l >{\ttfamily}l X @{}}\\\toprule -\emph{short} & \emph{name} & \emph{default} & \emph{description}\\\midrule - -h&--help & &display this help and exit - -l&--license & &- display license information and exit - -v&--version & & - display version (current 1.2) and exit - -d&--dpi=<int> & 150 & - the dots per inch for images - -j&--jpg & &- create .jpg files (need Ghostscript) - -p&--png & &- create .png files (need Ghostscript) - -e&--eps & &- create .eps files (need pdftops) - -s&--svg & &- create .svg files (need pdf2svg) - -P&--ppm & &- create .ppm files (need pdftoppm) - -a&--all & &- create .(pdf,eps,jpg,png) images - -c&--clear & &- delete all temp and aux files - -o&--output & &- create a file-out.tex whitout PGF|TiKZ|PST code - -m&--margins=<int>& &- margins in bp for pdfcrop (default 0) - -np&--nopreview & &- create images files whitout preview package - -ns&--nosource & &- delete all source for images files - &--miktex & &- use --enable-write18 for MikTeX users - &--xetex & &- using (Xe)LaTeX for create images - &--latex & &- using LaTeX for create images - &--luatex & &- using (Lua)LaTeX for create images - &--nopdf & &- don't create a PDF image files (default off) - &--other=<string> & &- search other environment (default other) - &--ignore=<string> & &- skip verbatim environment (default ignore) - &--imgdir=<string> & &- the folder for images (default images) - \bottomrule -\end{tabularx} - - -Example: -* ltximg test.tex -e -p -j -c -o --imgdir=pics -* produce test-out.tex whitout PGF|TiKZ|PST environments and create "pics" -* dir whit all images (pdf,eps,png,jpg) and source (.tex) for all related -* parts using (pdf)LaTeX whit preview package and cleaning all tmp files. -* Suport bundling for short options: ltximg test.tex -epjco --imgdir=pics -END_OF_USAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lcg.doc.tlpobj new/tlpkg/tlpobj/lcg.doc.tlpobj --- old/tlpkg/tlpobj/lcg.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/lcg.doc.tlpobj 2017-04-14 17:46:54.000000000 +0200 @@ -0,0 +1,7 @@ +name lcg.doc +category Package +revision 31474 +shortdesc doc files of lcg +relocated 1 +docfiles size=65 + RELOC/doc/latex/lcg/lcg.pdf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ltximg.doc.tlpobj new/tlpkg/tlpobj/ltximg.doc.tlpobj --- old/tlpkg/tlpobj/ltximg.doc.tlpobj 2016-04-14 19:18:59.000000000 +0200 +++ new/tlpkg/tlpobj/ltximg.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -name ltximg.doc -category Package -revision 37006 -shortdesc doc files of ltximg -docfiles size=90 - texmf-dist/doc/support/ltximg/CHANGES - texmf-dist/doc/support/ltximg/README - texmf-dist/doc/support/ltximg/ltximg-doc.pdf - texmf-dist/doc/support/ltximg/ltximg-doc.tex ++++++ ltximg.tar.xz -> lcg.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/lcg/lcg.sty new/tex/latex/lcg/lcg.sty --- old/tex/latex/lcg/lcg.sty 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/lcg/lcg.sty 2016-11-25 19:33:53.000000000 +0100 @@ -0,0 +1,226 @@ +%% +%% This is file `lcg.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% lcg.dtx (with options: `lcg') +%% +%% Copyright (c) 2001--2013 Erich Janka (erich.janka(a)gmail.com) +%% +%% This package may be distributed and/or modified under the terms of the +%% LaTeX Project Public License, as described in lppl.txt in the base +%% LaTeX distribution, either version 1.2 or (at your option) +%% any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% +%% This program consits of the files lcg.dtx and lcg.ins +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{lcg}[2013/08/09 v1.3 generating random numbers] +\RequirePackage{keyval} +\@ifundefined{rand}{} + {\PackageWarning{lcg}{Command `rand' already defined}} +\@ifundefined{r@ndcountername}{} + {\PackageWarning{lcg}{Command `r@ndcountername' + already defined}} +\@ifundefined{r@nd}{} + {\PackageWarning{lcg}{Command `r@nd' already defined}} +\@ifundefined{initr@nd}{} + {\PackageWarning{lcg}{Command `initr@nd' already defined}} +\@ifundefined{cutr@nger@nd}{} + {\PackageWarning{lcg}{Command `cutr@nger@nd' already defined}} +\@ifundefined{@rderr@nd}{} + {\PackageWarning{lcg}{Command `@rderr@nd' already defined}} +\@ifundefined{ProcessOptionsWithKVr@nd}{} + {\PackageWarning{lcg}{Command `ProcessOptionsWithKVr@nd' + already defined}}% +\@ifundefined{qui@t}{} + {\PackageWarning{lcg}{Command `qui@t' already defined}} +\@ifundefined{firstletterr@nd}{} + {\PackageWarning{lcg}{Command `firstletterr@nd' already defined}} + % \end{macrocode} +\@ifundefined{c@f@rst}{} + {\PackageWarning{lcg}{Counter `f@rst' already defined}} +\@ifundefined{c@l@st}{} + {\PackageWarning{lcg}{Counter `l@st' already defined}} +\@ifundefined{c@cr@nd}{} + {\PackageWarning{lcg}{Counter `cr@nd' already defined}} +\@ifundefined{f@rst}{} + {\PackageWarning{lcg}{Existing command `f@rst' conflicts + with counter `f@rst'}} +\@ifundefined{l@st}{} + {\PackageWarning{lcg}{Existing command `l@st' conflicts + with counter `l@st'}} +\@ifundefined{cr@nd}{} + {\PackageWarning{lcg}{Existing command `cr@nd' conflicts + with counter `cr@nd'}} +\def\initr@nd{% + \def\r@ndcountername{rand}% + \newcount \f@rst + \newcount \l@st + \newcount \cr@nd + \pr@keysr@nd% + \ProcessOptionsWithKVr@nd{Init}% + \p@stkeysr@nd% + \@utputr@nd% +} % end of \def\initr@nd +\def\reinitrand{\@ifnextchar[\@reinitr@nd{\@reinitr@nd[]}}% +\def\@reinitr@nd[#1]{% + \pr@keysr@nd% + \setkeys{Init}{#1}% + \p@stkeysr@nd% + \@utputr@nd% +}% end of \def\reinitrand +\def\chgrand{\@ifnextchar[\@chgr@nd{\@chgr@nd[]}} +\def\@chgr@nd[#1]{% + \@tempcnta = \z@ + \@tempcntb = \z@ + \setkeys{Init}{#1}% + \p@stkeysr@nd% + \@utputr@nd% +} % end of \def\chgrand +\def\ProcessOptionsWithKVr@nd#1{% + \let\@tempa\@empty + \@for\CurrentOption:=\@classoptionslist\do{% + \@ifundefined{KV@#1@\CurrentOption}% + {}{\edef\@tempa{\@tempa,\CurrentOption,}}} + \edef\@tempa{% + \noexpand\setkeys{#1}{\@tempa\@ptionlist{\@currname.\@currext}}} + \@tempa + \AtEndOfPackage{\let\@unprocessedoptions\relax}} +\define@key{Init}{first}[1]{\f@rst = #1} +\define@key{Init}{last}[2147483647]{\l@st = #1} +\define@key{Init}{counter}[rand]{\def\r@ndcountername{#1}} +\define@key{Init}{seed}[\z@]{% seed for random number generator + \ifnum #1 < \z@% + \PackageWarning{lcg}{Seed should be > 0 -- + Seed will be initialized with the actual time}% + \cr@nd = \z@% + \else% + \cr@nd = #1 + \typeout{Random number generator initialized to #1}% + \fi% +} +\define@key{Init}{quiet}[y]{ + \def\qui@t{\expandafter\firstletterr@nd #1\delimiter} + \if \qui@t y% nothing to do + \else\if\qui@t Y \def\qui@t{y} + \else\if\qui@t j \def\qui@t{y} + \else\if\qui@t J \def\qui@t{y} + \else\if\qui@t n \def\qui@t{n} + \else\if\qui@t N \def\qui@t{n} + \else + \PackageWarning{lcg}{Value of key <quiet> must be <y> or <n>} + \def\qui@t{y} + \fi\fi\fi\fi\fi\fi +} +\def\pr@keysr@nd{% + \f@rst = \@ne % 1 + \l@st = 2147483647 % 2147483647 + \cr@nd = \z@ % 0 + \@tempcnta = \z@ + \@tempcntb = \z@ + \def\r@ndcountername{rand}% + \def\qui@t{n} +} % end of newcommand\def\pr@keysr@nd +\def\p@stkeysr@nd{% + \@rderr@nd% last < first -> swap + \cutr@nger@nd% range too big -> cut + \@ifundefined{c@\r@ndcountername}{\newcounter{\r@ndcountername}}% + {% + \PackageWarning{lcg}{Using an already existing + counter \r@ndcountername}% + }% +\setcounter{\r@ndcountername}{0}% +} % end of \def\p@stkeysr@nd +\def\firstletterr@nd#1#2\delimiter{#1} +\def\@utputr@nd{% + \if \qui@t y% do nothing + \else + \typeout{Smallest possible random number: \the\f@rst}% + \typeout{Largest possible random number: \the\l@st}% + \typeout{The pseudo random numbers will be stored + in the LaTeX counter `\r@ndcountername'}% + \fi +} +\def\@rderr@nd{% + \ifnum \l@st < \f@rst% + \PackageWarning{lcg}{Key `last' less than key `first' + -- swapped}% + \@tempcnta = \f@rst + \f@rst = \l@st + \l@st = \@tempcnta + \fi% +}% end of \def\@rderr@nd +\def\cutr@nger@nd{% + \ifnum\l@st<\z@\else + \@tempcntb = -2147483646 % -2^31 + 2 + \@tempcnta = \f@rst + \advance \@tempcntb \l@st + \multiply \@tempcntb \m@ne + \advance \@tempcnta \@tempcntb + \ifnum \@tempcnta < \z@% + \PackageWarning{lcg}{Range contains too many numbers + -- right border reset to largest possible value}% + \advance \l@st \@tempcnta + \fi% + \fi% +}% end of \checkr@ange +\def\rand{% + \r@nd% + \@tempcnta + \@tempcntb + \@tempcnta = \f@rst + \@tempcntb = \l@st + \multiply \@tempcnta \m@ne + \advance \@tempcntb \@tempcnta + \advance \@tempcntb \@ne %l@st-f@rst+1 + \@tempcnta = 2147483647 + \divide \@tempcnta \@tempcntb + \multiply \@tempcnta \@tempcntb + \ifnum \cr@nd > \@tempcnta + \rand% + \else + \setcounter{\r@ndcountername}{\cr@nd}% + \@tempcnta = \cr@nd + \divide \@tempcnta \@tempcntb + \multiply \@tempcnta \@tempcntb + \multiply \@tempcnta \m@ne + \addtocounter{\r@ndcountername}{\@tempcnta}% + \addtocounter{\r@ndcountername}{\f@rst}% + \fi +} % end of \rand +\def\r@nd{% + \ifnum \cr@nd < \@ne% then ... initialize generator + \cr@nd = \the\time + \advance \cr@nd \inputlineno + \multiply \cr@nd \value{page} + \advance \cr@nd \the\year + \multiply \cr@nd \the\month + \multiply \cr@nd \the\day + \advance \cr@nd \inputlineno + \if \qui@t y% + \else + \typeout{Random number generator initialized to \the\cr@nd}% + \fi + \r@nd% + \else % else ... generate new number + \@tempcnta = \cr@nd + \divide \@tempcnta 127773 % \@tempcnta = floor(z/q) + \@tempcntb = \@tempcnta % \@tempcntb = floor(z/q) + \multiply \@tempcnta -2836 % \@tempcnta = -r*floor(z/q) + \multiply \@tempcntb -127773 % \@tempcntb = -q*floor(z/q) + \advance \cr@nd \@tempcntb % cr@nd = z mod q + \multiply \cr@nd 16807 % cr@nd = a * (z mod q) + \advance \cr@nd \@tempcnta % cr@nd = a*z mod m + \ifnum \cr@nd < \z@% + \advance \cr@nd 2147483647 % cr@nd = (a*z mod m) > 0 + \fi + \global\cr@nd=\cr@nd % persist the change outside current scope + \fi +}% end of \r@nd +\initr@nd % initialize the package +\endinput +%% +%% End of file `lcg.sty'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/ltximg/ltximg.pl new/texmf-dist/scripts/ltximg/ltximg.pl --- old/texmf-dist/scripts/ltximg/ltximg.pl 2015-04-22 23:19:53.000000000 +0200 +++ new/texmf-dist/scripts/ltximg/ltximg.pl 1970-01-01 01:00:00.000000000 +0100 @@ -1,1023 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $argv:q' if 0; -use v5.18; -use File::Path; # creating/removing dirs -use File::Copy; # copying files -use File::Basename; # scan argument -use IO::File; # simple IO operation -use Getopt::Long qw(:config bundling_override); # read parameter and activate "bundling" -use autodie; # more safe -use Config; -use File::Spec; -use File::Find; - -#------------------------ Constantes ----------------------------------# -my $tempDir = "."; # temporary directory -my $other = "other"; # other environment for search -my $imageDir = "images"; # Dir for images (images default) -my $ignore = "ignore"; # ignore verbatim environment -my $exacount = 1; # Counter for source images -my $imgNo = 1; # Counter for PGF/TIKZ/PST environments -my $nopreview = 0; # 1->create images in nopreview mode -my $noSource = 0; # Delete TeX source for images -my $nopdf = 0; # No create a PDF image file -my $clear = 0; # 0 or 1, clears all temporary files -my $DPI = "150"; # value for ppm, png, jpg -my $margins = "0"; # margins for pdf crop -my $latex = 0; # 1->create all images using latex -my $xetex = 0; # 1->create all images using xelatex -my $luatex = 0; # 1->create all images using lualatex -my $png = 0; # 1->create .png using Ghoscript -my $jpg = 0; # 1->create .jpg using Ghoscript -my $eps = 0; # 1->create .eps using pdftops -my $svg = 0; # 1->create .svg files -my $ppm = 0; # 1->create .ppm using pdftoppm -my $all = 0; # 1->create all images and files for type -my $output = 0; # 1->create output file whitout PGF/PST -my $miktex = 0; # 1->enable write 18 for miktex system -my $Verbose = 0; # 0 or 1, logfile - -#------------------------------ CHANGES -------------------------------# -# v1.2 2015-04-21 - Change mogrify to gs for image formats -# - Create output file -# - Rewrite source code and fix regex -# - Add more image format -# - Change date to iso format -# v1.0 2013-12-01 - First public release -#----------------------------------------------------------------------# - -#----------------------------- Search GS ------------------------------# -# The next code its part of pdfcrop from TexLive 2014 -# Windows detection -my $Win = 0; -$Win = 1 if $^O =~ /mswin32/i; -$Win = 1 if $^O =~ /cygwin/i; - -my $archname = $Config{'archname'}; -$archname = 'unknown' unless defined $Config{'archname'}; - -# get Ghostscript command name -$::opt_gscmd = ''; -sub find_ghostscript () { - return if $::opt_gscmd; - if ($Verbose) { - print "* Perl executable: $^X\n"; - if ($] < 5.006) { - print "* Perl version: $]\n"; - } - else { - printf "* Perl version: v%vd\n", $^V; - } - if (defined &ActivePerl::BUILD) { - printf "* Perl product: ActivePerl, build %s\n", ActivePerl::BUILD(); - } - printf "* Pointer size: $Config{'ptrsize'}\n"; - printf "* Pipe support: %s\n", - (defined($Config{'d_pipe'}) ? 'yes' : 'no'); - printf "* Fork support: %s\n", - (defined($Config{'d_fork'}) ? 'yes' : 'no'); - } - my $system = 'unix'; - $system = "dos" if $^O =~ /dos/i; - $system = "os2" if $^O =~ /os2/i; - $system = "win" if $^O =~ /mswin32/i; - $system = "cygwin" if $^O =~ /cygwin/i; - $system = "miktex" if defined($ENV{"TEXSYSTEM"}) and - $ENV{"TEXSYSTEM"} =~ /miktex/i; - print "* OS name: $^O\n" if $Verbose; - print "* Arch name: $archname\n" if $Verbose; - print "* System: $system\n" if $Verbose; - my %candidates = ( - 'unix' => [qw|gs gsc|], - 'dos' => [qw|gs386 gs|], - 'os2' => [qw|gsos2 gs|], - 'win' => [qw|gswin32c gs|], - 'cygwin' => [qw|gs gswin32c|], - 'miktex' => [qw|mgs gswin32c gs|] - ); - if ($system eq 'win' or $system eq 'cygwin' or $system eq 'miktex') { - if ($archname =~ /mswin32-x64/i) { - my @a = (); - foreach my $name (@{$candidates{$system}}) { - push @a, 'gswin64c' if $name eq 'gswin32c'; - push @a, $name; - } - $candidates{$system} = \@a; - } - } - my %exe = ( - 'unix' => '', - 'dos' => '.exe', - 'os2' => '.exe', - 'win' => '.exe', - 'cygwin' => '.exe', - 'miktex' => '.exe' - ); - my $candidates_ref = $candidates{$system}; - my $exe = $Config{'_exe'}; - $exe = $exe{$system} unless defined $exe; - my @path = File::Spec->path(); - my $found = 0; - foreach my $candidate (@$candidates_ref) { - foreach my $dir (@path) { - my $file = File::Spec->catfile($dir, "$candidate$exe"); - if (-x $file) { - $::opt_gscmd = $candidate; - $found = 1; - print "* Found ($candidate): $file\n" if $Verbose; - last; - } - print "* Not found ($candidate): $file\n" if $Verbose; - } - last if $found; - } - if (not $found and $Win) { - $found = SearchRegistry(); - } - if ($found) { - print "* Autodetected ghostscript command: $::opt_gscmd\n" if $Verbose; - } - else { - $::opt_gscmd = $$candidates_ref[0]; - print "* Default ghostscript command: $::opt_gscmd\n" if $Verbose; - } -} - -sub SearchRegistry () { - my $found = 0; - eval 'use Win32::TieRegistry qw|KEY_READ REG_SZ|;'; - if ($@) { - if ($Verbose) { - print "* Registry lookup for Ghostscript failed:\n"; - my $msg = $@; - $msg =~ s/\s+$//; - foreach (split /\r?\n/, $msg) { - print " $_\n"; - } - } - return $found; - } - my $open_params = {Access => KEY_READ(), Delimiter => '/'}; - my $key_name_software = 'HKEY_LOCAL_MACHINE/SOFTWARE/'; - my $current_key = $key_name_software; - my $software = new Win32::TieRegistry $current_key, $open_params; - if (not $software) { - print "* Cannot find or access registry key `$current_key'!\n" - if $::opt_verbose; - return $found; - } - print "* Search registry at `$current_key'.\n" if $Verbose; - my %list; - foreach my $key_name_gs (grep /Ghostscript/i, $software->SubKeyNames()) { - $current_key = "$key_name_software$key_name_gs/"; - print "* Registry entry found: $current_key\n" if $Verbose; - my $key_gs = $software->Open($key_name_gs, $open_params); - if (not $key_gs) { - print "* Cannot open registry key `$current_key'!\n" if $Verbose; - next; - } - foreach my $key_name_version ($key_gs->SubKeyNames()) { - $current_key = "$key_name_software$key_name_gs/$key_name_version/"; - print "* Registry entry found: $current_key\n" if $Verbose; - if (not $key_name_version =~ /^(\d+)\.(\d+)$/) { - print " The sub key is not a version number!\n" if $Verbose; - next; - } - my $version_main = $1; - my $version_sub = $2; - $current_key = "$key_name_software$key_name_gs/$key_name_version/"; - my $key_version = $key_gs->Open($key_name_version, $open_params); - if (not $key_version) { - print "* Cannot open registry key `$current_key'!\n" if $Verbose; - next; - } - $key_version->FixSzNulls(1); - my ($value, $type) = $key_version->GetValue('GS_DLL'); - if ($value and $type == REG_SZ()) { - print " GS_DLL = $value\n" if $Verbose; - $value =~ s|([\\/])([^\\/]+\.dll)$|$1gswin32c.exe|i; - my $value64 = $value; - $value64 =~ s/gswin32c\.exe$/gswin64c.exe/; - if ($archname =~ /mswin32-x64/i and -f $value64) { - $value = $value64; - } - if (-f $value) { - print "EXE found: $value\n" if $Verbose; - } - else { - print "EXE not found!\n" if $Verbose; - next; - } - my $sortkey = sprintf '%02d.%03d %s', - $version_main, $version_sub, $key_name_gs; - $list{$sortkey} = $value; - } - else { - print "Missing key `GS_DLL' with type `REG_SZ'!\n" if $Verbose; - } - } - } - foreach my $entry (reverse sort keys %list) { - $::opt_gscmd = $list{$entry}; - print "* Found (via registry): $::opt_gscmd\n" if $Verbose; - $found = 1; - last; - } - return $found; -} - -find_ghostscript(); - -if ($Win and $::opt_gscmd =~ /\s/) { - $::opt_gscmd = "\"$::opt_gscmd\""; -} -# end GS search - -#-----------------Program identification, options and help ------------# - -my $program = "LTXimg"; -my $nv='1.1'; -my $copyright = <<END_COPYRIGHT ; -2015-04-21 - Copyright (c) 2013-2015 by Pablo Gonzalez L. -END_COPYRIGHT -my $licensetxt = <<END_LICENSE ; - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, - MA 02111-1307 USA -END_LICENSE -my $title = "$program $nv, $copyright"; -my $usage = <<"END_OF_USAGE"; -${title} -Usage: ltximg file.tex [options] - -LTXimg extract and convert all PGF|TiKZ|Pstricks environments from TeX - source into single images files (pdf/png/eps/jpg/svg) using Ghostscript. - By default search and extract environments using (pdf)LaTeX. - -Environments suports by LTXimg: - - pspicture tikzpicture pgfpicture forest ganttchart - tikzcd circuitikz dependency other postscript - -Options: - - -h,--help - display this help and exit - -l,--license - display license information and exit - -v,--version - display version (current $nv) and exit - -d,--dpi=<int> - the dots per inch for images (default $DPI) - -j,--jpg - create .jpg files (need Ghostscript) - -p,--png - create .png files (need Ghostscript) - -e,--eps - create .eps files (need pdftops) - -s,--svg - create .svg files (need pdf2svg) - -P,--ppm - create .ppm files (need pdftoppm) - -a,--all - create .(pdf,eps,jpg,png) images - -c,--clear - delete all temp and aux files - -o,--output - create a file-out.tex whitout PGF|TiKZ|PST code - -m,--margins=<int> - margins in bp for pdfcrop (default 0) - -np,--nopreview - create images files whitout preview package - -ns,--nosource - delete all source for images files - --miktex - use --enable-write18 for MikTeX users - --xetex - using (Xe)LaTeX for create images - --latex - using LaTeX for create images - --luatex - using (Lua)LaTeX for create images - --nopdf - don't create a PDF image files (default off) - --other=<string> - search other environment (default other) - --ignore=<string> - skip verbatim environment (default ignore) - --imgdir=<string> - the folder for images (default images) - - - -Example: -* ltximg test.tex -e -p -j -c -o --imgdir=pics -* produce test-out.tex whitout PGF|TiKZ|PST environments and create "pics" -* dir whit all images (pdf,eps,png,jpg) and source (.tex) for all related -* parts using (pdf)LaTeX whit preview package and cleaning all tmp files. -* Suport bundling for short options: ltximg test.tex -epjco --imgdir=pics -END_OF_USAGE - -# Options -my $result=GetOptions ( - 'h|help' => \$::opt_help, - 'v|version' => \$::opt_version, - 'l|license' => \$::opt_license, - 'd|dpi=i' => \$DPI,# numeric - 'm|margins=i' => \$margins,# numeric - 'imgdir=s' => \$imageDir, # string - 'ignore=s' => \$ignore, # string - 'other=s' => \$other, # string - 'c|clear' => \$clear, # flag - 'np|nopreview' => \$nopreview, # flag - 'e|eps' => \$eps, # flag - 'j|jpg' => \$jpg, # flag - 'p|png' => \$png, # flag - 'P|ppm' => \$ppm, # flag - 's|svg' => \$svg, # flag - 'a|all' => \$all, # flag - 'miktex' => \$miktex, # flag - 'nopdf' => \$nopdf, # flag - 'o|output' => \$output, # flag - 'xetex' => \$xetex, # flag - 'latex' => \$latex, # flag - 'luatex' => \$luatex,# flag - 'ns|nosource' => \$noSource, # flag - 'Verbose' => \$Verbose, -) or die $usage; - -# help functions -sub errorUsage { die "@_ (try ltximg --help for more information)\n"; } - -# options for command line -if ($::opt_help) { - print $usage; - exit(0); -} -if ($::opt_version) { - print $title; - exit(0); -} -if ($::opt_license) { - print $licensetxt; - exit(0); -} -# General options -if ($latex) { - $latex = 1; -} -if ($xetex) { - $xetex = 1; -} -if ($luatex) { - $luatex = 1; -} - -if ($nopdf) { - $nopdf = 1; -} -if ($eps) { - $eps = 1; -} -if ($jpg) { - $jpg = 1; -} -if ($png) { - $png = 1; -} -if ($ppm) { - $ppm = 1; -} -if ($svg) { - $svg = 1; -} -if ($all){ - $eps = $png = $jpg = 1; -} - -if ($nopreview) { - $nopreview= 1; -} - -if ($output) { - $output= 1; -} - -if ($miktex) { - $miktex= 1; -} -# open file - -my $InputFilename = ""; -@ARGV > 0 or errorUsage "Input filename missing"; -@ARGV < 2 or errorUsage "Unknown option or too many input files"; -$InputFilename = $ARGV[0]; - -#--------------------- Arreglo de la extensión ------------------------# -my @SuffixList = ('.tex', '', '.ltx'); # posible extensión -my ($name, $path, $ext) = fileparse($ARGV[0], @SuffixList); -$ext = '.tex' if not $ext; - -#---------------- Creamos el directorio para las imágenes -------------# --e $imageDir or mkdir($imageDir,0744) or die "No puedo crear $imageDir: $!\n"; - -# Define in file -my $archivo_entrada = shift; - -# Standart line ltximg run -print "$program $nv, $copyright"; - -##---------------------------- PARTE 1 -------------------------------## -#------------ Creamos un hash con los cambios para verbatim -----------# -my %cambios = ( -# pst/tikz set - '\psset' => '\PSSET', - '\tikzset' => '\TIKZSET', -# pspicture - '\pspicture' => '\TRICKS', - '\endpspicture' => '\ENDTRICKS', -# pspicture - '\begin{pspicture' => '\begin{TRICKS', - '\end{pspicture' => '\end{TRICKS', -# postscript - '\begin{postscript}' => '\begin{POSTRICKS}', - '\end{postscript}' => '\end{POSTRICKS}', -# $other - "\\begin\{$other" => '\begin{OTHER', - "\\end\{$other" => '\end{OTHER', -# document - '\begin{document}' => '\begin{DOCTRICKS}', - '\end{document}' => '\end{DOCTRICKS}', -# tikzpicture - '\begin{tikzpicture}' => '\begin{TIKZPICTURE}', - '\end{tikzpicture}' => '\end{TIKZPICTURE}', -# pgfinterruptpicture - '\begin{pgfinterruptpicture'=> '\begin{PGFINTERRUPTPICTURE', - '\end{pgfinterruptpicture' => '\end{PGFINTERRUPTPICTURE', -# pgfpicture - '\begin{pgfpicture}' => '\begin{PGFPICTURE}', - '\end{pgfpicture}' => '\end{PGFPICTURE}', -# ganttchart - '\begin{ganttchart}' => '\begin{GANTTCHART}', - '\end{ganttchart}' => '\end{GANTTCHART}', -# circuitikz - '\begin{circuitikz}' => '\begin{CIRCUITIKZ}', - '\end{circuitikz}' => '\end{CIRCUITIKZ}', -# forest - '\begin{forest}' => '\begin{FOREST}', - '\end{forest}' => '\end{FOREST}', -# tikzcd - '\begin{tikzcd}' => '\begin{TIKZCD}', - '\end{tikzcd}' => '\end{TIKZCD}', -# dependency - '\begin{dependency}' => '\begin{DEPENDENCY}', - '\end{dependency}' => '\end{DEPENDENCY}', -); - -#------------------------ Coment inline Verbatim ----------------------# -open my $ENTRADA, '<', "$archivo_entrada"; -my $archivo; -{ - local $/; - $archivo = <$ENTRADA>; -} -close $ENTRADA; - -# Variables y constantes -my $no_del = "\0"; -my $del = $no_del; - -# Reglas -my $llaves = qr/\{ .+? \} /x; -my $no_corchete = qr/(?:\[ .+? \])? /x; -my $delimitador = qr/\{ (?<del>.+?) \} /x; -my $verb = qr/(spv|v|V)erb [*]? /ix; -my $lst = qr/lstinline (?!\*) $no_corchete /ix; -my $mint = qr/mint (?!\*) $no_corchete $llaves /ix; -my $marca = qr/\\ (?:$verb | $lst | $mint ) (\S) .+? \g{-1} /x; -my $comentario = qr/^ \s* \%+ .+? $ /mx; -my $definedel = qr/\\ (?: DefineShortVerb | lstMakeShortInline ) $no_corchete $delimitador /ix; -my $indefinedel = qr/\\ (?: UndefineShortVerb | lstDeleteShortInline) $llaves /ix; - -while ($archivo =~ - / $marca - | $comentario - | $definedel - | $indefinedel - | $del .+? $del # delimitado - /pgmx) { - - my($pos_inicial, $pos_final) = ($-[0], $+[0]); # posiciones - my $encontrado = ${^MATCH}; # lo encontrado - - if ($encontrado =~ /$definedel/){ # definimos delimitador - $del = $+{del}; - $del = "\Q$+{del}" if substr($del,0,1) ne '\\'; # es necesario "escapar" el delimitador - } - elsif($encontrado =~ /$indefinedel/) { # indefinimos delimitador - $del = $no_del; - } - else { # aquí se hacen los cambios - while (my($busco, $cambio) = each %cambios) { - $encontrado =~ s/\Q$busco\E/$cambio/g; # es necesario escapar $busco - } - substr $archivo, $pos_inicial, $pos_final-$pos_inicial, $encontrado; # insertamos los nuevos cambios - - pos($archivo)= $pos_inicial + length $encontrado; # re posicionamos la siguiente búsqueda - } -} - -# Constantes -my $BP = '\\\\begin{postscript}'; -my $EP = '\\\\end{postscript}'; -my $BPL = '\begin{postscript}'; -my $EPL = '\end{postscript}'; -my $sipgf = 'pgfpicture'; -my $nopgf = 'pgfinterruptpicture'; -my $graphics = "graphic=\{\[scale=1\]$imageDir/$name-fig"; - -# directorio en el cual están las imágenes -my $dir = "$tempDir/$imageDir"; - -#--------------------- Coment Verbatim environment --------------------# - -my @lineas = split /\n/, $archivo; - -# Verbatim environments -my $ENTORNO = qr/(?: (v|V)erbatim\*?| PSTexample | LTXexample| $ignore\*? | PSTcode | tcblisting\*? | spverbatim | minted | lstlisting | alltt | comment\*? | xcomment)/xi; - -# postscript environment -my $POSTSCRIPT = qr/(?: postscript)/xi; - -# tikzpicture environment -my $TIKZENV = qr/(?: tikzpicture)/xi; -# -my $DEL; - -# tcbverb verbatim -my $tcbverb = qr/\\(?:tcboxverb|myverb)/; -my $arg_brac = qr/(?:\[.+?\])?/; -my $arg_curl = qr/\{(.+)\}/; - -# coment verbatim environment -for (@lineas) { - if (/\\begin\{($ENTORNO)(?{ $DEL = "\Q$^N" })\}/ .. /\\end\{$DEL\}/) { - while (my($busco, $cambio) = each %cambios) { - s/\Q$busco\E/$cambio/g; - } - } -} -# coment tcolorbox inline -for (@lineas) { - if (m/$tcbverb$arg_brac$arg_curl/) { - while (my($busco, $cambio) = each %cambios) { - s/\Q$busco\E/$cambio/g; - } - } # close - } -# remove postscript from hash -delete @cambios{'\begin{postscript}','\end{postscript}'}; -# coment in postscript environment -for (@lineas) { - if (/\\begin\{($POSTSCRIPT)(?{ $DEL = "\Q$^N" })\}/ .. /\\end\{$DEL\}/) { - while (my($busco, $cambio) = each %cambios) { - s/\Q$busco\E/$cambio/g; - } - } # close postcript environment -} -# remove tikzpicture from hash -delete @cambios{'\begin{tikzpicture}','\end{tikzpicture}'}; -# coment in tikzpicture environment -for (@lineas) { - if (/\\begin\{($TIKZENV)(?{ $DEL = "\Q$^N" })\}/ .. /\\end\{$DEL\}/) { - while (my($busco, $cambio) = each %cambios) { - s/\Q$busco\E/$cambio/g; - } - } # close TIKZ environment -} - -undef %cambios; # erase hash - -#------------- Convert ALL into Postscript environments ---------------# - -$archivo = join("\n", @lineas); -## Partición del documento - -my($cabeza,$cuerpo,$final) = $archivo =~ m/\A (.+?) (\\begin{document} .+?)(\\end{document}.*)\z/msx; - -# \pspicture to \begin{pspicture} -$cuerpo =~ s/\\pspicture(\*)?(.+?)\\endpspicture/\\begin{pspicture$1}$2\\end{pspicture$1}/gmsx; - -# pspicture to Postscript -$cuerpo =~ s/ - ( - (?:\\psset\{[^\}]+\}.*?)? - (?:\\begin\{pspicture(\*)?\}) - .*? - (?:\\end\{pspicture(\*)?\}) - ) - /$BPL\n$1\n$EPL/gmsx; - -# pgfpicture to Postscript -$cuerpo =~ s/ - ( - \\begin{$sipgf} - .*? - ( - \\begin{$nopgf} - .+? - \\end{$nopgf} - .*? - )*? - \\end{$sipgf} - ) - /$BPL\n$1\n$EPL/gmsx; - -# tikz to Postscript -$cuerpo =~ s/ - ( - (?:\\tikzset(\{(?:\{.*?\}|[^\{])*\}).*?)? # si está lo guardo - (?:\\begin\{tikzpicture\}) # aquí comienza la búsqueda - .*? # guardo el contenido en $1 - (?:\\end\{tikzpicture\}) # termina la búsqueda - ) # cierra $1 - /$BPL\n$1\n$EPL/gmsx; - -# rest to PostScript -my $export = qr/(forest|ganttchart|tikzcd|circuitikz|dependency|$other\*?)/x; - -$cuerpo =~ s/(\\begin\{($export)\} (.*?) \\end\{\g{-2}\})/$BPL\n$1\n$EPL/gmsx; - -#-------------------------- Reverse changes ---------------------------# -$archivo = "$cabeza$cuerpo$final"; -my %cambios = ( -# pst/tikz set - '\PSSET' => '\psset', - '\TIKZSET' => '\tikzset', -# pspicture - '\TRICKS' => '\pspicture', - '\ENDTRICKS' => '\endpspicture', -# pspicture - '\begin{TRICKS' => '\begin{pspicture', - '\end{TRICKS' => '\end{pspicture', -# $other - '\begin{OTHER' => "\\begin\{$other", - '\end{OTHER' => "\\end\{$other", -# document - '\begin{DOCTRICKS}' => '\begin{document}', - '\end{DOCTRICKS}' => '\end{document}', -# tikzpicture - '\begin{TIKZPICTURE}' => '\begin{tikzpicture}', - '\end{TIKZPICTURE}' => '\end{tikzpicture}', -# pgfinterruptpicture - '\begin{PGFINTERRUPTPICTURE'=> '\begin{pgfinterruptpicture', - '\end{PGFINTERRUPTPICTURE' => '\end{pgfinterruptpicture', -# pgfpicture - '\begin{PGFPICTURE}' => '\begin{pgfpicture}', - '\end{PGFPICTURE}' => '\end{pgfpicture}', -# ganttchart - '\begin{GANTTCHART}' => '\begin{ganttchart}', - '\end{GANTTCHART}' => '\end{ganttchart}', -# circuitikz - '\begin{CIRCUITIKZ}' => '\begin{circuitikz}', - '\end{CIRCUITIKZ}' => '\end{circuitikz}', -# forest - '\begin{FOREST}' => '\begin{forest}', - '\end{FOREST}' => '\end{forest}', -# tikzcd - '\begin{TIKZCD}' => '\begin{tikzcd}', - '\end{TIKZCD}' => '\end{tikzcd}', -# dependency - '\begin{DEPENDENCY}' => '\begin{dependency}', - '\end{DEPENDENCY}' => '\end{dependency}', -); - -#-------------------------- Back Postscript ---------------------------# - -my @lineas = split /\n/, $archivo; -# reverse in postscript environment -for (@lineas) { - if (/\\begin\{($POSTSCRIPT)(?{ $DEL = "\Q$^N" })\}/ .. /\\end\{$DEL\}/) { - while (my($busco, $cambio) = each %cambios) { - s/\Q$busco\E/$cambio/g; - } - } # close postscript environment changes -} - -# join changes -$archivo = join("\n", @lineas); - -#--------------- Extract source code for PST/PGF/TIKZ -----------------# -# Dividir el archivo -my($cabeza,$cuerpo,$final) = $archivo =~ m/\A (.+?) (\\begin{document} .+?)(\\end{document}.*)\z/msx; - -# Poner el atributo añadido a PostScript -while ($cuerpo =~ /\\begin\{postscript\}/gsm) { - - my $corchetes = $1; - my($pos_inicial, $pos_final) = ($-[1], $+[1]); # posición donde están los corchetes - - if (not $corchetes) { - $pos_inicial = $pos_final = $+[0]; # si no hay corchetes, nos ponemos al final de \begin - } - if (not $corchetes or $corchetes =~ /\[\s*\]/) { # si no hay corchetes, o están vacíos, - $corchetes = "[$graphics-$exacount}]"; # ponemos los nuestros - } - substr($cuerpo, $pos_inicial, $pos_final - $pos_inicial) = $corchetes; - pos($cuerpo) = $pos_inicial + length $corchetes; # reposicionamos la búsqueda de la exp. reg. -} -continue { - $exacount++; -} -# Delte source files -if (-e "$imageDir/$name-fig-1$ext") { -unlink <"$imageDir/$name-fig-*$ext">; -} -#---------------------- Extract source code in images -----------------# -while ($cuerpo =~ /$BP\[.+?(?<img_src_name>$imageDir\/.+?-\d+)\}\](?<code>.+?)(?=$EP)/gsm) { - open my $SALIDA, '>', "$+{'img_src_name'}$ext"; - print $SALIDA <<"EOC"; -$cabeza\\pagestyle{empty}\n\\begin{document}$+{'code'}\\end{document} -EOC -close $SALIDA; -} - -#--------------- Create a one file whit all figs file -----------------# -if ($nopreview) { -if (-e "$imageDir/$name-fig-1$ext") { -# 1- Leer los source files -my @pstexafiles = glob("$imageDir/$name-fig-*$ext"); - -# 2- Ordenar según el índice y extención -@pstexafiles = - map { $_->[1] } - sort { $a->[0] <=> $b->[0] } - map { [ ($_ =~ /(\d+$ext)/), $_ ] } - @pstexafiles; - -# 3- Bucle para leer las secciones -my @almacen; -for my $exafile (@pstexafiles) { - - # 3.1- Leer el archivo - open my $FH, '<', $exafile; # - my $tex = join q{}, <$FH>; # - close $FH; - - # 3.2- Extraer la parte que nos interesa - my($pedazo) = $tex =~ m/\\begin\{document\}\s*(.+?)\s*\\end\{document\}/sm; - - # 3.3- Almacenamos, si hemos encontrado algo - push @almacen, $pedazo if $pedazo; -} -# 4- Salida - -open my $SALIDA, '>', "$tempDir/$name-fig$ext"; -print $SALIDA "$cabeza\\pagestyle{empty}\n\\begin\{document\}\n"; - -my $fig = 1; -for my $item (@almacen) { - print $SALIDA $item; - print $SALIDA "\n%% fig $fig\n"; - print $SALIDA "\\newpage\n"; - $fig++; -} - -print $SALIDA '\end{document}'; -close $SALIDA; - } # close join files -} # close $nopreview -else { -my $opcion = $xetex ? 'xetex,' - : $latex ? '' - : 'pdftex,' - ; - -my $preview = <<"EXTRA"; -\\AtBeginDocument\{% -\\RequirePackage\[${opcion}active,tightpage\]\{preview\}% -\\renewcommand\\PreviewBbAdjust\{-60pt -60pt 60pt 60pt\}% -\\newenvironment\{postscript\}\{\}\{\}% -\\PreviewEnvironment\{postscript\}\}% -EXTRA - # write - open my $SALIDA, '>', "$tempDir/$name-fig$ext"; - print $SALIDA $preview . $archivo; - close $SALIDA; -} - -#---------------------- Create images files ---------------------------# -# Define compilers -my $compile = $xetex ? 'xelatex' - : $luatex ? 'lualatex' - : $latex ? 'latex' - : 'pdftex' - ; -my $opt_compile = $miktex ? '--enable-write18 --interaction=batchmode' - : '--shell-escape --interaction=batchmode' - ; - -# Option for gs -my $opt_gspdf='-q -dSAFER -sDEVICE=pdfwrite -dPDFSETTINGS=/prepress'; -my $opt_gspng="-q -dSAFER -sDEVICE=pngalpha -r$DPI"; -my $opt_gsjpg="-q -dSAFER -sDEVICE=jpeg -r$DPI -dJPEGQ=100 -dGraphicsAlphaBits=4 -dTextAlphaBits=4"; - -# Option for pdfcrop -my $opt_crop= $xetex ? "--xetex --margins $margins" - : $luatex ? "--luatex --margins $margins" - : $latex ? "--margins $margins" - : "--pdftex --margins $margins" - ; -# Fix pdftops error message in windows -if ($^O eq 'MSWin32' or $^O eq 'MSWin64'){ -open my $ppmconf, '>', "$tempDir/xpd"; -print $ppmconf <<'EOH'; -errQuiet yes -EOH -close $ppmconf; - } -#-------------------------- Compiling image file ----------------------# -if($nopreview){ - print "Create $name-fig.pdf in $imageDir dir whit all PGF/TIKZ/PST using $compile\n"; - } -else{ - print "Create $name-fig.pdf in $imageDir dir whit all PGF/TIKZ/PST using $compile and preview package\n"; - } - -# Run TeX mode -system("$compile $opt_compile -output-directory=$imageDir $tempDir/$name-fig$ext"); -if($latex){ - system("dvips -q -Ppdf -o $imageDir/$name-fig.ps $imageDir/$name-fig.dvi"); - system("ps2pdf -dPDFSETTINGS=/prepress $imageDir/$name-fig.ps $imageDir/$name-fig.pdf"); - } -print "The file $imageDir/$name-fig.pdf need a cropping using pdfcrop whit options: $opt_crop\n"; -system("pdfcrop $opt_crop $imageDir/$name-fig.pdf $imageDir/$name-fig.pdf"); - -##-------------------------- Create image formats ----------------------# - -opendir(my $DIR, $imageDir); -my @figs = sort readdir $DIR; -closedir $DIR; -for my $fig (@figs) { -if ($fig =~ /(?<fig>$name-fig-)(?<num>\d+)$ext/) { -print "Create $imageDir/$name-fig-$+{num} from $name$ext\r"; -# PDF format -if (!$nopdf) { -system("$::opt_gscmd $opt_gspdf -o $imageDir/$name-fig-%1d.pdf $imageDir/$name-fig.pdf"); -} -# PNG format -if ($png) { -system("$::opt_gscmd $opt_gspng -o $imageDir/$name-fig-%1d.png $imageDir/$name-fig.pdf"); - } -# JPEG format -if ($jpg) { -system("$::opt_gscmd $opt_gsjpg -o $imageDir/$name-fig-%1d.jpg $imageDir/$name-fig.pdf"); - } - -# SVG format pdf2svg -if ($svg) { - system("pdf2svg $imageDir/$name-fig.pdf $imageDir/$+{fig}%1d.svg all"); - } -# EPS format -if ($eps) { - if ($^O eq 'MSWin32' or $^O eq 'MSWin64'){ - system("pdftops -cfg $tempDir/xpd -q -eps -f $+{num} -l $+{num} $imageDir/$name-fig.pdf $imageDir/$+{fig}$+{num}.eps"); - }else{ - system("pdftops -q -eps -f $+{num} -l $+{num} $imageDir/$name-fig.pdf $imageDir/$+{fig}$+{num}.eps"); - } - } # close EPS -# PPM format -if ($ppm) { - if ($^O eq 'MSWin32' or $^O eq 'MSWin64'){ - system("pdftoppm -cfg $tempDir/xpd -q -r $DPI -f $+{num} -l $+{num} $imageDir/$name-fig.pdf $imageDir/$+{fig}$+{num}"); - } - else{ - system("pdftoppm -q -r $DPI -f $+{num} -l $+{num} $imageDir/$name-fig.pdf $imageDir/$+{fig}$+{num}"); - } - } # close PPM - } # close if ($fig = -} # close for - -## Renaming PPM -if ($ppm) { -if (opendir(DIR,$dir)) { # abro el directorio - while (my $oldname = readdir DIR) { # lo recorro - # el nuevo nombre es fruto de una sustitución - my $newname = $oldname =~ s/^($name-(fig|exa)-\d+)(-\d+).ppm$/$1 . ".ppm"/re; - - if ($oldname ne $newname) { # comprobación - rename("$dir/$oldname", "$dir/$newname"); # renombro - } - } - closedir DIR; - } # close rename ppm -} # close ppm - -#------- Creating output file whitout PGF/PST/TIKZ code ---------------# -if ($output) { -print "Create file $name-out$ext whitout PGF/PST/TIKZ code\n"; - -#----------------- Convert Postscript to includegraphics --------------# -my $grap="\\includegraphics[scale=1]{$name-fig-"; -my $close = '}'; -my $IMGno = 1; - -$cuerpo =~ s/$BP.+?$EP/$grap@{[$IMGno++]}$close/msg; - -#------------------------ Clean output file --------------------------# -# append postscript to hash -$cambios{'\begin{POSTRICKS}'} = '\begin{postscript}'; -$cambios{'\end{POSTRICKS}'} = '\end{postscript}'; - -# Constantes -my $BEGINDOC = quotemeta('\begin{document}'); -my $USEPACK = quotemeta('\usepackage'); -my $REQPACK = quotemeta('\usepackage'); -my $GRAPHICX = quotemeta('{graphicx}'); - -# Exp. Reg. -my $CORCHETES = qr/\[ [^]]*? \]/x; -my $PALABRAS = qr/\b (?: pst-\w+ | pstricks (?: -add )? | psfrag |psgo |vaucanson-g| auto-pst-pdf | graphicx )/x; -my $FAMILIA = qr/\{ \s* $PALABRAS (?: \s* [,] \s* $PALABRAS )* \s* \}/x; - -# comentar -$cabeza =~ s/ ^ ($USEPACK $CORCHETES $GRAPHICX) /%$1/msxg; - -# eliminar líneas enteras -$cabeza =~ s/ ^ $USEPACK (?: $CORCHETES )? $FAMILIA \n//msxg; - -# eliminar palabras sueltas -$cabeza =~ s/ (?: ^ $USEPACK \{ | \G) [^}]*? \K (,?) \s* $PALABRAS (\s*) (,?) /$1 and $3 ? ',' : $1 ? $2 : ''/gemsx; - -# Añadir -$cabeza .= <<"EXTRA"; -\\usepackage{graphicx} -\\graphicspath{{$imageDir/}} -\\usepackage{grfext} -\\PrependGraphicsExtensions*{.pdf} -EXTRA - -# Clear PST content in preamble -$cabeza =~ s/\\usepackage\{\}/% delete/gmsx; -$cabeza =~ s/\\psset\{.+?\}/% \\psset delete/gmsx; -$cabeza =~ s/\\SpecialCoor/% \\SpecialCoor/gmsx; - -# Recorremos el archivo y realizamos los cambios -while (my($busco, $cambio) = each %cambios) { - $cabeza =~ s/\Q$busco\E/$cambio/g; - $cuerpo =~ s/\Q$busco\E/$cambio/g; - } - -# write -open my $SALIDA, '>', "$tempDir/$name-out$ext"; -print $SALIDA "$cabeza$cuerpo$final"; -close $SALIDA; - -# compile output file - -if ($xetex){ - system("xelatex $opt_compile $tempDir/$name-out$ext"); - } # xetex -elsif($luatex){ - system("lualatex $opt_compile $tempDir/$name-out$ext"); - } # luatex -else{ - system("pdflatex $opt_compile $tempDir/$name-out$ext"); - } # pdftex - -}# close output file - -#--------------------------------- Clean ------------------------------# -if ($clear) { -my @del_aux_tex; -find(\&del_aux_tex, $tempDir); -sub del_aux_tex{ -my $auximgfile = $_; -# search .(aux|log) -if(-f $auximgfile && $auximgfile =~ /$name-out\.(aux|log)$/){ -push @del_aux_tex, $File::Find::name; - } -if(-f $auximgfile && $auximgfile =~ /$name-fig$ext/){ -push @del_aux_tex, $File::Find::name; - } -} -unlink @del_aux_tex; -} # close clear in $tempDir - -if ($clear) { -my @del_tmp; -find(\&del_tmp, $imageDir); -sub del_tmp{ -my $auximgfile = $_; -# search .(aux|log) -if(-f $auximgfile && $auximgfile =~ /$name-fig\.(aux|dvi|log|ps|pdf)/){ -push @del_tmp, $File::Find::name; - } -} - -unlink @del_tmp; -} # close clear $name-fig.tex - -# Clear source files -if ($noSource) { -unlink <"$imageDir/$name-fig-*$ext">; -}# end source clear - -if ($output) { -print "Finish, LTXimg create $name-out$ext and put all figures in $imageDir dir\n"; -}else{ -print "Finish, LTXimg create all figures in $imageDir dir\n"; -} - -if ($^O eq 'MSWin32' or $^O eq 'MSWin64'){ -unlink "$tempDir/xpd"; - } - -__END__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lcg.tlpobj new/tlpkg/tlpobj/lcg.tlpobj --- old/tlpkg/tlpobj/lcg.tlpobj 1970-01-01 01:00:00.000000000 +0100 +++ new/tlpkg/tlpobj/lcg.tlpobj 2017-04-14 17:46:54.000000000 +0200 @@ -0,0 +1,18 @@ +name lcg +category Package +revision 31474 +shortdesc Generate random integers +relocated 1 +longdesc The lcg package generates random numbers (integers) via a +longdesc linear congruential generator (Schrage's method). The random +longdesc numbers are written to a counter. The keyval package is used +longdesc for the user to provide values for the range and a seed, and +longdesc for the name of the counter to be used. +runfiles size=2 + RELOC/tex/latex/lcg/lcg.sty +catalogue-also random +catalogue-ctan /macros/latex/contrib/lcg +catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-license lppl +catalogue-topics calculation random +catalogue-version 1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ltximg.tlpobj new/tlpkg/tlpobj/ltximg.tlpobj --- old/tlpkg/tlpobj/ltximg.tlpobj 2016-04-14 19:18:59.000000000 +0200 +++ new/tlpkg/tlpobj/ltximg.tlpobj 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -name ltximg -category Package -revision 37006 -shortdesc Split LaTeX files to sanitise a conversion process -longdesc The package provides a Perl script that extracts all TikZ and -longdesc PStricks environments for separate processing to produce images -longdesc (in eps, pdf, png or jpg format) for use by a converter or the -longdesc preview bundle. -depend ltximg.ARCH -runfiles size=9 - texmf-dist/scripts/ltximg/ltximg.pl -catalogue-ctan /support/ltximg -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license gpl2 -catalogue-topics chunks -catalogue-version 1.2 ++++++ leadsheets.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/leadsheets/README new/doc/latex/leadsheets/README --- old/doc/latex/leadsheets/README 2016-02-04 00:01:38.000000000 +0100 +++ new/doc/latex/leadsheets/README 2017-01-24 00:01:04.000000000 +0100 @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the LEADSHEETS package v0.3a 2016/02/02 +the LEADSHEETS package v0.5a 2017/01/23 typesetting leadsheets and songbooks @@ -8,7 +8,7 @@ Web: http://www.mychemistry.eu/forums/forum/leadsheets/ E-Mail: contact(a)mychemistry.eu -------------------------------------------------------------------------- -Copyright 2014-2016 Clemens Niederberger +Copyright 2014-2017 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 @@ -24,13 +24,16 @@ -------------------------------------------------------------------------- The leadsheets bundle consists of the following files - leadsheets.sty + - leadsheet.cls - libraries -- they all follow the naming scheme leadsheets.library.<name>.code.tex: * chordnames * chords + * external * musejazz * musicsymbols * properties + * shorthands * songs * templates * translations Binary files old/doc/latex/leadsheets/leadsheets_en.pdf and new/doc/latex/leadsheets/leadsheets_en.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/leadsheets/leadsheets_en.tex new/doc/latex/leadsheets/leadsheets_en.tex --- old/doc/latex/leadsheets/leadsheets_en.tex 2015-07-28 23:21:53.000000000 +0200 +++ new/doc/latex/leadsheets/leadsheets_en.tex 2017-01-24 00:01:04.000000000 +0100 @@ -1,20 +1,45 @@ -% !arara: pdflatex: { shell: on } -% arara: biber -% arara: pdflatex -% arara: pdflatex +% arara: pdflatex: { shell: on , action: nonstopmode } +% !arara: biber +% !arara: pdflatex +% !arara: pdflatex +% -------------------------------------------------------------------------- +% the LEADSHEETS package +% +% typesetting leadsheets and songbooks +% +% -------------------------------------------------------------------------- +% Clemens Niederberger +% E-Mail: contact(a)mychemistry.eu +% -------------------------------------------------------------------------- +% Copyright 2014-2017 Clemens Niederberger +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3 +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3 or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Clemens Niederberger. +% -------------------------------------------------------------------------- \documentclass[load-preamble+]{cnltx-doc} -\usepackage{leadsheets} +\usepackage{leadsheets,bookmark} \setcnltx{ package = leadsheets , info = Typesetting leadsheets and songbooks , authors = Clemens Niederberger , email = contact(a)mychemistry.eu , - url = http://www.mychemistry.eu/forums/forum/leadsheets/ , + url = https://github.com/cgnieder/leadsheets/ , add-cmds = { - chord , chordname , + choir , chord , chordname , definesongtitletemplate , defineversetypetemplate , expandcode , + ifallsongproperties , + ifanysongproperty , ifobeylines , ifsongmeasuring , ifsongpropertiesequal , @@ -22,6 +47,14 @@ ifversenamed , ifversenumbered , ifversestarred , + includeleadsheet , + instruction , + leadsheetstranslate , + lsenparen , + mkchoir , + mkinstruction , + mklsenparen , + mklsenparens , newversetype , printsongpropertylist , setchords , @@ -42,6 +75,7 @@ endmdframed , mdframed , newfontfamily , + newrobustcmd , musejazz } , add-envs = { @@ -52,7 +86,8 @@ info , interlude , intro , intro* , - outro , outro * + outro , outro * , + prechorus , prechorus* , solo , solo* , song , verse @@ -227,11 +262,14 @@ library to use MuseScore's \enquote{MuseJazz} font, see section~\ref{sec:musejazz-libr}. It loads the \library{chords} library. - \item[\library{songs}] \packageoption{songs}This is the \emph{main + \item[\library{songs}] \packageoption{songs}This is the \emph{main library}. It defines everything necessary for the typesetting of the leadsheets. It currently loads \emph{all other libraries}, \ie, user libraries \emph{and} internal libraries, except for the \library{musejazz} - library. This library is described in part~\ref{part:leadsheets-library}. + library. This library is described in part~\ref{part:leadsheets-songs-library}. + \item[\library{external}] \packageoption{external}enables to include + external leadsheet documents using the \cls{leadsheets} class into a main + document, see part~\ref{part:external-leadsheet} for details. \end{description} Those libraries can also be loaded as a package option. If you say \begin{sourcecode} @@ -254,6 +292,9 @@ loaded directly by users. It defines the necessary macros for song properties. See section~\ref{sec:song-properties} for more details on the concept. + \item[\library{shorthands}] This is an auxiliary library not meant to be + loaded directly by users. It provides means for defining shorthand + characters. \item[\library{transposing}] This is an auxiliary library not meant to be loaded directly by users. It defines a transposing mechanism for chord symbols. See section~\ref{sec:transposing} for further details. @@ -315,6 +356,8 @@ \showsymbol{wholerest} & \showsymbol{halfrest} \\ \showsymbol{quarterrest} & \showsymbol{eighthrest} \\ \showsymbol{sixteenthrest} \\ + \midrule + \showsymbol{Break} \\ \bottomrule \end{tabular} \label{tab:musicsymbols} @@ -352,8 +395,15 @@ The distance between two bar rules as in \cs{doublebar} or \cs{stopbar}. \end{commands} +Finally \musicsymbols{} provides a macro for adding an abitrary meter: +\begin{commands} + \command{meter}[\marg{numerator}\marg{denominator}] + \sinceversion{0.5}For example \verbcode+\meter{6}{8}+: \meter{6}{8} +\end{commands} + \clearpage -\part{The \library*{chords} Library (and the \library*{musejazz} Library)}\label{part:chords-library} +\part{The \library*{chords} Library (and the \library*{musejazz} + Library)}\label{part:chords-library} \dictum[Wes Montgomery]{% I never practice my guitar -- from time to time I just open the case and throw in a piece of raw meat.% @@ -491,7 +541,9 @@ \keyval{major}{code}\Default The token list \code{ma}. \keyval{minor}{code}\Default{m} - The token list \code{mi}. + The token list \code{mi}. This option knows a special value. If you set + \keyis{minor}{lowercase} then minor chords are converted to lowercase + letters. This means an input \code{Dmi} becomes \code{d}. \keyval{major-seven}{code}\Default{\cs*{textsuperscript}\Marg{maj7}} The token list \code{maj7}. \keyval{major-nine}{code}\Default{\cs*{textsuperscript}\Marg{maj9}} @@ -558,7 +610,7 @@ Here is a small example of it's usage and the outcome: -\begin{example}[compile,program=lualatex,max-pages=1,add-frame=false] +\begin{example}[compile,program=xelatex,max-pages=1,add-frame=false] % compile with LuaLaTeX or XeLaTeX \documentclass[margin=4mm]{standalone} \usepackage{leadsheets} @@ -569,7 +621,7 @@ \end{example} \clearpage -\part{The \library*{songs} Library}\label{part:leadsheets-library} +\part{The \library*{songs} Library}\label{part:leadsheets-songs-library} \dictum[Jeff Beck]{% I don't care about the rules. If I don't break the rules at least ten times every song then I'm not doing my job.% @@ -581,7 +633,7 @@ can be used to create complete songbooks. The basic idea is that songs are typeset in the \env{song} environment. Each song gets a number of properties (see section~\ref{sec:song-properties}) that determine how the title of the -song is typeset. For the typesetting of the titles a template mechansim is +song is typeset. For the typesetting of the titles a template mechanism is used (see section~\ref{sec:title-templates}). Songs can also be tagged. The tags then allow to typeset only songs matching a list of tags that is specified via an option. @@ -722,6 +774,10 @@ Makes the characters \shortcut{:} and \shortcut{\barsymbol} active inside the \env{song} environment. See sections~\ref{sec:special-characters} and~\ref{sec:typesetting-bars} for more details. + \keybool{disable-measuring}\Default{false} + \sinceversion{0.4}This option turns of the song height measuring. This + makes song title template definitions easier (see section~\ref{sec:title-templates} for + details). \emph{The song property \property{height} will be set to 0pt then!} \end{options} \subsection{Song Properties}\label{sec:song-properties} @@ -796,15 +852,17 @@ There are three more properties, \property{counter}, \property{ID} and \property{height} that cannot be set but are set automatically for each song. The \property{counter} simply holds the number of the current song starting -from \code{1} for the first song. The \property{ID} currently always ia +from \code{1} for the first song. The \property{ID} currently always is \code{song\meta{counter}} where \meta{counter} is the current \property{counter} value. The property \property{height} holds the height of the typeset song in pt. The height is determined by placing the body of the respective \env{song} environment in a vertical box and measuring the height -and depth of the box. This is done in a measuring phase that can be tested in -a songtitle template definition, see section~\ref{sec:title-templates} for -details. \emph{ This is important since the property \property{height} is not -available in the measuring phase but only afterwards!} +and depth of the box. This is done in a measuring phase that can and should +be tested in a songtitle template definition, see +section~\ref{sec:title-templates} for details. \emph{This is important since + the property \property{height} is not available in the measuring phase but + only afterwards!} If the option \option{disable-measuring} has been set the +property \property{height} will have the value~0pt! In principle all properties can get list of entries where items are separated with \code{\visualizespaces{ and }}. Of course this doesn't make sense for @@ -1107,7 +1165,7 @@ and \code{-}, though, as well as the mandatory space (\visiblespace)! Each \env{verse} like environment (see section~\ref{sec:other-envverse-like} -for more information) is treated uniquely by this mechansim: +for more information) is treated uniquely by this mechanism: \begin{example} \definesongtitletemplate{empty}{} @@ -1424,7 +1482,7 @@ according to the chosen title template. It is chosen through the option \option{title-template} which can be set with \cs{setleadsheets} or as option to a specific \env{song} environment. \leadsheets{} provides few predefined -templates and an easy mechansim to define own templates. +templates and an easy mechanism to define own templates. \subsubsection{Existing Templates} @@ -1488,16 +1546,22 @@ mandatory argument. \expandable\command{ifsongproperty}[\marg{property}\marg{true}\marg{false}] Checks if property \meta{property} has been set. + \command{ifanysongproperty}[\Marg{csv list of properties}\marg{true}\marg{false}] + \sinceversion{0.4}Checks if any of the properties in \meta{csv list of + properties} has been set. + \command{ifallsongproperties}[\Marg{csv list of properties}\marg{true}\marg{false}] + \sinceversion{0.4}Checks if all of the properties in \meta{csv list of + properties} have been set. \command{ifsongpropertiesequal}[\marg{property 1}\marg{property 2}\marg{true}\marg{false}] Checks if properties \meta{property 1} and \meta{property 2} have been set to the same value. \expandable\command{ifsongmeasuring}[\marg{true}\marg{false}] \leadsheets{} measures the height of a song body before it typesets it and - it can be necessary in a template to know if the measuring phase is active - or not. For example the song property \property{height} should only be - used if \emph{not} in the measuring phase: it's value get's determined - there and is not yet available. + it can often be necessary in a template to know if the measuring phase is + active or not. For example the song property \property{height} should + only be used if \emph{not} in the measuring phase: it's value get's + determined there and is not yet available. \command{expandcode}[\marg{code}] Exhaustively expands \meta{code}. Experienced users won't need this. It is essentially @@ -1934,10 +1998,255 @@ \end{table} \clearpage -\part{Appendix} +\part{The \library*{external} Library and the \cls*{leadsheet} + Class}\label{part:external-leadsheet} \dictum[Thelonious Monk]{% Talking about music is like dancing about architecture.% } + +\section{The Idea} + +For\sinceversion{0.5} some users -- like myself -- it may be desirable to +create leadsheets that can be reused in another document as a compilation of +songs. The usual way would be to +\begin{itemize} + \item either solve this manually by copying the \env{song} environment from + one document to the other. This is not ideal, of course. + \item place the \env{song} in a file of its own and \cs*{input} it in the + different documents. This is easy and safe but requires a total of three + files for two documents. That's not really a problem, though, so it is a + valid way. +\end{itemize} + +\leadsheets{} now provides a third way. You write the single leadsheet using +the \cls{leadsheet} class that comes with this package. Let's call this file +\code{single.tex} for the following discussion: +\begin{sourcecode} + \documentclass{leadsheet} + \usepackage[T1]{fontenc} + \usepackage[utf8]{inputenc} + + \begin{document} + + \begin{song}{ ... } + ... + \end{song} + + \end{document} +\end{sourcecode} + +You can now include this document as is in another file -- let's call it +\code{multiple.tex}: +\begin{sourcecode} + \documentclass{scrartcl} + \usepackage{leadsheets} + \useleadsheetslibraries{external} + + \begin{document} + + \includeleadsheet{single.tex} + + \end{document} +\end{sourcecode} + +Depending on the settings this removes the complete preamble from +\code{single.tex} and only includes the document body of the file. + +\section{The \cls*{leadsheet} Class}\label{sec:leadsheet-class} + +The \cls{leadsheet} class is a class file built upon the \cls{scrartcl} +class. It defines a song title template \titletemplate{leadsheet}, makes a +few setup choices +\begin{sourcecode} + \setleadsheets{ + title-template = leadsheet , + bar-shortcuts , + verse/numbered , + verses-format = , + verses-label-format = \bfseries , + info/format = \itshape , + chorus/format = \itshape + } +\end{sourcecode} +and sets the header and the footer of the leadsheet pages. + +\begin{example}[ + compile, + graphics={trim={2cm 18cm 2cm 2cm},clip}, + add-sourcecode-options={literate=}] + \documentclass{leadsheet} + \usepackage[T1]{fontenc} + \usepackage[utf8]{inputenc} + \usepackage[ngerman]{babel} + + \begin{document} + + \begin{song}{title={Mary Had A Little Lamb}, music={Stevie Ray Vaughan}, + interpret={Stevie Ray Vaughan}, lyrics={traditional}, tags={srv,blues}} + \begin{verse} + Mary had a little lamb \\ + Its fleece was white as snow, yea \\ + Everywhere the child went \\ + The little lamb was sure to go, yea + \end{verse} + \begin{verse} + He followed her to school one day \\ + And broke the teacher's rule \\ + What a time did they have \\ + That day at school + \end{verse} + \end{song} + + \end{document} +\end{example} + +The header contains \enquote{\meta{song title} (\meta{interpret})} if the +leadsheet has more than one page in total. Otherwise it is empty. + +The footer contains \enquote{\meta{page} of \meta{pages}} if the leadsheet has +more than one page in total. Otherwise it is empty. + +The class provides the verse type \env{prechorus}: +\begin{environments} + \environment{prechorus}[\oarg{options}] + Environment for marking the pre-chorus of a song. +\end{environments} + +\begin{commands} + \command{instruction}[\marg{text}] + Short macro to add instructional text. + \command{mkinstruction}[\marg{text}] + The formatting macro used by \cs{instruction}. You can redefine it in + order to change the appearance. The default definition is: \\ + \verbcode+\newcommand*\mkinstruction[1]{\emph{#1}}+ + \command{choir}[\marg{text}] + Short macro to add (background) choir text. + \command{mkchoir}[\marg{text}] + The formatting macro used by \cs{choir}. You can redefine it in + order to change the appearance. The default definition is: \\ + \verbcode+\newcommand*\mkchoir[1]{\instruction{\leadsheetstranslate{choir}: #1}}+ + \command{lsenparen}[\marg{text}] + Short macro to add parentheses around text. Used internally by + \cs{instruction}. + \command{mklsenparens} + The parentheses setting macro used by \cs{lsenparen}. You can redefine it + in order to change the parentheses. The default definition is: \\ + \verbcode+\newcommand*\mklsenparens{[]}+ \\ + \emph{The definition needs to be expandable and to expand to exactly two + tokens or braced groups, one for the opening parenthesis and the second + for the closing parenthesis!} + \command{mklsenparen}[\marg{openen parenthesis}\marg{closing + parenthesis}\marg{text}] + The formatting macro used by \cs{lsenparen}. You can redefine it in + order to change the appearance. The default definition is: \\ + \verbcode+\newcommand*\mklsenparen[3]{\textup{#1}#3\textup{#2}}+ +\end{commands} + +Here is an example that demonstrates \cs{choir} and \cs{instruction}. (The +code of the example code has been saved in a file called +\code{single-leadsheet.tex}. It is used later on again.)\label{single-leadsheet} +\begin{example}[compile,graphics={trim={2cm 18cm 2cm 2cm},clip}, + add-sourcecode-options={literate=}] + \documentclass{leadsheet} + \usepackage[T1]{fontenc} + \usepackage[utf8]{inputenc} + + \begin{document} + + \begin{song}{title=foobar} + \begin{verse} + \instruction{keyboard only} \\ + Lorem ipsum dolor sit amet, consetetur sadipscing \\ + \choir{sed diam nonumy eirmod tempor invidunt ut labore et dolore} + \end{verse} + \begin{prechorus} + \instruction{+ band} \\ + Lorem ipsum dolor sit amet, consetetur sadipscing + \end{prechorus} + \end{song} + + \end{document} +\end{example} + +\section{The \library*{external} Library} + +Loading the \library{external} library allows to include complete leadsheet +documents (\ie, with preamble) into a main document. This requires the +included leadsheet to use the \cls{leadsheet} class (see +section~\ref{sec:leadsheet-class}). When the file is included the whole +preamble of said file will be discarded. This can be changed with an option +but then \cs*{usepackage} and \cs*{RequirePackage} will still be disabled and +simply do nothing in the included file. + +\begin{commands} + \command{includeleadsheet}[\sarg\oarg{options}\marg{file name}] + Include the leadsheet \meta{file name}. \meta{options} apply locally for + the included file. The file \meta{file name} may include a complete + document preamble. +\end{commands} + +\begin{filecontents*}{single-leadsheet.tex} +\documentclass{leadsheet} +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} + +\begin{document} + +\begin{song}{title=foobar} +\begin{verse} + \instruction{keyboard only} \\ + Lorem ipsum dolor sit amet, consetetur sadipscing \\ + \choir{sed diam nonumy eirmod tempor invidunt ut labore et dolore} +\end{verse} +\begin{prechorus} + \instruction{+ band} \\ + Lorem ipsum dolor sit amet, consetetur sadipscing +\end{prechorus} +\end{song} + +\end{document} +\end{filecontents*} +The next example shows the basic usage by inputting the example file mentioned +on page~\pageref{single-leadsheet}. \emph{Notice that the formatting setup by + the \cls{leadsheets} is not used}. Also the title template +\titletemplate{leadsheet} is not defined in this process. +\begin{example}[compile,graphics={trim={2cm 18cm 2cm 2cm},clip}, + add-sourcecode-options={literate=}] + \documentclass{scrartcl} + \usepackage{leadsheets} + \useleadsheetslibraries{external} + + \begin{document} + + \includeleadsheet{single-leadsheet} + + \end{document} +\end{example} +Also notice that the \env{prechorus} environment and the \cs{instruction} and +\cs{choir} macros \emph{are} available! \emph{All new macros defined in the + \cls{leadsheet} class and described in section~\ref{sec:leadsheet-class} are + defined}. If you do not want this then you can use the starred version of +\cs{includeleadsheet}. In this process the preamble of the included file is +gobbled. It may be desirable not to have the preamble gobbled, though -- +because of custom macro definitions for example. +\begin{options} + \keybool{gobble-preamble}\Default{true} + If set to \code{false} \cs{includeleadsheet} will not gobble the preamble + of the file it inputs. Using this is dangerous: for it to work + \cs*{usepackage} and \cs*{RequirePackage} have to be disabled while the + file is included. So including the preamble may lead to more problems + than it solves. +\end{options} + +The included leadsheets do not have to be a complete document -- a standard +tex file only consisting of the \env{song} environments will work just as +nicely. Files that are complete documents but are using another class than +\cls{leadsheet} will lead to errors, though. + +\clearpage +\part{Appendix} +\dictum[Thelonious Monk]{Wrong is right.} \appendix \end{document} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/leadsheets.doc.tlpobj new/tlpkg/tlpobj/leadsheets.doc.tlpobj --- old/tlpkg/tlpobj/leadsheets.doc.tlpobj 2016-04-14 19:16:27.000000000 +0200 +++ new/tlpkg/tlpobj/leadsheets.doc.tlpobj 2017-04-14 17:46:55.000000000 +0200 @@ -1,9 +1,9 @@ name leadsheets.doc category Package -revision 39564 +revision 43034 shortdesc doc files of leadsheets relocated 1 -docfiles size=225 +docfiles size=246 RELOC/doc/latex/leadsheets/README RELOC/doc/latex/leadsheets/leadsheets_en.pdf RELOC/doc/latex/leadsheets/leadsheets_en.tex ++++++ leadsheets.tar.xz ++++++ ++++ 1789 lines of diff (skipped) ++++++ leaflet.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/leaflet/README new/doc/latex/leaflet/README --- old/doc/latex/leaflet/README 2013-11-07 23:32:28.000000000 +0100 +++ new/doc/latex/leaflet/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -The leaflet document class -========================== - -A LaTeX document class to create small hand-outs (flyers) that fit on a -single sheet of paper which is then folded twice. Pages are rearranged by -LaTeX so that they print correctly on a single sheet -- no external script -is necessary. (Works with PostScript and PDF.) - -Recommended TDS locations: - - leaflet.cls: tex/latex/leaflet - leaflet.pdf,leaflet-manual.pdf: doc/latex/leaflet - -For general installation advice, see -http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/leaflet/README.md new/doc/latex/leaflet/README.md --- old/doc/latex/leaflet/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/latex/leaflet/README.md 2017-03-17 23:01:04.000000000 +0100 @@ -0,0 +1,23 @@ +The leaflet document class +========================== + +A LaTeX document class to create small hand-outs (flyers) that fit on a +single sheet of paper which is then folded twice. Pages are rearranged by +LaTeX so that they print correctly on a single sheet -- no external script +is necessary. (Works with PostScript and PDF.) + +Recommended TDS locations: +``` + leaflet.cls: tex/latex/leaflet + leaflet.pdf,leaflet-manual.pdf: doc/latex/leaflet +``` +For general installation advice, see +http://www.tex.ac.uk/cgi-bin/texfaq2html?label=instpackages + +For bug reports use [this address](https://github.com/rolfn/leaflet/issues). + +The leaflet document class is also on CTAN:[macros/latex/contrib/leaflet](http://mirrors.ctan.org/macros/latex/co… + + + + Binary files old/doc/latex/leaflet/leaflet-manual.pdf and new/doc/latex/leaflet/leaflet-manual.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/leaflet/leaflet-manual.tex new/doc/latex/leaflet/leaflet-manual.tex --- old/doc/latex/leaflet/leaflet-manual.tex 2016-02-12 01:25:45.000000000 +0100 +++ new/doc/latex/leaflet/leaflet-manual.tex 2017-03-17 23:01:04.000000000 +0100 @@ -6,9 +6,9 @@ %% %% leaflet.dtx (with options: `manual') %% -%% Copyright (C) 2003, 2004 +%% Copyright (C) 2003, 2004, ... %% Rolf Niepraschk, Rolf.Niepraschk(a)gmx.de -%% Hubert Gaesslein, HubertJG(a)open.mind.de +%% Hubert Gaesslein, hubertjg(a)gmx.de %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -21,8 +21,8 @@ %% This work has the LPPL maintenance status "author-maintained". %% \def\filename{leaflet-manual.tex} -\def\fileversion{v1.1a} % change this when leaflet-manual changed, too. -\def\filedate{2015/12/27} +\def\fileversion{v1.1b} % change this when leaflet-manual changed, too. +\def\filedate{2017/03/17} \def\docdate {2015/12/27} % change this when leaflet-manual changed, too. \listfiles \errorcontextlines=99 Binary files old/doc/latex/leaflet/leaflet.pdf and new/doc/latex/leaflet/leaflet.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/leaflet.doc.tlpobj new/tlpkg/tlpobj/leaflet.doc.tlpobj --- old/tlpkg/tlpobj/leaflet.doc.tlpobj 2016-04-14 19:16:28.000000000 +0200 +++ new/tlpkg/tlpobj/leaflet.doc.tlpobj 2017-04-14 17:46:55.000000000 +0200 @@ -1,10 +1,10 @@ name leaflet.doc category Package -revision 39683 +revision 43523 shortdesc doc files of leaflet relocated 1 docfiles size=86 - RELOC/doc/latex/leaflet/README + RELOC/doc/latex/leaflet/README.md RELOC/doc/latex/leaflet/leaflet-manual.pdf RELOC/doc/latex/leaflet/leaflet-manual.tex RELOC/doc/latex/leaflet/leaflet.pdf ++++++ leaflet.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/leaflet/leaflet.cls new/tex/latex/leaflet/leaflet.cls --- old/tex/latex/leaflet/leaflet.cls 2016-02-12 01:25:45.000000000 +0100 +++ new/tex/latex/leaflet/leaflet.cls 2017-03-17 23:01:05.000000000 +0100 @@ -6,9 +6,9 @@ %% %% leaflet.dtx (with options: `class') %% -%% Copyright (C) 2003, 2004 +%% Copyright (C) 2003, 2004, ... %% Rolf Niepraschk, Rolf.Niepraschk(a)gmx.de -%% Hubert Gaesslein, HubertJG(a)open.mind.de +%% Hubert Gaesslein, hubertjg(a)gmx.de %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -232,8 +232,7 @@ \LoadClass{article} \RequirePackage{everyshi,graphicx} \newcommand*\LL@pagesize@specials[2]{} -\@ifundefined{Gin@driver}{}% -{% +\@ifundefined{Gin@driver}{}{% \ifx\Gin@driver\@empty\else% \filename@parse{\Gin@driver}\@tempswafalse% \def\reserved@a{dvips}% @@ -253,6 +252,19 @@ \@tempdima=#1\@tempdimb=#2% \pdfpagewidth\@tempdima\pdfpageheight\@tempdimb}% \fi + \def\reserved@a{luatex}% + \ifx\filename@base\reserved@a + \ClassInfo{leaflet}{Generating code for LuaTeX}% + \ifx\pdfvariable\@undefined + \def\LL@pagesize@specials#1#2{% + \@tempdima=#1\@tempdimb=#2% + \pdfpagewidth\@tempdima\pdfpageheight\@tempdimb}% + \else + \def\LL@pagesize@specials#1#2{% + \@tempdima=#1\@tempdimb=#2% + \pagewidth\@tempdima\pageheight\@tempdimb}% + \fi + \fi \def\reserved@a{xetex}% \ifx\filename@base\reserved@a \ClassInfo{leaflet}{Generating code for XeTeX}% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/leaflet.tlpobj new/tlpkg/tlpobj/leaflet.tlpobj --- old/tlpkg/tlpobj/leaflet.tlpobj 2016-04-14 19:16:28.000000000 +0200 +++ new/tlpkg/tlpobj/leaflet.tlpobj 2017-04-14 17:46:55.000000000 +0200 @@ -1,6 +1,6 @@ name leaflet category Package -revision 39683 +revision 43523 shortdesc Create small handouts (flyers) relocated 1 longdesc A document class to create small hand-outs (flyers) that fit on @@ -12,7 +12,7 @@ runfiles size=5 RELOC/tex/latex/leaflet/leaflet.cls catalogue-ctan /macros/latex/contrib/leaflet -catalogue-date 2016-02-10 15:54:10 +0100 +catalogue-date 2017-03-17 18:23:39 +0100 catalogue-license lppl catalogue-topics layout class -catalogue-version 1.1a +catalogue-version 1.1b ++++++ lecturer.doc.tar.xz ++++++ ++++++ lecturer.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lecturer.tlpobj new/tlpkg/tlpobj/lecturer.tlpobj --- old/tlpkg/tlpobj/lecturer.tlpobj 2016-04-14 19:16:31.000000000 +0200 +++ new/tlpkg/tlpobj/lecturer.tlpobj 2017-04-14 17:46:57.000000000 +0200 @@ -34,6 +34,6 @@ RELOC/tex/generic/lecturer/ltr-steps.tex RELOC/tex/generic/lecturer/t-lecturer.tex catalogue-ctan /macros/generic/lecturer -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics presentation ++++++ ledmac.doc.tar.xz ++++++ Binary files old/doc/latex/ledmac/ledarab.pdf and new/doc/latex/ledmac/ledarab.pdf differ Binary files old/doc/latex/ledmac/ledmac.pdf and new/doc/latex/ledmac/ledmac.pdf differ Binary files old/doc/latex/ledmac/ledpar.pdf and new/doc/latex/ledmac/ledpar.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ledmac.doc.tlpobj new/tlpkg/tlpobj/ledmac.doc.tlpobj --- old/tlpkg/tlpobj/ledmac.doc.tlpobj 2016-04-14 19:16:32.000000000 +0200 +++ new/tlpkg/tlpobj/ledmac.doc.tlpobj 2017-04-14 17:46:57.000000000 +0200 @@ -1,6 +1,6 @@ name ledmac.doc category Package -revision 38640 +revision 41811 shortdesc doc files of ledmac relocated 1 docfiles size=822 ++++++ ledmac.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ledmac/ledmac.sty new/tex/latex/ledmac/ledmac.sty --- old/tex/latex/ledmac/ledmac.sty 2015-10-15 00:31:41.000000000 +0200 +++ new/tex/latex/ledmac/ledmac.sty 2016-11-25 19:33:53.000000000 +0100 @@ -23,7 +23,7 @@ %% This work consists of the files listed in the README file. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ledmac}[2015/10/14 v0.19.3 LaTeX port of EDMAC] +\ProvidesPackage{ledmac}[2016/08/06 v0.19.4 LaTeX port of EDMAC] \newif\ifledfinal \newif\ifnoeledmac @@ -681,7 +681,7 @@ \long\def\critext#1#2/{\leavevmode \begingroup \no@expands - \xdef\@tag{\protect#1}% + \gdef\@tag{#1}% \set@line \global\insert@count=0 \ignorespaces #2\relax @@ -697,7 +697,7 @@ \newcommand{\edtext}[2]{\leavevmode \begingroup \no@expands - \xdef\@tag{\protect#1}% + \gdef\@tag{#1}% \set@line \global\insert@count=0 \ignorespaces #2\relax @@ -725,7 +725,7 @@ \newcommand*{\edfont@info}{\f@encoding/\f@family/\f@series/\f@shape} -\newcommand*{\lemma}[1]{\xdef\@tag{\protect#1}\ignorespaces} +\newcommand*{\lemma}[1]{\gdef\@tag{#1}\ignorespaces} \newcommand*{\linenum}[1]{% \xdef\@tempa{#1|||||||\noexpand\\\l@d@nums}% \global\let\l@d@nums=\empty diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ledmac.tlpobj new/tlpkg/tlpobj/ledmac.tlpobj --- old/tlpkg/tlpobj/ledmac.tlpobj 2016-04-14 19:16:34.000000000 +0200 +++ new/tlpkg/tlpobj/ledmac.tlpobj 2017-04-14 17:46:58.000000000 +0200 @@ -1,6 +1,6 @@ name ledmac category Package -revision 38640 +revision 41811 shortdesc Typeset scholarly editions relocated 1 longdesc A macro package for typesetting scholarly critical editions. @@ -8,7 +8,7 @@ longdesc macros. It supports indexing by page and line number and simple longdesc tabular- and array-style environments. The package is longdesc distributed with the related ledpar and ledarab packages. The -longdesc package is now superseded by eledmac. +longdesc package is now superseded by reledmac. runfiles size=41 RELOC/tex/latex/ledmac/afoot.sty RELOC/tex/latex/ledmac/ledarab.sty @@ -16,7 +16,7 @@ RELOC/tex/latex/ledmac/ledpar.sty catalogue-also ednotes poemscol catalogue-ctan /macros/latex/contrib/ledmac -catalogue-date 2015-10-14 20:53:07 +0200 +catalogue-date 2016-08-07 07:39:22 +0200 catalogue-license lppl1.3 catalogue-topics crit-ed -catalogue-version 0.19.3 +catalogue-version 0.19.4 ++++++ leftidx.doc.tar.xz ++++++ ++++++ leftidx.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/leftidx.tlpobj new/tlpkg/tlpobj/leftidx.tlpobj --- old/tlpkg/tlpobj/leftidx.tlpobj 2016-04-14 19:16:35.000000000 +0200 +++ new/tlpkg/tlpobj/leftidx.tlpobj 2017-04-14 17:46:58.000000000 +0200 @@ -8,6 +8,6 @@ runfiles size=1 RELOC/tex/latex/leftidx/leftidx.sty catalogue-ctan /macros/latex/contrib/leftidx -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics subsup-pos maths ++++++ leipzig.doc.tar.xz ++++++ ++++++ leipzig.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/leipzig.tlpobj new/tlpkg/tlpobj/leipzig.tlpobj --- old/tlpkg/tlpobj/leipzig.tlpobj 2016-04-14 19:16:35.000000000 +0200 +++ new/tlpkg/tlpobj/leipzig.tlpobj 2017-04-14 17:46:58.000000000 +0200 @@ -12,7 +12,7 @@ RELOC/tex/latex/leipzig/leipzig.sty RELOC/tex/latex/leipzig/leipzig.tex catalogue-ctan /macros/latex/contrib/leipzig -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics linguistic catalogue-version 1.1 ++++++ lengthconvert.doc.tar.xz ++++++ ++++++ lengthconvert.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lengthconvert.tlpobj new/tlpkg/tlpobj/lengthconvert.tlpobj --- old/tlpkg/tlpobj/lengthconvert.tlpobj 2016-04-14 19:16:36.000000000 +0200 +++ new/tlpkg/tlpobj/lengthconvert.tlpobj 2017-04-14 17:46:58.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/lengthconvert/lengthconvert.sty catalogue-also printlen catalogue-ctan /macros/latex/contrib/lengthconvert -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics misc-conv catalogue-version 1.0a ++++++ lettre.doc.tar.xz ++++++ ++++++ lettre.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lettre.tlpobj new/tlpkg/tlpobj/lettre.tlpobj --- old/tlpkg/tlpobj/lettre.tlpobj 2016-04-14 19:16:36.000000000 +0200 +++ new/tlpkg/tlpobj/lettre.tlpobj 2017-04-14 17:46:59.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/lettre/default.ins RELOC/tex/latex/lettre/lettre.cls catalogue-ctan /macros/latex/contrib/lettre -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics letter french catalogue-version 2.353 ++++++ lettrine.doc.tar.xz ++++++ ++++++ lettrine.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lettrine.tlpobj new/tlpkg/tlpobj/lettrine.tlpobj --- old/tlpkg/tlpobj/lettrine.tlpobj 2016-04-14 19:16:37.000000000 +0200 +++ new/tlpkg/tlpobj/lettrine.tlpobj 2017-04-14 17:46:59.000000000 +0200 @@ -17,7 +17,7 @@ RELOC/tex/latex/lettrine/pzc2.cfl RELOC/tex/latex/lettrine/pzc3.cfl catalogue-ctan /macros/latex/contrib/lettrine -catalogue-date 2015-09-01 14:20:07 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics lettrine catalogue-version 1.9 ++++++ levy.doc.tar.xz ++++++ ++++++ levy.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/levy.tlpobj new/tlpkg/tlpobj/levy.tlpobj --- old/tlpkg/tlpobj/levy.tlpobj 2016-04-14 19:16:37.000000000 +0200 +++ new/tlpkg/tlpobj/levy.tlpobj 2017-04-14 17:46:59.000000000 +0200 @@ -59,6 +59,6 @@ RELOC/tex/generic/levy/greekmacros.tex RELOC/tex/generic/levy/slgreek.sty catalogue-ctan /fonts/greek/levy -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics font font-mf font-greek ++++++ lewis.doc.tar.xz ++++++ ++++++ lewis.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lewis.tlpobj new/tlpkg/tlpobj/lewis.tlpobj --- old/tlpkg/tlpobj/lewis.tlpobj 2016-04-14 19:16:38.000000000 +0200 +++ new/tlpkg/tlpobj/lewis.tlpobj 2017-04-14 17:46:59.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=1 RELOC/tex/latex/lewis/lewis.sty catalogue-ctan /macros/latex/contrib/lewis -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license pd catalogue-topics chemistry catalogue-version 0.1 ++++++ lexikon.doc.tar.xz ++++++ ++++++ lexikon.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lexikon.tlpobj new/tlpkg/tlpobj/lexikon.tlpobj --- old/tlpkg/tlpobj/lexikon.tlpobj 2016-04-14 19:16:38.000000000 +0200 +++ new/tlpkg/tlpobj/lexikon.tlpobj 2017-04-14 17:46:59.000000000 +0200 @@ -6,7 +6,7 @@ runfiles size=2 RELOC/tex/latex/lexikon/lexikon.sty catalogue-ctan /macros/latex/contrib/lexikon -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-18 16:48:54 +0200 catalogue-license lppl catalogue-topics dictionary catalogue-version 1.0c ++++++ lexref.doc.tar.xz ++++++ ++++++ lexref.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lexref.tlpobj new/tlpkg/tlpobj/lexref.tlpobj --- old/tlpkg/tlpobj/lexref.tlpobj 2016-04-14 19:16:38.000000000 +0200 +++ new/tlpkg/tlpobj/lexref.tlpobj 2017-04-14 17:46:59.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=5 RELOC/tex/latex/lexref/lexref.sty catalogue-ctan /macros/latex/contrib/lexref -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics legal catalogue-version 1.1a ++++++ lfb.doc.tar.xz ++++++ ++++++ lfb.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lfb.tlpobj new/tlpkg/tlpobj/lfb.tlpobj --- old/tlpkg/tlpobj/lfb.tlpobj 2016-04-14 19:16:38.000000000 +0200 +++ new/tlpkg/tlpobj/lfb.tlpobj 2017-04-14 17:47:00.000000000 +0200 @@ -78,7 +78,7 @@ RELOC/fonts/tfm/public/lfb/lfbb8.tfm RELOC/fonts/tfm/public/lfb/lfbb9.tfm catalogue-ctan /fonts/greek/lfb -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font font-mf font-greek catalogue-version 1.0 ++++++ lgreek.doc.tar.xz ++++++ ++++++ lgreek.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lgreek.tlpobj new/tlpkg/tlpobj/lgreek.tlpobj --- old/tlpkg/tlpobj/lgreek.tlpobj 2016-04-14 19:16:39.000000000 +0200 +++ new/tlpkg/tlpobj/lgreek.tlpobj 2017-04-14 17:47:00.000000000 +0200 @@ -12,6 +12,6 @@ RELOC/tex/latex/lgreek/lgreek.sty catalogue-also levy-latex catalogue-ctan /macros/latex/contrib/lgreek -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl2 catalogue-topics font-use greek ++++++ lh.doc.tar.xz ++++++ ++++++ lh.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lh.tlpobj new/tlpkg/tlpobj/lh.tlpobj --- old/tlpkg/tlpobj/lh.tlpobj 2016-04-14 19:16:40.000000000 +0200 +++ new/tlpkg/tlpobj/lh.tlpobj 2017-04-14 17:47:00.000000000 +0200 @@ -578,7 +578,7 @@ RELOC/tex/plain/lh/testkern.tex catalogue-also ccfonts cmbright concrete ecc catalogue-ctan /fonts/cyrillic/lh -catalogue-date 2016-02-05 09:37:59 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font font-mf font-cyrillic catalogue-version 3.5g ++++++ lhcyr.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lhcyr.tlpobj new/tlpkg/tlpobj/lhcyr.tlpobj --- old/tlpkg/tlpobj/lhcyr.tlpobj 2016-04-14 19:16:42.000000000 +0200 +++ new/tlpkg/tlpobj/lhcyr.tlpobj 2017-04-14 17:47:01.000000000 +0200 @@ -57,6 +57,6 @@ RELOC/tex/latex/lhcyr/statya.tex catalogue-also koi8 catalogue-ctan /macros/latex/contrib/lhcyr -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics multilingual font-supp ++++++ lhelp.doc.tar.xz ++++++ ++++++ lhelp.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lhelp.tlpobj new/tlpkg/tlpobj/lhelp.tlpobj --- old/tlpkg/tlpobj/lhelp.tlpobj 2016-04-14 19:16:42.000000000 +0200 +++ new/tlpkg/tlpobj/lhelp.tlpobj 2017-04-14 17:47:01.000000000 +0200 @@ -15,7 +15,7 @@ runfiles size=5 RELOC/tex/latex/lhelp/lhelp.sty catalogue-ctan /macros/latex/contrib/lhelp -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics macro-supp catalogue-version 2.0 ++++++ libertine.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/libertine/README new/doc/fonts/libertine/README --- old/doc/fonts/libertine/README 2015-04-13 00:23:27.000000000 +0200 +++ new/doc/fonts/libertine/README 2017-03-26 23:45:59.000000000 +0200 @@ -1,4 +1,4 @@ -This is the README for libertine, version 5.3.0 (2015-04-10). +This is the README for libertine, version 5.3.0 (2017-03-26). This package provides support for use of the Linux Libertine and Linux Biolinum families of fonts with LaTeX. Most features are usable with @@ -55,7 +55,7 @@ with [pdf]LaTeX and \usepackage{unicode-math} - \setmathfont{texgyrepagellamath-regular.otf} + \setmathfont[Scale=MatchUppercase]{libertinusmath-regular.otf} with xeLaTeX or luaLaTeX. @@ -79,5 +79,5 @@ the terms of the LaTeX Project Public License. Thanks to Herbert Voss, Patrick Gundlach, Silke Hofstra, Marc Penninga, -Michael Sharpe, Denis Bitouz� and Khaled Hosny for their assistance. The +Michael Sharpe, Denis Bitouzé and Khaled Hosny for their assistance. The maintainer of this package is Bob Tennent (rdt at cs.queensu.ca) Binary files old/doc/fonts/libertine/libertine.pdf and new/doc/fonts/libertine/libertine.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/libertine/libertine.tex new/doc/fonts/libertine/libertine.tex --- old/doc/fonts/libertine/libertine.tex 2014-02-15 00:25:41.000000000 +0100 +++ new/doc/fonts/libertine/libertine.tex 2017-03-21 23:01:03.000000000 +0100 @@ -240,7 +240,7 @@ with pdf\LaTeX\ and \begin{verbatim} \usepackage{unicode-math} - \setmathfont{texgyrepagellamath-regular.otf} + \setmathfont[Scale=MatchUppercase]{libertinusmath-regular.otf} \end{verbatim} with xe\LaTeX\ or lua\LaTeX. @@ -360,7 +360,7 @@ \clearpage \subsection{General Keyboard} \begin{longtable}[l]{lll} -0 & \verb|\LKey{zero}|,\verb|\LKey{0}| & \LARGE\strut\fbox{\LKey{zero}} \\ +0 & \verb|\LKey{zero}|,\verb|\LKey{0}| & \LARGE\strut\fbox{\LKey{0}} \\ 9 & \verb|\LKey{nine}|,\verb|\LKey{9}| & \LARGE\strut\fbox{\LKey{nine}} \\ A & \verb|\LKey{A}| & \LARGE\strut\fbox{\LKey{A}} \\ Z & \verb|\LKey{Z}| & \LARGE\strut\fbox{\LKey{Z}} \\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/libertine.doc.tlpobj new/tlpkg/tlpobj/libertine.doc.tlpobj --- old/tlpkg/tlpobj/libertine.doc.tlpobj 2016-04-14 19:16:42.000000000 +0200 +++ new/tlpkg/tlpobj/libertine.doc.tlpobj 2017-04-14 17:47:01.000000000 +0200 @@ -1,9 +1,9 @@ name libertine.doc category Package -revision 36815 +revision 43603 shortdesc doc files of libertine relocated 1 -docfiles size=303 +docfiles size=304 RELOC/doc/fonts/libertine/Bugs.txt RELOC/doc/fonts/libertine/ChangeLog.txt RELOC/doc/fonts/libertine/GPL.txt ++++++ libertine.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-n/libertine.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-n.new/libertine.tar.xz differ: char 26, line 1 ++++++ libertinegc.doc.tar.xz ++++++ ++++++ libertinegc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/libertinegc.tlpobj new/tlpkg/tlpobj/libertinegc.tlpobj --- old/tlpkg/tlpobj/libertinegc.tlpobj 2016-04-14 19:17:02.000000000 +0200 +++ new/tlpkg/tlpobj/libertinegc.tlpobj 2017-04-14 17:47:09.000000000 +0200 @@ -101,7 +101,7 @@ RELOC/tex/latex/libertinegc/libertinegc.sty catalogue-also libertine catalogue-ctan /fonts/libertinegc -catalogue-date 2016-02-21 05:08:42 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font catalogue-version 1.00 ++++++ libertinus.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/libertinus/AUTHORS.txt new/doc/fonts/libertinus/AUTHORS.txt --- old/doc/fonts/libertinus/AUTHORS.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/doc/fonts/libertinus/AUTHORS.txt 2017-05-12 23:59:09.000000000 +0200 @@ -0,0 +1,11 @@ +# This is the official list of project authors for copyright purposes. +# This file is distinct from the CONTRIBUTORS.txt file. +# See the latter for an explanation. +# +# Names should be added to this file as: +# Name or Organization <email address> + +Philipp H. Poll <gillian(a)linuxlibertine.org> +Khaled Hosny <khaledhosny(a)eglug.org> +STI Pub Companies +Elsevier, Inc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/libertinus/FONTLOG.txt new/doc/fonts/libertinus/FONTLOG.txt --- old/doc/fonts/libertinus/FONTLOG.txt 2016-02-01 00:44:49.000000000 +0100 +++ new/doc/fonts/libertinus/FONTLOG.txt 2017-05-18 23:42:40.000000000 +0200 @@ -45,6 +45,34 @@ ChangeLog --------- +17 May 2017 (Khaled Hosny) <Libertinus> Version 6.4 +- Fix broken extensibles of the left square bracket in the math font. + +12 May 2017 (Khaled Hosny) <Libertinus> Version 6.3 +- Add U+231C-231Fi and U+2A7D-2A7E to the math font. +- Add script math alphabet based on that of XITS Math font. +- Add monospaced math alphabet based on that of cmtt10 font with modified + METAFONT parameters to better fit with Libertinus glyphs. +- Improve math top accent positions. +- Fix spacing of math italic i and j. +- Increase the gap between \sum and its limits. +- Improved math braces and brackets based on STIX Two Math font. +- Disable optical variants of math alphanumerics that were based on the text + sup/superscript glyphs as they don’t look good besides being incomplete and + inconsistent. +- Remove duplicate glyphs that caused broken GPOS generation. +- Drop optical bounds (‘opbd’, ‘rtbd’ and ‘lfbd’) features as they were + incomplete and virtually unsupported. +- Fix text mark placement below O and o. +- Fix oldstyle numbers feature in Libertinus Serif Semibold that had wrong + glyph mapping for 6, 7, 8 and 9. +- Use swash Q when followed by v. +- Various consistency fixes to font names and vertical metrics. +- Fix placement of the half ring in U+1E9A. +- Fix several Libertinus Serif Bold italic alternate glyphs that were not bold. +- Fix Libertinus Serif Italic U+2098-2099 (subscript m and n) that looked like + superscript circled + and -. + 30 Jan 2016 (Khaled Hosny) <Libertinus> Version 6.2 - Fixed missing big variant rule for U+27EF. - Fixed swapped \phi and \varphi symbols. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/libertinus/OFL.txt new/doc/fonts/libertinus/OFL.txt --- old/doc/fonts/libertinus/OFL.txt 2016-02-01 00:44:49.000000000 +0100 +++ new/doc/fonts/libertinus/OFL.txt 2017-05-12 23:59:09.000000000 +0200 @@ -1,4 +1,5 @@ -Portions copyright (c) 2012-2016, Khaled Hosny (khaledhosny(a)eglug.org). Portions copyright (c) 2003–2012, Philipp H. Poll (www.linuxlibertine.org | gillian at linuxlibertine.org), with Reserved Font Name "Linux Libertine" and "Biolinum". +Copyright © 2012-2017 The Libertinus Project Authors, with Reserved Font Name +"Linux Libertine", "Biolinum", "STIX Fonts". This Font Software is licensed under the SIL Open Font License, Version 1.1. This license is copied below, and is also available with a FAQ at: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/libertinus/README.txt new/doc/fonts/libertinus/README.txt --- old/doc/fonts/libertinus/README.txt 2016-01-23 00:17:28.000000000 +0100 +++ new/doc/fonts/libertinus/README.txt 2017-05-12 23:59:09.000000000 +0200 @@ -5,6 +5,8 @@ started as an OpenType math companion of the Libertine font family, but grown as a full fork to address some of the bugs in the fonts. +Libertinus is forked from 5.3.0 (2012-07-02) release of Linux Libertine fonts. + The family consists of: * Libertinus Serif: forked from *Linux Libertine*. Binary files old/doc/fonts/libertinus/documentation/libertinus-testmath.pdf and new/doc/fonts/libertinus/documentation/libertinus-testmath.pdf differ Binary files old/doc/fonts/libertinus/documentation/libertinuskeyboard-regular-table.pdf and new/doc/fonts/libertinus/documentation/libertinuskeyboard-regular-table.pdf differ Binary files old/doc/fonts/libertinus/documentation/libertinusmath-regular-table.pdf and new/doc/fonts/libertinus/documentation/libertinusmath-regular-table.pdf differ Binary files old/doc/fonts/libertinus/documentation/libertinusmono-regular-table.pdf and new/doc/fonts/libertinus/documentation/libertinusmono-regular-table.pdf differ Binary files old/doc/fonts/libertinus/documentation/libertinussans-bold-table.pdf and new/doc/fonts/libertinus/documentation/libertinussans-bold-table.pdf differ Binary files old/doc/fonts/libertinus/documentation/libertinussans-italic-table.pdf and new/doc/fonts/libertinus/documentation/libertinussans-italic-table.pdf differ Binary files old/doc/fonts/libertinus/documentation/libertinussans-regular-table.pdf and new/doc/fonts/libertinus/documentation/libertinussans-regular-table.pdf differ Binary files old/doc/fonts/libertinus/documentation/libertinusserif-bold-table.pdf and new/doc/fonts/libertinus/documentation/libertinusserif-bold-table.pdf differ Binary files old/doc/fonts/libertinus/documentation/libertinusserif-bolditalic-table.pdf and new/doc/fonts/libertinus/documentation/libertinusserif-bolditalic-table.pdf differ Binary files old/doc/fonts/libertinus/documentation/libertinusserif-italic-table.pdf and new/doc/fonts/libertinus/documentation/libertinusserif-italic-table.pdf differ Binary files old/doc/fonts/libertinus/documentation/libertinusserif-regular-table.pdf and new/doc/fonts/libertinus/documentation/libertinusserif-regular-table.pdf differ Binary files old/doc/fonts/libertinus/documentation/libertinusserif-semibold-table.pdf and new/doc/fonts/libertinus/documentation/libertinusserif-semibold-table.pdf differ Binary files old/doc/fonts/libertinus/documentation/libertinusserif-semibolditalic-table.pdf and new/doc/fonts/libertinus/documentation/libertinusserif-semibolditalic-table.pdf differ Binary files old/doc/fonts/libertinus/documentation/libertinusserifdisplay-regular-table.pdf and new/doc/fonts/libertinus/documentation/libertinusserifdisplay-regular-table.pdf differ Binary files old/doc/fonts/libertinus/documentation/libertinusserifinitials-regular-table.pdf and new/doc/fonts/libertinus/documentation/libertinusserifinitials-regular-table.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/libertinus.doc.tlpobj new/tlpkg/tlpobj/libertinus.doc.tlpobj --- old/tlpkg/tlpobj/libertinus.doc.tlpobj 2016-04-14 19:17:02.000000000 +0200 +++ new/tlpkg/tlpobj/libertinus.doc.tlpobj 2017-05-19 02:22:06.000000000 +0200 @@ -1,9 +1,10 @@ name libertinus.doc category Package -revision 39526 +revision 44409 shortdesc doc files of libertinus relocated 1 -docfiles size=1164 +docfiles size=1153 + RELOC/doc/fonts/libertinus/AUTHORS.txt RELOC/doc/fonts/libertinus/FONTLOG.txt RELOC/doc/fonts/libertinus/OFL.txt RELOC/doc/fonts/libertinus/README.txt ++++++ libertinus.tar.xz ++++++ Binary files old/fonts/opentype/public/libertinus/libertinuskeyboard-regular.otf and new/fonts/opentype/public/libertinus/libertinuskeyboard-regular.otf differ Binary files old/fonts/opentype/public/libertinus/libertinusmath-regular.otf and new/fonts/opentype/public/libertinus/libertinusmath-regular.otf differ Binary files old/fonts/opentype/public/libertinus/libertinusmono-regular.otf and new/fonts/opentype/public/libertinus/libertinusmono-regular.otf differ Binary files old/fonts/opentype/public/libertinus/libertinussans-bold.otf and new/fonts/opentype/public/libertinus/libertinussans-bold.otf differ Binary files old/fonts/opentype/public/libertinus/libertinussans-italic.otf and new/fonts/opentype/public/libertinus/libertinussans-italic.otf differ Binary files old/fonts/opentype/public/libertinus/libertinussans-regular.otf and new/fonts/opentype/public/libertinus/libertinussans-regular.otf differ Binary files old/fonts/opentype/public/libertinus/libertinusserif-bold.otf and new/fonts/opentype/public/libertinus/libertinusserif-bold.otf differ Binary files old/fonts/opentype/public/libertinus/libertinusserif-bolditalic.otf and new/fonts/opentype/public/libertinus/libertinusserif-bolditalic.otf differ Binary files old/fonts/opentype/public/libertinus/libertinusserif-italic.otf and new/fonts/opentype/public/libertinus/libertinusserif-italic.otf differ Binary files old/fonts/opentype/public/libertinus/libertinusserif-regular.otf and new/fonts/opentype/public/libertinus/libertinusserif-regular.otf differ Binary files old/fonts/opentype/public/libertinus/libertinusserif-semibold.otf and new/fonts/opentype/public/libertinus/libertinusserif-semibold.otf differ Binary files old/fonts/opentype/public/libertinus/libertinusserif-semibolditalic.otf and new/fonts/opentype/public/libertinus/libertinusserif-semibolditalic.otf differ Binary files old/fonts/opentype/public/libertinus/libertinusserifdisplay-regular.otf and new/fonts/opentype/public/libertinus/libertinusserifdisplay-regular.otf differ Binary files old/fonts/opentype/public/libertinus/libertinusserifinitials-regular.otf and new/fonts/opentype/public/libertinus/libertinusserifinitials-regular.otf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/libertinus.tlpobj new/tlpkg/tlpobj/libertinus.tlpobj --- old/tlpkg/tlpobj/libertinus.tlpobj 2016-04-14 19:17:05.000000000 +0200 +++ new/tlpkg/tlpobj/libertinus.tlpobj 2017-05-19 02:22:08.000000000 +0200 @@ -1,6 +1,6 @@ name libertinus category Package -revision 39526 +revision 44409 shortdesc The Libertinus font family relocated 1 longdesc This is a fork of the Linux Libertine and Linux Biolinum fonts @@ -9,9 +9,9 @@ longdesc bugs in the fonts. The family consists of: Libertinus Serif: longdesc forked from Linux Libertine. Libertinus Sans: forked from Linux longdesc Biolinum. Libertinus Mono: forked from Linux Libertine Mono. -longdesc Libertinus Math: an OpenType math font for use in OpenType math- -longdesc capable applications like LuaTeX, XeTeX or MS Word 2007+. -runfiles size=1380 +longdesc Libertinus Math: an OpenType math font for use in OpenType +longdesc math-capable applications like LuaTeX, XeTeX or MS Word 2007+. +runfiles size=1440 RELOC/fonts/opentype/public/libertinus/libertinuskeyboard-regular.otf RELOC/fonts/opentype/public/libertinus/libertinusmath-regular.otf RELOC/fonts/opentype/public/libertinus/libertinusmono-regular.otf @@ -27,7 +27,7 @@ RELOC/fonts/opentype/public/libertinus/libertinusserifdisplay-regular.otf RELOC/fonts/opentype/public/libertinus/libertinusserifinitials-regular.otf catalogue-ctan /fonts/libertinus -catalogue-date 2016-01-31 09:27:12 +0100 +catalogue-date 2017-05-17 22:26:27 +0200 catalogue-license ofl catalogue-topics font-serif font-sans font-mono font-maths font-otf -catalogue-version 6.2 +catalogue-version 6.4 ++++++ libertinust1math.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/libertinust1math/README new/doc/fonts/libertinust1math/README --- old/doc/fonts/libertinust1math/README 2016-03-28 23:57:14.000000000 +0200 +++ new/doc/fonts/libertinust1math/README 2017-06-10 00:29:05.000000000 +0200 @@ -6,6 +6,25 @@ The LibertinusT1Math font is available under the terms of Open Font License version 1.1, and the support files are released under the LPPL. -Current version 1.00 (2016-03-27) +Current version 1.0.4 (2017-06-08) + +Changes in version 1.0.4 +1. Decreased widths of extension elements of horizontal parens and braces to get better horizontal constructions. +2. Fixed an encoding problem for double vertical arrow (uni21D0.ex). + +Changes in version 1.0.3a +Fixed another error in map file affecting only use with dvips/gs. + +Changes in version 1.0.3 +1. Modified some glyphs in libertinust1math.pfb. +2. Added fd for mathbb, changed sty to define\mathbb. +3. Changed encoding files to get a real \setminus (uni29F5) rather than the small version (uni2216). + +Changes in version 1.0.2 +Corrected errors in encoding names in map file, affecting only processing with gs. (Thanks Uwe Siart.) + +Changes in version 1.0.1 +1. Corrected errors in libertinust1math.sty, so slanted \oint and \oiint work as expected. +2. Corrected errors in ls2libertinust1mathex.fd so that unusual NFSS entries are correctly redirected. Michael Sharpe (msharpe at ucsd dot edu) \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/libertinust1math.doc.tlpobj new/tlpkg/tlpobj/libertinust1math.doc.tlpobj --- old/tlpkg/tlpobj/libertinust1math.doc.tlpobj 2016-04-14 19:17:10.000000000 +0200 +++ new/tlpkg/tlpobj/libertinust1math.doc.tlpobj 2017-06-10 02:21:29.000000000 +0200 @@ -1,6 +1,6 @@ name libertinust1math.doc category Package -revision 40167 +revision 44542 shortdesc doc files of libertinust1math relocated 1 docfiles size=143 ++++++ libertinust1math.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/libertinust1math/LibertinusT1Math.afm new/fonts/afm/public/libertinust1math/LibertinusT1Math.afm --- old/fonts/afm/public/libertinust1math/LibertinusT1Math.afm 2016-03-28 23:57:14.000000000 +0200 +++ new/fonts/afm/public/libertinust1math/LibertinusT1Math.afm 2017-06-10 00:29:05.000000000 +0200 @@ -1,6 +1,6 @@ StartFontMetrics 2.0 -Comment Generated by FontForge 20150526 -Comment Creation Date: Sun Mar 27 16:35:16 2016 +Comment Generated by FontForge 20161003 +Comment Creation Date: Thu Jun 8 17:06:26 2017 FontName LibertinusT1Math FullName LibertinusT1 Math FamilyName LibertinusT1 Math @@ -2513,16 +2513,16 @@ C -1 ; WX 1570 ; N uni27FE ; B 107 70 1511 437 ; C -1 ; WX 1130 ; N uni2906 ; B 59 68 1023 435 ; C -1 ; WX 1130 ; N uni2907 ; B 107 71 1071 438 ; -C -1 ; WX 527 ; N uni29F5 ; B 17 0 516 573 ; +C -1 ; WX 323 ; N uni29F5 ; B 30 -59 308 646 ; C -1 ; WX 527 ; N uni29F6 ; B 17 0 516 645 ; C -1 ; WX 527 ; N uni29F7 ; B 17 0 516 573 ; C -1 ; WX 602 ; N uni29F8 ; B 85 -325 517 695 ; -C -1 ; WX 602 ; N uni29F9 ; B -517 -325 -85 695 ; +C -1 ; WX 602 ; N uni29F9 ; B 85 -325 517 695 ; C -1 ; WX 1049 ; N uni2A00 ; B 40 -226 1009 743 ; C -1 ; WX 1049 ; N uni2A01 ; B 40 -232 1009 737 ; C -1 ; WX 1049 ; N uni2A02 ; B 40 -232 1009 737 ; C -1 ; WX 823 ; N uni2A03 ; B 39 -236 784 739 ; -C -1 ; WX 823 ; N uni2A04 ; B 39 -236 784 739 ; +C -1 ; WX 823 ; N uni2A04 ; B 40 -236 783 740 ; C -1 ; WX 823 ; N uni2A05 ; B 40 -236 783 739 ; C -1 ; WX 823 ; N uni2A06 ; B 40 -236 783 739 ; C -1 ; WX 1215 ; N uni2A0C ; B 60 -299 1135 800 ; @@ -3576,7 +3576,7 @@ C -1 ; WX 431 ; N uni23DE.lt ; B 0 -204 431 80 ; C -1 ; WX 593 ; N uni23DE.md ; B 0 0 593 182 ; C -1 ; WX 431 ; N uni23DE.rt ; B 0 -204 431 80 ; -C -1 ; WX 432 ; N uni23DE.ex ; B 0 0 432 80 ; +C -1 ; WX 200 ; N uni23DE.ex ; B 0 0 200 80 ; C -1 ; WX 1224 ; N uni23B4.size2 ; B 0 553 1224 771 ; C -1 ; WX 1836 ; N uni23B4.size3 ; B 0 553 1836 771 ; C -1 ; WX 2446 ; N uni23B4.size4 ; B 0 554 2446 772 ; @@ -3603,7 +3603,7 @@ C -1 ; WX 893 ; N uni23DD.md ; B 0 0 893 83 ; C -1 ; WX 893 ; N uni23DD.rt ; B 0 0 893 263 ; C -1 ; WX 893 ; N uni23DC.lt ; B 0 -180 893 83 ; -C -1 ; WX 893 ; N uni23DC.md ; B 0 0 893 83 ; +C -1 ; WX 400 ; N uni23DC.md ; B 0 0 400 83 ; C -1 ; WX 893 ; N uni23DC.rt ; B 0 -180 893 83 ; C -1 ; WX 918 ; N uni23DE.size1 ; B 0 556 918 704 ; C -1 ; WX 918 ; N uni23DF.size1 ; B 0 -320 918 -172 ; @@ -3628,13 +3628,13 @@ C -1 ; WX 790 ; N uni0332.size2 ; B 0 -131 790 -87 ; C -1 ; WX 335 ; N uni20EE.ex ; B 0 -302 335 -262 ; C -1 ; WX 1714 ; N uni2A0C.size1 ; B 56 -530 1614 1654 ; -C -1 ; WX 702 ; N arrowleft.left ; B 59 70 702 436 ; -C -1 ; WX 558 ; N arrowleft.right ; B 0 227 500 279 ; -C -1 ; WX 558 ; N arrowright.left ; B 58 227 558 279 ; -C -1 ; WX 702 ; N arrowright.right ; B 0 70 643 436 ; -C -1 ; WX 318 ; N uni21A9.right ; B 0 226 260 540 ; -C -1 ; WX 318 ; N uni21AA.left ; B 58 226 318 540 ; -C -1 ; WX 607 ; N uni21A6.left ; B 107 70 607 436 ; +C -1 ; WX 702 ; N arrowleft.lt ; B 59 70 702 436 ; +C -1 ; WX 558 ; N arrowleft.rt ; B 0 227 500 279 ; +C -1 ; WX 558 ; N arrowright.lt ; B 58 227 558 279 ; +C -1 ; WX 702 ; N arrowright.rt ; B 0 70 643 436 ; +C -1 ; WX 318 ; N uni21A9.rt ; B 0 226 260 540 ; +C -1 ; WX 318 ; N uni21AA.lt ; B 58 226 318 540 ; +C -1 ; WX 607 ; N uni21A6.lt ; B 107 70 607 436 ; C -1 ; WX 0 ; N uni0338.alt ; B 135 -53 378 567 ; C -1 ; WX 0 ; N uni0338.short ; B 200 100 334 400 ; C -1 ; WX 1138 ; N uni22C0.size1 ; B 50 -438 1088 938 ; @@ -3668,8 +3668,8 @@ C -1 ; WX 821 ; N uni222F.sl ; B 55 -299 867 800 ; C -1 ; WX 735 ; N uni222F ; B 60 -299 656 800 ; C -1 ; WX 1034 ; N uni222F.size1 ; B 56 -530 934 1654 ; -C -1 ; WX 315 ; N uni2190.x ; B 0 227 315 279 ; -C -1 ; WX 315 ; N uni21D0.x ; B 0 142 315 363 ; +C -1 ; WX 315 ; N uni2190.ex ; B 0 227 315 279 ; +C -1 ; WX 315 ; N uni21D0.ex ; B 0 142 315 363 ; C -1 ; WX 309 ; N uni2016.ex ; B 80 -51 229 550 ; C -1 ; WX 1171 ; N uni222F.size1sl ; B 54 -530 1377 1654 ; C -1 ; WX 682 ; N uni222F.sm ; B 30 -194 622 690 ; @@ -3699,7 +3699,7 @@ C -1 ; WX 1077 ; N uni27E9.size3 ; B 100 -379 987 2067 ; C -1 ; WX 1317 ; N uni27E9.size4 ; B 105 -507 1217 2553 ; C -1 ; WX 796 ; N uni29F8.size1 ; B 25 -271 771 1561 ; -C -1 ; WX 796 ; N uni29F9.size1 ; B -771 -271 -25 1561 ; +C -1 ; WX 796 ; N uni29F9.size1 ; B 25 -271 771 1561 ; C -1 ; WX 607 ; N integral.size1sl ; B 54 -530 1037 1654 ; C -1 ; WX 959 ; N uni222C.size1sl ; B 54 -530 1377 1654 ; C -1 ; WX 1293 ; N uni222D.size1sl ; B 54 -530 1717 1654 ; @@ -3721,7 +3721,7 @@ C -1 ; WX 703 ; N summation.sm ; B 24 -50 644 735 ; C -1 ; WX 468 ; N uni03DD.ital ; B 15 -228 504 451 ; C -1 ; WX 429 ; N uni03F6.ital ; B 24 -12 406 442 ; -C -1 ; WX 463 ; N uni21D1.x ; B 121 -51 342 253 ; +C -1 ; WX 463 ; N uni21D1.ex ; B 121 -51 342 253 ; C -1 ; WX 268 ; N u1D62A.dtls ; B 83 -3 275 439 ; C -1 ; WX 282 ; N u1D62B.dtls ; B -68 -213 294 439 ; C -1 ; WX 260 ; N u1D5C2.dtls ; B 81 -3 179 433 ; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/libertinust1math/libusBMR.enc new/fonts/enc/dvips/libertinust1math/libusBMR.enc --- old/fonts/enc/dvips/libertinust1math/libusBMR.enc 2016-03-28 23:57:14.000000000 +0200 +++ new/fonts/enc/dvips/libertinust1math/libusBMR.enc 2016-11-25 19:31:08.000000000 +0100 @@ -91,7 +91,7 @@ /u1D418 % 89 /u1D419 % 90 /bracketleft % '133 -/uni2216 % '134 +/uni29F5 % was /uni2216 % '134 /bracketright % '135 /braceleft % '136 /slash % '137 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/libertinust1math/libusMR.enc new/fonts/enc/dvips/libertinust1math/libusMR.enc --- old/fonts/enc/dvips/libertinust1math/libusMR.enc 2016-03-28 23:57:14.000000000 +0200 +++ new/fonts/enc/dvips/libertinust1math/libusMR.enc 2016-11-25 19:31:08.000000000 +0100 @@ -91,7 +91,7 @@ /Y % '131 /Z % '132 /bracketleft % '133 -/uni2216 % '134 +/uni29F5 % was /uni2216 % '134 /bracketright % '135 /braceleft % '136 /slash % '137 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/libertinust1math/libusSYM.enc new/fonts/enc/dvips/libertinust1math/libusSYM.enc --- old/fonts/enc/dvips/libertinust1math/libusSYM.enc 2016-03-28 23:57:14.000000000 +0200 +++ new/fonts/enc/dvips/libertinust1math/libusSYM.enc 2017-06-10 00:29:05.000000000 +0200 @@ -116,7 +116,7 @@ /equivalence % 114 /uni2262 % 115 /uni23D0 % 116 arrow ext -/uni21D1.x % 117 Arrow ext +/uni21D1.ex % 117 Arrow ext /uni2263 % 118 /lessequal % 119 /greaterequal % 120 @@ -226,8 +226,8 @@ /uni25C9 % 224 /lozenge % 225 /circle % 226 -/uni2190.x % 227 -/uni21D0.x % 228 +/uni2190.ex % 227 +/uni21D0.ex % 228 /uni25CE % 229 /H18533 % 230 /.notdef % 231 @@ -237,7 +237,7 @@ /.notdef % 235 /.notdef % 236 /.notdef % 237 -/.notdef % 238 +/.notdef % 238 /uni21CD % 239 not LeftA /uni21CE % 240 not RtA /uni21CF % 241 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/map/dvips/libertinust1math/libertinust1math.map new/fonts/map/dvips/libertinust1math/libertinust1math.map --- old/fonts/map/dvips/libertinust1math/libertinust1math.map 2016-03-28 23:57:14.000000000 +0200 +++ new/fonts/map/dvips/libertinust1math/libertinust1math.map 2016-11-25 19:31:09.000000000 +0100 @@ -1,10 +1,10 @@ libertinust1-mathit LibertinusT1Math " libMIenc ReEncodeFont " <[libusMI.enc <LibertinusT1Math.pfb libertinust1-mathit-bold LibertinusT1Math " libBMIenc ReEncodeFont " <[libusBMI.enc <LibertinusT1Math.pfb -libertinust1-mathex LibertinusT1Math " libEXenc ReEncodeFont " <[libusEX.enc <LibertinusT1Math.pfb -libertinust1-mathrm LibertinusT1Math " libMRenc ReEncodeFont " <[libusMR.enc <LibertinusT1Math.pfb -libertinust1-mathrm-bold LibertinusT1Math " libBMRenc ReEncodeFont " <[libusBMR.enc <LibertinusT1Math.pfb +libertinust1-mathex LibertinusT1Math " libusEXenc ReEncodeFont " <[libusEX.enc <LibertinusT1Math.pfb +libertinust1-mathrm LibertinusT1Math " libusMRenc ReEncodeFont " <[libusMR.enc <LibertinusT1Math.pfb +libertinust1-mathrm-bold LibertinusT1Math " libusBMRenc ReEncodeFont " <[libusBMR.enc <LibertinusT1Math.pfb libertinust1-mathbb LibertinusT1Math " libusBBenc ReEncodeFont " <[libusBB.enc <LibertinusT1Math.pfb libertinust1-mathsf LibertinusT1Math " libusSFenc ReEncodeFont " <[libusSF.enc <LibertinusT1Math.pfb libertinust1-mathsfi LibertinusT1Math " libusSFIenc ReEncodeFont " <[libusSFI.enc <LibertinusT1Math.pfb libertinust1-mathsfb LibertinusT1Math " libusSFBenc ReEncodeFont " <[libusSFB.enc <LibertinusT1Math.pfb -libertinust1-mathsym LibertinusT1Math " libSYMenc ReEncodeFont " <[libusSYM.enc <LibertinusT1Math.pfb +libertinust1-mathsym LibertinusT1Math " libusSCRenc ReEncodeFont " <[libusSYM.enc <LibertinusT1Math.pfb Binary files old/fonts/tfm/public/libertinust1math/libertinust1-mathit-bold.tfm and new/fonts/tfm/public/libertinust1math/libertinust1-mathit-bold.tfm differ Binary files old/fonts/tfm/public/libertinust1math/libertinust1-mathit.tfm and new/fonts/tfm/public/libertinust1math/libertinust1-mathit.tfm differ Binary files old/fonts/tfm/public/libertinust1math/libertinust1-mathrm-bold.tfm and new/fonts/tfm/public/libertinust1math/libertinust1-mathrm-bold.tfm differ Binary files old/fonts/tfm/public/libertinust1math/libertinust1-mathrm.tfm and new/fonts/tfm/public/libertinust1math/libertinust1-mathrm.tfm differ Binary files old/fonts/tfm/public/libertinust1math/libertinust1-mathsym.tfm and new/fonts/tfm/public/libertinust1math/libertinust1-mathsym.tfm differ Binary files old/fonts/type1/public/libertinust1math/LibertinusT1Math.pfb and new/fonts/type1/public/libertinust1math/LibertinusT1Math.pfb differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/libertinust1math/libertinust1math.sty new/tex/latex/libertinust1math/libertinust1math.sty --- old/tex/latex/libertinust1math/libertinust1math.sty 2016-03-28 23:57:14.000000000 +0200 +++ new/tex/latex/libertinust1math/libertinust1math.sty 2017-06-10 00:29:05.000000000 +0200 @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e}[1999/12/01] -\def\fileversion{1.0.0} -\def\filedate{2016/03/25} +\def\fileversion{1.0.4} +\def\filedate{2017/06/08} \ProvidesPackage{libertinust1math} [\filedate\space v\fileversion---latex support for LibertinusT1Math (msharpe)] @@ -38,6 +38,7 @@ \DeclareFontSubstitution{LS2}{libertinust1mathsym}{m}{n} \DeclareSymbolFont{letters} {LS1}{libertinust1math} {m}{it} \DeclareSymbolFont{operators} {LS1}{libertinust1math} {m} {n} +\DeclareSymbolFont{symbolsbb} {LS1}{libertinust1mathbb} {m} {n} \DeclareSymbolFont{symbols} {LS2}{libertinust1mathsym} {m} {n} \DeclareSymbolFont{largesymbols} {LS2}{libertinust1mathex} {m} {n} \SetSymbolFont{letters} {bold}{LS1}{libertinust1math} {b}{it} @@ -55,6 +56,7 @@ \DeclareMathAlphabet{\mathcal}{U}{stixcal}{m}{n} \SetMathAlphabet{\mathcal}{bold}{U}{stixcal}{b}{n} \DeclareMathAlphabet{\mathbcal} {U}{stixcal}{b}{n} +\DeclareSymbolFontAlphabet{\mathbb} {symbolsbb} \libus@MathSymbol{\upGamma} {\mathalpha}{operators}{"00} \libus@MathSymbol{\upDelta} {\mathalpha}{operators}{"01} @@ -481,8 +483,8 @@ \libus@MathSymbol{\intslop} {\mathop}{largesymbols}{"88} \libus@MathSymbol{\iintslop} {\mathop}{largesymbols}{"8A} \libus@MathSymbol{\iiintslop} {\mathop}{largesymbols}{"8C} -\libus@MathSymbol{\ointslop} {\mathop}{largesymbols}{"8D} -\libus@MathSymbol{\oiintslop} {\mathop}{largesymbols}{"92} +\libus@MathSymbol{\ointslop} {\mathop}{largesymbols}{"8E} +\libus@MathSymbol{\oiintslop} {\mathop}{largesymbols}{"93} \libus@MathSymbol{\iiiintslop} {\mathop}{largesymbols}{"90} \libus@MathSymbol{\intupop} {\mathop}{largesymbols}{"7E} \libus@MathSymbol{\iintupop} {\mathop}{largesymbols}{"80} @@ -632,8 +634,8 @@ \libus@MathSymbol{\bracketlu}{\mathord}{letters}{"B6} \libus@MathSymbol{\bracketru}{\mathord}{letters}{"B7} \libus@MathSymbol{\bracketex}{\mathord}{symbols}{"89} -\libus@MathSymbol{\parenex}{\mathord}{symbols}{"90} -\def\libus@braceglue{\hskip -.10em plus .05em} +\libus@MathSymbol{\parenex}{\mathord}{symbols}{"8A} +\def\libus@braceglue{\hskip -.1em plus .05em} \def\downbracefill{$\m@th% \braceld\libus@braceglue% \cleaders\hbox{$\braceex$}\hfill% @@ -646,7 +648,7 @@ \libus@braceglue\bracemd\libus@braceglue% \cleaders\hbox{$\braceex$}\hfill% \libus@braceglue\braceru$} -\def\libus@parenglue{\hskip -.2em plus .2em} +\def\libus@parenglue{\hskip -.15em plus .05em} \def\downparenfill{$\m@th% \parenld\libus@parenglue% \cleaders\hbox{$\parenex$}\hfill% @@ -1025,7 +1027,7 @@ \let\to=\rightarrow %\libus@MathSymbol{\downarrow} {\mathrel}{symbols}{"46} \libus@MathSymbol{\leftrightarrow} {\mathrel}{symbols}{"47} -\libus@MathSymbol{\updownarrow} {\mathrel}{symbols}{"48} +%\libus@MathSymbol{\updownarrow} {\mathrel}{symbols}{"48} \libus@MathSymbol{\nwarrow} {\mathrel}{symbols}{"49} \libus@MathSymbol{\nearrow} {\mathrel}{symbols}{"4A} \libus@MathSymbol{\searrow} {\mathrel}{symbols}{"4B} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/libertinust1math/ls1libertinust1mathbb.fd new/tex/latex/libertinust1math/ls1libertinust1mathbb.fd --- old/tex/latex/libertinust1math/ls1libertinust1mathbb.fd 1970-01-01 01:00:00.000000000 +0100 +++ new/tex/latex/libertinust1math/ls1libertinust1mathbb.fd 2016-11-25 19:33:53.000000000 +0100 @@ -0,0 +1,19 @@ +\ProvidesFile{ls1libertinust1mathbb.fd} +[2016/08/22 latex LibertinusT1Mathbb LS1 font definitions] + +\expandafter\ifx\csname LinuxLibertineT@scale\endcsname\relax + \let\LinuxLibertineT@@scale\@empty +\else + \edef\LinuxLibertineT@@scale{s*[\csname LinuxLibertineT@scale\endcsname]}% +\fi + +\DeclareFontFamily{LS1}{libertinust1mathbb}{\skewchar\font127 } + +\DeclareFontShape{LS1}{libertinust1mathbb}{m}{n} {<-> \LinuxLibertineT@@scale libertinust1-mathbb}{} + +\DeclareFontShape{LS1}{libertinust1mathbb}{b}{n}{<->ssub * libertinust1mathbb/m/n}{} +\DeclareFontShape{LS1}{libertinust1mathbb}{b}{it}{<->ssub * libertinust1mathbb/m/n}{} +\DeclareFontShape{LS1}{libertinust1mathbb}{bx}{n}{<->ssub * libertinust1mathbb/m/n}{} +\DeclareFontShape{LS1}{libertinust1mathbb}{bx}{it}{<->ssub * libertinust1mathbb/m/n}{} +\DeclareFontShape{LS1}{libertinust1mathbb}{m}{it}{<->ssub * libertinust1mathbb/m/n}{} +\endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/libertinust1math.tlpobj new/tlpkg/tlpobj/libertinust1math.tlpobj --- old/tlpkg/tlpobj/libertinust1math.tlpobj 2016-04-14 19:17:11.000000000 +0200 +++ new/tlpkg/tlpobj/libertinust1math.tlpobj 2017-06-10 02:21:30.000000000 +0200 @@ -1,6 +1,6 @@ name libertinust1math category Package -revision 40167 +revision 44542 shortdesc A Type 1 font and LaTeX support for Libertinus Math relocated 1 longdesc The package provides a Type1 version of Libertinus Math, with a @@ -8,7 +8,7 @@ longdesc allow it to serve as a math accompaniment to Libertine under longdesc LaTeX. execute addMap libertinust1math.map -runfiles size=439 +runfiles size=440 RELOC/fonts/afm/public/libertinust1math/LibertinusT1Math.afm RELOC/fonts/enc/dvips/libertinust1math/libusBB.enc RELOC/fonts/enc/dvips/libertinust1math/libusBMI.enc @@ -35,11 +35,12 @@ RELOC/fonts/type1/public/libertinust1math/LibertinusT1Math.pfb RELOC/tex/latex/libertinust1math/libertinust1math.sty RELOC/tex/latex/libertinust1math/ls1libertinust1math.fd + RELOC/tex/latex/libertinust1math/ls1libertinust1mathbb.fd RELOC/tex/latex/libertinust1math/ls2libertinust1mathex.fd RELOC/tex/latex/libertinust1math/ls2libertinust1mathsym.fd RELOC/tex/latex/libertinust1math/ot1libertinust1mathsf.fd catalogue-ctan /fonts/libertinust1math -catalogue-date 2016-03-30 06:22:42 +0200 -catalogue-license ofl -catalogue-topics font-serif font-sans font-mono font-maths font-t1enc -catalogue-version 1.00 +catalogue-date 2017-06-09 08:15:19 +0200 +catalogue-license ofllppl +catalogue-topics font-serif font-maths font-type1 font-t1enc +catalogue-version 1.0.4 ++++++ libgreek.doc.tar.xz ++++++ ++++++ libgreek.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/libgreek.tlpobj new/tlpkg/tlpobj/libgreek.tlpobj --- old/tlpkg/tlpobj/libgreek.tlpobj 2016-04-14 19:17:12.000000000 +0200 +++ new/tlpkg/tlpobj/libgreek.tlpobj 2017-04-14 17:47:14.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=3 RELOC/tex/latex/libgreek/libgreek.sty catalogue-ctan /macros/latex/contrib/libgreek -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font-maths font-supp catalogue-version 1.0 ++++++ librarian.doc.tar.xz ++++++ ++++++ librarian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/librarian.tlpobj new/tlpkg/tlpobj/librarian.tlpobj --- old/tlpkg/tlpobj/librarian.tlpobj 2016-04-14 19:17:13.000000000 +0200 +++ new/tlpkg/tlpobj/librarian.tlpobj 2017-04-14 17:47:14.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/generic/librarian/librarian.tex RELOC/tex/generic/librarian/t-librarian.tex catalogue-ctan /macros/generic/librarian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics biblio catalogue-version 1.0 ++++++ librebaskerville.doc.tar.xz ++++++ ++++++ librebaskerville.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/librebaskerville.tlpobj new/tlpkg/tlpobj/librebaskerville.tlpobj --- old/tlpkg/tlpobj/librebaskerville.tlpobj 2016-04-14 19:17:13.000000000 +0200 +++ new/tlpkg/tlpobj/librebaskerville.tlpobj 2017-04-14 17:47:14.000000000 +0200 @@ -105,6 +105,6 @@ RELOC/tex/latex/librebaskerville/TS1LibreBaskerville-TLF.fd RELOC/tex/latex/librebaskerville/librebaskerville.sty catalogue-ctan /fonts/librebaskerville -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font font-otf font-type1 ++++++ librebodoni.doc.tar.xz ++++++ ++++++ librebodoni.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/librebodoni.tlpobj new/tlpkg/tlpobj/librebodoni.tlpobj --- old/tlpkg/tlpobj/librebodoni.tlpobj 2016-04-14 19:17:14.000000000 +0200 +++ new/tlpkg/tlpobj/librebodoni.tlpobj 2017-04-14 17:47:14.000000000 +0200 @@ -135,6 +135,6 @@ RELOC/tex/latex/librebodoni/T1LibreBodoni-TLF.fd RELOC/tex/latex/librebodoni/TS1LibreBodoni-TLF.fd catalogue-ctan /fonts/librebodoni -catalogue-date 2016-02-02 05:57:37 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license ofl catalogue-topics font font-otf font-type1 ++++++ librecaslon.doc.tar.xz ++++++ ++++++ librecaslon.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/librecaslon.tlpobj new/tlpkg/tlpobj/librecaslon.tlpobj --- old/tlpkg/tlpobj/librecaslon.tlpobj 2016-04-14 19:17:15.000000000 +0200 +++ new/tlpkg/tlpobj/librecaslon.tlpobj 2017-04-14 17:47:15.000000000 +0200 @@ -155,6 +155,6 @@ RELOC/tex/latex/librecaslon/TS1LibreCaslonText-TLF.fd RELOC/tex/latex/librecaslon/librecaslon.sty catalogue-ctan /fonts/librecaslon -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license ofl catalogue-topics font font-type1 font-otf ++++++ libris.doc.tar.xz ++++++ ++++++ libris.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/libris.tlpobj new/tlpkg/tlpobj/libris.tlpobj --- old/tlpkg/tlpobj/libris.tlpobj 2016-04-14 19:17:17.000000000 +0200 +++ new/tlpkg/tlpobj/libris.tlpobj 2017-04-14 17:47:16.000000000 +0200 @@ -69,7 +69,7 @@ RELOC/tex/latex/libris/ts1yly.fd RELOC/tex/latex/libris/ts1ylyw.fd catalogue-ctan /fonts/libris -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics font font-type1 font-supp catalogue-version 1.007 ++++++ lilyglyphs.doc.tar.xz ++++++ ++++++ lilyglyphs.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lilyglyphs.tlpobj new/tlpkg/tlpobj/lilyglyphs.tlpobj --- old/tlpkg/tlpobj/lilyglyphs.tlpobj 2016-04-14 19:17:19.000000000 +0200 +++ new/tlpkg/tlpobj/lilyglyphs.tlpobj 2017-04-14 17:47:17.000000000 +0200 @@ -84,7 +84,7 @@ texmf-dist/tex/lualatex/lilyglyphs/pdfs/lily-twoBeamedQuavers.pdf catalogue-also context-lilypond catalogue-ctan /macros/luatex/latex/lilyglyphs -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics font font-otf font-music music catalogue-version 0.2.3 ++++++ limap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/limap/limap.cls new/tex/latex/limap/limap.cls --- old/tex/latex/limap/limap.cls 2006-01-13 00:58:03.000000000 +0100 +++ new/tex/latex/limap/limap.cls 2016-11-25 19:33:53.000000000 +0100 @@ -21,28 +21,23 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%^^A $Id: limap.dtx 1.2 2000/03/01 20:11:42 gene Exp gene $ -%%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Purpose: %% A package for typesetting Information Maps. %% %% Documentation: %% The documentation can be generated from the original file -%% limap.dtx with the doc style/package. LaTeX the file limap.tex -%% to get the full documentation in \textsc{dvi} format. +%% limap.dtx with the doc class/package. LaTeX the file limap.tex +%% to get the full documentation in pdf format. %% %% Author: Gerd Neugebauer -%% Mainzer Str. 8 -%% 56321 Rhens (Germany) -%% Mail: gerd.neugebauer(a)sdm.de -%% gerd.neugebauer(a)gmx.de +%% Im Lerchelsb\"ohl 5 +%% 64521 Gro\ss-Gerau (Germany) +%% Mail: gene(a)gerd-neugebauer.de %% -%% Copyright (C) 1999-2000 Gerd Neugebauer +%% Copyright (C) 1999-2016 Gerd Neugebauer %% %% limap.dtx may be distributed under the terms of the LaTeX Project -%% Public License, as described in lppl.txt in the base LaTeX -%% distribution. Either version 1.0 or, at your option, any later -%% version. +%% Public License version 1.3c, as described in lppl.txt. %% %% This class is still under development and may be replaced with a %% new version which provides an enhanced functionality. @@ -64,14 +59,36 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\def\LIMAP@RCS$#1: #2 #3${#2} \def\filename{limap.dtx} -\xdef\fileversion{\LIMAP@RCS$Revision: 1.2 $} -\xdef\filedate{\LIMAP@RCS$Date: 2000/03/01 20:11:42 $} +\def\fileversion{2.1} +\def\filedate{2016/05/29} \let\docversion=\fileversion \let\docdate=\filedate \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{limap}[\filedate\space gene] +\ProvidesClass{limap}[\filedate\space Gerd Neugebauer] +\def\defineLimapLanguage#1#2#3#4#5{% + \expandafter\def\csname LIMAP@SelectLanguage@#1\endcsname{% + \def\MapContinued{#2}% + \def\MapContinuing{#3}% + \def\MapTOCname{#4}% + \def\MapTOCpage{#5}% + }% +} +\defineLimapLanguage{austrian}% + { Fortsetzung}{Fortsetzung\dots}% + {Titel}{Seite} +\defineLimapLanguage{german}% + { Fortsetzung}{Fortsetzung\dots}% + {Titel}{Seite} +\defineLimapLanguage{english}% + { Continued}{Continuing\dots}% + {Title}{Page} +\defineLimapLanguage{USenglish}% + { Continued}{Continuing\dots}% + {Title}{Page} +\defineLimapLanguage{french}% + { continuation}{continuation\dots}% + {Intitulé}{Page} \providecommand\LIMAP@Language{english} \DeclareOption{austrian}{\renewcommand\LIMAP@Language{austrian}} \DeclareOption{german}{\renewcommand\LIMAP@Language{german}} @@ -80,6 +97,7 @@ \DeclareOption{USenglish}{\renewcommand\LIMAP@Language{USenglish}} \newif\ifLIMAP@strict \LIMAP@stricttrue \DeclareOption{nonstrict}{\LIMAP@strictfalse} +\DeclareOption{nolines}{\def\MapRuleWidth{0pt}\ignorespaces} \providecommand\LIMAP@ClassType{report} \DeclareOption{book}{\renewcommand\LIMAP@ClassType{book}} \DeclareOption{report}{\renewcommand\LIMAP@ClassType{report}} @@ -100,8 +118,10 @@ \csname LIMAP@Class@\LIMAP@Variant @\LIMAP@ClassType\endcsname}% } \ProcessOptions -\LoadClass{\csname LIMAP@Class@\LIMAP@Variant @\LIMAP@ClassType\endcsname} +\LoadClass{\csname + LIMAP@Class@\LIMAP@Variant @\LIMAP@ClassType\endcsname} \RequirePackage{longtable} +\RequirePackage{etoolbox} \RequirePackage{booktabs} \RequirePackage{fancyhdr} \addtolength{\headheight}{2ex}% @@ -111,17 +131,19 @@ \lhead{\textit{\footnotesize\@title}} \def\@title{} \raggedbottom -\newcommand\MapRuleWidth{.25pt} +\providecommand\MapRuleWidth{.25pt} +\newcommand\MapRuleStart{} \newcommand\MapContinued{} \newcommand\MapContinuing{} \newcommand\MapContinuingFormat[1]{\textit{\footnotesize #1}} -\newcommand\MapContinuedFormat[1]{, {\MapTitleContinuedSize #1}} +\newcommand\MapContinuedFormat[1]{, {\MapTitleContinuedFont #1}} \let\MapFont\textsf -\let\MapTitleSize\Large -\let\MapTitleContinuedSize\small +\let\MapTitleFont\Large +\let\MapTitleContinuedFont\small +\def\MapBlockLabelFont{} \newcommand\MapParskip{2ex} -\newcommand\MapTitlefraction{.2} -\newcommand\MapTextfraction{.75} +\newcommand\MapTitleFraction{.2} +\newcommand\MapTextFraction{.75} \let\MapNewpage\newpage \newcommand\MapTOC[1]{% \refstepcounter{\@nameuse{Map@TOC@name\the\Map@level}}% @@ -129,35 +151,50 @@ } \newcommand\MapTOCname{} \newcommand\MapTOCpage{} -\let\MapTOCemph=\emph -\providecommand\LIMAP@SelectLanguage@austrian{% - \renewcommand\MapContinued{ Fortsetzung}% - \renewcommand\MapContinuing{Fortsetzung\dots} - \renewcommand\MapTOCname{Titel} - \renewcommand\MapTOCpage{Seite} -} -\providecommand\LIMAP@SelectLanguage@german{% - \renewcommand\MapContinued{ Fortsetzung}% - \renewcommand\MapContinuing{Fortsetzung\dots} - \renewcommand\MapTOCname{Titel} - \renewcommand\MapTOCpage{Seite} -} -\providecommand\LIMAP@SelectLanguage@english{% - \renewcommand\MapContinued{ Continued}% - \renewcommand\MapContinuing{Continuing\dots} - \renewcommand\MapTOCname{Title} - \renewcommand\MapTOCpage{Page} -} -\providecommand\LIMAP@SelectLanguage@USenglish{% - \renewcommand\MapContinued{ Continued}% - \renewcommand\MapContinuing{Continuing\dots} - \renewcommand\MapTOCname{Title} - \renewcommand\MapTOCpage{Page} -} +\newcommand\MapTOCheadfont{\scriptsize\emph} \newlength{\Map@length} \newcount\Map@level \Map@level=0 \newcount\Map@blockcount +\def\LT@final@warn{% + \AtEndDocument{% + \PackageWarning{limap}% + {Table \@width s have changed. Rerun LaTeX.\@gobbletwo}}% + \global\let\LT@final@warn\relax} +\def\Map#1{% + \def\LT@err{\PackageError{limap}}% + \def\LT@warn{\PackageWarning{limap}}% + \let\Block\Map@Block + \let\endBlock\Map@endBlock + \Map@blockcount=0 + \global\advance\Map@no1 + \ifx\Map@UP\empty\else + \immediate\write\@auxout + {\string\expandafter\string\xdef\string\csname\space + Map@parts@\Map@UP\string\endcsname{\string\csname\space + Map@parts@\Map@UP\string\endcsname\the\Map@no:}}% + \fi + \edef\Map@UP{\the\Map@no}% + \ifnum\Map@level>0 + \xdef\Map@@up{\Map@UP}% Just to save the value across blocks. + \endgroup + \Map@end + \begingroup + \edef\Map@UP{\Map@@up}% + \def\@currenvir{Map}% + \fi + \edef\Map@this{\the\Map@no}% + \immediate\write\@auxout + {\string\global\string\@namedef{Map@parts@\the\Map@no}{}}% + \global\advance\Map@level1 + \def\Map@TITLE{#1}% + \Map@start + } +\def\endMap{% + \Map@end + \global\advance\Map@level-1 + \ignorespaces +} \newif\ifMap@open@ \Map@open@false \@namedef{Map@TOC@name0}{chapter} @@ -174,33 +211,40 @@ \@namedef{Map@TOC@name11}{subsubparagraph} \@namedef{Map@TOC@name12}{subsubparagraph} \newcommand\Map@start{% + \advance\Map@counter1 \setlength{\Map@length}{\textwidth}% - \addtolength{\Map@length}{-\MapTitlefraction\textwidth}% - \addtolength{\Map@length}{-\MapTextfraction\textwidth}% - \MapTOC{\Map@TITLE}% + \addtolength{\Map@length}{-\MapTitleFraction\textwidth}% + \addtolength{\Map@length}{-\MapTextFraction\textwidth}% + \ifx\Map@TITLE\empty\else + \MapTOC{\Map@TITLE}% + \fi \longtable - {@{}p{\MapTitlefraction\textwidth}@{\hspace{\Map@length}} - p{\MapTextfraction\textwidth}@{}}% + {@{}p{\MapTitleFraction\textwidth}@{\hspace{\Map@length}} + p{\MapTextFraction\textwidth}@{}}% \multicolumn{2}{@{}p{\textwidth}@{}}{% - \MapFont{\MapTitleSize\rule{0pt}{3ex}% + \MapFont{\MapTitleFont\rule{0pt}{3ex}% \Map@TITLE}} \endfirsthead \multicolumn{2}{@{}p{\textwidth}@{}}{% - \MapFont{\MapTitleSize\rule{0pt}{3ex}% + \MapFont{\MapTitleFont\rule{0pt}{3ex}% \Map@TITLE\MapContinuedFormat{\MapContinued}}}% \endhead - \par\vspace*{-\parskip}\vspace*{-2ex}\\ - &\rule{\MapTextfraction\textwidth}{\MapRuleWidth}\newline - \mbox{}\hfill\raisebox{3pt}{\MapContinuingFormat{\MapContinuing}} + \\ + &\MapRuleStart + \rule{\MapTextFraction\textwidth}{\MapRuleWidth}\newline + \mbox{}\hfill + \raisebox{3pt}{\MapContinuingFormat{\MapContinuing}} \endfoot - &\rule{\MapTextfraction\textwidth}{\MapRuleWidth}% + &\MapRuleStart + \rule{\MapTextFraction\textwidth}{\MapRuleWidth}% \vspace{\MapParskip} \endlastfoot \xdef\@currentlabel{\Map@TITLE}% + \label{Map@\the\Map@no}% \global\Map@open@true } \newcommand\Map@end{% - \ifMap@open@ + \ifMap@open@\vspace*{1.5ex} \global\Map@open@false \endlongtable \MapNewpage @@ -208,7 +252,8 @@ \iftrue \ifnum\Map@blockcount>9 \PackageWarning{limap}% - {*** The current map contains too much blocks: \the\Map@blockcount}% + {*** The current map contains too much blocks: + \the\Map@blockcount}% \else\ifnum\Map@blockcount>7 \PackageWarning{limap}% {--- The current map contains \the\Map@blockcount blocks.}% @@ -217,98 +262,117 @@ } \newcommand\Map@UP{} \newcount\Map@no +\newcount\Map@counter +\Map@counter=0 \@namedef{Map@parts@}{} -\newenvironment{Map}[1]{% - \def\LT@err{\PackageError{limap}}% - \def\LT@warn{\PackageWarning{limap}}% - \let\Block\Map@Block - \let\endBlock\Map@endBlock - \Map@blockcount=0 - \global\advance\Map@no1 - \ifx\Map@UP\empty\else - \immediate\write\@auxout - {\string\expandafter\string\xdef\string\csname\space - Map@parts@\Map@UP\string\endcsname{\string\csname\space - Map@parts@\Map@UP\string\endcsname\the\Map@no:}}% - \fi - \edef\Map@UP{\the\Map@no}% - \ifnum\Map@level>0 - \xdef\Map@@up{\Map@UP}% Just to save the value across blocks. - \endgroup - \Map@end - \begingroup - \edef\Map@UP{\Map@@up}% - \def\@currenvir{Map}% - \fi - \edef\Map@this{\the\Map@no}% - \immediate\write\@auxout - {\string\global\string\@namedef{Map@title@\the\Map@no}{#1}}% - \immediate\write\@auxout - {\string\global\string\@namedef{Map@page@\the\Map@no}{\the\c@page}}% - \immediate\write\@auxout - {\string\global\string\@namedef{Map@parts@\the\Map@no}{}}% - \global\advance\Map@level1 - \def\Map@TITLE{#1}% - \Map@start - }{% - \Map@end - \global\advance\Map@level-1 -} -\newenvironment{Map@Block}[1]{\par\vspace*{-\parskip}\vspace*{-2ex}% +\newenvironment{Map@Block}[1]{\par + \vspace*{-\parskip}\vspace*{-1ex}% \\\null\par \vspace*{\MapParskip}% - \raggedright\hspace{0pt}\MapFont{#1}% + \raggedright\hspace{0pt}\MapFont{\MapBlockLabelFont{#1}}% \gdef\@currentlabel{#1}% &\parskip=\MapParskip - \rule{\MapTextfraction\textwidth}{\MapRuleWidth}\par + {\MapRuleStart + \rule{\MapTextFraction\textwidth}{\MapRuleWidth}}\par }{% } -\newcommand\Wide@Block{\\\multicolumn2{@{}l@{}}}{} -\newcommand\MapTableOfContents{% - \medskip\par - \xdef\Map@@{\csname Map@parts@\the\Map@no\endcsname}% - \gdef\Map@@@{}% +\newcommand\Block[1]{\PackageWarning{limap}{The sectioning command + `Block' has been encountered outside the scope of a Map + environment.}} +\newcommand\WideBlock{\\\multicolumn2{@{}l@{}}} +\newif\if@Map@toc@sep@ +\def\MapTableOfContents@open{% \centering \begin{tabular}{p{.6\textwidth}r}\toprule - \MapTOCemph{\MapTOCname}&\MapTOCemph{\MapTOCpage}\\ - \midrule - \expandafter\Map@toc@loop \Map@@:% - \\\bottomrule + \MapTOCheadfont{\MapTOCname}& + \MapTOCheadfont{\MapTOCpage}\\\midrule + \ifcsdef{Map@parts@\the\Map@no}{ + \edef\Map@tmp@{\csname Map@parts@\the\Map@no\endcsname:}% + \expandafter\Map@toc@loop\Map@tmp@ + \\\bottomrule + }{} \end{tabular} } +\def\MapTableOfContents@boxed{% + \centering + \begin{tabular}{|p{.6\textwidth}|r|}\hline + \MapTOCheadfont{\MapTOCname}& + \MapTOCheadfont{\MapTOCpage}\\\hline + \ifcsdef{Map@parts@\the\Map@no}{ + \edef\Map@tmp@{\csname Map@parts@\the\Map@no\endcsname:}% + \expandafter\Map@toc@loop\Map@tmp@ + \\\hline + }{} + \end{tabular} +} +\newcommand\MapTableOfContentsStyle{open} +\newcommand\MapTableOfContents{\par + \global\@Map@toc@sep@false + \csname MapTableOfContents@\MapTableOfContentsStyle\endcsname + \vspace*{-1.5\parskip}\par\ignorespaces +} \def\Map@toc@loop#1:{% - \def\Map@@{#1}% - \ifx\Map@@\empty - \global\let\Map@@=\relax + \def\Map@tmp@{#1}% + \ifx\Map@tmp@\empty + \global\let\Map@next@=\relax \else - \gdef\Map@@{\Map@@@\@nameuse{Map@title@#1}&\@nameuse{Map@page@#1}% - \global\let\Map@@@=\\% - \Map@toc@loop}% + \if@Map@toc@sep@ + \gdef\Map@next@{\\ + \ref{Map@#1}&\pageref{Map@#1}% + \Map@toc@loop}% + \else + \gdef\Map@next@{% + \ref{Map@#1}&\pageref{Map@#1}% + \Map@toc@loop}% + \global\@Map@toc@sep@true + \fi \fi - \Map@@ + \Map@next@ +} +\newcommand\MapTabularFraction{.95} +\newenvironment{MapTabular}{% + \begin{center} + \begin{tabular*}{\MapTabularFraction\linewidth}% +}{% + \end{tabular*} + \end{center}\ignorespaces } \newcommand\MakeTitle{\thispagestyle{empty} \rule{0pt}{.25\textheight}\par \mbox{}\hfill - \begin{minipage}{\MapTextfraction\textwidth} + \begin{minipage}{\MapTextFraction\textwidth} \raggedright - \rule{\textwidth}{1pt}\par - \vspace*{5ex}% + \rule{\textwidth}{2pt}\par + \vspace*{2.5\MapParskip}% \sf{\huge \@title\par}% - \vspace*{5ex}% - \rule{\textwidth}{1pt}\par - \vspace*{5ex}% + \vspace*{2.5\MapParskip}% + \rule{\textwidth}{2pt}\par + \vspace*{2.5\MapParskip}% \MapFont{\large \@author} \par - \vspace*{10ex}% + \vspace*{2.5\MapParskip}% \MapFont{\footnotesize \@date} - \vspace*{10ex}% + \vspace*{\MapParskip}% + \end{minipage}% + \vspace*{-22ex}% + \par +} +\newenvironment{Abstract}{\vfill + \par + \mbox{}\hfill + \begin{minipage}{\MapTextFraction\textwidth}\parskip=1ex + \rule{\textwidth}{1pt}\medskip\par +}{\par\rule{\textwidth}{1pt} \end{minipage}% \par } \let\maketitle\MakeTitle +\let\abstract\Abstract +\let\endabstract\endAbstract \InputIfFileExists{limap.cfg}{}{} \csname LIMAP@SelectLanguage@\LIMAP@Language\endcsname \ifLIMAP@strict + \def\chapter{\PackageWarning{limap}{The sectioning command + `chapter' is not available.}} \def\subsection{\PackageWarning{limap}{The sectioning command `subsection' is not available.}} \def\subsubsection{\PackageWarning{limap}{The sectioning command diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/limap/limap.sty new/tex/latex/limap/limap.sty --- old/tex/latex/limap/limap.sty 2006-01-13 00:58:03.000000000 +0100 +++ new/tex/latex/limap/limap.sty 2016-11-25 19:33:53.000000000 +0100 @@ -21,28 +21,23 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) %%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%^^A $Id: limap.dtx 1.2 2000/03/01 20:11:42 gene Exp gene $ -%%^^A%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Purpose: %% A package for typesetting Information Maps. %% %% Documentation: %% The documentation can be generated from the original file -%% limap.dtx with the doc style/package. LaTeX the file limap.tex -%% to get the full documentation in \textsc{dvi} format. +%% limap.dtx with the doc class/package. LaTeX the file limap.tex +%% to get the full documentation in pdf format. %% %% Author: Gerd Neugebauer -%% Mainzer Str. 8 -%% 56321 Rhens (Germany) -%% Mail: gerd.neugebauer(a)sdm.de -%% gerd.neugebauer(a)gmx.de +%% Im Lerchelsb\"ohl 5 +%% 64521 Gro\ss-Gerau (Germany) +%% Mail: gene(a)gerd-neugebauer.de %% -%% Copyright (C) 1999-2000 Gerd Neugebauer +%% Copyright (C) 1999-2016 Gerd Neugebauer %% %% limap.dtx may be distributed under the terms of the LaTeX Project -%% Public License, as described in lppl.txt in the base LaTeX -%% distribution. Either version 1.0 or, at your option, any later -%% version. +%% Public License version 1.3c, as described in lppl.txt. %% %% This class is still under development and may be replaced with a %% new version which provides an enhanced functionality. @@ -64,14 +59,36 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\def\LIMAP@RCS$#1: #2 #3${#2} \def\filename{limap.dtx} -\xdef\fileversion{\LIMAP@RCS$Revision: 1.2 $} -\xdef\filedate{\LIMAP@RCS$Date: 2000/03/01 20:11:42 $} +\def\fileversion{2.1} +\def\filedate{2016/05/29} \let\docversion=\fileversion \let\docdate=\filedate \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{limap}[\filedate\space gene] +\ProvidesPackage{limap}[\filedate\space Gerd Neugebauer] +\def\defineLimapLanguage#1#2#3#4#5{% + \expandafter\def\csname LIMAP@SelectLanguage@#1\endcsname{% + \def\MapContinued{#2}% + \def\MapContinuing{#3}% + \def\MapTOCname{#4}% + \def\MapTOCpage{#5}% + }% +} +\defineLimapLanguage{austrian}% + { Fortsetzung}{Fortsetzung\dots}% + {Titel}{Seite} +\defineLimapLanguage{german}% + { Fortsetzung}{Fortsetzung\dots}% + {Titel}{Seite} +\defineLimapLanguage{english}% + { Continued}{Continuing\dots}% + {Title}{Page} +\defineLimapLanguage{USenglish}% + { Continued}{Continuing\dots}% + {Title}{Page} +\defineLimapLanguage{french}% + { continuation}{continuation\dots}% + {Intitulé}{Page} \providecommand\LIMAP@Language{english} \DeclareOption{austrian}{\renewcommand\LIMAP@Language{austrian}} \DeclareOption{german}{\renewcommand\LIMAP@Language{german}} @@ -80,21 +97,25 @@ \DeclareOption{USenglish}{\renewcommand\LIMAP@Language{USenglish}} \newif\ifLIMAP@strict \LIMAP@stricttrue \DeclareOption{nonstrict}{\LIMAP@strictfalse} +\DeclareOption{nolines}{\def\MapRuleWidth{0pt}\ignorespaces} \ProcessOptions \RequirePackage{longtable} +\RequirePackage{etoolbox} \RequirePackage{booktabs} \raggedbottom -\newcommand\MapRuleWidth{.25pt} +\providecommand\MapRuleWidth{.25pt} +\newcommand\MapRuleStart{} \newcommand\MapContinued{} \newcommand\MapContinuing{} \newcommand\MapContinuingFormat[1]{\textit{\footnotesize #1}} -\newcommand\MapContinuedFormat[1]{, {\MapTitleContinuedSize #1}} +\newcommand\MapContinuedFormat[1]{, {\MapTitleContinuedFont #1}} \let\MapFont\textsf -\let\MapTitleSize\Large -\let\MapTitleContinuedSize\small +\let\MapTitleFont\Large +\let\MapTitleContinuedFont\small +\def\MapBlockLabelFont{} \newcommand\MapParskip{2ex} -\newcommand\MapTitlefraction{.2} -\newcommand\MapTextfraction{.75} +\newcommand\MapTitleFraction{.2} +\newcommand\MapTextFraction{.75} \let\MapNewpage\newpage \newcommand\MapTOC[1]{% \refstepcounter{\@nameuse{Map@TOC@name\the\Map@level}}% @@ -102,35 +123,50 @@ } \newcommand\MapTOCname{} \newcommand\MapTOCpage{} -\let\MapTOCemph=\emph -\providecommand\LIMAP@SelectLanguage@austrian{% - \renewcommand\MapContinued{ Fortsetzung}% - \renewcommand\MapContinuing{Fortsetzung\dots} - \renewcommand\MapTOCname{Titel} - \renewcommand\MapTOCpage{Seite} -} -\providecommand\LIMAP@SelectLanguage@german{% - \renewcommand\MapContinued{ Fortsetzung}% - \renewcommand\MapContinuing{Fortsetzung\dots} - \renewcommand\MapTOCname{Titel} - \renewcommand\MapTOCpage{Seite} -} -\providecommand\LIMAP@SelectLanguage@english{% - \renewcommand\MapContinued{ Continued}% - \renewcommand\MapContinuing{Continuing\dots} - \renewcommand\MapTOCname{Title} - \renewcommand\MapTOCpage{Page} -} -\providecommand\LIMAP@SelectLanguage@USenglish{% - \renewcommand\MapContinued{ Continued}% - \renewcommand\MapContinuing{Continuing\dots} - \renewcommand\MapTOCname{Title} - \renewcommand\MapTOCpage{Page} -} +\newcommand\MapTOCheadfont{\scriptsize\emph} \newlength{\Map@length} \newcount\Map@level \Map@level=0 \newcount\Map@blockcount +\def\LT@final@warn{% + \AtEndDocument{% + \PackageWarning{limap}% + {Table \@width s have changed. Rerun LaTeX.\@gobbletwo}}% + \global\let\LT@final@warn\relax} +\def\Map#1{% + \def\LT@err{\PackageError{limap}}% + \def\LT@warn{\PackageWarning{limap}}% + \let\Block\Map@Block + \let\endBlock\Map@endBlock + \Map@blockcount=0 + \global\advance\Map@no1 + \ifx\Map@UP\empty\else + \immediate\write\@auxout + {\string\expandafter\string\xdef\string\csname\space + Map@parts@\Map@UP\string\endcsname{\string\csname\space + Map@parts@\Map@UP\string\endcsname\the\Map@no:}}% + \fi + \edef\Map@UP{\the\Map@no}% + \ifnum\Map@level>0 + \xdef\Map@@up{\Map@UP}% Just to save the value across blocks. + \endgroup + \Map@end + \begingroup + \edef\Map@UP{\Map@@up}% + \def\@currenvir{Map}% + \fi + \edef\Map@this{\the\Map@no}% + \immediate\write\@auxout + {\string\global\string\@namedef{Map@parts@\the\Map@no}{}}% + \global\advance\Map@level1 + \def\Map@TITLE{#1}% + \Map@start + } +\def\endMap{% + \Map@end + \global\advance\Map@level-1 + \ignorespaces +} \newif\ifMap@open@ \Map@open@false \@namedef{Map@TOC@name0}{chapter} @@ -147,33 +183,40 @@ \@namedef{Map@TOC@name11}{subsubparagraph} \@namedef{Map@TOC@name12}{subsubparagraph} \newcommand\Map@start{% + \advance\Map@counter1 \setlength{\Map@length}{\textwidth}% - \addtolength{\Map@length}{-\MapTitlefraction\textwidth}% - \addtolength{\Map@length}{-\MapTextfraction\textwidth}% - \MapTOC{\Map@TITLE}% + \addtolength{\Map@length}{-\MapTitleFraction\textwidth}% + \addtolength{\Map@length}{-\MapTextFraction\textwidth}% + \ifx\Map@TITLE\empty\else + \MapTOC{\Map@TITLE}% + \fi \longtable - {@{}p{\MapTitlefraction\textwidth}@{\hspace{\Map@length}} - p{\MapTextfraction\textwidth}@{}}% + {@{}p{\MapTitleFraction\textwidth}@{\hspace{\Map@length}} + p{\MapTextFraction\textwidth}@{}}% \multicolumn{2}{@{}p{\textwidth}@{}}{% - \MapFont{\MapTitleSize\rule{0pt}{3ex}% + \MapFont{\MapTitleFont\rule{0pt}{3ex}% \Map@TITLE}} \endfirsthead \multicolumn{2}{@{}p{\textwidth}@{}}{% - \MapFont{\MapTitleSize\rule{0pt}{3ex}% + \MapFont{\MapTitleFont\rule{0pt}{3ex}% \Map@TITLE\MapContinuedFormat{\MapContinued}}}% \endhead - \par\vspace*{-\parskip}\vspace*{-2ex}\\ - &\rule{\MapTextfraction\textwidth}{\MapRuleWidth}\newline - \mbox{}\hfill\raisebox{3pt}{\MapContinuingFormat{\MapContinuing}} + \\ + &\MapRuleStart + \rule{\MapTextFraction\textwidth}{\MapRuleWidth}\newline + \mbox{}\hfill + \raisebox{3pt}{\MapContinuingFormat{\MapContinuing}} \endfoot - &\rule{\MapTextfraction\textwidth}{\MapRuleWidth}% + &\MapRuleStart + \rule{\MapTextFraction\textwidth}{\MapRuleWidth}% \vspace{\MapParskip} \endlastfoot \xdef\@currentlabel{\Map@TITLE}% + \label{Map@\the\Map@no}% \global\Map@open@true } \newcommand\Map@end{% - \ifMap@open@ + \ifMap@open@\vspace*{1.5ex} \global\Map@open@false \endlongtable \MapNewpage @@ -181,7 +224,8 @@ \iftrue \ifnum\Map@blockcount>9 \PackageWarning{limap}% - {*** The current map contains too much blocks: \the\Map@blockcount}% + {*** The current map contains too much blocks: + \the\Map@blockcount}% \else\ifnum\Map@blockcount>7 \PackageWarning{limap}% {--- The current map contains \the\Map@blockcount blocks.}% @@ -190,97 +234,114 @@ } \newcommand\Map@UP{} \newcount\Map@no +\newcount\Map@counter +\Map@counter=0 \@namedef{Map@parts@}{} -\newenvironment{Map}[1]{% - \def\LT@err{\PackageError{limap}}% - \def\LT@warn{\PackageWarning{limap}}% - \let\Block\Map@Block - \let\endBlock\Map@endBlock - \Map@blockcount=0 - \global\advance\Map@no1 - \ifx\Map@UP\empty\else - \immediate\write\@auxout - {\string\expandafter\string\xdef\string\csname\space - Map@parts@\Map@UP\string\endcsname{\string\csname\space - Map@parts@\Map@UP\string\endcsname\the\Map@no:}}% - \fi - \edef\Map@UP{\the\Map@no}% - \ifnum\Map@level>0 - \xdef\Map@@up{\Map@UP}% Just to save the value across blocks. - \endgroup - \Map@end - \begingroup - \edef\Map@UP{\Map@@up}% - \def\@currenvir{Map}% - \fi - \edef\Map@this{\the\Map@no}% - \immediate\write\@auxout - {\string\global\string\@namedef{Map@title@\the\Map@no}{#1}}% - \immediate\write\@auxout - {\string\global\string\@namedef{Map@page@\the\Map@no}{\the\c@page}}% - \immediate\write\@auxout - {\string\global\string\@namedef{Map@parts@\the\Map@no}{}}% - \global\advance\Map@level1 - \def\Map@TITLE{#1}% - \Map@start - }{% - \Map@end - \global\advance\Map@level-1 -} -\newenvironment{Map@Block}[1]{\par\vspace*{-\parskip}\vspace*{-2ex}% +\newenvironment{Map@Block}[1]{\par + \vspace*{-\parskip}\vspace*{-1ex}% \\\null\par \vspace*{\MapParskip}% - \raggedright\hspace{0pt}\MapFont{#1}% + \raggedright\hspace{0pt}\MapFont{\MapBlockLabelFont{#1}}% \gdef\@currentlabel{#1}% &\parskip=\MapParskip - \rule{\MapTextfraction\textwidth}{\MapRuleWidth}\par + {\MapRuleStart + \rule{\MapTextFraction\textwidth}{\MapRuleWidth}}\par }{% } -\newcommand\Wide@Block{\\\multicolumn2{@{}l@{}}}{} -\newcommand\MapTableOfContents{% - \medskip\par - \xdef\Map@@{\csname Map@parts@\the\Map@no\endcsname}% - \gdef\Map@@@{}% +\newcommand\Block[1]{\PackageWarning{limap}{The sectioning command + `Block' has been encountered outside the scope of a Map + environment.}} +\newcommand\WideBlock{\\\multicolumn2{@{}l@{}}} +\newif\if@Map@toc@sep@ +\def\MapTableOfContents@open{% \centering \begin{tabular}{p{.6\textwidth}r}\toprule - \MapTOCemph{\MapTOCname}&\MapTOCemph{\MapTOCpage}\\ - \midrule - \expandafter\Map@toc@loop \Map@@:% - \\\bottomrule + \MapTOCheadfont{\MapTOCname}& + \MapTOCheadfont{\MapTOCpage}\\\midrule + \ifcsdef{Map@parts@\the\Map@no}{ + \edef\Map@tmp@{\csname Map@parts@\the\Map@no\endcsname:}% + \expandafter\Map@toc@loop\Map@tmp@ + \\\bottomrule + }{} \end{tabular} } +\def\MapTableOfContents@boxed{% + \centering + \begin{tabular}{|p{.6\textwidth}|r|}\hline + \MapTOCheadfont{\MapTOCname}& + \MapTOCheadfont{\MapTOCpage}\\\hline + \ifcsdef{Map@parts@\the\Map@no}{ + \edef\Map@tmp@{\csname Map@parts@\the\Map@no\endcsname:}% + \expandafter\Map@toc@loop\Map@tmp@ + \\\hline + }{} + \end{tabular} +} +\newcommand\MapTableOfContentsStyle{open} +\newcommand\MapTableOfContents{\par + \global\@Map@toc@sep@false + \csname MapTableOfContents@\MapTableOfContentsStyle\endcsname + \vspace*{-1.5\parskip}\par\ignorespaces +} \def\Map@toc@loop#1:{% - \def\Map@@{#1}% - \ifx\Map@@\empty - \global\let\Map@@=\relax + \def\Map@tmp@{#1}% + \ifx\Map@tmp@\empty + \global\let\Map@next@=\relax \else - \gdef\Map@@{\Map@@@\@nameuse{Map@title@#1}&\@nameuse{Map@page@#1}% - \global\let\Map@@@=\\% - \Map@toc@loop}% + \if@Map@toc@sep@ + \gdef\Map@next@{\\ + \ref{Map@#1}&\pageref{Map@#1}% + \Map@toc@loop}% + \else + \gdef\Map@next@{% + \ref{Map@#1}&\pageref{Map@#1}% + \Map@toc@loop}% + \global\@Map@toc@sep@true + \fi \fi - \Map@@ + \Map@next@ +} +\newcommand\MapTabularFraction{.95} +\newenvironment{MapTabular}{% + \begin{center} + \begin{tabular*}{\MapTabularFraction\linewidth}% +}{% + \end{tabular*} + \end{center}\ignorespaces } \newcommand\MakeTitle{\thispagestyle{empty} \rule{0pt}{.25\textheight}\par \mbox{}\hfill - \begin{minipage}{\MapTextfraction\textwidth} + \begin{minipage}{\MapTextFraction\textwidth} \raggedright - \rule{\textwidth}{1pt}\par - \vspace*{5ex}% + \rule{\textwidth}{2pt}\par + \vspace*{2.5\MapParskip}% \sf{\huge \@title\par}% - \vspace*{5ex}% - \rule{\textwidth}{1pt}\par - \vspace*{5ex}% + \vspace*{2.5\MapParskip}% + \rule{\textwidth}{2pt}\par + \vspace*{2.5\MapParskip}% \MapFont{\large \@author} \par - \vspace*{10ex}% + \vspace*{2.5\MapParskip}% \MapFont{\footnotesize \@date} - \vspace*{10ex}% + \vspace*{\MapParskip}% + \end{minipage}% + \vspace*{-22ex}% + \par +} +\newenvironment{Abstract}{\vfill + \par + \mbox{}\hfill + \begin{minipage}{\MapTextFraction\textwidth}\parskip=1ex + \rule{\textwidth}{1pt}\medskip\par +}{\par\rule{\textwidth}{1pt} \end{minipage}% \par } \InputIfFileExists{limap.cfg}{}{} \csname LIMAP@SelectLanguage@\LIMAP@Language\endcsname \ifLIMAP@strict + \def\chapter{\PackageWarning{limap}{The sectioning command + `chapter' is not available.}} \def\subsection{\PackageWarning{limap}{The sectioning command `subsection' is not available.}} \def\subsubsection{\PackageWarning{limap}{The sectioning command diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/limap.tlpobj new/tlpkg/tlpobj/limap.tlpobj --- old/tlpkg/tlpobj/limap.tlpobj 2016-04-14 19:17:21.000000000 +0200 +++ new/tlpkg/tlpobj/limap.tlpobj 2017-04-14 17:47:18.000000000 +0200 @@ -1,21 +1,22 @@ name limap category Package -revision 15878 -shortdesc Typeset maps and blocks according to the Information Mapping method +revision 41390 +shortdesc Typeset maps and blocks according to the Information Mapping(r) method relocated 1 -longdesc The Information Mapping method provides a methodology for +longdesc The Information Mapping(r) method provides a methodology for longdesc structuring and presenting information. It claims to be useful longdesc for readers who are more concerned about finding the right longdesc information than reading the document as a whole. Thus short, longdesc highly structured, and context free pieces of information are longdesc used. A LaTeX style and a LaTeX class are provided. The style longdesc contains definitions to typeset maps and blocks according to -longdesc the Information Mapping method. The class provides all +longdesc the Information Mapping(r) method. The class provides all longdesc definitions to typeset a whole document. -runfiles size=6 +runfiles size=7 RELOC/tex/latex/limap/limap.cls RELOC/tex/latex/limap/limap.sty catalogue-ctan /macros/latex/contrib/gene/limap -catalogue-date 2015-08-03 05:43:12 +0200 -catalogue-license lppl -catalogue-topics struc-mkup class +catalogue-date 2016-10-01 16:08:46 +0200 +catalogue-license lppl1.3 +catalogue-topics struc-mkup class article-like report-like book-pub +catalogue-version 2.1 ++++++ linearA.doc.tar.xz ++++++ ++++++ linearA.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/linearA.tlpobj new/tlpkg/tlpobj/linearA.tlpobj --- old/tlpkg/tlpobj/linearA.tlpobj 2016-04-14 19:17:21.000000000 +0200 +++ new/tlpkg/tlpobj/linearA.tlpobj 2017-04-14 17:47:18.000000000 +0200 @@ -20,6 +20,6 @@ RELOC/fonts/type1/public/linearA/LinearACmplxSigns.pfb RELOC/tex/latex/linearA/linearA.sty catalogue-ctan /fonts/archaic/linearA -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics font font-type1 font-archaic ++++++ linegoal.doc.tar.xz ++++++ ++++++ linegoal.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/linegoal.tlpobj new/tlpkg/tlpobj/linegoal.tlpobj --- old/tlpkg/tlpobj/linegoal.tlpobj 2016-04-14 19:17:22.000000000 +0200 +++ new/tlpkg/tlpobj/linegoal.tlpobj 2017-04-14 17:47:18.000000000 +0200 @@ -14,7 +14,7 @@ runfiles size=1 RELOC/tex/latex/linegoal/linegoal.sty catalogue-ctan /macros/latex/contrib/linegoal -catalogue-date 2015-08-08 19:53:23 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics layout catalogue-version 2.9 ++++++ lineno.doc.tar.xz ++++++ ++++++ lineno.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lineno.tlpobj new/tlpkg/tlpobj/lineno.tlpobj --- old/tlpkg/tlpobj/lineno.tlpobj 2016-04-14 19:17:23.000000000 +0200 +++ new/tlpkg/tlpobj/lineno.tlpobj 2017-04-14 17:47:19.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/lineno/vplref.sty catalogue-also numline edmac ledmac ednotes manyfoot poemscol catalogue-ctan /macros/latex/contrib/lineno -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics typesetting catalogue-version 4.41 ++++++ linguex.doc.tar.xz ++++++ ++++++ linguex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/linguex.tlpobj new/tlpkg/tlpobj/linguex.tlpobj --- old/tlpkg/tlpobj/linguex.tlpobj 2016-04-14 19:17:23.000000000 +0200 +++ new/tlpkg/tlpobj/linguex.tlpobj 2017-04-14 17:47:19.000000000 +0200 @@ -15,7 +15,7 @@ RELOC/tex/latex/linguex/linguho.sty RELOC/tex/latex/linguex/ps-trees.sty catalogue-ctan /macros/latex/contrib/linguex -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics linguistic tree catalogue-version 4.3 ++++++ linop.doc.tar.xz ++++++ ++++++ linop.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/linop.tlpobj new/tlpkg/tlpobj/linop.tlpobj --- old/tlpkg/tlpobj/linop.tlpobj 2016-06-07 17:34:00.000000000 +0200 +++ new/tlpkg/tlpobj/linop.tlpobj 2017-04-14 17:47:19.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/linop/linop.sty catalogue-ctan /macros/latex/contrib/linop -catalogue-date 2016-06-06 17:53:46 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics maths physics catalogue-version 0.1 ++++++ lipsum.doc.tar.xz ++++++ ++++++ lipsum.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lipsum.tlpobj new/tlpkg/tlpobj/lipsum.tlpobj --- old/tlpkg/tlpobj/lipsum.tlpobj 2016-04-14 19:17:24.000000000 +0200 +++ new/tlpkg/tlpobj/lipsum.tlpobj 2017-04-14 17:47:20.000000000 +0200 @@ -11,7 +11,7 @@ RELOC/tex/latex/lipsum/lipsum.sty catalogue-also blindtext kantlipsum catalogue-ctan /macros/latex/contrib/lipsum -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics macro-supp dummy-gen catalogue-version 1.3 ++++++ lisp-on-tex.doc.tar.xz ++++++ ++++++ lisp-on-tex.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lisp-on-tex.tlpobj new/tlpkg/tlpobj/lisp-on-tex.tlpobj --- old/tlpkg/tlpobj/lisp-on-tex.tlpobj 2016-04-14 19:17:24.000000000 +0200 +++ new/tlpkg/tlpobj/lisp-on-tex.tlpobj 2017-04-14 17:47:20.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/latex/lisp-on-tex/lisp-string.sty RELOC/tex/latex/lisp-on-tex/lisp-util.sty catalogue-ctan /macros/latex/contrib/lisp-on-tex -catalogue-date 2015-10-25 11:03:13 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license bsd catalogue-topics exec-foreign catalogue-version 2.0 ++++++ listbib.doc.tar.xz ++++++ ++++++ listbib.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/listbib.tlpobj new/tlpkg/tlpobj/listbib.tlpobj --- old/tlpkg/tlpobj/listbib.tlpobj 2016-04-14 19:17:24.000000000 +0200 +++ new/tlpkg/tlpobj/listbib.tlpobj 2017-04-14 17:47:20.000000000 +0200 @@ -15,7 +15,7 @@ texmf-dist/tex/latex/listbib/listbib.tex catalogue-also biblist catalogue-ctan /macros/latex/contrib/listbib -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics bibtex-util catalogue-version 2.2 ++++++ listing.doc.tar.xz ++++++ ++++++ listing.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/listing.tlpobj new/tlpkg/tlpobj/listing.tlpobj --- old/tlpkg/tlpobj/listing.tlpobj 2016-04-14 19:17:25.000000000 +0200 +++ new/tlpkg/tlpobj/listing.tlpobj 2017-04-14 17:47:21.000000000 +0200 @@ -14,7 +14,7 @@ RELOC/tex/latex/listing/listing.sty catalogue-also listings catalogue-ctan /macros/latex/contrib/listing -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics listing catalogue-version 1.2 ++++++ listings-ext.doc.tar.xz ++++++ ++++++ listings-ext.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/listings-ext.tlpobj new/tlpkg/tlpobj/listings-ext.tlpobj --- old/tlpkg/tlpobj/listings-ext.tlpobj 2016-04-14 19:17:28.000000000 +0200 +++ new/tlpkg/tlpobj/listings-ext.tlpobj 2017-04-14 17:47:22.000000000 +0200 @@ -14,7 +14,7 @@ texmf-dist/scripts/listings-ext/listings-ext.sh texmf-dist/tex/latex/listings-ext/listings-ext.sty catalogue-ctan /macros/latex/contrib/listings-ext -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics listing catalogue-version 67 ++++++ listings.doc.tar.xz ++++++ ++++++ listings.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/listings.tlpobj new/tlpkg/tlpobj/listings.tlpobj --- old/tlpkg/tlpobj/listings.tlpobj 2016-04-14 19:17:27.000000000 +0200 +++ new/tlpkg/tlpobj/listings.tlpobj 2017-04-14 17:47:21.000000000 +0200 @@ -32,7 +32,7 @@ RELOC/tex/latex/listings/lstmisc.sty catalogue-also listing catalogue-ctan /macros/latex/contrib/listings -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics listing synt-hlt catalogue-version 1.6 ++++++ listlbls.doc.tar.xz ++++++ ++++++ listlbls.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/listlbls.tlpobj new/tlpkg/tlpobj/listlbls.tlpobj --- old/tlpkg/tlpobj/listlbls.tlpobj 2016-04-14 19:17:28.000000000 +0200 +++ new/tlpkg/tlpobj/listlbls.tlpobj 2017-04-14 17:47:22.000000000 +0200 @@ -13,7 +13,7 @@ runfiles size=1 RELOC/tex/latex/listlbls/listlbls.sty catalogue-ctan /macros/latex/contrib/listlbls -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics label-ref debug-supp catalogue-version 1.03 ++++++ listliketab.doc.tar.xz ++++++ ++++++ listliketab.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/listliketab.tlpobj new/tlpkg/tlpobj/listliketab.tlpobj --- old/tlpkg/tlpobj/listliketab.tlpobj 2016-04-14 19:17:28.000000000 +0200 +++ new/tlpkg/tlpobj/listliketab.tlpobj 2017-04-14 17:47:22.000000000 +0200 @@ -10,6 +10,6 @@ runfiles size=1 RELOC/tex/latex/listliketab/listliketab.sty catalogue-ctan /macros/latex/contrib/listliketab -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics list table ++++++ listofsymbols.doc.tar.xz ++++++ ++++++ listofsymbols.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/listofsymbols.tlpobj new/tlpkg/tlpobj/listofsymbols.tlpobj --- old/tlpkg/tlpobj/listofsymbols.tlpobj 2016-04-14 19:17:28.000000000 +0200 +++ new/tlpkg/tlpobj/listofsymbols.tlpobj 2017-04-14 17:47:22.000000000 +0200 @@ -16,7 +16,7 @@ runfiles size=2 RELOC/tex/latex/listofsymbols/listofsymbols.sty catalogue-ctan /macros/latex/contrib/listofsymbols -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics toc-etc catalogue-version 0.2 ++++++ lithuanian.doc.tar.xz ++++++ ++++++ lithuanian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lithuanian.tlpobj new/tlpkg/tlpobj/lithuanian.tlpobj --- old/tlpkg/tlpobj/lithuanian.tlpobj 2016-04-14 19:17:29.000000000 +0200 +++ new/tlpkg/tlpobj/lithuanian.tlpobj 2017-04-14 17:47:22.000000000 +0200 @@ -65,6 +65,6 @@ RELOC/tex/latex/lithuanian/lithuanian.ldf RELOC/tex/latex/lithuanian/lithuanian.sty catalogue-ctan /language/lithuanian -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics lithuanian font-proc font-supp ++++++ liturg.doc.tar.xz ++++++ ++++++ liturg.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/liturg.tlpobj new/tlpkg/tlpobj/liturg.tlpobj --- old/tlpkg/tlpobj/liturg.tlpobj 2016-04-14 19:17:29.000000000 +0200 +++ new/tlpkg/tlpobj/liturg.tlpobj 2017-04-14 17:47:23.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=5 RELOC/tex/latex/liturg/liturg.sty catalogue-ctan /macros/latex/contrib/liturg -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics theology catalogue-version 1.0 ++++++ lkproof.doc.tar.xz ++++++ ++++++ lkproof.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lkproof.tlpobj new/tlpkg/tlpobj/lkproof.tlpobj --- old/tlpkg/tlpobj/lkproof.tlpobj 2016-04-14 19:17:29.000000000 +0200 +++ new/tlpkg/tlpobj/lkproof.tlpobj 2017-04-14 17:47:23.000000000 +0200 @@ -9,7 +9,7 @@ RELOC/tex/latex/lkproof/proof.sty catalogue-also proofs catalogue-ctan /macros/latex/contrib/lkproof -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl catalogue-topics logic catalogue-version 3.1 ++++++ lm-math.doc.tar.xz ++++++ ++++++ lm-math.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lm-math.tlpobj new/tlpkg/tlpobj/lm-math.tlpobj --- old/tlpkg/tlpobj/lm-math.tlpobj 2016-04-14 19:18:12.000000000 +0200 +++ new/tlpkg/tlpobj/lm-math.tlpobj 2017-04-14 17:47:39.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=180 RELOC/fonts/opentype/public/lm-math/latinmodern-math.otf catalogue-ctan /fonts/lm-math -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gfl catalogue-topics font font-maths font-otf catalogue-version 1.959 ++++++ lm.doc.tar.xz ++++++ ++++++ lm.tar.xz ++++++ /work/SRC/openSUSE:Factory/texlive-specs-n/lm.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-n.new/lm.tar.xz differ: char 26, line 1 ++++++ lmake.doc.tar.xz ++++++ ++++++ lmake.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lmake.tlpobj new/tlpkg/tlpobj/lmake.tlpobj --- old/tlpkg/tlpobj/lmake.tlpobj 2016-04-14 19:18:12.000000000 +0200 +++ new/tlpkg/tlpobj/lmake.tlpobj 2017-04-14 17:47:39.000000000 +0200 @@ -9,7 +9,7 @@ runfiles size=2 RELOC/tex/latex/lmake/lmake.sty catalogue-ctan /macros/latex/contrib/lmake -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.2 catalogue-topics macro-supp catalogue-version 1.0 ++++++ lobster2.doc.tar.xz ++++++ ++++++ lobster2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lobster2.tlpobj new/tlpkg/tlpobj/lobster2.tlpobj --- old/tlpkg/tlpobj/lobster2.tlpobj 2016-04-14 19:18:12.000000000 +0200 +++ new/tlpkg/tlpobj/lobster2.tlpobj 2017-04-14 17:47:39.000000000 +0200 @@ -96,6 +96,6 @@ RELOC/tex/latex/lobster2/T1LobsterTwo-LF.fd RELOC/tex/latex/lobster2/TS1LobsterTwo-LF.fd catalogue-ctan /fonts/lobster2 -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license ofl catalogue-topics font font-calligraphic font-type1 font-ttf ++++++ locality.doc.tar.xz ++++++ ++++++ locality.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/locality.tlpobj new/tlpkg/tlpobj/locality.tlpobj --- old/tlpkg/tlpobj/locality.tlpobj 2016-04-14 19:18:15.000000000 +0200 +++ new/tlpkg/tlpobj/locality.tlpobj 2017-04-14 17:47:40.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=3 RELOC/tex/latex/locality/locality.sty catalogue-ctan /macros/latex/contrib/locality -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macro-supp catalogue-version 0.2 ++++++ localloc.doc.tar.xz ++++++ ++++++ localloc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/localloc.tlpobj new/tlpkg/tlpobj/localloc.tlpobj --- old/tlpkg/tlpobj/localloc.tlpobj 2016-04-14 19:18:15.000000000 +0200 +++ new/tlpkg/tlpobj/localloc.tlpobj 2017-04-14 17:47:40.000000000 +0200 @@ -9,6 +9,6 @@ runfiles size=2 RELOC/tex/latex/localloc/localloc.sty catalogue-ctan /macros/latex/contrib/localloc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license other-free catalogue-topics macro-supp ++++++ logbox.doc.tar.xz ++++++ ++++++ logbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/logbox.tlpobj new/tlpkg/tlpobj/logbox.tlpobj --- old/tlpkg/tlpobj/logbox.tlpobj 2016-04-14 19:18:15.000000000 +0200 +++ new/tlpkg/tlpobj/logbox.tlpobj 2017-04-14 17:47:40.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=1 RELOC/tex/latex/logbox/logbox.sty catalogue-ctan /macros/latex/contrib/logbox -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics macro-supp catalogue-version 1.0 ++++++ logical-markup-utils.doc.tar.xz ++++++ ++++++ logical-markup-utils.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/logical-markup-utils.tlpobj new/tlpkg/tlpobj/logical-markup-utils.tlpobj --- old/tlpkg/tlpobj/logical-markup-utils.tlpobj 2016-04-14 19:18:16.000000000 +0200 +++ new/tlpkg/tlpobj/logical-markup-utils.tlpobj 2017-04-14 17:47:40.000000000 +0200 @@ -12,6 +12,6 @@ RELOC/tex/latex/logical-markup-utils/quoted.sty catalogue-also csquotes catalogue-ctan /macros/latex/contrib/logical-markup-utils -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics quote-marks ++++++ logicproof.doc.tar.xz ++++++ ++++++ logicproof.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/logicproof.tlpobj new/tlpkg/tlpobj/logicproof.tlpobj --- old/tlpkg/tlpobj/logicproof.tlpobj 2016-04-14 19:18:16.000000000 +0200 +++ new/tlpkg/tlpobj/logicproof.tlpobj 2017-04-14 17:47:41.000000000 +0200 @@ -13,6 +13,6 @@ runfiles size=2 RELOC/tex/latex/logicproof/logicproof.sty catalogue-ctan /macros/latex/contrib/logicproof -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics logic ++++++ logicpuzzle.doc.tar.xz ++++++ ++++++ logicpuzzle.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/logicpuzzle.tlpobj new/tlpkg/tlpobj/logicpuzzle.tlpobj --- old/tlpkg/tlpobj/logicpuzzle.tlpobj 2016-04-14 19:18:17.000000000 +0200 +++ new/tlpkg/tlpobj/logicpuzzle.tlpobj 2017-04-14 17:47:41.000000000 +0200 @@ -35,7 +35,7 @@ RELOC/tex/latex/logicpuzzle/logicpuzzle.sty RELOC/tex/latex/logicpuzzle/lpenv.sty catalogue-ctan /graphics/pgf/contrib/logicpuzzle -catalogue-date 2015-12-14 12:05:18 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics pgf-tikz games catalogue-version 2.5 ++++++ logpap.doc.tar.xz ++++++ ++++++ logpap.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/logpap.tlpobj new/tlpkg/tlpobj/logpap.tlpobj --- old/tlpkg/tlpobj/logpap.tlpobj 2016-04-14 19:18:17.000000000 +0200 +++ new/tlpkg/tlpobj/logpap.tlpobj 2017-04-14 17:47:41.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=7 RELOC/tex/latex/logpap/logpap.sty catalogue-ctan /macros/latex/contrib/logpap -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics diagram catalogue-version 0.6 ++++++ logreq.doc.tar.xz ++++++ ++++++ logreq.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/logreq.tlpobj new/tlpkg/tlpobj/logreq.tlpobj --- old/tlpkg/tlpobj/logreq.tlpobj 2016-04-14 19:18:17.000000000 +0200 +++ new/tlpkg/tlpobj/logreq.tlpobj 2017-04-14 17:47:41.000000000 +0200 @@ -19,7 +19,7 @@ RELOC/tex/latex/logreq/logreq.def RELOC/tex/latex/logreq/logreq.sty catalogue-ctan /macros/latex/contrib/logreq -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics compilation catalogue-version 1.0 ++++++ lollipop.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/otherformats/lollipop/README new/texmf-dist/doc/otherformats/lollipop/README --- old/texmf-dist/doc/otherformats/lollipop/README 2016-05-15 00:14:55.000000000 +0200 +++ new/texmf-dist/doc/otherformats/lollipop/README 2016-11-25 19:30:42.000000000 +0100 @@ -16,23 +16,22 @@ persian-tex(a)tug.org Here is how much of TeX's memory you used: - 1187 strings out of 496577 - 16107 string characters out of 6202674 - 66696 words of memory out of 5000000 - 3268 multiletter control sequences out of 15000+600000 - 10531 words of font info for 38 fonts, out of 8000000 for 9000 + 1194 strings out of 496579 + 16173 string characters out of 6202690 + 72655 words of memory out of 5000000 + 3270 multiletter control sequences out of 15000+600000 + 11241 words of font info for 40 fonts, out of 8000000 for 9000 19 hyphenation exceptions out of 8191 - 24i,4n,24p,189b,562s stack positions out of 5000i,500n,10000p,200000b,80000s - -Output written on lollipop-manual.dvi (71 pages, 158476 bytes). + 24i,4n,24p,187b,562s stack positions out of 5000i,500n,10000p,200000b,80000s +Output written on lollipop-manual.dvi (59 pages, 155468 bytes). History so far: 0.9 October 1992, first public release 0.91 Unannounced update - TeX3 based lolplain + TeX3 based lollipop-plain penalties and white space in embedded constructs splittopskip set equal to topskip @@ -54,7 +53,7 @@ address book example format. 0.97 4 April 2014, organized and updated - files and also generated various formats. + files and also generated format. 0.98 6 April 2014, changed all lollipop filenames to start with `lollipop' prefix, and fixed typewriter font. @@ -72,8 +71,6 @@ 1.03 19 April 2014, Fixed the wrong numbering of nested enumerate lists -1.04 9 April 2016, Updated lualollipop.ini for the new luatex binary - 1.05 16 April 2016, Changed \lolli@name to \lollipop@name added \footnoterule to output routine defined \PushLeftIndentLevel, \PopLeftIndentLevel, @@ -85,4 +82,5 @@ fixed the error caused by \newhelp 1.06 14 May 2016, Defined \FrenchSpacing - Use 12pt size \ No newline at end of file + +1.07 21 May 2016, Some minor changes \ No newline at end of file Binary files old/texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.pdf and new/texmf-dist/doc/otherformats/lollipop/manual/lollipop-manual.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex new/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex --- old/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex 2016-05-15 00:14:55.000000000 +0200 +++ new/texmf-dist/doc/otherformats/lollipop/manual/prelim.tex 2016-11-25 19:30:42.000000000 +0100 @@ -201,13 +201,13 @@ This manual needs quite some resources: here's what \TeX\ told me it needed. \Ver>Here is how much of TeX's memory you used: - 1187 strings out of 496577 - 16107 string characters out of 6202674 - 66696 words of memory out of 5000000 - 3268 multiletter control sequences out of 15000+600000 - 10531 words of font info for 38 fonts, out of 8000000 for 9000 + 1194 strings out of 496579 + 16173 string characters out of 6202690 + 72655 words of memory out of 5000000 + 3270 multiletter control sequences out of 15000+600000 + 11241 words of font info for 40 fonts, out of 8000000 for 9000 19 hyphenation exceptions out of 8191 - 24i,4n,24p,189b,562s stack positions out of 5000i,500n,10000p,200000b,80000s<Rev + 24i,4n,24p,187b,562s stack positions out of 5000i,500n,10000p,200000b,80000s<Rev Because of all the examples this manual takes quite some time to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex new/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex --- old/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex 2016-05-15 00:14:55.000000000 +0200 +++ new/texmf-dist/doc/otherformats/lollipop/manual/titlepag.tex 2016-11-25 19:30:42.000000000 +0100 @@ -34,8 +34,8 @@ \PointSize:15 \Style:roman A manual for the Lollipop \TeX\ format\par -Version 1.06\par -Last updated 14 May 2016\par +Version 1.07\par +Last updated 21 May 2016\par Pages: \LastInPageCounter+\LastRegPageCounter % so far we could have done this with labels, however \AddToCounter:LastRegPage=LastInPageValue diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/otherformats/lollipop/tex-inde.xen new/texmf-dist/doc/otherformats/lollipop/tex-inde.xen --- old/texmf-dist/doc/otherformats/lollipop/tex-inde.xen 2016-05-15 00:14:55.000000000 +0200 +++ new/texmf-dist/doc/otherformats/lollipop/tex-inde.xen 2016-11-25 19:30:42.000000000 +0100 @@ -17,7 +17,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the lollipop package, see lollipop.tex. @@ -27,7 +27,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the lollipop package, see lollipop.tex. @@ -37,7 +37,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the lollipop package, see lollipop.tex. @@ -46,7 +46,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the lollipop package, see lollipop.tex. @@ -56,7 +56,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the lollipop package, see lollipop.tex. @@ -65,7 +65,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the lollipop package, see lollipop.tex. @@ -75,7 +75,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the lollipop package, see lollipop.tex. @@ -84,7 +84,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: requires lollipop-define.tex, lollipop-document.tex lollipop-float.tex, lollipop-fontdefs.tex, lollipop-fonts.tex, @@ -98,7 +98,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the lollipop package, see lollipop.tex. @@ -108,7 +108,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the lollipop package, see lollipop.tex. @@ -118,7 +118,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the lollipop package, see lollipop.tex. @@ -127,7 +127,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the lollipop package, see lollipop.tex. @@ -139,7 +139,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the manual of the lollipop package, see lollipop.tex. @@ -150,7 +150,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the manual of the lollipop package, see lollipop.tex. @@ -160,7 +160,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the manual of the lollipop package, see lollipop.tex. @@ -170,7 +170,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the manual of the lollipop package, see lollipop.tex. @@ -180,7 +180,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the manual of the lollipop package, see lollipop.tex. @@ -190,7 +190,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: requires comment.tex, extern.tex, head.tex, list.tex mandefs.tex, lollipop-manual.bbl, opt.tex, out.tex, prelim.tex, @@ -202,7 +202,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the manual of the lollipop package, see lollipop.tex. @@ -213,7 +213,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the manual of the lollipop package, see lollipop.tex. @@ -223,7 +223,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the manual of the lollipop package, see lollipop.tex. @@ -234,7 +234,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the manual of the lollipop package, see lollipop.tex. @@ -244,7 +244,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the manual of the lollipop package, see lollipop.tex. @@ -254,7 +254,7 @@ Keywords: lollipop, macro package, style definitions Author: Victor Eijkhout and Vafa Khalighi Supported: yes -Latest version: v1.06, 14 May 2016 +Latest version: v1.07, 21 May 2016 Archives: http://ctan.org/pkg/lollipop Note: part of the manual of the lollipop package, see lollipop.tex. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lollipop.doc.tlpobj new/tlpkg/tlpobj/lollipop.doc.tlpobj --- old/tlpkg/tlpobj/lollipop.doc.tlpobj 2016-05-15 03:19:32.000000000 +0200 +++ new/tlpkg/tlpobj/lollipop.doc.tlpobj 2017-04-14 17:47:41.000000000 +0200 @@ -1,8 +1,8 @@ name lollipop.doc category Package -revision 41130 +revision 41438 shortdesc doc files of lollipop -docfiles size=140 +docfiles size=136 texmf-dist/doc/otherformats/lollipop/README texmf-dist/doc/otherformats/lollipop/manual/address.tex texmf-dist/doc/otherformats/lollipop/manual/appendix.tex ++++++ lollipop.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/lollipop/lollipop.tex new/texmf-dist/tex/lollipop/lollipop.tex --- old/texmf-dist/tex/lollipop/lollipop.tex 2016-05-15 00:14:55.000000000 +0200 +++ new/texmf-dist/tex/lollipop/lollipop.tex 2016-11-25 19:34:04.000000000 +0100 @@ -60,7 +60,7 @@ \let\willbeunhskip\unhskip \Typeface:ComputerModern -\Pointsize:12 +\Pointsize:10 \Style:bold \Style:slant \Style:italic \Style:roman \Distance:verbatimwhiteleft=levelindent @@ -130,10 +130,9 @@ % fixed the error caused by \newhelp % % v1.06 Defined \FrenchSpacing -% Use 12pt size % \edef\fmtname{\lollipop@name}%defined in Tools -\def\fmtversion{v1.06, 14 May 2016} +\def\fmtversion{v1.07, 21 May 2016} \append@to@list{everyjob}{\message{ >>>> This is Lollipop TeX (\fmtversion) <<<<}} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lollipop.tlpobj new/tlpkg/tlpobj/lollipop.tlpobj --- old/tlpkg/tlpobj/lollipop.tlpobj 2016-05-15 03:19:33.000000000 +0200 +++ new/tlpkg/tlpobj/lollipop.tlpobj 2017-04-14 17:47:41.000000000 +0200 @@ -1,6 +1,6 @@ name lollipop category Package -revision 41130 +revision 41438 shortdesc TeX made easy longdesc Lollipop is "TeX made easy" -- it is a macro package that longdesc functions as a toolbox for writing TeX macros. Its main aim is @@ -14,8 +14,11 @@ longdesc mechanism offers. In addition, development of support for longdesc Lollipop documents written in RTL languages (such as Persian) longdesc is underway. +depend cm +depend hyphen-base +depend lollipop depend lollipop.ARCH -execute AddFormat name=lollipop engine=tex options="lollipop.ini" fmttriggers=cm,hyphen-base,lollipop,tex-ini-files +execute AddFormat name=lollipop engine=tex options="lollipop.ini" fmttriggers=cm,hyphen-base,lollipop runfiles size=57 texmf-dist/tex/lollipop/lollipop-define.tex texmf-dist/tex/lollipop/lollipop-document.tex @@ -31,7 +34,7 @@ texmf-dist/tex/lollipop/lollipop.ini texmf-dist/tex/lollipop/lollipop.tex catalogue-ctan /macros/lollipop -catalogue-date 2016-05-14 14:30:39 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license gpl3 catalogue-topics format -catalogue-version 1.06 +catalogue-version 1.07 ++++++ longfbox.doc.tar.xz ++++++ ++++++ longfbox.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/longfbox.tlpobj new/tlpkg/tlpobj/longfbox.tlpobj --- old/tlpkg/tlpobj/longfbox.tlpobj 2016-04-14 19:18:18.000000000 +0200 +++ new/tlpkg/tlpobj/longfbox.tlpobj 2017-04-14 17:47:42.000000000 +0200 @@ -10,7 +10,7 @@ RELOC/tex/latex/longfbox/longbox.sty RELOC/tex/latex/longfbox/longfbox.sty catalogue-ctan /macros/latex/contrib/longfbox -catalogue-date 2016-02-02 05:57:37 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics boxing decoration catalogue-version 1.0 ++++++ longfigure.doc.tar.xz ++++++ ++++++ longfigure.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/longfigure.tlpobj new/tlpkg/tlpobj/longfigure.tlpobj --- old/tlpkg/tlpobj/longfigure.tlpobj 2016-04-14 19:18:19.000000000 +0200 +++ new/tlpkg/tlpobj/longfigure.tlpobj 2017-04-14 17:47:42.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=4 RELOC/tex/latex/longfigure/longfigure.sty catalogue-ctan /macros/latex/contrib/longfigure -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics table table-long graphics-incl catalogue-version 1.0 ++++++ longnamefilelist.doc.tar.xz ++++++ ++++++ longnamefilelist.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/longnamefilelist.tlpobj new/tlpkg/tlpobj/longnamefilelist.tlpobj --- old/tlpkg/tlpobj/longnamefilelist.tlpobj 2016-04-14 19:18:19.000000000 +0200 +++ new/tlpkg/tlpobj/longnamefilelist.tlpobj 2017-04-14 17:47:42.000000000 +0200 @@ -12,7 +12,7 @@ runfiles size=2 RELOC/tex/latex/longnamefilelist/longnamefilelist.sty catalogue-ctan /macros/latex/contrib/longnamefilelist -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics doc-mgmt catalogue-version 0.2 ++++++ loops.doc.tar.xz ++++++ ++++++ loops.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/loops.tlpobj new/tlpkg/tlpobj/loops.tlpobj --- old/tlpkg/tlpobj/loops.tlpobj 2016-04-14 19:18:19.000000000 +0200 +++ new/tlpkg/tlpobj/loops.tlpobj 2017-04-14 17:47:42.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=13 RELOC/tex/latex/loops/loops.sty catalogue-ctan /macros/latex/contrib/loops -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics list-supp macro-supp csv-support catalogue-version 1.3 ++++++ lpform.doc.tar.xz ++++++ ++++++ lpform.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lpform.tlpobj new/tlpkg/tlpobj/lpform.tlpobj --- old/tlpkg/tlpobj/lpform.tlpobj 2016-04-14 19:18:20.000000000 +0200 +++ new/tlpkg/tlpobj/lpform.tlpobj 2017-04-14 17:47:42.000000000 +0200 @@ -14,6 +14,6 @@ runfiles size=2 RELOC/tex/generic/lpform/lpform.sty catalogue-ctan /macros/generic/lpform -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics maths ++++++ lpic.doc.tar.xz ++++++ ++++++ lpic.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lpic.tlpobj new/tlpkg/tlpobj/lpic.tlpobj --- old/tlpkg/tlpobj/lpic.tlpobj 2016-04-14 19:18:20.000000000 +0200 +++ new/tlpkg/tlpobj/lpic.tlpobj 2017-04-14 17:47:42.000000000 +0200 @@ -16,7 +16,7 @@ RELOC/tex/latex/lpic/lpic.sty catalogue-also overpic catalogue-ctan /macros/latex/contrib/lpic -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics graphics-text catalogue-version 0.8 ++++++ lplfitch.doc.tar.xz ++++++ ++++++ lplfitch.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lplfitch.tlpobj new/tlpkg/tlpobj/lplfitch.tlpobj --- old/tlpkg/tlpobj/lplfitch.tlpobj 2016-04-14 19:18:20.000000000 +0200 +++ new/tlpkg/tlpobj/lplfitch.tlpobj 2017-04-14 17:47:42.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/lplfitch/lplfitch.sty catalogue-ctan /macros/latex/contrib/lplfitch -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics maths catalogue-version 0.9 ++++++ lps.doc.tar.xz ++++++ ++++++ lps.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lps.tlpobj new/tlpkg/tlpobj/lps.tlpobj --- old/tlpkg/tlpobj/lps.tlpobj 2016-04-14 19:18:20.000000000 +0200 +++ new/tlpkg/tlpobj/lps.tlpobj 2017-04-14 17:47:43.000000000 +0200 @@ -10,7 +10,7 @@ runfiles size=2 RELOC/tex/latex/lps/lps.cls catalogue-ctan /macros/latex/contrib/lps -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics journalpub class catalogue-version 0.7 ++++++ lroundrect.doc.tar.xz ++++++ ++++++ lroundrect.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lroundrect.tlpobj new/tlpkg/tlpobj/lroundrect.tlpobj --- old/tlpkg/tlpobj/lroundrect.tlpobj 2016-04-14 19:18:21.000000000 +0200 +++ new/tlpkg/tlpobj/lroundrect.tlpobj 2017-04-14 17:47:43.000000000 +0200 @@ -11,7 +11,7 @@ runfiles size=2 RELOC/tex/latex/lroundrect/lroundrect.sty catalogue-ctan /macros/latex/contrib/lroundrect -catalogue-date 2016-02-24 05:09:02 +0100 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl1.3 catalogue-topics boxing catalogue-version 1.0 ++++++ lsc.doc.tar.xz ++++++ ++++++ lsc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lsc.tlpobj new/tlpkg/tlpobj/lsc.tlpobj --- old/tlpkg/tlpobj/lsc.tlpobj 2016-04-14 19:18:21.000000000 +0200 +++ new/tlpkg/tlpobj/lsc.tlpobj 2017-04-14 17:47:43.000000000 +0200 @@ -13,6 +13,6 @@ RELOC/bibtex/bib/lsc/lsc.bib RELOC/tex/latex/lsc/lsc.sty catalogue-ctan /macros/latex/contrib/lsc -catalogue-date 2015-08-03 05:43:12 +0200 +catalogue-date 2016-06-24 19:18:15 +0200 catalogue-license lppl catalogue-topics comp-net ++++++ lshort-bulgarian.doc.tar.xz ++++++ ++++++ lshort-chinese.doc.tar.xz ++++++ ++++ 19443 lines of diff (skipped) ++++++ lshort-czech.doc.tar.xz ++++++ ++++++ lshort-dutch.doc.tar.xz ++++++ ++++++ lshort-english.doc.tar.xz ++++++ ++++++ lshort-estonian.doc.tar.xz ++++++ ++++++ lshort-finnish.doc.tar.xz ++++++ ++++++ lshort-french.doc.tar.xz ++++++ ++++++ lshort-german.doc.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lshort-german/eingabefile.tex new/doc/latex/lshort-german/eingabefile.tex --- old/doc/latex/lshort-german/eingabefile.tex 2015-06-12 01:05:41.000000000 +0200 +++ new/doc/latex/lshort-german/eingabefile.tex 2016-11-25 19:29:25.000000000 +0100 @@ -17,20 +17,20 @@ \subsection{Leerstellen} - -"`Unsichtbare"' Zeichen wie das Leerzeichen, Tabulatoren und das Zeilenende + +"`Unsichtbare"' Zeichen wie das Leerzeichen, Tabulatoren und das Zeilenende werden von \LaTeX{} einheitlich als Leerzeichen behandelt. \emph{Mehrere} -Leerzeichen werden wie \emph{ein} Leerzeichen behandelt. Wenn man andere als -die normalen Wort- und Zeilenabstände will, kann man dies also nicht durch die -Eingabe von zusätzlichen Leerzeichen oder Leerzeilen erreichen, sondern nur mit +Leerzeichen werden wie \emph{ein} Leerzeichen behandelt. Wenn man andere als +die normalen Wort- und Zeilenabstände will, kann man dies also nicht durch die +Eingabe von zusätzlichen Leerzeichen oder Leerzeilen erreichen, sondern nur mit entsprechenden \LaTeX-Befehlen. Eine Leerzeile zwischen Textzeilen bedeutet das Ende eines Absatzes. \emph{Mehrere} Leerzeilen werden wie \emph{eine} Leerzeile behandelt. - - + + \subsection{\LaTeX-Befehle und Gruppen} - + Die meisten \LaTeX-Befehle haben eines der beiden folgenden Formate: Entweder sie beginnen mit einem Backslash~(\lstinline|\|) und haben dann einen nur aus Buchstaben bestehenden Namen, der durch ein oder mehrere Leerzeichen oder @@ -58,31 +58,31 @@ Am \today{} scheint die Sonne. Oder: Am \today\ schneit es. \end{LTXexample} - -Manche Befehle haben Parameter, die zwischen geschwungenen Klammern angegeben + +Manche Befehle haben Parameter, die zwischen geschwungenen Klammern angegeben werden müssen. Manche Befehle haben Parameter, die weggelassen oder zwischen -eckigen Klammern angegeben werden können. Manche Befehle haben Varianten, die +eckigen Klammern angegeben werden können. Manche Befehle haben Varianten, die durch das Hinzufügen eines Sterns an den Befehlsnamen unterschieden werden. Geschwungene Klammern können auch dazu verwendet werden, Gruppen (\emph{groups}) -zu bilden. Die Wirkung von Befehlen, die innerhalb von Gruppen oder Umgebungen -(\emph{environments}) angegeben werden, endet immer mit dem Ende der Gruppe -bzw.\ der Umgebung. Im obigen Beispiel ist~\lstinline|{}| eine leere Gruppe, die +zu bilden. Die Wirkung von Befehlen, die innerhalb von Gruppen oder Umgebungen +(\emph{environments}) angegeben werden, endet immer mit dem Ende der Gruppe +bzw.\ der Umgebung. Im obigen Beispiel ist~\lstinline|{}| eine leere Gruppe, die außer der Beendigung des Befehlsnamens \texttt{today} keine Wirkung hat. - + \subsection{Kommentare} - -Alles, was hinter einem Prozentzeichen (\lstinline|%|) steht (bis zum Ende der -Eingabezeile), wird von \LaTeX{} ignoriert. Dies kann für Notizen des Autors + +Alles, was hinter einem Prozentzeichen (\lstinline|%|) steht (bis zum Ende der +Eingabezeile), wird von \LaTeX{} ignoriert. Dies kann für Notizen des Autors verwendet werden, die nicht oder noch nicht ausgedruckt werden sollen. \begin{LTXexample} Das ist ein % dummes % Besser: ein lehrreiches <---- -Beispiel. +Beispiel. \end{LTXexample} - + \subsection{Aufbau} Der erste Befehl in einem \LaTeX-Eingabefile muss der Befehl @@ -90,14 +90,14 @@ \documentclass \end{lstlisting} sein. Er legt fest, welche Art von Schriftstück überhaupt erzeugt werden soll -(Bericht, Buch, Brief usw.). Danach können weitere Befehle folgen bzw. -deklariert werden, die für das gesamte Dokument gelten sollen. Dieser Teil des +(Bericht, Buch, Brief usw.). Danach können weitere Befehle folgen bzw. +deklariert werden, die für das gesamte Dokument gelten sollen. Dieser Teil des Dokuments wird auch als \emph{Vorspann} oder \emph{Präambel} bezeichnet. Mit dem Befehl \begin{lstlisting} \begin{document} \end{lstlisting} -endet der Vorspann, und es beginnt das Setzen des Schriftstücks. Nun folgen der +endet der Vorspann, und es beginnt das Setzen des Schriftstücks. Nun folgen der Text und alle \LaTeX-Befehle, die das Ausdrucken des Schriftstücks bewirken. Die Eingabe muss mit dem Befehl \begin{lstlisting} @@ -105,15 +105,15 @@ \end{lstlisting} beendet werden. Falls nach diesem Befehl noch Eingaben folgen, werden sie von \LaTeX{} ignoriert. - -Listing~\ref{mini} zeigt ein \emph{minimales} \LaTeX-File. Ein etwas + +Listing~\ref{mini} zeigt ein \emph{minimales} \LaTeX-File. Ein etwas komplizierteres File ist in Listing~\ref{dokument} skizziert. - + \begin{example}[caption={Ein minimales \LaTeX-File},label={mini}] \documentclass{article} \begin{document} Small is beautiful. -\end{document} +\end{document} \end{example} \begin{example}[caption={Aufbau eines Artikels},label={dokument}] @@ -140,21 +140,21 @@ \subsection{Dokumentklassen}\label{docsty} - + Die am Beginn des Eingabefiles mit \begin{lstlisting} \documentclass[<optionen>]{<klasse>} \end{lstlisting} -definierte "`Klasse"' eines Dokumentes enthält Vereinbarungen über das Layout -und die logischen Strukturen, z.\,B.\ die Gliederungseinheiten (Kapitel etc.\@), +definierte "`Klasse"' eines Dokumentes enthält Vereinbarungen über das Layout +und die logischen Strukturen, z.\,B.\ die Gliederungseinheiten (Kapitel etc.\@), die für alle Dokumente dieses Typs gemeinsam sind. Zwischen den geschwungenen Klammern \emph{muss} genau eine Dokumentklasse -angegeben werden. Tabelle~\vref{docstyles} führt -Klassen auf, die in jeder vollständigen \LaTeX-Installation existieren. +angegeben werden. Tabelle~\vref{docstyles} führt +Klassen auf, die in jeder vollständigen \LaTeX-Installation existieren. -Zwischen den eckigen Klammern \emph{können}, durch Kommas getrennt, eine oder -mehrere Optionen für das Klassenlayout angegeben werden. Die wichtigsten +Zwischen den eckigen Klammern \emph{können}, durch Kommas getrennt, eine oder +mehrere Optionen für das Klassenlayout angegeben werden. Die wichtigsten Optionen für die Standardklassen sind in der Tabelle~\vref{options} angeführt. Das Eingabefile für diese Beschreibung beginnt z.\,B.\ mit: \begin{lstlisting} @@ -171,24 +171,24 @@ \multicolumn{2}{r}{\small Forsetzung nächste Seite}\\ \endfoot \endlastfoot - article & - für Artikel in wissenschaftlichen Zeitschriften, kürzere Berichte u.\,v.\,a. + article & + für Artikel in wissenschaftlichen Zeitschriften, kürzere Berichte u.\,v.\,a. \\ - report & - für längere Berichte, die aus mehreren Kapiteln bestehen, Diplomarbeiten, - Dissertationen u.\,ä. -\\ - book & - für Bücher -\\ - scrartcl, scrreprt, scrbook & - Die sog. KOMA-Klassen sind Varianten der o.\,g. Klassen mit besserer Anpassung - an DIN-Papierformate und "`europäische"' Typographie. Zudem erlauben sie - mittels Optionen die Anpassung des Layouts. Entgegen den Standardklassen + report & + für längere Berichte, die aus mehreren Kapiteln bestehen, Diplomarbeiten, + Dissertationen u.\,ä. +\\ + book & + für Bücher +\\ + scrartcl, scrreprt, scrbook & + Die sog. KOMA-Klassen sind Varianten der o.\,g. Klassen mit besserer Anpassung + an DIN-Papierformate und "`europäische"' Typographie. Zudem erlauben sie + mittels Optionen die Anpassung des Layouts. Entgegen den Standardklassen existiert eine deutsche und englische Dokumenation (siehe \cite{scrguide}) \\ beamer & - für Präsentationen + für Präsentationen \\ \bottomrule \end{longtable} @@ -204,32 +204,32 @@ \multicolumn{2}{r}{\small Forsetzung nächste Seite}\\ \endfoot \endlastfoot - 10pt 11pt 12pt & - wählt die normale Schriftgröße des Dokuments aus. 10\,pt hohe Schrift ist die - Voreinstellung; diese Beschreibung benutzt 11\,pt. -\\ - a4paper & - für Papier im DIN\,A4-Format. Ohne diese Option nehmen die Standardklassen das - amerikanisches Papierformat. + 10pt 11pt 12pt & + wählt die normale Schriftgröße des Dokuments aus. 10\,pt hohe Schrift ist die + Voreinstellung; diese Beschreibung benutzt 11\,pt. +\\ + a4paper & + für Papier im DIN\,A4-Format. Ohne diese Option nehmen die Standardklassen das + amerikanisches Papierformat. \\ - fleqn & - für linksbündige statt zentrierte mathematische Gleichungen + fleqn & + für linksbündige statt zentrierte mathematische Gleichungen \\ leqno & - für Gleichungsnummern links statt rechts von jeder nummerierten Gleichung + für Gleichungsnummern links statt rechts von jeder nummerierten Gleichung \\ - titlepage notitlepage & - legt fest, ob Titel und Zusammenfassung auf einer eigenen Seite erscheinen - sollen. \texttt{titlepage} ist die Voreinstellung für die Klassen - \texttt{report} und \texttt{book}. -\\ - onecolumn twocolumn & - für ein- oder zweispaltigen Satz. Die Voreinstellung ist immer - \texttt{onecolumn}. -\\ - oneside twoside & - legt fest, ob die Seiten für ein- oder zweiseitigen Druck gestaltet werden - sollen. \texttt{oneside} ist die Voreinstellung für alle Klassen außer + titlepage notitlepage & + legt fest, ob Titel und Zusammenfassung auf einer eigenen Seite erscheinen + sollen. \texttt{titlepage} ist die Voreinstellung für die Klassen + \texttt{report} und \texttt{book}. +\\ + onecolumn twocolumn & + für ein- oder zweispaltigen Satz. Die Voreinstellung ist immer + \texttt{onecolumn}. +\\ + oneside twoside & + legt fest, ob die Seiten für ein- oder zweiseitigen Druck gestaltet werden + sollen. \texttt{oneside} ist die Voreinstellung für alle Klassen außer \texttt{book}. \\\bottomrule \end{longtable} @@ -238,13 +238,13 @@ \subsection{Pakete}\label{packages} - + Mit dem Befehl \begin{lstlisting} \usepackage[<optionen>]{<paket>} \end{lstlisting} -können im Vorspann ergänzende Makropakete (\emph{packages}) geladen werden, die das -Layout der Dokumentklasse modifizieren oder zusätzliche Funktionalität +können im Vorspann ergänzende Makropakete (\emph{packages}) geladen werden, die das +Layout der Dokumentklasse modifizieren oder zusätzliche Funktionalität bereitstellen. Eine Auswahl von Paketen findet sich in der Tabelle~\vref{pack}. Der Befehl \lstinline+\usepackage+ erlaubt das Laden mehrerer Pakete, wobei eine Optionenübergabe nicht möglich ist, bzw. die Optionen für alle Pakete gelten. @@ -259,35 +259,35 @@ \multicolumn{2}{r}{\small Fortsetzung nächste Seite}\\ \endfoot \endlastfoot - amsmath, amssymb & - Mathematischer Formelsatz mit erweiterten Fähigkeiten, zusätzliche - mathematische Schriften und Symbole; Beschreibung siehe \cite{ch8}. + amsmath, amssymb & + Mathematischer Formelsatz mit erweiterten Fähigkeiten, zusätzliche + mathematische Schriften und Symbole; Beschreibung siehe \cite{mathmode}. \\ - array & - Verbesserte und erweiterte Versionen der Umgebungen \texttt{array}, + array & + Verbesserte und erweiterte Versionen der Umgebungen \texttt{array}, \texttt{tabular} und \texttt{tabular*}. \\ - babel & - Anpassungen für viele verschiedene Sprachen. Die gewählten Sprachen werden + babel & + Anpassungen für viele verschiedene Sprachen. Die gewählten Sprachen werden als Optionen angegeben. \\ csquotes & Mächtiges Paket zum korrekten Setzen (fremdsprachlicher) Anführungszeichen \\ - fontenc & + fontenc & Erlaubt die Verwendung von Schriften mit unterschiedlicher Kodierung (Zeichenvorrat, Anordnung). \\ - geometry & - Manipulation des Seitenlayouts.\\ - graphicx & - Einbindung von extern erzeugten Graphiken. Die umfangreichen Möglichkeiten - dieses Pakets werden in~\cite{grfguide} und~\cite{grfcomp} beschrieben. -\\ - hyperref & - Ermöglicht Hyperlinks zwischen Textstellen und zu externen Dokumenten; - besonders sinnvoll einsetzbar, wenn mit \TeX\ eine Ausgabedatei im + geometry & + Manipulation des Seitenlayouts.\\ + graphicx & + Einbindung von extern erzeugten Graphiken. Die umfangreichen Möglichkeiten + dieses Pakets werden in~\cite{grfguide} und~\cite{grfcomp} beschrieben. +\\ + hyperref & + Ermöglicht Hyperlinks zwischen Textstellen und zu externen Dokumenten; + besonders sinnvoll einsetzbar, wenn mit \TeX\ eine Ausgabedatei im \textsc{pdf}- oder \textsc{html}-Format erzeugt wird. \\ - imakeidx & + imakeidx & Unterstützt das Erstellen eines Index. \\ listings & Flexible Erweiterung der \texttt{verbatim}-Umgebung. @@ -296,22 +296,22 @@ für Tabellen über mehrere Seiten mit automatischem Seitenumbruch. \\ microtype & Verändert den Absatzumbruch leicht, um bessere Zeilenumbrüche zu erzeugen; optischer Randausgleich. \\ - multicol & + multicol & Mehrspaltiger Satz mit Kolumnenausgleich. \\ - selinput & + selinput & Deklaration der Zeichenkodierung im Eingabefile. \\ siunitx & Formatierung von Zahlen und physikalischen Einheiten \\ - tabularx & - für Tabellen mit automatisch an den vorhandenen Platz angepasster Breite der + tabularx & + für Tabellen mit automatisch an den vorhandenen Platz angepasster Breite der Spalten. \\ - textcomp & + textcomp & Bindet Schriften mit zusätzlichen Textsymbolen ein. \\ - xcolor & - Unterstützung für Farbausgabe; Beschreibung siehe~\cite{grfguide} + xcolor & + Unterstützung für Farbausgabe; Beschreibung siehe~\cite{grfguide} und~\cite{grfcomp}. \\ \bottomrule @@ -320,23 +320,23 @@ \subsection{Eingabezeichensatz}\label{inputenc} -Bei jedem \LaTeX-System dürfen mindestens die folgenden Zeichen zur Eingabe von +Bei jedem \LaTeX-System dürfen mindestens die folgenden Zeichen zur Eingabe von Text verwendet werden: \begin{quote} \ttfamily a\dots z A\dots Z 0\dots 9 \\ . : ; , ? ! ` ' ( ) [ ] - / * @ + = \end{quote} -Die folgenden Eingabezeichen haben für \LaTeX{} eine Spezialbedeutung oder sind +Die folgenden Eingabezeichen haben für \LaTeX{} eine Spezialbedeutung oder sind nur innerhalb von mathematischen Formeln erlaubt: \begin{quote} \verb.$ & % # _ { } ~ ^ " \ | < >. \end{quote} -Für Zeichen, die über obige Liste hinausgehen, beispielsweise die Umlaute, sind +Für Zeichen, die über obige Liste hinausgehen, beispielsweise die Umlaute, sind unterschiedliche Kodierungen in -Gebrauch. Die Kodierung ist hierbei vom Betriebssystem sowie vom Editor +Gebrauch. Die Kodierung ist hierbei vom Betriebssystem sowie vom Editor abhängig. Um Umlaute direkt zu nutzen ohne auf spezielle Kodierung einzugehen, -bietet sich das Paket \texttt{selinput} an. Es ermittelt während des +bietet sich das Paket \texttt{selinput} an. Es ermittelt während des Kompilierungsvorgangs die verwendete Kodierung. Um dies sicher zu stellen, muss das Paket wie folgt in der Präambel eingebunden werden: \begin{example}[caption={Bestimmung der Kodierung für die Nutzung von Umlauten},] @@ -359,15 +359,15 @@ \end{beispiel} Falls \LaTeX{} ein eingegebenes Zeichen nicht darstellen kann, was meist für die -sogenannten "`Pseudografik-Zeichen"' gilt, bekommt man eine entsprechende -Fehlermeldung. Auch sind manche Zeichen nur im Text, andere nur in +sogenannten "`Pseudografik-Zeichen"' gilt, bekommt man eine entsprechende +Fehlermeldung. Auch sind manche Zeichen nur im Text, andere nur in mathematischen Formeln erlaubt. -Man beachte, dass der in der \emph{Ausgabe} darstellbare Zeichenvorrat von +Man beachte, dass der in der \emph{Ausgabe} darstellbare Zeichenvorrat von \LaTeX{} nicht davon abhängt, welche Zeichen als \emph{Eingabe} erlaubt sind: -Für jedes überhaupt darstellbare Zeichen -- also auch diejenigen, die nicht im -Zeichensatz des jeweiligen Betriebssystems enthalten sind -- gibt es einen -\LaTeX-Befehl oder eine Ersatzdarstellung, die ausschließlich mit ASCII-Zeichen +Für jedes überhaupt darstellbare Zeichen -- also auch diejenigen, die nicht im +Zeichensatz des jeweiligen Betriebssystems enthalten sind -- gibt es einen +\LaTeX-Befehl oder eine Ersatzdarstellung, die ausschließlich mit ASCII-Zeichen auskommt. Näheres darüber erfahren Sie in Abschnitt \ref{spezial}. \endinput diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lshort-german/einleitung.tex new/doc/latex/lshort-german/einleitung.tex --- old/doc/latex/lshort-german/einleitung.tex 2015-06-12 01:05:41.000000000 +0200 +++ new/doc/latex/lshort-german/einleitung.tex 2016-11-25 19:29:25.000000000 +0100 @@ -29,13 +29,13 @@ {\parindent=0cm \LaTeX{} ist ein Satzsystem, das für viele Arten von Schriftstücken verwendet werden kann, von einfachen Briefen bis zu -kompletten Büchern. Besonders geeignet ist es für -wissenschaftliche oder technische Dokumente. \LaTeX{} ist für +kompletten Büchern. Besonders geeignet ist es für +wissenschaftliche oder technische Dokumente. \LaTeX{} ist für praktisch alle verbreiteten Betriebssysteme verfügbar. - + Die vorliegende Kurzbeschreibung bezieht sich auf die Version -\LaTeXe\ in der Fassung vom Juni~2001 und sollte für den -Einstieg in \LaTeX{} ausreichen. +\LaTeXe\ in der Fassung vom Juni~2001 und sollte für den +Einstieg in \LaTeX{} ausreichen. Eine vollständige Beschreibung enthält das \manual{} in Verbindung mit der Online-Dokumentation. } @@ -45,7 +45,7 @@ {\parindent=0cm\thispagestyle{empty} -Copyright \copyright{} 1998--2012 M.~Daniel, P.~Gundlach, W.~Schmidt, J.~Knappen, H.~Partl, I.~Hyna +Autoren: 1998--2016 M.~Daniel, P.~Gundlach, W.~Schmidt, J.~Knappen, H.~Partl, I.~Hyna \bigskip @@ -76,12 +76,12 @@ \bigskip Die Autoren bedanken sich bei -Luzia Dietsche, -Michael Hofmann, +Luzia Dietsche, +Michael Hofmann, Peter Karp, Rolf \mbox{Niepraschk}, Heiko Oberdiek, -Bernd Raichle, +Bernd Raichle, Rainer Schöpf und Stefan Steffens für Tipps, Anmerkungen und Korrekturen. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lshort-german/l2kurz.bib new/doc/latex/lshort-german/l2kurz.bib --- old/doc/latex/lshort-german/l2kurz.bib 2015-06-12 01:05:41.000000000 +0200 +++ new/doc/latex/lshort-german/l2kurz.bib 2016-11-25 19:29:25.000000000 +0100 @@ -4,7 +4,7 @@ @misc{biblatex-de, author = {Philipp Lehman}, title = {Das biblatex Paket}, - note = {Übersetzt von Christine Römer, Bestandteil der Online-Dokumentation + note = {Übersetzt von Christine Römer, Bestandteil der Online-Dokumentation von \LaTeX, Datei \texttt{biblatex-de.pdf}.} } @@ -33,7 +33,7 @@ @MISC{grfguide, author = {D. P. Carlisle}, title = {Packages in the \glqq graphics\grqq{} bundle}, - note = {Bestandteil der Online-Dokumentation von \LaTeX, Datei \texttt{grfguide.ps}.} + note = {Bestandteil der Online-Dokumentation von \LaTeX, Datei \texttt{grfguide.pdf}.} } @MISC{ch8, @@ -126,34 +126,33 @@ @MISC{lay, author = {H. Partl and A. Kielhorn}, title = {Layout-Änderungen mit \LaTeX}, - note = {EDV-Zentrum der Technischen Universität Wien (1996).\\ \url{ftp://dante.ctan.org/tex-archive/macros/latex/^^J - contrib/supported/refman/}} + note = {EDV-Zentrum der Technischen Universität Wien (1996).\\ \url{http://mirrors.ctan.org/macros/latex/contrib/refman/layout_d.pdf}} } @MISC{germdoc, author = {B. Raichle}, title = {Kurzbeschreibung -- \texttt{german.sty}}, - note = {\url{ftp://dante.ctan.org/tex-archive/language/german/gerdoc.tex}} + note = {\url{http://mirrors.ctan.org/language/german/gerdoc.pdf}} } @MISC{faq, author = {Patrick Gundlach}, title = {Fragen und Antworten (FAQ) über das Textsatzsystem \TeX{}}, - note = {\url{http://texfragen.de/}} + note = {\url{https://texfragen.de/}} } @MISC{epslatex, author = {K. Reckdahl}, title = {Using Imported Graphics in \LaTeXe}, year = {1997}, - note = {\url{ftp://dante.ctan.org/tex-archive/info/epslatex.ps}} + note = {\url{http://mirrors.ctan.org/info/epslatex/english/epslatex.pdf}} } @MISC{typografie, author = {A. Reichert}, title = {Typografie -- Gestaltung einer Beispielklasse}, year = {1997}, - note = {\url{ftp://dante.ctan.org/info/german/typografie/}} + note = {\url{https://ctan.org/tex-archive/info/german/typografie/}} } @MISC{postscript, @@ -173,8 +172,8 @@ @MISC{mathmode, author = {Herbert Vo\ss}, - title = {Math mode}, - note = {Bestandteil der Online-Dokumentation von \LaTeX, Datei \texttt{mathmode.pdf}.} + title = {Mathematical Typesetting with \LaTeX}, + note = {Bestandteil der Online-Dokumentation von \LaTeX, Datei \texttt{mathmode.pdf}. Neuste Version unter \url{https://www.tug.org/~hvoss/}.} } @MISC{clsguide, Binary files old/doc/latex/lshort-german/l2kurz.pdf and new/doc/latex/lshort-german/l2kurz.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lshort-german/l2kurz.tex new/doc/latex/lshort-german/l2kurz.tex --- old/doc/latex/lshort-german/l2kurz.tex 2015-06-12 01:05:41.000000000 +0200 +++ new/doc/latex/lshort-german/l2kurz.tex 2016-11-25 19:29:25.000000000 +0100 @@ -4,11 +4,11 @@ % arara: bibtex % arara: pdflatex: {synctex: true} % arara: pdflatex: {synctex: true} -\newcommand{\lkver}{3.0a} % laufende Versionsnummer ... -\newcommand{\lkdate}{9.\ Juni\ 2015} % ... und Datum +\newcommand{\lkver}{3.0b} % laufende Versionsnummer ... +\newcommand{\lkdate}{4.\ November\ 2016} % ... und Datum \typeout{ LaTeX2e-Kurzbeschreibung} -\typeout{ Copyright 2012,2015 Marco Daniel, Patrick Gundlach } +\typeout{ Copyright 2012--2016 Marco Daniel, Patrick Gundlach } \typeout{ Copyright 1998--2003 W.Schmidt, J.Knappen, H.Partl, I.Hyna } \typeout{ Copyright 1994, 1995 J.Knappen, H.Partl, E.Schlegl, I.Hyna } \typeout{ Copyright 1987 H.Partl, E.Schlegl, I.Hyna } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/lshort-german/mathematik.tex new/doc/latex/lshort-german/mathematik.tex --- old/doc/latex/lshort-german/mathematik.tex 2015-06-12 01:05:41.000000000 +0200 +++ new/doc/latex/lshort-german/mathematik.tex 2016-11-25 19:29:25.000000000 +0100 @@ -158,7 +158,7 @@ \end{LTXexample} Die kalligraphischen Buchstaben (\lstinline:\mathcal:) gibt es nur als -Großbuchstaben. Mit dem Paket \texttt{amssymb} \cite{ch8} stehen +Großbuchstaben. Mit dem Paket \texttt{amssymb} \cite{mathmode} stehen auch Alphabete für Mengenzeichen und Frakturschrift zur Verfügung. Lokal können noch weitere installiert sein. @@ -440,7 +440,7 @@ \sin x & = x -\frac{x^{3}}{3!} +\frac{x^{5}}{5!} - {} \nonumber\\ - &\mathrel{\phantom{=}} + &\mathrel{\phantom{=}}\negmedspace{} -\frac{x^{7}}{7!} + \cdots \end{align} \end{LTXexample} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/lshort-german.doc.tlpobj new/tlpkg/tlpobj/lshort-german.doc.tlpobj --- old/tlpkg/tlpobj/lshort-german.doc.tlpobj 2016-04-14 19:18:35.000000000 +0200 +++ new/tlpkg/tlpobj/lshort-german.doc.tlpobj 2017-04-14 17:47:49.000000000 +0200 @@ -1,6 +1,6 @@ name lshort-german.doc category Package -revision 37499 +revision 42434 shortdesc doc files of lshort-german relocated 1 docfiles size=320

1 0

Jump to page: