Hello community,
here is the log from the commit of package texlive-specs-h for openSUSE:Factory checked in at 2017-06-25 19:21:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-h (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-h.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-h"
Sun Jun 25 19:21:50 2017 rev:26 rq:504798 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-h/texlive-specs-h.changes 2017-06-08 14:54:39.409699463 +0200
+++ /work/SRC/openSUSE:Factory/.texlive-specs-h.new/texlive-specs-h.changes 2017-06-25 19:25:25.900311220 +0200
@@ -1,0 +2,42 @@
+Mon Jun 19 13:31:54 UTC 2017 - werner@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@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@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@suse.de
+
+- Update to TeXLive 2017 20170520 pretest
+
+-------------------------------------------------------------------
Old:
----
eqnarray.doc.tar.xz
eqnarray.tar.xz
eqparbox.doc.tar.xz
eqparbox.tar.xz
erdc.doc.tar.xz
erdc.tar.xz
erewhon.doc.tar.xz
erewhon.tar.xz
errata.doc.tar.xz
errata.tar.xz
es-tex-faq.doc.tar.xz
esami.doc.tar.xz
esami.tar.xz
esdiff.doc.tar.xz
esdiff.tar.xz
esint-type1.doc.tar.xz
esint-type1.tar.xz
esint.doc.tar.xz
esint.tar.xz
esk.doc.tar.xz
esk.tar.xz
eskd.doc.tar.xz
eskd.tar.xz
eskdx.doc.tar.xz
eskdx.tar.xz
eso-pic.doc.tar.xz
eso-pic.tar.xz
esrelation.doc.tar.xz
esrelation.tar.xz
esstix.doc.tar.xz
esstix.tar.xz
estcpmm.doc.tar.xz
estcpmm.tar.xz
esvect.doc.tar.xz
esvect.tar.xz
etaremune.doc.tar.xz
etaremune.tar.xz
etdipa.doc.tar.xz
etex-pkg.doc.tar.xz
etex-pkg.tar.xz
etex.doc.tar.xz
etex.tar.xz
etextools.doc.tar.xz
etextools.tar.xz
ethiop-t1.doc.tar.xz
ethiop-t1.tar.xz
ethiop.doc.tar.xz
ethiop.tar.xz
etoc.doc.tar.xz
etoc.tar.xz
etoolbox-de.doc.tar.xz
etoolbox.doc.tar.xz
etoolbox.tar.xz
euenc.doc.tar.xz
euenc.tar.xz
New:
----
dtxdescribe.doc.tar.xz
dtxdescribe.tar.xz
dtxgallery.doc.tar.xz
dtxgallery.source.tar.xz
dtxgen.doc.tar.xz
dtxgen.tar.xz
dtxtut.doc.tar.xz
duerer-latex.doc.tar.xz
duerer-latex.tar.xz
duerer.doc.tar.xz
duerer.tar.xz
duotenzor.doc.tar.xz
duotenzor.tar.xz
dutchcal.doc.tar.xz
dutchcal.tar.xz
dvdcoll.doc.tar.xz
dvdcoll.tar.xz
dvgloss.doc.tar.xz
dvgloss.tar.xz
dviasm.doc.tar.xz
dviasm.tar.xz
dvicopy.doc.tar.xz
dvidvi.doc.tar.xz
dviincl.doc.tar.xz
dviincl.tar.xz
dviinfox.doc.tar.xz
dviinfox.tar.xz
dviljk.doc.tar.xz
dvipdfmx.doc.tar.xz
dvipdfmx.tar.xz
dvipng.doc.tar.xz
dvipos.doc.tar.xz
dvips.doc.tar.xz
dvips.tar.xz
dvips_config.dif
dvipsconfig.tar.xz
dvisvgm.doc.tar.xz
dynamicnumber.doc.tar.xz
dynamicnumber.tar.xz
dynblocks.doc.tar.xz
dynblocks.tar.xz
dyntree.doc.tar.xz
dyntree.tar.xz
e-french.doc.tar.xz
e-french.tar.xz
ean.doc.tar.xz
ean.tar.xz
ean13isbn.doc.tar.xz
ean13isbn.tar.xz
easy.doc.tar.xz
easy.tar.xz
easyformat.doc.tar.xz
easyformat.tar.xz
ecgdraw.doc.tar.xz
ecgdraw.tar.xz
emf.doc.tar.xz
emf.tar.xz
eqnalign.doc.tar.xz
eqnalign.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-h.spec ++++++
++++ 33104 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-h/texlive-specs-h.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-h.new/texlive-specs-h.spec
++++++ dvips_config.dif ++++++
--- texmf-dist/dvips/config/config.ps
+++ texmf-dist/dvips/config/config.ps 2015-03-30 07:16:30.017519469 +0000
@@ -46,7 +46,9 @@ Z0
% Partially download Type 1 fonts by default. Only reason not to do
% this is if you encounter bugs. (Please report them to
% @email{tex-k@tug.org} if you do.)
-j
+% Change for SUSE: The option j *does* trouble if a embedded eps file
+% uses the same font but includes other characters as well (boo#897284).
+j0
% This shows how to add your own map file.
% Remove the comment and adjust the name:
++++++ erewhon.doc.tar.xz -> ean.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/erewhon/FontLog.txt new/doc/fonts/erewhon/FontLog.txt
--- old/doc/fonts/erewhon/FontLog.txt 2014-09-30 02:08:26.000000000 +0200
+++ new/doc/fonts/erewhon/FontLog.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,176 +0,0 @@
-These fonts are based on Utopia font which was released by Adobe for TeX
-users group with following license:
-
-Adobe Systems Incorporated ("Adobe") hereby grants to the TeX Users
-Group and its members a nonexclusive, royalty-free, perpetual license to
-the typeface software for the Utopia Regular, Utopia Italic, Utopia Bold
-and Utopia bold Italic typefaces, including Adobe Type 1 font programs
-for each style (collectively, the "Software") as set forth below.
-
-Adobe grants the TeX Users Group a license under its copyrights, to use,
-reproduce, display and distribute the Software for any purpose and
-without fee provided that the following copyright notice appears in all
-whole and partial copies of the Software and provided that the following
-trademark symbol and attribution appear in all unmodified copies of the
-Software:
-
-Copyright 1989, 1991 Adobe Systems Incorporated. All rights reserved.
-(alternatively, @1989, 1991 Adobe Systems Incorporated. All rights reserved.)
-Utopia(R)
-Utopia is either a registered trademark or trademark of Adobe Systems
-Incorporated in the United States and/or other countries. Used under
-license.
-
-Adobe also grants to the TeX Users Group a license to modify the
-Software for any purpose and redistribute such modifications, for any
-purpose and royalty-free, provided that the modified Software shall not
-use the font name(s) or trademark(s), in whole or in part, unless
-explicit written permission is granted by Adobe. This restriction
-applies to all references stored in the Software for identification
-purposes, such as the font menu name and other font description
-fields. The TeX Users Group is also permitted to sublicense, and grant
-such sublicensees the right to further sublicense, any or all the
-foregoing rights through multiple tiers of distribution. The licenses
-granted herein are granted in perpetuity and may not be terminated by
-either party unless such termination is based on a breach of the terms
-and conditions herein stated.
-
-Adobe retains ownership of the copyright in the Software. The TeX Users
-Group agrees that Adobe and its suppliers are the sole and exclusive
-owners of all rights, title and interest, including all copyrights,
-patents, trademarks, trade names, trade secrets and other intellectual
-property rights in the Software. No title or ownership of the Software,
-any copies of the Software, or the patent, copyright, trade secret,
-trademark, trade name or other proprietary rights contained in the
-Software is transferred to the TeX Users Group.
-
-The Adobe trademarks shall not be used in advertising pertaining to the
-distribution of the Software without express prior permission from
-Adobe. Any such use shall be in accordance with the Adobe trademark
-guidelines, available on the Adobe website at
-http://www.adobe.com/misc/pdfs/TM GuideforThirdPartiesFinal.pdf.
-If any portion of the Software is changed, it cannot be marketed under
-Adobe's trademarks unless Adobe, in its sole discretion, approves by a
-prior writing the quality of the resulting implementation.
-
-The TeX Users Group shall have the right to evaluate the Software
-provided by Adobe.
-
-Then the TeX Users Group (TUG) gave all such rights, irrevocably and in
-perpetuity, to any and all interested parties.
-
-Heuristica fonts contains glyphs from Vntopia font family,
-http://vntex.sf.net which was released by Han The Thanh on 2006
-according to the conditions of the Adobe/TUG license agreement.
-
-Build and install instructions
-==============================
-
-You need fontforge (http://fontforge.sourceforge.net/), xgridfit
-(http://xgridfit.sourceforge.net/) and font-helpers
-(http://code.google.com/p/font-helpers/ ) in order to build the fonts from
-the sources. Also you should have GNU make and coreutils. At first you
-must unpack/copy files from font-helpers into the directory where the *.sfd
-files are located. Then type
-
-make
-
-and the truetype fonts will be produced. On systems with X.Org you may do
-
-make install
-
-as root to install the fonts system-wide (/usr/share/fonts/TTF). Otherwise
-copy the *.ttf files into ~/.fonts/ directory. Then run fc-cache if you have
-fontconfig.
-
-ChangeLog
----------
-
-2014-09-06 Michael Sharpe
- Because of many changes to heuristica glyphs and metrics, renamed package to Erewhon.
-
-2014-04-15 Michael Sharpe
- Added lnum and sups tables to otf file for better processing by autoinst.
- Added hints to a number of glyphs that lacked them.
-
-2012-03-06 Andrey V. Panov
- Added more smallcaps.
- Added substitutions for the Ewe language.
- Added several extended Latin characters.
- Added ligatures with "esh".
- Version 1.0.1 is released.
-
-2011-12-28 Andrey V. Panov
- Added panose values.
- Changed Win and HHead OS/2 metrics.
- Added more ligatures with "f" and "longs".
- Added "beta", "gamma", "lambda", "theta", "chi" to Regular;
- Version 1.0 is released.
-
-2011-02-15 Andrey V. Panov
- Added subscript, superscript and tabular oldstyle figures.
- Added more vulgar fractions.
- Added several extended Latin and Cyrillic characters.
- Version 0.4 is released.
-
-2010-10-28 Andrey V. Panov
- Added small capitals (basic Latin and Cyrillic) in Regular.
- Added more phonetic characters to Regular.
- Version 0.3 is released.
-
-2010-06-09 Andrey V. Panov
- Added several characters mostly for support of Polish and Romanian.
- Version 0.2.2 is released.
-
-2010-02-15 Andrey V. Panov
- Tuned some kerning pairs in Cyrillic.
- Added U+211F, U+2123.
- Added LaTeX support.
- Manually instructed "g" in Regular.
- Version 0.2.1 is released.
-
-2009-08-09 Andrey V. Panov
- Version 0.2 is released.
-
-2009-08-08 Andrey V. Panov
- Added Cyrillic letters to support modern Abkhazian alphabet.
- Added "Euro".
-
-2009-08-07 Andrey V. Panov
- Added kerning to Cyrillic.
-
-2009-07-08 Andrey V. Panov
- Added old style kerning ('kern' table).
-
-2009-03-21 Andrey V. Panov
-
- Some elements of truetype control value table are now modified
- with xgridfit. So build process requires ttx from fontutils and
- xgridfit.
-
-2009-03-11 Andrey V. Panov
-
- Merged glyphs from Vntopia fonts of Han The Thanh with modifications for
- more condensed accents.
- Added U+494, U+495, U+4C7, U+4C8, U+512, U+513.
- Added several IPA charters to Regular.
- Updated scripts for producing fonts.
-
-2009-01-25 Andrey V. Panov
-
- Fixed spacing of generated rotated glyphs in italic fonts.
- Added longs, u+268, esh, several extended Cyrillic letters.
-
-2008-12-24 Andrey V. Panov
-
- Added more accents.
-
-2008-12-07 Andrey V. Panov
-
- Added capital variants for "ring", "tilde". Generating script now builds
- a lot of accented Latin and Cyrillic glyphs and several IPA rotated
- symbols.
-
-2008-11-25 Andrey V. Panov
-
- The first beta version (0.1) is released.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/erewhon/OFL-FAQ.txt new/doc/fonts/erewhon/OFL-FAQ.txt
--- old/doc/fonts/erewhon/OFL-FAQ.txt 2014-09-30 02:08:26.000000000 +0200
+++ new/doc/fonts/erewhon/OFL-FAQ.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,369 +0,0 @@
-OFL FAQ - Frequently Asked Questions about the SIL Open Font License (OFL)
-Version 1.1-update2 - 23 August 2010
-(See http://scripts.sil.org/OFL for updates)
-
-
-CONTENTS OF THIS FAQ
-1 USING AND DISTRIBUTING FONTS LICENSED UNDER THE OFL
-2 USING OFL FONTS FOR WEB PAGES AND ONLINE WEBFONT SERVICES
-3 MODIFYING OFL-LICENSED FONTS
-4 LICENSING YOUR ORIGINAL FONTS UNDER THE OFL
-5 CHOOSING RESERVED FONT NAMES
-6 ABOUT THE FONTLOG
-7 MAKING CONTRIBUTIONS TO OFL PROJECTS
-8 ABOUT THE LICENSE ITSELF
-9 ABOUT SIL INTERNATIONAL
-APPENDIX A - FONTLOG EXAMPLE
-
-
-1 USING AND DISTRIBUTING FONTS LICENSED UNDER THE OFL
-
-1.1 Can I use the fonts for a book or other print publication?
-Yes. You can mention the font and author in the book's colophon if you wish, but that is not required.
-
-1.2 Can the fonts be included with Free/Libre and Open Source Software collections such as GNU/Linux and BSD distributions?
-Yes! Fonts licensed under the OFL can be freely included alongside other software under FLOSS (Free/Libre and Open Source Software) licenses. Since fonts are typically aggregated with, not merged into, existing software, there is little need to be concerned about incompatibility with existing software licenses. You may also repackage the fonts and the accompanying components in a .rpm or .deb package and include them in distribution CD/DVDs and online repositories. (Also see section 5.9 about rebuilding from source.)
-
-1.3 I want to distribute the fonts with my program. Does this mean my program also has to be Free/Libre and Open Source Software?
-No. Only the portions based on the Font Software are required to be released under the OFL. The intent of the license is to allow aggregation or bundling with software under restricted licensing as well.
-
-1.4 Can I sell a software package that includes these fonts?
-Yes, you can do this with both the Original Version and a Modified Version of the fonts. Examples of bundling made possible by the OFL would include: word processors, design and publishing applications, training and educational software, games and entertainment software, mobile device applications, etc.
-
-1.5 Can I include the fonts on a CD of freeware or commercial fonts?
-Yes, as long some other font or software is also on the disk, so the OFL font is not sold by itself.
-
-1.6 Why won't the OFL let me sell the fonts alone?
-The intent is to keep people from making money by simply redistributing the fonts. The only people who ought to profit directly from the fonts should be the original authors, and those authors have kindly given up potential direct income to distribute their fonts under the OFL. Please honour and respect their contribution!
-
-1.7 What about sharing OFL fonts with friends on a CD, DVD or USB stick?
-You are very welcome to share open fonts with friends, family and colleagues through removable media. Just remember to include the full font package, including any copyright notices and licensing information as available in OFL.txt. In the case where you sell the font, it has to come bundled with software.
-
-1.8 Can I host the fonts on a web site for others to use?
-Yes, as long as you make the full font package available. In most cases it may be best to point users to the main site that distributes the Original Version so they always get the most recent stable and complete version. See also discussion of webfonts in Section 2.
-
-1.9 Can I host the fonts on a server for use over our internal network?
-Yes. If the fonts are transferred from the server to the client computer by means that allow them to be used even if the computer is no longer attached to the network, the full package (copyright notices, licensing information, etc.) should be included.
-
-1.10 Does the full OFL license text always need to accompany the font?
-The only situation in which an OFL font can be distributed without the text of the OFL (either in a separate file or in font metadata), is when a font is embedded in a document or bundled within a program. In the case of metadata included within a font, it is legally sufficient to include only a link to the text of the OFL on http://scripts.sil.org/OFL, but we strongly recommend against this. Most modern font formats include metadata fields that will accept the full OFL text, and full inclusion increases the likelihood that users will understand and properly apply the license.
-
-1.11 What do you mean by 'embedding'? How does that differ from other means of distribution?
-By 'embedding' we mean inclusion of the font in a document or file in a way that makes extraction (and redistribution) difficult or clearly discouraged. In many cases the names of embedded fonts might also not be obvious to those reading the document, the font data format might be altered, and only a subset of the font - only the glyphs required for the text - might be included. Any other means of delivering a font to another person is considered 'distribution', and needs to be accompanied by any copyright notices and licensing information available in OFL.txt.
-
-1.12 So can I embed OFL fonts in my document?
-Yes, either in full or a subset. The restrictions regarding font modification and redistribution do not apply, as the font is not intended for use outside the document.
-
-1.13 Does embedding alter the license of the document itself?
-No. Referencing or embedding an OFL font in any document does not change the license of the document itself. The requirement for fonts to remain under the OFL does not apply to any document created using the fonts and their derivatives. Similarly, creating any kind of graphic using a font under OFL does not make the resulting artwork subject to the OFL.
-
-1.14 If OFL fonts are extracted from a document in which they are embedded (such as a PDF file), what can be done with them? Is this a risk to author(s)?
-The few utilities that can extract fonts embedded in a PDF will typically output limited amounts of outlines - not a complete font. To create a working font from this method is much more difficult and time consuming than finding the source of the original OFL font. So there is little chance that an OFL font would be extracted and redistributed inappropriately through this method. Even so, copyright laws address any misrepresentation of authorship. All Font Software released under the OFL and marked as such by the author(s) is intended to remain under this license regardless of the distribution method, and cannot be redistributed under any other license. We strongly discourage any font extraction - we recommend directly using the font sources instead - but if you extract font outlines from a document, please be considerate: use your common sense and respect the work of the author(s) and the licensing model.
-
-1.15 What about distributing fonts with a document? Within a compressed folder structure? Is it distribution, bundling or embedding?
-Certain document formats may allow the inclusion of an unmodified font within their file structure which consists of a compressed folder containing the various resources forming the document (such as pictures and thumbnails). Including fonts within such a structure is understood as being different from embedding but rather similar to bundling (or mere aggregation) which the license explicitly allows. In this case the font is conveyed unchanged whereas embedding a font usually transforms it from the original format. The OFL does not allow anyone to extract the font from such a structure to then redistribute it under another license. The explicit permission to redistribute and embed does not cancel the requirement for the Font Software to remain under the license chosen by its author(s).
-
-1.16 What about ebooks shipping with open fonts?
-The requirements differ depending on whether the fonts are linked, embedded or distributed (bundled or aggregated). Some ebook formats use web technologies to do font linking via @font-face, others are designed for font embedding, some use fonts distributed with the document or reading software, and a few rely solely on the fonts already present on the target system. The license requirements depend on the type of inclusion as discussed in 1.15.
-
-1.17 Can Font Software released under the OFL be subject to URL-based access restrictions methods or DRM (Digital Rights Management) mechanisms?
-Yes, but these issues are out-of-scope for the OFL. The license itself neither encourages their use nor prohibits them since such mechanisms are not implemented in the components of the Font Software but through external software. Such restrictions are put in place for many different purposes corresponding to various usage scenarios. One common example is to limit potentially dangerous cross-site scripting attacks. However, in the spirit of libre/open fonts and unrestricted writing systems, we strongly encourage open sharing and reuse of OFL fonts, and the establishment of an environment where such restrictions are unnecessary. Note that whether you wish to use such mechanisms or you prefer not to, you must still abide by the rules set forth by the OFL when using fonts released by their authors under this license. Derivative fonts must be licensed under the OFL, even if they are part of a service for which you charge fees and/or for which access to source code is restricted. You may not sell the fonts on their own - they must be part of a larger software package, bundle or subscription plan. For example, even if the OFL font is distributed in a software package or via an online service using a DRM mechanism, the user would still have the right to extract that font, use, study, modify and redistribute it under the OFL.
-
-1.18 I've come across a font released under the OFL. How can I easily get more information about the Original Version? How can I know where it stands compared to the Original Version or other Modified Versions?
-Consult the copyright statement(s) in the license for ways to contact the original authors. Consult the FONTLOG for information on how the font differs from the Original Version, and get in touch with the various contributors via the information in the acknowledgement section. Please consider using the Original Versions of the fonts whenever possible.
-
-1.19 What do you mean in condition 4? Can you provide examples of abusive promotion / endorsement / advertisement vs. normal acknowledgement?
-The intent is that the goodwill and reputation of the author(s) should not be used in a way that makes it sound like the original author(s) endorse or approve of a specific Modified Version or software bundle. For example, it would not be right to advertise a word processor by naming the author(s) in a listing of software features, or to promote a Modified Version on a web site by saying "designed by ...". However, it would be appropriate to acknowledge the author(s) if your software package has a list of people who deserve thanks. We realize that this can seem to be a grey area, but the standard used to judge an acknowledgement is that if the acknowledgement benefits the author(s) it is allowed, but if it primarily benefits other parties, or could reflect poorly on the author(s), then it is not.
-
-
-2 USING OFL FONTS FOR WEBPAGES AND ONLINE WEBFONT SERVICES
-
-2.1 Can I make webpages using these fonts?
-Yes! Go ahead! Using CSS (Cascading Style Sheets) is recommended. Your three best options:
-- referring directly in your stylesheet to open fonts which may be available on the user's system
-- providing links to download the full package of the font - either from your own website or from elsewhere - so users can install it themselves
-- using @font-face to distribute the font directly to browsers. This is recommended and explicitly allowed by the licensing model because it is distribution. The font file itself is distributed with other components of the webpage. It is not embedded in the webpage but referenced through a web address which will cause the browser to retrieve and use the corresponding font to render the webpage (see 1.11 and 1.15 for details related to embedding fonts into documents). As you take advantage of the @font-face cross-platform standard, be aware that webfonts are often tuned for a web environment and not intended for installation and use outside a browser. The reasons in favour of using webfonts are to allow design of dynamic text elements instead of static graphics, to make it easier for content to be localized and translated, indexed and searched, and all this with cross-platform open standards without depending on restricted extensions or plugins. You should check the CSS cascade (the order in which fonts are being called or delivered to your users) when testing.
-
-2.2 Can I make and use WOFF (Web Open Font Format) versions of OFL fonts?
-Yes, but you need to be careful. A change in font format normally is considered modification, and Reserved Font Names (RFNs) cannot be used. Because of the design of the WOFF format, however, it is possible to create a WOFF version that is not considered modification, and so would not require a name change. You are allowed to create, use and distribute a WOFF version of an OFL font without changing the font name, but only if:
-
-- the original font data remains unchanged except for WOFF compression, and
-- WOFF-specific metadata is either omitted altogether or present and includes, unaltered, the contents of all equivalent metadata in the original font.
-
-If the original font data or metadata is changed, or the WOFF-specific metadata is incomplete, the font must be considered a Modified Version, the OFL restrictions would apply and the name of the font must be changed: any RFNs cannot be used and copyright notices and licensing information must be included and cannot be deleted or modified. You must come up with a unique name - we recommend one corresponding to your domain or your particular web application. Be aware that only the original author(s) can use RFNs. This is to prevent collisions between a derivative tuned to your audience and the original upstream version and so to reduce confusion.
-
-Please note that most WOFF conversion tools and online services do not meet the two requirements listed above, and so their output must be considered a Modified Version. So be very careful and check to be sure that the tool or service you're using is compressing unchanged data and completely and accurately reflecting the original font metadata.
-
-2.3 What about other webfont formats such as EOT/EOTLite/CWT/etc.?
-In most cases these formats alter the original font data more than WOFF, and do not completely support appropriate metadata, so their use must be considered modification and RFNs may not be used.
-
-2.4 Can I make OFL fonts available through webfont online services?
-Yes, you are welcome to include OFL fonts in online webfont services as long as you properly meet all the conditions of the license. The origin and open status of the font should be clear among the other fonts you are hosting. Authorship, copyright notices and license information must be sufficiently visible to your users or subscribers so they know where the font comes from and the rights granted by the author(s). Make sure the font file contains the needed copyright notice(s) and licensing information in its metadata. Please double-check the accuracy of every field to prevent contradictory information. Other font formats, including EOT/EOTLite/CWT and superior alternatives like WOFF, already provide fields for this information. Remember that if you modify the font within your library or convert it to another format for any reason the OFL restrictions apply and you need to change the names accordingly. Please respect the author's wishes as expressed in the OFL and do not misrepresent original designers and their work. Don't lump quality open fonts together with dubious freeware or public domain fonts. Consider how you can best work with the original designers and foundries, support their efforts and generate goodwill that will benefit your service. (See 1.17 for details related to URL-based access restrictions methods or DRM mechanisms).
-
-2.5 Can I make and publish CMS themes or templates that use OFL fonts? Can I include the fonts themselves in the themes or templates? Can I sell the whole package?
-Yes, you are very welcome to integrate open fonts into themes and templates for your preferred CMS and make them more widely available. Be aware that you can only sell the fonts and your CMS add-on as part of a software bundle. (See 1.4 for details and examples about selling bundles).
-
-2.6 Some webfont formats and services provide ways of "optimising" the font for a particular website or web application; is that allowed?
-Yes, it is permitted, but remember that these optimised versions are Modified Versions and so must follow OFL requirements like appropriate renaming. Also you need to bear in mind the other important parameters beyond compression, speed and responsiveness: you need to consider the audience of your particular website or web application, as choosing some optimisation parameters may turn out to be less than ideal for them. Subsetting by removing certain glyphs or features may seriously limit functionality of the font in various languages used by your users. It may also introduce degradation of quality in the rendering or specific bugs on the various platforms compared to the original font. In other words, remember that one person's optimised font may be another person's missing feature. Various advanced typographic features are also available through CSS and may provide the desired effects without the need to modify the font.
-
-
-3 MODIFYING OFL-LICENSED FONTS
-
-3.1 Can I change the fonts? Are there any limitations to what things I can and cannot change?
-You are allowed to change anything, as long as such changes do not violate the terms of the license. In other words, you are not allowed to remove the copyright statement(s) from the font, but you could put additional information into it that covers your contribution.
-
-3.2 I have a font that needs a few extra glyphs - can I take them from an OFL licensed font and copy them into mine?
-Yes, but if you distribute that font to others it must be under the OFL, and include the information mentioned in condition 2 of the license.
-
-3.3 Can I charge people for my additional work? In other words, if I add a bunch of special glyphs and/or OpenType/Graphite code, can I sell the enhanced font?
-Not by itself. Derivative fonts must be released under the OFL and cannot be sold by themselves. It is permitted, however, to include them in a larger software package (such as text editors, office suites or operating systems), even if the larger package is sold. In that case, you are strongly encouraged, but not required, to also make that derived font easily and freely available outside of the larger package.
-
-3.4 Can I pay someone to enhance the fonts for my use and distribution?
-Yes. This is a good way to fund the further development of the fonts. Keep in mind, however, that if the font is distributed to others it must be under the OFL. You won't be able to recover your investment by exclusively selling the font, but you will be making a valuable contribution to the community. Please remember how you have benefited from the contributions of others.
-
-3.5 I need to make substantial revisions to the font to make it work with my program. It will be a lot of work, and a big investment, and I want to be sure that it can only be distributed with my program. Can I restrict its use?
-No. If you redistribute a Modified Version of the font it must be under the OFL. You may not restrict it in any way beyond what the OFL permits and requires. This is intended to ensure that all released improvements to the fonts become available to everyone. But you will likely get an edge over competitors by being the first to distribute a bundle with the enhancements. Again, please remember how you have benefited from the contributions of others.
-
-3.6 Do I have to make any derivative fonts (including extended source files, build scripts, documentation, etc.) publicly available?
-No, but please consider sharing your improvements with others. You may find that you receive in return more than what you gave.
-
-3.7 If a trademark is claimed in the OFL font, does that trademark need to remain in modified fonts?
-Yes, any trademark notices must remain in any derivative fonts to respect trademark laws, but you may add any additional trademarks you claim, officially registered or not. For example if an OFL font called "Foo" contains a notice that "Foo is a trademark of Acme", then if you rename the font to "Bar" when creating a Modified Version, the new trademark notice could say "Foo is a trademark of Acme Inc. - Bar is a trademark of Roadrunner Technologies Ltd.". Trademarks work alongside the OFL and are not subject to the terms of the licensing agreement. Please refer to the appropriate trademark laws.
-
-
-4 LICENSING YOUR ORIGINAL FONTS UNDER THE OFL
-
-4.1 Can I use the SIL OFL for my own fonts?
-Yes! We heartily encourage everyone to use the OFL to distribute their own original fonts. It is a carefully constructed license that allows great freedom along with enough artistic integrity protection for the work of the authors as well as clear rules for other contributors and those who redistribute the fonts. The licensing model is used successfully by various organisations, both for-profit and not-for-profit, to release fonts of varying levels of scope and complexity.
-
-4.2 What do I have to do to apply the OFL to my font?
-If you want to release your fonts under the OFL, we recommend you do the following:
-
-4.2.1 Put your copyright and Reserved Font Names information at the beginning of the main OFL.txt file in place of the dedicated placeholders. Include this file in your release package.
-
-4.2.2 Put your copyright and the OFL text with Reserved Font Names into your font files (the copyright and license fields). A link to the OFL text on the OFL web site is an acceptable (but not recommended) alternative. Also add this information to any other components (build scripts, glyph databases, documentation, test files, etc). Depending on the format of your fonts and sources, you can use template human-readable headers or machine-readable metadata.
-
-4.2.3 Write an initial FONTLOG.txt for your font and include it in the release package.
-
-4.2.4 Include the relevant practical documentation on the license by including the OFL-FAQ.txt in your package.
-
-4.3 Will you make my font OFL for me?
-We won't do the work for you. We can, however, try to answer your questions, unfortunately we do not have the resources to review and check your font packages for correct use of the OFL.
-
-4.4 Will you distribute my OFL font for me?
-No, although if the font is of sufficient quality and general interest we may include a link to it on our partial list of OFL fonts on the OFL web site. You may wish to consider other open font catalogs or hosting services, such as the Unifont Font Guide (http://unifont.org/fontguide), The League of Movable Type (http://theleagueofmovabletype.com), Kernest (http://kernest.com/) or the Open Font Library (http://openfontlibrary.org/), which despite the name has no direct relationship to the OFL or SIL. We do not endorse any particular catalog or hosting service - it is your responsibility to determine if the service is right for you.
-
-4.5 Why should I use the OFL for my fonts?
-- to meet needs for fonts that can be modified to support minority languages
-- to provide a legal and clear way for people to respect your work but still use it (and reduce piracy)
-- to involve others in your font project
-- to enable your fonts to be expanded with new weights and improved writing system/language support
-- to allow more technical font developers to add features to your design (such as OpenType and Graphite support)
-- to renew the life of an old font lying on your hard drive with no business model
-- to allow your font to be included in Libre Software operating systems like Ubuntu
-- to give your font world status and wide, unrestricted distribution
-- to educate students about quality typeface and font design
-- to expand your test base and get more useful feedback
-- to extend your reach to new markets when users see your metadata and go to your website
-- to get your font more easily into one of the webfont online services
-- to attract attention for your commercial fonts
-- to make money through webfont services
-- to make money by bundling fonts with applications
-- to make money adjusting and extending existing open fonts
-- to get a better chance that foundations/NGOs/charities/companies who commission fonts will pick you
-- to be part of a sharing design and development community
-- to give back and contribute to a growing body of font sources
-
-
-5 CHOOSING RESERVED FONT NAMES
-
-5.1 What are Reserved Font Names?
-These are font names, or portions of font names, that the author has chosen to reserve for use only with the Original Version of the font, or for Modified Version(s) created by the original author.
-
-5.2 Why can't I use the Reserved Font Names in my derivative font names? I'd like people to know where the design came from.
-The best way to acknowledge the source of the design is to thank the original authors and any other contributors in the files that are distributed with your revised font (although no acknowledgement is required). The FONTLOG is a natural place to do this. Reserved Font Names ensure that the only fonts that have the original names are the unmodified Original Versions. This allows designers to maintain artistic integrity while allowing collaboration to happen. It eliminates potential confusion and name conflicts. When choosing a name, be creative and avoid names that reuse almost all the same letters in the same order or sound like the original. It will help everyone if Original Versions and Modified Versions can easily be distinguished from one another and from other derivatives. Any substitution and matching mechanism is outside the scope of the license.
-
-5.3 What do you mean by "primary name as presented to the user"? Are you referring to the font menu name?
-Yes, this applies to the font menu name and other mechanisms that specify a font in a document. It would be fine, however, to keep a text reference to the original fonts in the description field, in your modified source file or in documentation provided alongside your derivative as long as no one could be confused that your modified source is the original. But you cannot use the Reserved Font Names in any way to identify the font to the user (unless the Copyright Holder(s) allow(s) it through a separate agreement). Users who install derivatives (Modified Versions) on their systems should not see any of the original Reserved Font Names in their font menus, for example. Again, this is to ensure that users are not confused and do not mistake one font for another and so expect features only another derivative or the Original Version can actually offer.
-
-5.4 Am I not allowed to use any part of the Reserved Font Names?
-You may not use individual words from the Reserved Font Names, but you would be allowed to use parts of words, as long as you do not use any word from the Reserved Font Names entirely. We do not recommend using parts of words because of potential confusion, but it is allowed. For example, if "Foobar" was a Reserved Font Name, you would be allowed to use "Foo" or "bar", although we would not recommend it. Such an unfortunate choice would confuse the users of your fonts as well as make it harder for other designers to contribute.
-
-5.5 So what should I, as an author, identify as Reserved Font Names?
-Original authors are encouraged to name their fonts using clear, distinct names, and only declare the unique parts of the name as Reserved Font Names. For example, the author of a font called "Foobar Sans" would declare "Foobar" as a Reserved Font Name, but not "Sans", as that is a common typographical term, and may be a useful word to use in a derivative font name. Reserved Font Names should also be single words. A font called "Flowing River" should have Reserved Font Names "Flowing" and "River", not "Flowing River". You also need to be very careful about reserving font names which are already linked to trademarks (whether registered or not) which you do not own.
-
-5.6 Do I, as an author, have to identify any Reserved Font Names?
-No, but we strongly encourage you to do so. This is to avoid confusion between your work and Modified Versions.
-
-5.7 Are any names (such as the main font name) reserved by default?
-No. That is a change to the license as of version 1.1. If you want any names to be Reserved Font Names, they must be specified after the copyright statement(s).
-
-5.8 Is there any situation in which I can use Reserved Font Names for a Modified Version?
-The Copyright Holder(s) can give certain trusted parties the right to use any of the Reserved Font Names through separate written agreements. For example, even if "Foobar" is a RFN, you could write up an agreement to give company "XYZ" the right to distribute a modified version with a name that includes "Foobar". This allows for freedom without confusion.
-
-5.9 Do font rebuilds require a name change? Do I have to change the name of the font when my packaging workflow includes a full rebuild from source?
-Yes, all rebuilds which change the font data and the smart code are Modified Versions and the requirements of the OFL apply: you need to respect what the Author(s) have chosen in terms of Reserved Font Names. However if a package (or installer) is simply a wrapper or a compressed structure around the final font - leaving them intact on the inside - then no name change is required. Please get in touch with the author(s) and copyright holder(s) to inquire about the presence of font sources beyond the final font file(s) and the recommended build path. That build path may very well be non-trivial and hard to reproduce accurately by the maintainer. If a full font build path is made available by the upstream author(s) please be aware that any regressions and changes you may introduce when doing a rebuild for packaging purposes is your responsibility as a package maintainer since you are effectively creating a separate branch. You should make it very clear to your users that your rebuilt version is not the canonical one from upstream.
-
-5.10 Can I add other Reserved Font Names when making a derivative font?
-Yes. List your additional Reserved Font Names after your additional copyright statement, as indicated with example placeholders at the top of the OFL.txt file. Be sure you do not remove any exiting RFNs but only add your own.
-
-
-6 ABOUT THE FONTLOG
-
-6.1 What is this FONTLOG thing exactly?
-It has three purposes: 1) to provide basic information on the font to users and other developers, 2) to document changes that have been made to the font or accompanying files, either by the original authors or others, and 3) to provide a place to acknowledge authors and other contributors. Please use it!
-
-6.2 Is the FONTLOG required?
-It is not a requirement of the license, but we strongly recommend you have one.
-
-6.3 Am I required to update the FONTLOG when making Modified Versions?
-No, but users, designers and other developers might get very frustrated with you if you don't. People need to know how derivative fonts differ from the original, and how to take advantage of the changes, or build on them. There are utilities that can help create and maintain a FONTLOG, such as the FONTLOG support in FontForge.
-
-6.4 What should the FONTLOG look like?
-It is typically a separate text file (FONTLOG.txt), but can take other formats. It commonly includes these four sections:
-
-- brief header describing the FONTLOG itself and name of the font family
-- Basic Font Information - description of the font family, purpose and breadth
-- ChangeLog - chronological listing of changes
-- Acknowledgements - list of authors and contributors with contact information
-
-It could also include other sections, such as: where to find documentation, how to make contributions, information on contributing organizations, source code details, and a short design guide. See Appendix A for an example FONTLOG.
-
-
-7 MAKING CONTRIBUTIONS TO OFL PROJECTS
-
-7.1 Can I contribute work to OFL projects?
-In many cases, yes. It is common for OFL fonts to be developed by a team of people who welcome contributions from the wider community. Contact the original authors for specific information on how to participate in their projects.
-
-7.2 Why should I contribute my changes back to the original authors?
-It would benefit many people if you contributed back in response to what you've received. Your contributions and improvements to the fonts and other components could be a tremendous help and would encourage others to contribute as well and 'give back'. You will then benefit from other people's contributions as well. Sometimes maintaining your own separate version takes more effort than merging back with the original. Be aware that any contributions, however, must be either your own original creation or work that you own, and you may be asked to affirm that clearly when you contribute.
-
-7.3 I've made some very nice improvements to the font. Will you consider adopting them and putting them into future Original Versions?
-Most authors would be very happy to receive such contributions. Keep in mind that it is unlikely that they would want to incorporate major changes that would require additional work on their end. Any contributions would likely need to be made for all the fonts in a family and match the overall design and style. Authors are encouraged to include a guide to the design with the fonts. It would also help to have contributions submitted as patches or clearly marked changes - the use of smart source revision control systems like subversion, svk, mercurial, git or bzr is a good idea. Please follow the recommendations given by the author(s) in terms of preferred source formats and configuration parameters for sending contributions. If this is not indicated in a FONTLOG or other documentation of the font, consider asking them directly. Examples of useful contributions are bug fixes, additional glyphs, stylistic alternates (and the smart font code to access them) or improved hinting. Keep in mind that some kinds of changes (esp. hinting) may be technically difficult to integrate.
-
-7.4 How can I financially support the development of OFL fonts?
-It is likely that most authors of OFL fonts would accept financial contributions - contact them for instructions on how to do this. Such contributions would support future development. You can also pay for others to enhance the fonts and contribute the results back to the original authors for inclusion in the Original Version.
-
-
-8 ABOUT THE LICENSE ITSELF
-
-8.1 I see that this is version 1.1 of the license. Will there be later changes?
-Version 1.1 is the first minor revision of the OFL. We are confident that version 1.1 will meet most needs, but are open to future improvements. Any revisions would be for future font releases, and previously existing licenses would remain in effect. No retroactive changes are possible, although the Copyright Holder(s) can re-release the font under a revised OFL. All versions will be available on our web site: http://scripts.sil.org/OFL.
-
-8.2 Does this license restrict the rights of the Copyright Holder(s)?
-No. The Copyright Holder(s) still retain(s) all the rights to their creation; they are only releasing a portion of it for use in a specific way. For example, the Copyright Holder(s) may choose to release a 'basic' version of their font under the OFL, but sell a restricted 'enhanced' version. Only the Copyright Holder(s) can do this.
-
-8.3 Is the OFL a contract or a license?
-The OFL is a license and not a contract and so does not require you to sign it to have legal validity. By using, modifying and redistributing components under the OFL you indicate that you accept the license.
-
-8.4 I really like the terms of the OFL, but want to change it a little. Am I allowed to take ideas and actual wording from the OFL and put them into my own custom license for distributing my fonts?
-We strongly recommend against creating your very own unique open licensing model. Using a modified or derivative license will likely cut you off - along with the font(s) under that license - from the community of designers using the OFL, potentially expose you and your users to legal liabilities, and possibly put your work and rights at risk. The OFL went though a community and legal review process that took years of effort, and that review is only applicable to an unmodified OFL. The text of the OFL has been written by SIL (with review and consultation from the community) and is copyright (c) 2005-2010 SIL International. You may re-use the ideas and wording (in part, not in whole) in another non-proprietary license provided that you call your license by another unambiguous name, that you do not use the preamble, that you do not mention SIL and that you clearly present your license as different from the OFL so as not to cause confusion by being too similar to the original. If you feel the OFL does not meet your needs for an open license, please contact us.
-
-8.5 Can I translate the license and the FAQ into other languages?
-SIL certainly recognises the need for people who are not familiar with English to be able to understand the OFL and its use. Making the license very clear and readable has been a key goal for the OFL, but we know that people understand their own language best.
-
-If you are an experienced translator, you are very welcome to translate the OFL and OFL-FAQ so that designers and users in your language community can understand the license better. But only the original English version of the license has legal value and has been approved by the community. Translations do not count as legal substitutes and should only serve as a way to explain the original license. SIL - as the author and steward of the license for the community at large - does not approve any translation of the OFL as legally valid because even small translation ambiguities could be abused and create problems.
-
-SIL gives permission to publish unofficial translations into other languages provided that they comply with the following guidelines:
-
-- Put the following disclaimer in both English and the target language stating clearly that the translation is unofficial:
-
-"This is an unofficial translation of the SIL Open Font License into . It was not published by SIL International, and does not legally state the distribution terms for fonts that use the OFL. A release under the OFL is only valid when using the original English text. However, we recognize that this unofficial translation will help users and designers not familiar with English to better understand and use the OFL. We encourage designers who consider releasing their creation under the OFL to read the OFL-FAQ in their own language if it is available. Please go to http://scripts.sil.org/OFL for the official version of the license and the accompanying OFL-FAQ."
-
-- Keep your unofficial translation current and update it at our request if needed, for example if there is any ambiguity which could lead to confusion.
-
-If you start such a unofficial translation effort of the OFL and OFL-FAQ please let us know.
-
-
-9 ABOUT SIL INTERNATIONAL
-
-9.1 Who is SIL International and what do they do?
-SIL serves language communities worldwide, building their capacity for sustainable language development, by means of research, translation, training and materials development. SIL makes its services available to all without regard to religious belief, political ideology, gender, race, or ethnic background. SIL's members and volunteers share a Christian commitment.
-
-9.2 What does this have to do with font licensing?
-The ability to read, write, type and publish in one's own language is one of the most critical needs for millions of people around the world. This requires fonts that are widely available and support lesser-known languages. SIL develops - and encourages others to develop - a complete stack of writing systems implementation components available under open licenses. This open stack includes input methods, smart fonts, smart rendering libraries and smart applications. There has been a need for a common open license that is specifically applicable to fonts and related software (a crucial component of this stack), so SIL developed the SIL Open Font License with the help of the Free/Libre and Open Source Software community.
-
-9.3 How can I contact SIL?
-Our main web site is: http://www.sil.org/
-Our site about complex scripts is: http://scripts.sil.org/
-Information about this license (and contact information) is at: http://scripts.sil.org/OFL
-
-
-APPENDIX A - FONTLOG EXAMPLE
-
-Here is an example of the recommended format for a FONTLOG, although other formats are allowed.
-
------
-FONTLOG for the GlobalFontFamily fonts
-
-This file provides detailed information on the GlobalFontFamily Font Software. This information should be distributed along with the GlobalFontFamily fonts and any derivative works.
-
-Basic Font Information
-
-GlobalFontFamily is a Unicode typeface family that supports all languages that use the Latin script and its variants, and could be expanded to support other scripts.
-
-NewWorldFontFamily is based on the GlobalFontFamily and also supports Greek, Hebrew, Cyrillic and Armenian.
-
-More specifically, this release supports the following Unicode ranges...
-This release contains...
-Documentation can be found at...
-To contribute to the project...
-
-ChangeLog
-
-1 August 2008 (Tom Parker) GlobalFontFamily version 1.2.1
-- Tweaked the smart font code (Branch merged with trunk version)
-- Provided improved build and debugging environment for smart behaviours
-
-7 February 2007 (Pat Johnson) NewWorldFontFamily Version 1.3
-- Added Greek and Cyrillic glyphs
-
-7 March 2006 (Fred Foobar) NewWorldFontFamily Version 1.2
-- Tweaked contextual behaviours
-
-1 Feb 2005 (Jane Doe) NewWorldFontFamily Version 1.1
-- Improved build script performance and verbosity
-- Extended the smart code documentation
-- Corrected minor typos in the documentation
-- Fixed position of combining inverted breve below (U+032F)
-- Added OpenType/Graphite smart code for Armenian
-- Added Armenian glyphs (U+0531 -> U+0587)
-- Released as "NewWorldFontFamily"
-
-1 Jan 2005 (Joe Smith) GlobalFontFamily Version 1.0
-- Initial release
-
-Acknowledgements
-
-If you make modifications be sure to add your name (N), email (E), web-address (if you have one) (W) and description (D). This list is in alphabetical order.
-
-N: Jane Doe
-E: jane@university.edu
-W: http://art.university.edu/projects/fonts
-D: Contributor - Armenian glyphs and code
-
-N: Fred Foobar
-E: fred@foobar.org
-W: http://foobar.org
-D: Contributor - misc Graphite fixes
-
-N: Pat Johnson
-E: pat@fontstudio.org
-W: http://pat.fontstudio.org
-D: Designer - Greek & Cyrillic glyphs based on Roman design
-
-N: Tom Parker
-E: tom@company.com
-W: http://www.company.com/tom/projects/fonts
-D: Engineer - original smart font code
-
-N: Joe Smith
-E: joe@fontstudio.org
-W: http://joe.fontstudio.org
-D: Designer - original Roman glyphs
-
-Fontstudio.org is an not-for-profit design group whose purpose is...
-Foobar.org is a distributed community of developers...
-Company.com is a small business who likes to support community designers...
-University.edu is a renowed educational institution with a strong design department...
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/erewhon/OFL.txt new/doc/fonts/erewhon/OFL.txt
--- old/doc/fonts/erewhon/OFL.txt 2014-09-30 02:08:26.000000000 +0200
+++ new/doc/fonts/erewhon/OFL.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,104 +0,0 @@
-Copyright 1989, 1991 Adobe Systems Incorporated. All rights reserved.
-Utopia is either a registered trademark or trademark of Adobe Systems
-Incorporated in the United States and/or other countries. Used under
-license.
-
-Copyright 2006 Han The Thanh, Vntopia font family, http://vntex.sf.net
-
-Copyright (c) 2008-2012, Andrey V. Panov (panov@canopus.iacp.dvo.ru),
-with Reserved Font Name Heuristica.
-
-Copyright (c) 2014, Michael J. Sharpe (msharpe at ucsd dot edu),
-with Reserved Font Name Erewhon.
-
-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:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/erewhon/README new/doc/fonts/erewhon/README
--- old/doc/fonts/erewhon/README 2016-02-07 00:01:30.000000000 +0100
+++ new/doc/fonts/erewhon/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,109 +0,0 @@
-This package provides LaTeX support files for the Erewhon fonts, made up of fonts files and LaTeX support files for a family based on Andrey V. Panov's Heuristica fonts, version 1.0.1, which were in turn a substantial extension of the free Utopia font family making available Cyrillic glyphs, Small Caps in regular weight, upright shape, and oldstyle fixed-width figures in all styles. Erewhon adds small caps in all styles, slanted shapes distinct from italic, superior letter and figures in all styles, as well as inferior, numerator and denominator figures in all styles. The six font files in this package are in otf and pfb format, licensed under the SIL OFL. All other support files are subject to the LaTeX Project Public License. See
-http://www.ctan.org/license/lppl1.3
-for the details of that license.
-
-Current version: 1.05, 2016-02-05
-
-Changes in version 1.04
-1. Changed the subfamily names in RegularSlanted and BoldSlanted to Oblique and BoldOblique. The otfs now cooperate much better with fontspec, and show up properly in Windows and Linux font menus.
-2. Added small caps to Italic and BoldItalic, copying the Oblique versions. These are not yet well kerned.
-3. Added a number of small caps glyphs so that all small caps in T1 encoding are really small caps.
-4. Added an OT2 encoded version with TLF figures only.
-5. The T2A, T2B and T2C encodings are much improved---otftotfm seems to require a lot of help to get good encoding files.
-
-Changes in version 1.04
-1. Changed \Erewhon@scale in erewhon.sty to \erewhon@scale, in accordance with .fd files. (Thanks Marco Zunino.)
-2. Added a new macro, \useproportional, to erewhon.sty. It works analogously to \useosf, and may be useful if working with babel, where the option proportional to newtxtext should not be used if loading a math font.
-
-Changes in version 1.03
-Brought erewhon.sty more into conformance with newtxtext.sty with respect to handling babel, osf and figure commands like \osfstyle.
-
-Changes in version 1.02
-1. Added a visiblespace (uni2423) glyph to all fonts.
-2. Changed erewhon.fontspec so it provides by default correct upright shapes for {upright, sc} when using fontspec. (I am not able to make this work with {bold,sc}. You can make it work with {italic,sc} and {bolditalic,sc} using, e.g.,
-\setmainfont{Erewhon}[
-ItalicFeatures={SmallCapsFont={Erewhon-RegularSlanted}, SmallCapsFeatures={Letters=SmallCaps}},
-BoldItalicFeatures={ SmallCapsFont={Erewhon-BoldSlanted},SmallCapsFeatures={Letters=SmallCaps}}
-]
-If you use any similar settings for SlantedFeatures, you will not get upright small caps in upright mode. I believe this is most likely a fontspec bug.
-
-Changes in version 1.01a
-Corrected folder hierarchy names for afm files in tds.
-
-Changes in version 1.01
-1. Corrected spacing errors in italic and bold italic fonts.
-2. Minor corrections to some italic and bold italic superior letters.
-
-Changes in version 1.001
-1. Modified BlueValues of fonts to correct problems with t1lint, though t1lint still provokes warnings.
-2. Added afm files to distribution.
-
-The otf fonts contain all the kerning and other tables. Should you wish to modify these yourself, the LaTeX support files may be re-created using the command
-
-/usr/texbin/autoinst --inferiors --fractions --verbose --noupdmap --noswash --notitling --noornaments --target=./texmf --encoding=TS1,LY1,T2A,T2B,T2C,T1 --vendor=public --typeface=erewhon *.otf
-
-after cding to the folder containing just the modified otf fonts and a subfolder named texmf. You should replace the newly generated erewhon.sty with the one from the distribution in order to preserve its functionality. The names of the encoding files should also be modified appropriately from those assigned by autoinst. I used the following bash shell script, which assumed you are in the directory holding the otf files and a texmf subfolder:
-
-#!/bin/bash
-pushd texmf/fonts/map/dvips/erewhon
-sed -i '' 's/<\[a_/<\[zut1_/g' erewhon.map
-popd
-pushd texmf/fonts/enc/dvips/erewhon
-for f in *.enc; do mv ${f} zut1${f:1}; done
-popd
-
-Installation:
-
-Mac OS X: To install, open a Terminal window and cd to inside the downloaded TDS folder.
-
-Method A (recommended): type
-
-sudo /bin/cp -Rfp * /usr/local/texlive/texmf-local
-
-then
-
-sudo mktexlsr
-
-then
-
-sudo -H updmap-sys --enable Map=erewhon.map
-
-Method B: If you insist on making your font installations in your home folder, potentially making your personal installation become out of sync with updates to TeXLive, use instead
-
-(i) if you checked Update for All Users in TeXLive utility
-
-/bin/cp -Rfp * ~/Library/texmf
-
-then
-
-updmap --enable Map=erewhon.map
-
-(ii) otherwise
-
-/bin/cp -Rfp * ~/Library/texmf
-
-then
-
-sudo updmap-sys --enable Map=erewhon.map
-
-Linux: Very similar to Mac OS X.
-
-MikTeX: Copy erewhon.tds.zip to the root of the folder you use for personal additions to the TeX trees, open a command window, chdir to that folder, and type
-
-unzip erewhon.tds.zip
-initexmf --update-fndb
-initexmf --edit-config-file updmap
-
-The latter command should open updmap.cfg in your default editor, commonly Notepad. Add the line
-
-Map erewhon.map
-
-to updmap.cfg, save and close. Then, in the command window, type
-
-initexmf --mkmaps
-
-You can ignore error messages that may occur here. This should result in a properly enabled erewhon.
-
-Please send comments and bug reports or suggestions for improvement to
-
-msharpe at ucsd dot edu
\ No newline at end of file
Binary files old/doc/fonts/erewhon/erewhon-doc.pdf and new/doc/fonts/erewhon/erewhon-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/erewhon/erewhon-doc.tex new/doc/fonts/erewhon/erewhon-doc.tex
--- old/doc/fonts/erewhon/erewhon-doc.tex 2016-02-07 00:01:30.000000000 +0100
+++ new/doc/fonts/erewhon/erewhon-doc.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,105 +0,0 @@
-% !TEX TS-program = pdflatexmk
-\documentclass[11pt]{amsart}
-\usepackage[margin=1.5in]{geometry}
-\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
-\usepackage{graphicx}
-\pdfmapfile{=erewhon.map}
-%SetFonts
-% erewhon+newtxmath
-\usepackage[sups,p,osf,scaled=.98]{erewhon}
-\usepackage[T2A,OT2,T1]{fontenc}
-\usepackage{textcomp}
-\usepackage{cabin}
-\usepackage[varqu,varl]{zi4}% inconsolata
-\usepackage[utopia,vvarbb,bigdelims]{newtxmath}
-%SetFonts
-\usepackage{fonttable}
-\title{LaTeX Support for Erewhon}
-\author{Michael Sharpe}
-\date{\today} % Activate to display a given date or no date
-\begin{document}
-\maketitle
-\emph{Erewhon} is a font package based largely on Andrey V.\ Panov's \emph{Heuristica}, but with so many changes that it is no longer strictly compatible with that package, and is offered instead as an enhanced alternative. (\emph{Heuristica} extended the \emph{Utopia} font family made available by the \TeX\ Users' Group, adding many accented glyphs, Cyrillic glyphs, ligatures, superior and oldstyle fixed-width figures in all styles, and Small Caps in Regular style only. It is widely distributed as a free font collection in OpenType, TrueType and Type$1$ formats.) \emph{Erewhon} is provided in OpenType and Type$1$ formats with \LaTeX\ support files in encodings T$1$, TS$1$, LY$1$, OT$2$, T$2$A, T$2$B and T$2$C. Changes made in the transition from \emph{Heuristica} to \emph{Erewhon} include:
-\begin{itemize}
-\item
-\textsl{slanted} as well as \textit{Italic} shapes;
-\item
-\textsc{Small Caps} in \textsc{\textbf{bold}} as well as \textsc{regular} upright shapes, with \textsc{\textit{italic}} and \textsc{\textsl{slanted Small Caps}} shapes from the slanted variants;
-\item expanded lookup tables in the {\tt.otf} files for users of XeLaTeX and LuaLaTeX;
-\item a number of f-ligatures have been modified, and a \verb|T_h| ligature added;
-\item proportionally spaced figures (lining and oldstyle), adding to the existing taboldstyle figures;
-\item full collections of superior lowercase letters (including \`e as \textsu{\`e} and \'e as \textsu{\'e}), mainly for the benefit of languages in which those are in common use---e.g., French, Spanish;
-\item size reduced by 6\% from Heuristica, which matched the old version of Utopia---the new size matches that of Adobe's commercial UtopiaStd;
-\item shapes of some oldstyle figures modified to have more of an oldstyle appearance;
-\item fraction macros based on the new numerator and denominator figures;
-\item the bold upright face has been made less cramped.
-\end{itemize}
-
-The {\tt newtx} package has been modified, as of version $1.26$, to offer a new option {\tt utopia} (or, equivalently, {\tt heuristica} or {\tt erewhon}) that uses math italic glyphs taken from Utopia and oldstyle figures from \emph{Erewhon}. Its slanted Greek alphabets are constructed from the {\tt txfonts} slanted Greek letters by reducing their italic angle from $15.5$\textdegree\ to $13$\textdegree, matching Utopia's italic angle. So, for Erewhon text and matching math, you can use\footnote{There is most likely also a way to use {\tt MathDesign} or {\tt fourier} with at least partial compatibility.}:
-\begin{verbatim}
-\usepackage[p,osf,scaled=.98]{erewhon}
-\usepackage[varqu,varl]{inconsolata} % typewriter
-\usepackage[type1,scaled=.95]{cabin} % sans serif like Gill Sans
-\usepackage[utopia,vvarbb,bigdelims]{newtxmath}
-\end{verbatim}
-The effect of the options {\tt p,osf} is to force the default figure style in {\tt erewhon} text to be proportional oldstyle 0123456789 while using lining figures $0123456789$ in math mode. If no options are specified, tabular lining figures will be used throughout.
-
-\textsc{Options available:}
-\begin{itemize}
-\item The option {\tt scaled} allows you to change the scale. E.g., if you want \emph{Erewhon} to render at the same size as the original \emph{Utopia} or \emph{Heuristica}, use {\tt scaled=1.064}.
-\item
-The option {\tt proportional}, or, equivalently, {\tt p}, specifies the use of proportional rather than the default tabular figures.
-\item
- The {\tt space} option allows you to specify a factor by which to increase the interword spacing, which is, IMO, a bit tight.
-\item
-The option {\tt oldstyle}, or, equivalently, {\tt osf}, specifies oldstyle figures in text mode---math mode always uses tabular lining figures. By itself, {\tt osf} results in tabular oldstyle figures unless you also specify the option {\tt p}, or {\tt proportional}.
-\item The option {\tt scosf} changes the figure style to {\tt osf} only within small caps.
-\item
- The option {\tt sups} changes the footnote marker style to use the superior figures from \emph{Erewhon} rather than the default superscripts based on reduced lining figures, which usually appear too light. (The {\tt superiors} package offers further options.)
-\end{itemize}
-
-\emph{Erewhon} is so austere for a text font and \emph{Inconsolata} is so fancy for a typewriter font that you may find they blend together all too well. For more of a distinction replace the {\tt inconsolata} line above with
-\begin{verbatim}
-\usepackage{zlmtt} % serifed typewriter font extending cmtt
-\end{verbatim}
-
-As Utopia text is a bit cramped, you might try applying a small amount of letterspacing (tracking) and increasing the interword spacing by means of the {\tt microtype} package, or use the {\tt space} option.
-
-\textsc{Macros:}
-\begin{itemize}
-\item
-\verb|\textlf| and \verb|\texttlf| render their arguments in proportional and tabular lining figures respectively, no matter what the default figure style. E.g., \verb|\textlf{345}| produces \textlf{345}.
-\item
-\verb|\textosf| and \verb|\texttosf| render their arguments in proportional and tabular oldstyle figures respectively, no matter what the default figure style. For example, \verb|\textosf{345}| produces~\textosf{345}.
-\item
-\verb|\textsu| renders its argument in superior figures, no matter what the default figure style. E.g., \verb|\textsu{345}| produces \textsu{345}.
-\item
-\verb|\textin| renders its argument in inferior figures, no matter what the default figure style. E.g., \verb|\textin{345}| produces \textin{345}.
-\item
-\verb|\textnu| renders its argument in numerator figures, no matter what the default figure style. E.g., \verb|\textnu{345}| produces \textnu{345}.
-\item
-\verb|\textde| renders its argument in denominator figures, no matter what the default figure style. E.g., \verb|\textde{345}| produces \textde{345}.
-\item
-\verb|\textfrac| renders its two arguments as a vulgar fraction, using \verb|\textnu| for the numerator and \verb|\textde| for the denominator. E.g., \verb|\textfrac{31}{64}| produces~\textfrac{31}{64}.
-\end{itemize}
-\textsc{Very Brief, Nonsensical Math Example:}\\
-Let $B(X)$ be the set of blocks of $\Lambda_{X}$
-and let $b(X) \coloneq |{B(X)}|$ so that $\hat\phi=\sum_{Y\subset X}(-1)^{b(Y)}b(Y)$.
-
-\textsc{Glyph Coverage Examples}\\
-\textbf{Erewhon-Regular-tlf-ot2}\\
-\fonttable{Erewhon-Regular-tlf-ot2}
-
-(This 7-bit encoding is intended for users lacking a Cyrillic keyboard. For further information, consult the documentation for the package {\tt nimbus15}.)
-
-\textbf{Erewhon-Regular-tlf-t2a}\\
-\fonttable{Erewhon-Regular-tlf-t2a}
-\newpage
-\textbf{Erewhon-Regular-tlf-t2b}\\
-\fonttable{Erewhon-Regular-tlf-t2b}
-\newpage
-\textbf{Erewhon-Regular-tlf-t2c}\\
-\fonttable{Erewhon-Regular-tlf-t2c}
-
-
-\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/ean/README new/doc/generic/ean/README
--- old/doc/generic/ean/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/generic/ean/README 2016-11-25 19:27:41.000000000 +0100
@@ -0,0 +1,22 @@
+This directory contains the macro ean13 and ean8 for making EAN
+barcodes (13 or 8 digit on input and kern-rule queue on output).
+
+The usage of the macros is commeted in the file ean13.tex or ean8.tex.
+The simple test is presented in file eantest.tex (for plain).
+Macro works in plain and LateX and other standard macro packages.
+
+The fonts ocrb9 and ocrb7 is used. The mf-sources are presented (this
+is the copy from CTAN:fonts/ocr-b) with a little correction (the
+mode_setup is added to begin of file ocrbmac.mf).
+
+ean13.tex .... EAN 13 macro by Petr Olsak
+ean8.tex .... EAN 8 macro by Jaroslav Moucka (student)
+eantest.tex .. test of ean13 and ean8 in plain.
+*.mf ......... mf-sources of OCR-b font by Norbert Schwarz
+
+Petr Olsak (Ol\v{s}\'ak)
+Department of Mathematics
+Czech Techical University in Prague,
+Czech Republic
+e-mail: olsak@math.feld.cvut.cz
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/ean/eantest.tex new/doc/generic/ean/eantest.tex
--- old/doc/generic/ean/eantest.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/generic/ean/eantest.tex 2016-11-25 19:27:41.000000000 +0100
@@ -0,0 +1,8 @@
+\input ean13
+\nopagenumbers
+\ISBN 80-901950-0-8 \EAN 978-80-901950-0-4 % Typesetting System TeX
+\vskip1cm
+\input ean8
+\EAN 8591-2342
+\end
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ean.doc.tlpobj new/tlpkg/tlpobj/ean.doc.tlpobj
--- old/tlpkg/tlpobj/ean.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100
+++ new/tlpkg/tlpobj/ean.doc.tlpobj 2017-04-14 17:39:02.000000000 +0200
@@ -0,0 +1,8 @@
+name ean.doc
+category Package
+revision 20851
+shortdesc doc files of ean
+relocated 1
+docfiles size=2
+ RELOC/doc/generic/ean/README
+ RELOC/doc/generic/ean/eantest.tex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/erewhon.doc.tlpobj new/tlpkg/tlpobj/erewhon.doc.tlpobj
--- old/tlpkg/tlpobj/erewhon.doc.tlpobj 2016-04-14 18:59:57.000000000 +0200
+++ new/tlpkg/tlpobj/erewhon.doc.tlpobj 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-name erewhon.doc
-category Package
-revision 39604
-shortdesc doc files of erewhon
-relocated 1
-docfiles size=81
- RELOC/doc/fonts/erewhon/FontLog.txt
- RELOC/doc/fonts/erewhon/OFL-FAQ.txt
- RELOC/doc/fonts/erewhon/OFL.txt
- RELOC/doc/fonts/erewhon/README
- RELOC/doc/fonts/erewhon/erewhon-doc.pdf
- RELOC/doc/fonts/erewhon/erewhon-doc.tex
++++++ erewhon.tar.xz -> ean.tar.xz ++++++
++++ 134804 lines of diff (skipped)
++++++ easy-todo.doc.tar.xz ++++++
++++++ easy-todo.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/easy-todo.tlpobj new/tlpkg/tlpobj/easy-todo.tlpobj
--- old/tlpkg/tlpobj/easy-todo.tlpobj 2016-04-14 18:58:58.000000000 +0200
+++ new/tlpkg/tlpobj/easy-todo.tlpobj 2017-04-14 17:39:02.000000000 +0200
@@ -8,6 +8,6 @@
runfiles size=1
RELOC/tex/latex/easy-todo/easy-todo.sty
catalogue-ctan /macros/latex/contrib/easy-todo
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license apache2
catalogue-topics notes editorial
++++++ easyfig.doc.tar.xz ++++++
++++++ easyfig.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/easyfig.tlpobj new/tlpkg/tlpobj/easyfig.tlpobj
--- old/tlpkg/tlpobj/easyfig.tlpobj 2016-04-14 18:58:59.000000000 +0200
+++ new/tlpkg/tlpobj/easyfig.tlpobj 2017-04-14 17:39:02.000000000 +0200
@@ -15,7 +15,7 @@
runfiles size=2
RELOC/tex/latex/easyfig/easyfig.sty
catalogue-ctan /macros/latex/contrib/easyfig
-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 graphics-use
catalogue-version 1.2
++++++ easylist.doc.tar.xz ++++++
++++++ easylist.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/easylist.tlpobj new/tlpkg/tlpobj/easylist.tlpobj
--- old/tlpkg/tlpobj/easylist.tlpobj 2016-04-14 18:58:59.000000000 +0200
+++ new/tlpkg/tlpobj/easylist.tlpobj 2017-04-14 17:39:03.000000000 +0200
@@ -11,7 +11,7 @@
runfiles size=8
RELOC/tex/latex/easylist/easylist.sty
catalogue-ctan /macros/latex/contrib/easylist
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics list
catalogue-version 1.3
++++++ easyreview.doc.tar.xz ++++++
++++++ easyreview.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/easyreview.tlpobj new/tlpkg/tlpobj/easyreview.tlpobj
--- old/tlpkg/tlpobj/easyreview.tlpobj 2016-04-14 18:58:59.000000000 +0200
+++ new/tlpkg/tlpobj/easyreview.tlpobj 2017-04-14 17:39:03.000000000 +0200
@@ -11,7 +11,7 @@
runfiles size=1
RELOC/tex/latex/easyreview/easyReview.sty
catalogue-ctan /macros/latex/contrib/easyreview
-catalogue-date 2015-09-16 06:57:29 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics notes editorial
catalogue-version 1.0
++++++ ebezier.doc.tar.xz ++++++
++++++ ebezier.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebezier.tlpobj new/tlpkg/tlpobj/ebezier.tlpobj
--- old/tlpkg/tlpobj/ebezier.tlpobj 2016-04-14 18:59:00.000000000 +0200
+++ new/tlpkg/tlpobj/ebezier.tlpobj 2017-04-14 17:39:03.000000000 +0200
@@ -12,7 +12,7 @@
RELOC/tex/latex/ebezier/ebezier.sty
catalogue-also pst-bezier
catalogue-ctan /macros/latex/contrib/ebezier
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-curve graphics-in-tex
catalogue-version 4
++++++ ebgaramond-maths.doc.tar.xz ++++++
++++++ ebgaramond-maths.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebgaramond-maths.tlpobj new/tlpkg/tlpobj/ebgaramond-maths.tlpobj
--- old/tlpkg/tlpobj/ebgaramond-maths.tlpobj 2016-04-14 18:59:03.000000000 +0200
+++ new/tlpkg/tlpobj/ebgaramond-maths.tlpobj 2017-04-14 17:39:04.000000000 +0200
@@ -17,7 +17,7 @@
RELOC/tex/latex/ebgaramond-maths/ebgaramond-maths.sty
catalogue-also ebgaramond
catalogue-ctan /fonts/ebgaramond-maths
-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-maths font-virtual
catalogue-version 1.1
++++++ ebgaramond.doc.tar.xz ++++++
++++++ ebgaramond.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebgaramond.tlpobj new/tlpkg/tlpobj/ebgaramond.tlpobj
--- old/tlpkg/tlpobj/ebgaramond.tlpobj 2016-04-14 18:59:01.000000000 +0200
+++ new/tlpkg/tlpobj/ebgaramond.tlpobj 2017-04-14 17:39:03.000000000 +0200
@@ -351,7 +351,7 @@
RELOC/tex/latex/ebgaramond/ebgaramond.sty
RELOC/tex/latex/ebgaramond/mt-EBGaramond.cfg
catalogue-ctan /fonts/ebgaramond
-catalogue-date 2015-08-08 19:53:23 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license ofl
catalogue-topics font font-serif font-otf font-type1
catalogue-version 0.16
++++++ ebong.doc.tar.xz ++++++
++++++ ebong.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebong.tlpobj new/tlpkg/tlpobj/ebong.tlpobj
--- old/tlpkg/tlpobj/ebong.tlpobj 2016-04-14 18:59:03.000000000 +0200
+++ new/tlpkg/tlpobj/ebong.tlpobj 2017-04-14 17:39:04.000000000 +0200
@@ -10,6 +10,6 @@
runfiles size=2
texmf-dist/scripts/ebong/ebong.py
catalogue-ctan /language/ebong
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics indic
++++++ ebook.doc.tar.xz ++++++
++++++ ebook.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebook.tlpobj new/tlpkg/tlpobj/ebook.tlpobj
--- old/tlpkg/tlpobj/ebook.tlpobj 2016-04-14 18:59:04.000000000 +0200
+++ new/tlpkg/tlpobj/ebook.tlpobj 2017-04-14 17:39:04.000000000 +0200
@@ -10,6 +10,6 @@
runfiles size=1
RELOC/tex/latex/ebook/ebook.sty
catalogue-ctan /macros/latex/contrib/ebook
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics geometry font-use ebook
++++++ ebproof.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ebproof/README new/doc/latex/ebproof/README
--- old/doc/latex/ebproof/README 2015-03-22 22:22:17.000000000 +0100
+++ new/doc/latex/ebproof/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-== Presentation ==
-
-The ebproofs package provides commands to typeset proof trees, in the style of
-sequent calculus and related systems. The commands allow for writing
-inferences with any number of premisses and alignment of successive formulas
-on an arbitrary point. Various options allow complete control over spacing,
-styles of inference rules, placement of labels, etc.
-
-The distribution includes the following files:
-
- - ebproof.sty : the package
- - ebproof.pdf : the documentation
- - ebproof.tex : the LaTeX source for the documentation
-
-The package requires pgfkeys (from TikZ/PGF) for the option system.
-
-
-== License ==
-
-Copyright 2015 Emmanuel Beffara
-
-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 Emmanuel Beffara.
-
-This work consists of the files ebproof.sty and ebproof.tex.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ebproof/README.md new/doc/latex/ebproof/README.md
--- old/doc/latex/ebproof/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/ebproof/README.md 2017-05-17 23:51:34.000000000 +0200
@@ -0,0 +1,42 @@
+The ebproof package
+===================
+
+A LaTeX package to typeset formal proofs in the style of sequent calculus.
+
+Presentation
+------------
+
+The `ebproof` package provides commands to typeset proof trees, in the style
+of sequent calculus and related systems. The commands allow for writing
+inferences with any number of premisses and alignment of successive formulas
+on an arbitrary point. Various options allow complete control over spacing,
+styles of inference rules, placement of labels, etc.
+
+The distribution includes the following files:
+
+- `ebproof.sty` : the package
+- `ebproof.pdf` : the documentation
+- `ebproof.tex` : the LaTeX source for the documentation
+
+The package requires `expl3` (the LaTeX3 programming environment) which
+provides many useful programming tools.
+
+
+License
+-------
+
+Copyright 2015 Emmanuel Beffara
+
+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 Emmanuel Beffara.
+
+This work consists of the files `ebproof.sty` and `ebproof.tex`.
Binary files old/doc/latex/ebproof/ebproof.pdf and new/doc/latex/ebproof/ebproof.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ebproof/ebproof.tex new/doc/latex/ebproof/ebproof.tex
--- old/doc/latex/ebproof/ebproof.tex 2015-03-22 22:22:17.000000000 +0100
+++ new/doc/latex/ebproof/ebproof.tex 2017-05-17 23:51:34.000000000 +0200
@@ -1,5 +1,5 @@
%% ebproof.sty
-%% Copyright 2015 Emmanuel Beffara
+%% Copyright 2017 Emmanuel Beffara
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -21,7 +21,7 @@
\title{The \package{ebproof} package}
\author{Emmanuel Beffara \\ \url{manu@beffara.org}}
-\date{Version 1.1 \\ March 13, 2015}
+\date{Version 2.0 \\ March 17, 2017}
\usepackage{amssymb}
\usepackage{color}
@@ -40,7 +40,7 @@
\newcommand\env[1]{\lit{#1}}
\newcommand\opt[1]{\lit{#1}}
\newcommand\meta[1]{$\langle$\textit{#1}$\rangle$}
-\newcommand\oarg[1]{\lit{[}\meta{#1}\lit{]}}
+\newcommand\oarg[1]{\lit[\meta{#1}\lit]}
\newcommand\marg[1]{\lit{\{}\meta{#1}\lit{\}}}
\newenvironment{csdoc}[1]{%
@@ -84,10 +84,10 @@
\begin{example}{gobble=2}
\begin{prooftree}
- \Hypo{ \Gamma, A &\vdash B }
- \Infer1[abs]{ \Gamma &\vdash A\to B }
- \Hypo{ \Gamma \vdash A }
- \Infer2[app]{ \Gamma \vdash B }
+ \hypo{ \Gamma, A &\vdash B }
+ \infer1[abs]{ \Gamma &\vdash A\to B }
+ \hypo{ \Gamma \vdash A }
+ \infer2[app]{ \Gamma \vdash B }
\end{prooftree}
\end{example}
@@ -107,7 +107,7 @@
\cs{begin}\lit{\{prooftree\}}\oarg{options}
\meta{statements}
\cs{end}\lit{\{prooftree\}}}
- Typeset the proof tree desribed by the \meta{statements}, as described in
+ Typeset the proof tree described by the \meta{statements}, as described in
section~\ref{sec:statements}.
The \meta{options} provide default formatting options for the proof tree.
This environment can be used either in math mode or in text mode.
@@ -118,8 +118,8 @@
\cs{begin}\lit{\{prooftree*\}}\oarg{options}
\meta{statements}
\cs{end}\lit{\{prooftree*\}}}
- Typeset the proof centered on a line of its own; it is essentially
- equivalent to wrapping the \env{prooftree} environment inside a \env{center}
+ Typeset the proof on a line of its own; it is essentially equivalent to
+ wrapping the \env{prooftree} environment inside a displayed math
environment.
\end{csdoc}
@@ -132,15 +132,15 @@
\begin{example}{gobble=2}
\[
\begin{prooftree}
- \Hypo{ \vdash A }
- \Hypo{ \vdash B } \Infer1{ \vdash B, C }
- \Infer2{ \vdash A\wedge B, C }
+ \infer0{ \vdash A }
+ \hypo{ \vdash B } \infer1{ \vdash B, C }
+ \infer2{ \vdash A\wedge B, C }
\end{prooftree}
\quad \rightsquigarrow \quad
\begin{prooftree}
- \Hypo{ \vdash A } \Hypo{ \vdash B }
- \Infer2{ \vdash A\wedge B }
- \Infer1{ \vdash A\wedge B, C }
+ \infer0{ \vdash A } \hypo{ \vdash B }
+ \infer2{ \vdash A\wedge B }
+ \infer1{ \vdash A\wedge B, C }
\end{prooftree}
\]
\end{example}
@@ -148,10 +148,10 @@
\section{Statements}
\label{sec:statements}
-Statements describes proofs in postfix notation: when typesetting a proof tree
+Statements describe proofs in postfix notation: when typesetting a proof tree
whose last rule has, say, two premisses, you will first write statements for
the subtree of the first premiss, then statements for the subtree of the
-second premiss, then a statement like \cs{Infer2}\{\meta{conclusion}\} to
+second premiss, then a statement like \cs{infer2}\{\meta{conclusion}\} to
build an inference with these two subtrees as premisses and the given text as
conclusion.
@@ -160,17 +160,26 @@
At the end, it must contain exactly one tree, which is the one that will be
printed.
+Note that the commands defined in this section only exist right inside
+\env{prooftree} environments.
+If you have a macro with the same name as one of the statements, for instance
+\cs{hypo}, then this macro will keep its meaning outside \env{prooftree}
+environments as well as inside the arguments of a statement.
+If you really need to access the statements in another context, you can can
+always call them by prefixing their names with \lit{ebproof}, for instance as
+\cs{ebproofhypo}.
+
\subsection{Basic statements}
The basic statements for building proofs are the following, where
\meta{options} stands for arbitrary options as described in
section~\ref{sec:options}.
-\begin{csdoc}{\cs{Hypo}\oarg{options}\marg{text}}
+\begin{csdoc}{\cs{hypo}\oarg{options}\marg{text}}
Push a new proof tree consisting only in one conclusion line, with no
premiss and no line above, in other words a tree with only a leaf
- (\cs{Hypo} stands for \emph{hypothesis}).
+ (\cs{hypo} stands for \emph{hypothesis}).
\end{csdoc}
-\begin{csdoc}{\cs{Infer}\oarg{options}\marg{arity}\oarg{label}\marg{text}}
+\begin{csdoc}{\cs{infer}\oarg{options}\marg{arity}\oarg{label}\marg{text}}
Build an inference step by taking some proof trees from the top of the
stack, assembling them with a rule joining their conclusions and putting a
new conclusion below.
@@ -192,70 +201,92 @@
root of the tree: if \meta{text} contains the alignment character \verb|&|
then the axis is set at that position, otherwise the axis is set at the center
of the conclusion text.
-The \cs{Infer} statement makes sure that the axis of the premiss is at the
+The \cs{infer} statement makes sure that the axis of the premiss is at the
same position as the axis of the conclusion.
If there are several premisses, it places the axis at the center between the
left of the leftmost conclusion and the right of the rightmost conclusion:
\begin{example}{gobble=2}
\begin{prooftree}
- \Hypo{ &\vdash A, B, C }
- \Infer1{ A &\vdash B, C }
- \Infer1{ A, B &\vdash C }
- \Hypo{ D &\vdash E }
- \Infer2{ A, B, D &\vdash C, E }
- \Infer1{ A, B &\vdash C, D, E }
- \Infer1{ A &\vdash B, C, D, E }
+ \hypo{ &\vdash A, B, C }
+ \infer1{ A &\vdash B, C }
+ \infer1{ A, B &\vdash C }
+ \hypo{ D &\vdash E }
+ \infer2{ A, B, D &\vdash C, E }
+ \infer1{ A, B &\vdash C, D, E }
+ \infer1{ A &\vdash B, C, D, E }
\end{prooftree}
\end{example}
-\subsection{Additional statements}
-
-The following additional statements may be used to affect the format of the
-last proof tree on the stack:
-
-\begin{csdoc}{\cs{Ellipsis}\marg{label}\marg{text}}
+\begin{csdoc}{\cs{ellipsis}\marg{label}\marg{text}}
Typeset vertical dots, with a label on the right, and a new conclusion.
No inference lines are inserted.
\begin{example}{gobble=4}
\begin{prooftree}
- \Hypo{ \Gamma &\vdash A }
- \Ellipsis{foo}{ \Gamma &\vdash A, B }
+ \hypo{ \Gamma &\vdash A }
+ \ellipsis{foo}{ \Gamma &\vdash A, B }
\end{prooftree}
\end{example}
\end{csdoc}
-\begin{csdoc}{\cs{Alter}\marg{code}}
- Modify the proof with arbitrary commands, assuming that these commands do
- not affect the size.
- The \meta{code} is executed in an \cs{hbox} and is followed by the insertion
- of the actual box with the current sub-proof.
- It is mostly useful with \cs{color} commands:
+
+\subsection{Modifying proof trees}
+
+The following additional statements may be used to affect the format of the
+last proof tree on the stack:
+
+\begin{csdoc}{\cs{rewrite}\marg{code}}
+ Rewrite the proof while preserving its size and alignment. The \meta{code}
+ is typeset in horizontal mode, with the following control sequences defined:
+ \begin{itemize}
+ \item \cs{treebox} is a box register that contains the original material,
+ \item \cs{treemark}\marg{name} expands as the position of a given mark with
+ respect to the left of the box.
+ \end{itemize}
+ A simple use of this statement is to change the color of a proof tree:
+ \begin{example}{gobble=4}
+ \begin{prooftree}
+ \hypo{ \Gamma, A &\vdash B }
+ \infer1[abs]{ \Gamma &\vdash A\to B }
+ \rewrite{\color{red}\box\treebox}
+ \hypo{ \Gamma \vdash A }
+ \infer2[app]{ \Gamma \vdash B }
+ \end{prooftree}
+ \end{example}
+ Note the absence of spaces inside the call to \cs{rewrite}, because spaces
+ would affect the position of the tree box.
+ Note also that explicit use of \cs{treebox} is required to actually draw the
+ subtree.
+ Not using it will effectively not render the subtree, while still reserving
+ its space in the enclosing tree:
\begin{example}{gobble=4}
\begin{prooftree}
- \Hypo{ \Gamma, A &\vdash B }
- \Infer1[abs]{ \Gamma &\vdash A\to B }
- \Alter{\color{red}}
- \Hypo{ \Gamma \vdash A }
- \Infer2[app]{ \Gamma \vdash B }
+ \hypo{ \Gamma, A &\vdash B }
+ \infer1[abs]{ \Gamma &\vdash A\to B }
+ \rewrite{}
+ \hypo{ \Gamma \vdash A }
+ \infer2[app]{ \Gamma \vdash B }
\end{prooftree}
\end{example}
+ This kind of manipulation is useful for instance in conjunction with the
+ \package{beamer} package to allow revealing subtrees of a proof tree
+ progressively in successive slides of a given frame.
\end{csdoc}
-\begin{csdoc}{\cs{Delims}\marg{left}\marg{right}}
+\begin{csdoc}{\cs{delims}\marg{left}\marg{right}}
Put left and right delimiters around the whole sub-proof, without changing
the alignment (the spacing is affected by the delimiters, however).
The \meta{left} text must contain an opening occurrence of \cs{left} and the
\meta{right} text must contain a matching occurrence of \cs{right}.
- For instance, \verb|\Delims{\left(}{\right)}| will put the
+ For instance, \verb|\delims{\left(}{\right)}| will put the
sub-proof between parentheses.
\begin{example}{gobble=4}
\begin{prooftree}
- \Hypo{ A_1 \vee \cdots \vee A_n }
- \Hypo{ [A_i] }
- \Ellipsis{}{ B }
- \Delims{ \left( }{ \right)_{1\leq i\leq n} }
- \Infer2{ B }
+ \hypo{ A_1 \vee \cdots \vee A_n }
+ \hypo{ [A_i] }
+ \ellipsis{}{ B }
+ \delims{ \left( }{ \right)_{1\leq i\leq n} }
+ \infer2{ B }
\end{prooftree}
\end{example}
\end{csdoc}
@@ -264,10 +295,8 @@
\label{sec:options}
The formatting of trees, conclusion texts and inference rules is affected by
-options, specfied using the key-value system of PGF/TikZ, provided by the
-\package{pgfkeys} package.
-All options are in the \lit{/ebproof/} path in the key tree of
-\package{pgfkeys}.
+options, specified using the \LaTeX3 key-value system.
+All options are in the \lit{ebproof} module in the key tree.
They can be set locally for a proof tree or for a single statement using
optional arguments in the associated commands.
@@ -297,10 +326,10 @@
Proof trees grow downwards, with conclusions above and premisses below.
\begin{example}{gobble=4}
\begin{prooftree}[proof style=downwards]
- \Hypo{ \Gamma, A &\vdash B }
- \Infer1[abs]{ \Gamma &\vdash A\to B }
- \Hypo{ \Gamma \vdash A }
- \Infer2[app]{ \Gamma \vdash B }
+ \hypo{ \Gamma, A &\vdash B }
+ \infer1[abs]{ \Gamma &\vdash A\to B }
+ \hypo{ \Gamma \vdash A }
+ \infer2[app]{ \Gamma \vdash B }
\end{prooftree}
\end{example}
\end{csdoc}
@@ -319,12 +348,12 @@
The default value is \lit{true}.
\begin{example}{gobble=4}
\begin{prooftree}[center=false]
- \Infer0{ A \vdash A }
+ \infer0{ A \vdash A }
\end{prooftree}
\qquad
\begin{prooftree}[center=false]
- \Hypo{ \Gamma, A \vdash B }
- \Infer1{ \Gamma \vdash A \to B }
+ \hypo{ \Gamma, A \vdash B }
+ \infer1{ \Gamma \vdash A \to B }
\end{prooftree}
\end{example}
\end{csdoc}
@@ -336,9 +365,9 @@
The default value is \lit{1.5em}.
\begin{example}{gobble=4}
\begin{prooftree}[separation=0.5em]
- \Hypo{ A } \Hypo{ B } \Infer2{ C }
- \Hypo{ D } \Hypo{ E } \Hypo{ F } \Infer3{ G }
- \Hypo{ H } \Infer[separation=3em]3{ K }
+ \hypo{ A } \hypo{ B } \infer2{ C }
+ \hypo{ D } \hypo{ E } \hypo{ F } \infer3{ G }
+ \hypo{ H } \infer[separation=3em]3{ K }
\end{prooftree}
\end{example}
\end{csdoc}
@@ -348,10 +377,10 @@
The default value is \lit{0.7ex}.
\begin{example}{gobble=4}
\begin{prooftree}[rule margin=2ex]
- \Hypo{ \Gamma, A &\vdash B }
- \Infer1[abs]{ \Gamma &\vdash A\to B }
- \Hypo{ \Gamma \vdash A }
- \Infer2[app]{ \Gamma \vdash B }
+ \hypo{ \Gamma, A &\vdash B }
+ \infer1[abs]{ \Gamma &\vdash A\to B }
+ \hypo{ \Gamma \vdash A }
+ \infer2[app]{ \Gamma \vdash B }
\end{prooftree}
\end{example}
\end{csdoc}
@@ -377,24 +406,25 @@
\end{csdoc}
The precise rendering is influenced by parameters specified below.
Arbitrary new shapes can defined using the \lit{rule code} option described
- afterwards.
+ below and the \cs{ebproofnewrulestyle} command described in
+ section~\ref{sec:styles}.
\end{csdoc}
-In the optional argument of the \cs{Infer} statement, rule styles can be
+In the optional argument of the \cs{infer} statement, rule styles can be
specified directly, without prefixing the style name by ``\lit{rule style=}''.
-For instance, \cs{Infer}\lit{[dashed]} is equivalent to
-\cs{Infer}\lit{[rule style=dashed]}.
+For instance, \cs{infer}\lit{[dashed]} is equivalent to
+\cs{infer}\lit{[rule style=dashed]}.
\begin{example}{gobble=2}
\begin{prooftree}
- \Hypo{ \Gamma &\vdash A \to B }
- \Infer[no rule]1{ \Gamma &\vdash {!A} \multimap B }
- \Hypo{ \Delta &\vdash A }
- \Infer[rule thickness=2pt]1{ \Delta &\vdash {!A} }
- \Infer0{ B \vdash B }
- \Infer[dashed]2{ \Delta, {!A}\multimap B \vdash B }
- \Infer2{ \Gamma, \Delta &\vdash B }
- \Infer[double]1{ \Gamma \cup \Delta &\vdash B }
+ \hypo{ \Gamma &\vdash A \to B }
+ \infer[no rule]1{ \Gamma &\vdash {!A} \multimap B }
+ \hypo{ \Delta &\vdash A }
+ \infer[rule thickness=2pt]1{ \Delta &\vdash {!A} }
+ \infer0{ B \vdash B }
+ \infer[dashed]2{ \Delta, {!A}\multimap B \vdash B }
+ \infer2{ \Gamma, \Delta &\vdash B }
+ \infer[double]1{ \Gamma \cup \Delta &\vdash B }
\end{prooftree}
\end{example}
@@ -426,34 +456,16 @@
\begin{prooftree}[rule code={\hbox{\tikz
\draw[decorate,decoration={snake,amplitude=.3ex}]
(0,0) -- (\hsize,0);}}]
- \Hypo{ \Gamma &\vdash A }
- \Infer1{ \Gamma &\vdash A, \ldots, A }
- \Hypo{ \Delta, A, \ldots, A \vdash \Theta }
- \Infer2{ \Gamma, \Delta \vdash \Theta }
+ \hypo{ \Gamma &\vdash A }
+ \infer1{ \Gamma &\vdash A, \ldots, A }
+ \hypo{ \Delta, A, \ldots, A \vdash \Theta }
+ \infer2{ \Gamma, \Delta \vdash \Theta }
\end{prooftree}
\end{example}
Note that this example requires the \package{tikz} package, with the
\package{decorations.pathmorphing} library for the \lit{snake} decoration.
\end{csdoc}
-The option \opt{rule code} is particularly useful in a ``styles'' in the sense of
-\package{pgfkeys} as it allows to define new rule styles.
-The allowed values for \opt{rule style} are actually defined this way.
-The above example could be turned into a new rule style \lit{zigzag} with the
-following command:
-\begin{example}{gobble=2}
- \ebproofset{
- rule style/zigzag/.style={rule code={\hbox{\tikz
- \draw[decorate,decoration={snake,amplitude=.3ex}]
- (0,0) -- (\hsize,0);}}}}
- \begin{prooftree}
- \Hypo{ \Gamma &\vdash A }
- \Infer1{ \Gamma &\vdash A, \ldots, A }
- \Hypo{ \Delta, A, \ldots, A \vdash \Theta }
- \Infer[zigzag]2{ \Gamma, \Delta \vdash \Theta }
- \end{prooftree}
-\end{example}
-
\subsection{Format of conclusions}
\begin{csdoc}{%
@@ -462,8 +474,8 @@
\opt{right template=}\meta{code}}
Defines how conclusions are formatted.
The code is arbitrary \TeX\ code, composed in horizontal mode.
- The macro \cs{inserttext} can be used inside the actual text passed to the
- \cs{Hypo} and \cs{Infer} statements.
+ The macro \cs{inserttext} is used to insert the actual text passed to the
+ \cs{hypo} and \cs{infer} statements.
The \opt{template} value is used for conclusions with no alignment mark.
The \opt{left template} and \opt{right template} values are used on the left
and right side of the alignment mark when it is present.
@@ -471,14 +483,14 @@
conclusions are set in math mode.
The default values for \opt{left template} and \opt{right template} are
similar, with spacing assuming that a relation symbol is put near the
- alignment mark, so that \verb|\Infer1{A &\vdash B}| is spaced correctly.
+ alignment mark, so that \verb|\infer1{A &\vdash B}| is spaced correctly.
\begin{example}{gobble=4}
\begin{prooftree}[template=(\textbf\inserttext)]
- \Hypo{ foo }
- \Hypo{ bar }
- \Infer1{ baz }
- \Infer2{ quux }
+ \hypo{ foo }
+ \hypo{ bar }
+ \infer1{ baz }
+ \infer2{ quux }
\end{prooftree}
\end{example}
\end{csdoc}
@@ -490,8 +502,18 @@
\opt{right label=}\meta{text}}
The text to use as the labels of the rules, on the left and on the right
of the inference line.
- Using the second optional argument in \cs{Infer} is equivalent to setting
+ Using the second optional argument in \cs{infer} is equivalent to setting
the \env{right label} option with the value of that argument.
+
+ \begin{example}{gobble=4}
+ \begin{prooftree}
+ \hypo{ \Gamma, A &\vdash B }
+ \infer[left label=$\lambda$]1[abs]
+ { \Gamma &\vdash A\to B }
+ \hypo{ \Gamma \vdash A }
+ \infer[left label=@]2[app]{ \Gamma \vdash B }
+ \end{prooftree}
+ \end{example}
\end{csdoc}
\begin{csdoc}{%
\opt{left label template=}\meta{code} \\
@@ -508,6 +530,60 @@
The spacing between an inference lines and its labels.
The default value is \lit{0.5em}.
\end{csdoc}
+\begin{csdoc}{\opt{label axis=}\meta{dimension}}
+ The height of the horizontal axis used for aligning the labels with the
+ rules. The default value is \lit{0.5ex}.
+\end{csdoc}
+
+
+\subsection{Style macros}
+\label{sec:styles}
+
+The following commands allow for the definition of custom styles using the
+basic style options, in a way similar to PGF's ``styles'' and \LaTeX3's
+``meta-keys''.
+This allows setting a bunch of options with the same values in many proofs
+using a single definition.
+
+\begin{csdoc}{\cs{ebproofnewstyle}\marg{name}\marg{options}}
+ Define a new style option \meta{name} that sets the given \meta{options}.
+
+ For instance, the following code defines a new option \opt{small} that sets
+ various parameters so that proofs are rendered smaller.
+ \begin{example}{gobble=4}
+ \ebproofnewstyle{small}{
+ separation = 1em, rule margin = .5ex,
+ template = \footnotesize$\inserttext$ }
+ \begin{prooftree}[small]
+ \hypo{ \Gamma, A \vdash B }
+ \infer1{ \Gamma \vdash A\to B }
+ \hypo{ \Gamma \vdash A } \infer2{ \Gamma \vdash B }
+ \end{prooftree}
+ \end{example}
+\end{csdoc}
+
+\begin{csdoc}{\cs{ebproofnewrulestyle}\marg{name}\marg{options}}
+ Define a new rule style.
+ The \meta{options} part includes options used to set how to draw rules in
+ the new style.
+
+ The option \opt{rule code} is useful in this command as it allows to
+ define arbitrary rule styles.
+ For instance, the squiggly rule example above could be turned into a new
+ rule style \lit{zigzag} with the following code:
+ \begin{example}{gobble=4}
+ \ebproofnewrulestyle{zigzag}{
+ rule code = {\hbox{\tikz
+ \draw[decorate,decoration={snake,amplitude=.3ex}]
+ (0,0) -- (\hsize,0);}}}
+ \begin{prooftree}
+ \hypo{ \Gamma &\vdash A }
+ \infer1{ \Gamma &\vdash A, \ldots, A }
+ \hypo{ \Delta, A, \ldots, A \vdash \Theta }
+ \infer[zigzag]2{ \Gamma, \Delta \vdash \Theta }
+ \end{prooftree}
+ \end{example}
+\end{csdoc}
\section{License}
@@ -528,4 +604,35 @@
This work consists of the files \texttt{ebproof.sty} and \texttt{ebproof.tex}.
+
+\section{History}
+
+This section lists the principal evolutions of the package, in reverse
+chronological order.
+\begin{description}
+\item[Version 2.0]
+ A complete rewrite of the code using the \LaTeX3 programming environment.
+ The incompatible changes from the user's point of view are the following:
+ \begin{itemize}
+ \item Proof statements are now writtten in lowercase ({i.e.} \cs{Infer} is
+ now written \cs{infer} etc.) but the syntax is otherwise unchanged.
+ The old uppercase commands still work but produce a deprecation warning,
+ they will be removed in a future version.
+ \item New styles are now defined using \cs{ebproofnewstyle} and
+ \cs{ebproofnewrulestyle}. The previous method using PGF styles does not
+ work anymore (because PGF is not used anymore).
+ \end{itemize}
+ The new commands and options are the following:
+ \begin{itemize}
+ \item The statement \cs{rewrite} generalizes \cs{Alter},
+ \item The option \opt{label axis} controls vertical alignment of labels.
+ \end{itemize}
+\item[Version 1.1]
+ A bugfix release.
+ In \opt{template} options, one now uses \cs{inserttext} instead of \lit{\#1}
+ for the text arguments, which improves robustness.
+\item[Version 1.0]
+ The first public release.
+\end{description}
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebproof.doc.tlpobj new/tlpkg/tlpobj/ebproof.doc.tlpobj
--- old/tlpkg/tlpobj/ebproof.doc.tlpobj 2016-04-14 18:59:04.000000000 +0200
+++ new/tlpkg/tlpobj/ebproof.doc.tlpobj 2017-05-18 02:22:02.000000000 +0200
@@ -1,9 +1,9 @@
name ebproof.doc
category Package
-revision 36595
+revision 44392
shortdesc doc files of ebproof
relocated 1
-docfiles size=55
- RELOC/doc/latex/ebproof/README
+docfiles size=63
+ RELOC/doc/latex/ebproof/README.md
RELOC/doc/latex/ebproof/ebproof.pdf
RELOC/doc/latex/ebproof/ebproof.tex
++++++ ebproof.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ebproof/ebproof.sty new/tex/latex/ebproof/ebproof.sty
--- old/tex/latex/ebproof/ebproof.sty 2015-03-22 22:22:17.000000000 +0100
+++ new/tex/latex/ebproof/ebproof.sty 2017-05-17 23:51:34.000000000 +0200
@@ -1,8 +1,8 @@
% The ebproof package - Formal proofs in the style of sequent calculus
%% ebproof.sty
-%% Copyright 2015 Emmanuel Beffara
-%
+%% Copyright 2017 Emmanuel Beffara
+
% 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.
@@ -10,543 +10,758 @@
% 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 Emmanuel Beffara.
-%
+
% This work consists of the files ebproof.sty and ebproof.tex.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ebproof}[2015/03/13 v1.1 EB's proof trees]
+\RequirePackage{expl3}
+\RequirePackage{xparse}
+\ProvidesExplPackage{ebproof}{2017/05/17}{2.0}{EB's proof trees}
-% The |pgfkeys| package is used for the parameters in proof construction.
-\RequirePackage{pgfkeys}
+%% Parameters
-%%% Registers and internal parameters
+%%% Declaration of the parameters
-\newif\ifebproof@updown \ebproof@updownfalse
-\newif\ifebproof@center \ebproof@centertrue
+\keys_define:nn { ebproof } {
-%%% Parameters
+% general shape
-\def\ebproofset#1{\pgfqkeys{/ebproof}{#1}}
+center .bool_set:N = \l_ebproof_center_bool,
+
+proof~style .choice: ,
+proof~style / upwards .code:n = \bool_set_false:N \l_ebproof_updown_bool,
+proof~style / downwards .code:n = \bool_set_true:N \l_ebproof_updown_bool,
-\ebproofset{
-%
-% general shape
-%
-center/.is if=ebproof@center,
-proof style/.is choice,
-proof style/upwards/.code={\ebproof@updownfalse},
-proof style/downwards/.code={\ebproof@updowntrue},
-%
% spacing
-%
-separation/.initial=1.5em,
-rule margin/.initial=.7ex,
-%
+
+separation .dim_set:N = \l_ebproof_separation_dim,
+rule~margin .dim_set:N = \l_ebproof_rule_margin_dim,
+
% shape of inference lines
-%
-rule thickness/.initial=.4pt,
-rule separation/.initial=2pt,
-rule dash length/.initial=.2em,
-rule dash space/.initial=.3em,
-rule code/.initial=,
-%
+
+rule~thickness .dim_set:N = \l_ebproof_rule_thickness_dim,
+rule~separation .dim_set:N = \l_ebproof_rule_separation_dim,
+rule~dash~length .dim_set:N = \l_ebproof_rule_dash_length_dim,
+rule~dash~space .dim_set:N = \l_ebproof_rule_dash_space_dim,
+rule~code .tl_set:N = \l_ebproof_rule_code_tl,
+
+rule~style .choice:,
+
% templates
-%
-template/.initial=$\inserttext$,
-left template/.initial=$\inserttext\mathrel{}$,
-right template/.initial=$\mathrel{}\inserttext$,
-%
+
+template .tl_set:N = \l_ebproof_template_tl,
+left~template .tl_set:N = \l_ebproof_left_template_tl,
+right~template .tl_set:N = \l_ebproof_right_template_tl,
+
% labels
-%
-left label/.initial=,
-right label/.initial=,
-left label template/.initial=\inserttext,
-right label template/.initial=\inserttext,
-label separation/.initial=0.5em,
+
+left~label .tl_set:N = \l_ebproof_left_label_tl,
+right~label .tl_set:N = \l_ebproof_right_label_tl,
+left~label~template .tl_set:N = \l_ebproof_left_label_template_tl,
+right~label~template .tl_set:N = \l_ebproof_right_label_template_tl,
+label~separation .dim_set:N = \l_ebproof_label_separation_dim,
+label~axis .dim_set:N = \l_ebproof_label_axis_dim,
+
}
-% Rule styles
-
-\pgfqkeys{/ebproof/rule style}{
-.is choice,
-.search also=/ebproof,
-simple/.style={/ebproof/rule code={%
- \hrule height \pgfkeysvalueof{/ebproof/rule thickness}\relax
- }},
-%
-no rule/.style={/ebproof/rule code=},
-%
-double/.style={/ebproof/rule code={%
- \hrule height \pgfkeysvalueof{/ebproof/rule thickness}
- \kern\pgfkeysvalueof{/ebproof/rule separation}%
- \hrule height \pgfkeysvalueof{/ebproof/rule thickness}
- }},
-%
-dashed/.style={/ebproof/rule code={%
- \hbox to \hsize{%
- \@tempdima=\pgfkeysvalueof{/ebproof/rule dash space}%
- \divide\@tempdima2%
- \kern-\@tempdima%
- \cleaders\hbox{%
- \kern\@tempdima%
- \vrule
- height \pgfkeysvalueof{/ebproof/rule thickness}
- width \pgfkeysvalueof{/ebproof/rule dash length}%
- \kern\@tempdima
- }\hfill
- \kern-\@tempdima
- }%
- }},
-%
-simple % use the 'simple' rule style by default
+%%% Rule styles
+
+\NewDocumentCommand \ebproofnewrulestyle { mm } {
+ \keys_define:nn { ebproof } {
+ rule~style / #1 .meta:nn = { ebproof } { #2 }
+ }
}
-%%% Storage
+\ebproofnewrulestyle { simple } {
+ rule~code = { \tex_hrule:D height \l_ebproof_rule_thickness_dim }
+}
+
+\ebproofnewrulestyle { no~rule } {
+ rule~code =
+}
+
+\ebproofnewrulestyle { double } {
+ rule~code = {
+ \tex_hrule:D height \l_ebproof_rule_thickness_dim
+ \skip_vertical:N \l_ebproof_rule_separation_dim
+ \tex_hrule:D height \l_ebproof_rule_thickness_dim
+ }
+}
+
+\ebproofnewrulestyle { dashed } {
+ rule~code = {
+ \hbox_to_wd:nn { \tex_hsize:D } {
+ \dim_set:Nn \l_tmpa_dim { \l_ebproof_rule_dash_space_dim / 2 }
+ \skip_horizontal:n { -\l_tmpa_dim }
+ \tex_cleaders:D \hbox:n {
+ \skip_horizontal:N \l_tmpa_dim
+ \tex_vrule:D
+ height \l_ebproof_rule_thickness_dim
+ width \l_ebproof_rule_dash_length_dim
+ \skip_horizontal:N \l_tmpa_dim
+ }\tex_hfill:D
+ \skip_horizontal:n { -\l_tmpa_dim }
+ }
+ }
+}
+
+%%% Default values
+
+\keys_set:nn { ebproof } {
+ center = true,
+ proof~style = upwards,
+ separation = 1.5em,
+ rule~margin = .7ex,
+ rule~thickness = .4pt,
+ rule~separation = 2pt,
+ rule~dash~length = .2em,
+ rule~dash~space = .3em,
+ rule~style = simple,
+ template = $\inserttext$,
+ left~template = $\inserttext\mathrel{}$,
+ right~template = $\mathrel{}\inserttext$,
+ left~label = ,
+ right~label = ,
+ left~label~template = \inserttext,
+ right~label~template = \inserttext,
+ label~separation = 0.5em,
+ label~axis = 0.5ex
+}
+
+%%% Defining style macros
+
+\NewDocumentCommand \ebproofnewstyle { mm } {
+ \keys_define:nn { ebproof } { #1 .meta:n = { #2 } }
+}
+
+
+%% Proof trees
+
+% Proof trees are represented as a data structure that consists of a box and a
+% set of marks, which are vertical positions in the box (as distances from the
+% left edge). Arbitrary marks can be defined, the folowing are used for
+% alignment:
+% - left : the left of the conclusion
+% - right : the right of the conclusion
+% - axis : the vertical axis of the conclusion
+
+
+%%% Registers
-% Proof trees are represented as a data structure that consists of the
-% following data:
-%
-% - box : the tree itself, as a box, with the base line on that of
-% the conclusion
-% - left : the distance from the left of the box to the left of the
-% conclusion
-% - right : the distance from the right of the box to the right of the
-% conclusion
-% - axis : the distance from the left of the box to the vertical axis
-% of the conclusion
-%
% TeX does not actually provide data structures, so we have to encode things.
-% First we provide local allocators, for temporary allocation of registers in
-% a group. Dimensions are initialized to 0pt.
+% We provide an allocator for "registers" holding boxes with attributes. Such
+% a register consists in a box register and a property list for marks, which
+% maps mark names to values as explicit dimensions with units.
+
+% Create a new register.
+
+\cs_new:Nn \ebproof_new:N {
+ \box_new:N #1
+ \prop_new:c { l_ebproof_marks_ \__int_value:w #1 _prop }
+}
-\def\ebproof@localdimen#1{%
- \advance\count11\@ne% \count11 is the number of the last allocated \dimen
- \expandafter\dimendef\csname#1\endcsname=\count11%
- \csname#1\endcsname=0pt\relax}
+% Clear a register.
-% For boxes, the allocator must be used as
-%
-% \ebproof@localbox{NAME}=\hbox{...}
+\cs_new:Nn \ebproof_clear:N {
+ \hbox_set:Nn #1 {}
+ % Using \box_clear:N instead would not work because trying to push this box
+ % on the stack would not actually append any box.
+ \prop_clear:c { l_ebproof_marks_ \__int_value:w #1 _prop }
+ \ebproof_set_mark:Nnn #1 { left } { 0pt }
+ \ebproof_set_mark:Nnn #1 { right } { 0pt }
+ \ebproof_set_mark:Nnn #1 { axis } { 0pt }
+}
+
+
+%%% Mark operations
+
+% Set the value of a mark. The third argument is a dimension expression.
+
+\dim_new:N \l_ebproof_transit_dim
+
+\cs_new:Nn \ebproof_set_mark:Nnn {
+ \dim_set:Nn \l_ebproof_transit_dim { #3 }
+ \prop_put:cnV { l_ebproof_marks_ \__int_value:w #1 _prop } { #2 }
+ \l_ebproof_transit_dim
+}
+
+% Get the value of a mark. This is expandable and can be used in expressions.
+
+\cs_new:Nn \ebproof_mark:Nn {
+ \prop_item:cn { l_ebproof_marks_ \__int_value:w #1 _prop } { #2 }
+}
+
+% Shift the marks by a specified amount, without modifying the box.
+
+\cs_new:Nn \ebproof_shift_x:Nn {
+ \prop_map_inline:cn { l_ebproof_marks_ \__int_value:w #1 _prop } {
+ \ebproof_set_mark:Nnn #1 { ##1 } { ##2 + #2 }
+ }
+}
+
+% Move the left and right marks of the first tree so that they are at least as
+% far from the axis as they are in the second tree. For instance if the marks
+% are set as
+% 1: L---A-------R
+% 2: L-------A---R
+% then the marks of the first tree are then set as
+% 1: L-------A-------R
+% The contents of the tree are unchanged.
+
+\cs_new:Nn \ebproof_enlarge_conclusion:NN {
+ \dim_set:Nn \l_tmpa_dim { \ebproof_mark:Nn #1 {axis}
+ + \ebproof_mark:Nn #2 {left} - \ebproof_mark:Nn #2 {axis} }
+ \dim_compare:nNnT { \l_tmpa_dim } < { \ebproof_mark:Nn #1 {left} } {
+ \ebproof_set_mark:Nnn #1 {left} { \l_tmpa_dim } }
+ \dim_set:Nn \l_tmpa_dim { \ebproof_mark:Nn #1 {axis}
+ + \ebproof_mark:Nn #2 {right} - \ebproof_mark:Nn #2 {axis} }
+ \dim_compare:nNnT { \l_tmpa_dim } > { \ebproof_mark:Nn #1 {right} } {
+ \ebproof_set_mark:Nnn #1 {right} { \l_tmpa_dim } }
+}
+
+
+%%% Building blocks
+
+% Make a tree with explicit material in horizontal mode. Set the left and
+% right marks to extremal positions and set the axis in the middle.
+
+\cs_new:Nn \ebproof_make_simple:Nn {
+ \hbox_set:Nn #1 { #2 }
+ \ebproof_set_mark:Nnn #1 { left } { 0pt }
+ \ebproof_set_mark:Nnn #1 { axis } { \box_wd:N #1 / 2 }
+ \ebproof_set_mark:Nnn #1 { right } { \box_wd:N #1 }
+}
+
+% Make a tree with explicit material in horizontal mode, split in two parts.
+% Set the left and right marks to extremal positions and set the axis between
+% the two parts.
+
+\cs_new:Nn \ebproof_make_split:Nnn {
+ \ebproof_set_mark:Nnn #1 { left } { 0pt }
+ \hbox_set:Nn #1 { #2 }
+ \ebproof_set_mark:Nnn #1 { axis } { \box_wd:N #1 }
+ \hbox_set:Nn #1 { \hbox_unpack:N #1 #3 }
+ \ebproof_set_mark:Nnn #1 { right } { \box_wd:N #1 }
+}
+
+% Make a tree with explicit material in vertical mode, using an explicit width
+% and axis.
+
+\cs_new:Nn \ebproof_make_vertical:Nnnn {
+ \ebproof_set_mark:Nnn #1 { left } { 0pt }
+ \ebproof_set_mark:Nnn #1 { axis } { #2 }
+ \ebproof_set_mark:Nnn #1 { right } { #3 }
+ \vbox_set:Nn #1 {
+ \dim_set:Nn \tex_hsize:D { \ebproof_mark:Nn #1 {right} }
+ #4
+ }
+ \box_set_wd:Nn #1 { \ebproof_mark:Nn #1 {right} }
+}
+
+%%% Assembling boxes
+
+% Extend a tree box. The marks are shifted so that alignment is preserved. The
+% arguments are dimensions for the left, top, right and bottom sides
+% respectively.
+
+\cs_new:Nn \ebproof_extend:Nnnnn {
+ \dim_compare:nNnF { #2 } = { 0pt } {
+ \hbox_set:Nn #1 {
+ \skip_horizontal:n { #2 }
+ \box_use:N #1
+ }
+ \ebproof_shift_x:Nn #1 { #2 }
+ }
+ \box_set_ht:Nn #1 { \box_ht:N #1 + #3 }
+ \box_set_wd:Nn #1 { \box_wd:N #1 + #4 }
+ \box_set_dp:Nn #1 { \box_dp:N #1 + #5 }
+}
+
+% Append the contents of the second tree to the first one on the right, with
+% matching baselines. The marks of both trees are preserved. The middle
+% argument specifies the space to insert between boxes.
+
+\cs_new:Nn \ebproof_append_right:NnN {
+ \hbox_set:Nn #1 {
+ \box_use:N #1
+ \dim_compare:nNnF { #2 } = { 0pt } { \skip_horizontal:n { #2 } }
+ \box_use:N #3
+ }
+}
+
+% Append the contents of the second tree to the first one on the left, with
+% matching baselines. The marks of the first tree are shifted accordingly. The
+% middle argument specifies the space to insert between boxes.
+
+\cs_new:Nn \ebproof_append_left:NnN {
+ \ebproof_shift_x:Nn #1 { \box_wd:N #3 + #2 }
+ \hbox_set:Nn #1 {
+ \box_use:N #3
+ \dim_compare:nNnF { #2 } = { 0pt } { \skip_horizontal:n { #2 } }
+ \box_use:N #1
+ }
+}
+
+% Shift of two trees to the right so that the axes match. The marks of the one
+% that is shifted are updated accordingly.
+
+\cs_new:Nn \ebproof_align:NN {
+ \dim_set:Nn \l_tmpa_dim
+ { \ebproof_mark:Nn #2 {axis} - \ebproof_mark:Nn #1 {axis} }
+ \dim_compare:nNnTF \l_tmpa_dim < { 0pt } {
+ \ebproof_extend:Nnnnn #2 { -\l_tmpa_dim } { 0pt } { 0pt } { 0pt }
+ } {
+ \ebproof_extend:Nnnnn #1 { \l_tmpa_dim } { 0pt } { 0pt } { 0pt }
+ }
+}
+
+% Append the contents of the second tree above the first one, with matching
+% axes. The marks of the first tree are preserved.
+
+\cs_new:Nn \ebproof_append_above:NN {
+ \ebproof_align:NN #1 #2
+ \vbox_set:Nn #1 {
+ \box_use:N #2
+ \tex_prevdepth:D -1000pt
+ \box_use:N #1
+ }
+}
+
+% Append the contents of the second tree below the first one, with matching
+% axes. The marks of the first tree are preserved.
+
+\cs_new:Nn \ebproof_append_below:NN {
+ \ebproof_align:NN #1 #2
+ \vbox_set_top:Nn #1 {
+ \box_use:N #1
+ \tex_prevdepth:D -1000pt
+ \box_use:N #2
+ }
+}
+
+% Shift the material in a tree vertically so that the height and depth are
+% equal (like TeX's \vcenter but around the baseline).
+
+\cs_new:Nn \ebproof_vcenter:N {
+ \dim_set:Nn \l_tmpa_dim { ( \box_ht:N #1 - \box_dp:N #1 ) / 2 }
+ \box_set_eq:NN \l_tmpa_box #1
+ \hbox_set:Nn #1
+ { \box_move_down:nn { \l_tmpa_dim } { \box_use:N \l_tmpa_box } }
+}
+
+
+%% Making inferences
%
-% in order to set the value of the box.
+% The following commands use the parameters defined at the beginning of the
+% package for actually building proof trees using the commands defined above.
+
+% Append the contents of the second tree above or below the first one,
+% depending on current settings. Axes are aligned and the marks of the first
+% tree are preserved.
+
+\cs_new:Nn \ebproof_append_vertical:NN {
+ \bool_if:NTF \l_ebproof_updown_bool
+ { \ebproof_append_below:NN #1 #2 }
+ { \ebproof_append_above:NN #1 #2 }
+}
-\def\ebproof@localbox#1{%
- \advance\count14\@ne% \count14 is the number of the last allocated \box
- \expandafter\chardef\csname#1\endcsname\count14%
- \setbox\csname#1\endcsname}
-
-% From this we deduce an allocator for data structures. This allocator
-% receives a base name |A| and defines the registers |\A@box|, |\A@left|,
-% |\A@right| and |\A@axis|. The macro is used like |\ebproof@localbox|, by
-% providing a value for the box.
-
-\def\ebproof@alloc#1{%
- \ebproof@localdimen{#1@left}%
- \ebproof@localdimen{#1@right}%
- \ebproof@localdimen{#1@axis}%
- \ebproof@localbox{#1@box}}
-
-% Logically, such structures are stored on a stack. However, TeX does not
-% provide data structures, so we encode them using what we actually have. A
-% stack for boxes is implemented using a global hbox |\ebproof@box@stack| that
-% contains all the boxes successively, and the |\lastbox| primitive allows us
-% to pop elements from there. A macro |\ebproof@stack| is used to store the
-% dimensions textually: the empty stack is an empty macro, and a non-empty
-% stack is represented as |{left}{right}{axis}{tail}|. We maintain a counter
-% |\ebproof@level| with the number of elements on the stack, for consistency
-% checks.
-
-\newcount\ebproof@level
-\newbox\ebproof@box@stack
-\newbox\ebproof@box@temp
+% Make a box containing an inference rule with labels, using the current
+% settings. The width and axis position are taken as those of the conclusion
+% of another tree box. The third argument is used as a temporary register for
+% building labels.
+
+\cs_new:Nn \ebproof_make_rule_for:NNN {
+
+ % Build the rule.
+
+ \ebproof_make_vertical:Nnnn #1
+ { \ebproof_mark:Nn #2 {axis} - \ebproof_mark:Nn #2 {left} }
+ { \ebproof_mark:Nn #2 {right} - \ebproof_mark:Nn #2 {left} }
+ {
+ \skip_vertical:N \l_ebproof_rule_margin_dim
+ \tl_if_empty:NF { \l_ebproof_rule_code_tl } {
+ \tl_use:N \l_ebproof_rule_code_tl
+ \skip_vertical:N \l_ebproof_rule_margin_dim
+ }
+ }
+ \ebproof_vcenter:N #1
+
+ % Append the left label
+
+ \tl_if_blank:VF \l_ebproof_left_label_tl {
+ \ebproof_make_simple:Nn #3 {
+ \box_move_down:nn { \l_ebproof_label_axis_dim } { \hbox:n {
+ \cs_set_eq:NN \inserttext \l_ebproof_left_label_tl
+ \tl_use:N \l_ebproof_left_label_template_tl
+ } }
+ }
+ \box_set_ht:Nn #3 { 0pt }
+ \box_set_dp:Nn #3 { 0pt }
+ \ebproof_append_left:NnN
+ \l_ebproof_c_box \l_ebproof_label_separation_dim \l_ebproof_d_box
+ }
+
+ % Append the right label
+
+ \tl_if_blank:VF \l_ebproof_right_label_tl {
+ \ebproof_make_simple:Nn #3 {
+ \box_move_down:nn { \l_ebproof_label_axis_dim } { \hbox:n {
+ \cs_set_eq:NN \inserttext \l_ebproof_right_label_tl
+ \tl_use:N \l_ebproof_right_label_template_tl
+ } }
+ }
+ \box_set_ht:Nn #3 { 0pt }
+ \box_set_dp:Nn #3 { 0pt }
+ \ebproof_append_right:NnN
+ \l_ebproof_c_box \l_ebproof_label_separation_dim \l_ebproof_d_box
+ }
+
+}
+
+
+%% Stack-based interface
+
+%%% The stack
+
+% Logically, box structures are stored on a stack. However, TeX does not
+% provide data structures for that and the grouping mechanism is not flexible
+% enough, so we encode them using what we actually have. A stack for boxes is
+% implemented using a global hbox |\g_ebproof_stack_box| that contains all the
+% boxes successively. A sequence |\g_ebproof_stack_seq| is used to store the
+% dimensions property lists textually. We maintain a counter
+% |\g_ebproof_level_int| with the number of elements on the stack, for
+% consistency checks.
+
+\int_new:N \g_ebproof_level_int
+\box_new:N \g_ebproof_stack_box
+\seq_new:N \g_ebproof_stack_seq
% Clear the stack.
-\def\ebproof@clear{%
- \global\ebproof@level=0%
- \global\setbox\ebproof@box@stack=\box\voidb@x%
- \gdef\ebproof@stack{}}
-
-% Push an allocated structure (by name) on the stack.
-
-\def\ebproof@push#1{%
- \global\advance\ebproof@level1\relax
- \global\setbox\ebproof@box@stack=\hbox{%
- \unhbox\ebproof@box@stack\copy\csname#1@box\endcsname}%
- \xdef\ebproof@stack{%
- {\the\csname#1@left\endcsname}%
- {\the\csname#1@right\endcsname}%
- {\the\csname#1@axis\endcsname}%
- {\ebproof@stack}}}
-
-% Allocate a structure and pop its value from the top of the stack.
-
-\def\ebproof@pop#1{%
- \ifnum\ebproof@level>0\relax
- \global\advance\ebproof@level-1\relax
- \global\setbox\ebproof@box@stack=\hbox{%
- \unhbox\ebproof@box@stack
- \global\setbox\ebproof@box@temp=\lastbox}%
- \ebproof@alloc{#1}=\box\ebproof@box@temp%
- \begingroup\def\pop##1##2##3##4{\endgroup%
- \csname#1@left\endcsname=##1\relax
- \csname#1@right\endcsname=##2\relax
- \csname#1@axis\endcsname=##3\relax
- \gdef\ebproof@stack{##4}}%
- \expandafter\pop\ebproof@stack
- \else
- \PackageError{ebproof}{%
- Missing premiss in a proof tree}{}%
- \ebproof@alloc{#1}=\box\voidb@x%
- \fi}
-
-
-%%% Making boxes
-
-% Push a box with the axis in the middle.
-
-\def\ebproof@pushsimple#1{%
- \begingroup
- \ebproof@alloc{A}=\hbox{#1}%
- \A@axis=.5\wd\A@box
- \ebproof@push{A}%
- \endgroup}
-
-% Push a box made of two halves, with the axis between the halves.
-
-\def\ebproof@pushsplit#1#2{%
- \begingroup
- \ebproof@alloc{A}=\hbox{#1}%
- \A@axis=\wd\A@box
- \setbox\A@box=\hbox{\unhbox\A@box#2}%
- \ebproof@push{A}%
- \endgroup}
-
-% Join horizontally the two elements at the top of the stack.
-
-\def\ebproof@joinh{%
- \begingroup
- \ebproof@pop{A}%
- \ebproof@pop{B}%
- \ebproof@alloc{C}=\hbox{%
- \box\B@box
- \kern\pgfkeysvalueof{/ebproof/separation}%
- \box\A@box}%
- \C@left=\B@left
- \C@right=\A@right
- \C@axis=\wd\C@box
- \advance\C@axis\B@left
- \advance\C@axis-\A@right
- \divide\C@axis2\relax
- \ebproof@push{C}%
- \endgroup}
-
-% An $n$-ary version of the horizontal join.
-
-\def\ebproof@joinh@multi#1{%
- \begingroup
- \countdef\c=1
- \c=#1\relax%
- \ifnum\c=0
- \ebproof@alloc{X}=\hbox{}%
- \ebproof@push{X}%
- \else
- \ebproof@joinh@loop
- \fi
- \endgroup}
-\def\ebproof@joinh@loop{%
- \ifnum\c>1
- \ebproof@joinh
- \advance\c-1
- \expandafter\ebproof@joinh@loop
- \fi}
-
-% Append the last element to the right of the previous one, without changing
-% its alignment.
-
-\def\ebproof@joinright{%
- \begingroup
- \ebproof@pop{A}%
- \ebproof@pop{B}%
- \ebproof@alloc{C}=\hbox{%
- \box\B@box
- \kern\pgfkeysvalueof{/ebproof/separation}%
- \copy\A@box}%
- \C@left=\B@left
- \C@right=\B@right
- \advance\C@right\wd\A@box
- \advance\C@right\pgfkeysvalueof{/ebproof/separation}%
- \ebproof@push{C}%
- \endgroup}
+\cs_new:Nn \ebproof_clear_stack: {
+ \int_gset:Nn \g_ebproof_level_int { 0 }
+ \hbox_gset:Nn \g_ebproof_stack_box { }
+ \seq_gclear:N \g_ebproof_stack_seq
+}
-% Join vertically the two elements at the top of the stack, with a horizontal
-% rule of the appropriate size.
+% Push the contents of a register on the stack.
-\def\ebproof@joinv{%
- \begingroup
- \ebproof@pop{A}%
- \ebproof@pop{B}%
- %
- \ebproof@alloc{C}=\box\voidb@x%
- \ebproof@localdimen{A@shift}%
- \ebproof@localdimen{B@shift}%
- \ebproof@localdimen{R@shift}%
- \ebproof@localdimen{R@raise}%
- \ebproof@localdimen{R@width}%
- \ebproof@localdimen{C@width}%
- \ebproof@localdimen{tmp}%
- %
- % The placement of the boxes and the axis of the result
- \ifdim\A@axis>\B@axis
- \A@shift=0pt%
- \B@shift=\A@axis
- \advance\B@shift-\B@axis
- \C@axis=\A@axis
- \else
- \A@shift=\B@axis
- \advance\A@shift-\A@axis
- \B@shift=0pt%
- \C@axis=\B@axis
- \fi
- % The paddings of the result
- \C@left=\A@left
- \advance\C@left\A@shift
- \C@right=\A@right
- \tmp=\wd\B@box
- \advance\tmp\B@shift
- \advance\tmp-\wd\A@box
- \advance\tmp-\A@shift
- \ifdim\tmp>0pt%
- \C@width=\wd\B@box
- \advance\C@width\B@shift
- \advance\C@right\tmp
- \else
- \C@width=\wd\A@box
- \advance\C@width\A@shift
- \fi
- % The position of the rule
- \R@shift=\A@left
- \advance\R@shift\A@shift
- \tmp=\B@left
- \advance\tmp\B@shift
- \ifdim\R@shift>\tmp
- \R@shift=\tmp
- \fi
- % The width of the rule
- \R@width=\wd\A@box
- \advance\R@width\A@shift
- \advance\R@width-\A@right
- \tmp=\wd\B@box
- \advance\tmp\B@shift
- \advance\tmp-\B@right
- \ifdim\tmp>\R@width
- \R@width=\tmp
- \fi
- \advance\R@width-\R@shift
- % Make the rule box
- \ebproof@localbox{R@box}=\vbox{%
- \hsize=\R@width
- \hrule width \R@width height 0pt\relax
- \kern\pgfkeysvalueof{/ebproof/rule margin}%
- \pgfkeysgetvalue{/ebproof/rule code}{\@rulecode}%
- \ifx\@rulecode\@empty\else
- \@rulecode
- \unskip% so that only one margin is inserted if no rule is drawn
- \kern\pgfkeysvalueof{/ebproof/rule margin}%
- \fi
- }%
- % Make the label boxes
- \ebproof@localbox{LEFT}=\hbox{%
- \def\inserttext{\pgfkeysvalueof{/ebproof/left label}}%
- \pgfkeysvalueof{/ebproof/left label template}}%
- \ebproof@localbox{RIGHT}=\hbox{%
- \def\inserttext{\pgfkeysvalueof{/ebproof/right label}}%
- \pgfkeysvalueof{/ebproof/right label template}}%
- % Shift things if the left box is wider than |\R@shift|
- \ifvoid\LEFT\else
- \tmp=\wd\LEFT
- \advance\tmp\pgfkeysvalueof{/ebproof/label separation}
- \ifdim\tmp>\R@shift
- \advance\tmp-\R@shift
- \advance\A@shift\tmp
- \advance\B@shift\tmp
- \advance\C@left\tmp
- \advance\C@axis\tmp
- \advance\C@width\tmp
- \R@shift=0pt\relax
- \else
- \advance\R@shift-\tmp
- \fi
- \fi
- % Compute how the rule box must be shifted so that labels are aligned
- \ebproof@localbox{RC@box}=\hbox{$\vcenter{\copy\R@box}$}%
- \R@raise=\ht\R@box
- \advance\R@raise-\ht\RC@box
- % Make the complete rule box
- \setbox\RC@box=\hbox{%
- \ifvoid\LEFT\else
- \box\LEFT
- \kern\pgfkeysvalueof{/ebproof/label separation}
- \fi
- \box\RC@box
- \ifvoid\RIGHT\else
- \kern\pgfkeysvalueof{/ebproof/label separation}
- \box\RIGHT
- \fi}
- % Adapt the dimensions on the right if the total rule width is too large
- \tmp=\wd\RC@box
- \advance\tmp\R@shift
- \ifdim\tmp>\C@width
- \advance\tmp-\C@width
- \advance\C@right\tmp
- \fi
- % Cancel the labels' height and depth
- \setbox\RC@box=\hbox{\raise\R@raise\box\RC@box}
- \ht\RC@box=\ht\R@box
- \dp\RC@box=\dp\R@box
- % Make the box
- \ifebproof@updown
- \setbox\C@box=\vtop{%
- \moveright\A@shift\box\A@box
- \hrule height 0pt
- \moveright\R@shift\box\RC@box%
- \hrule height 0pt
- \moveright\B@shift\box\B@box}%
- \else
- \setbox\C@box=\vbox{%
- \moveright\B@shift\box\B@box
- \hrule height 0pt
- \moveright\R@shift\box\RC@box%
- \hrule height 0pt
- \moveright\A@shift\box\A@box}%
- \fi
- \ebproof@push{C}%
- \endgroup}
-
-%%% Modifying boxes
-
-% Alter a proof with a command that does not affect the size. Typically useful
-% with |\color| commands.
-
-\def\ebproof@alter#1{%
- \begingroup
- \ebproof@pop{A}%
- \setbox\A@box=\hbox{{#1\box\A@box}}%
- \ebproof@push{A}%
- \endgroup}
+\cs_new:Nn \ebproof_push:N {
+ \int_gincr:N \g_ebproof_level_int
+ \hbox_gset:Nn \g_ebproof_stack_box
+ { \hbox_unpack:N \g_ebproof_stack_box \box_use:N #1 }
+ \seq_gput_left:Nv \g_ebproof_stack_seq
+ { l_ebproof_marks_ \__int_value:w #1 _prop }
+}
-% Insert |\left| and |\right| delimiters without changing the alignment
+% Pop the value from the top of the stack into a register.
-\def\ebproof@delims#1#2{%
- \begingroup
- \ebproof@pop{TREE}%
- \ebproof@localbox{@SHIFTED}=%
- \hbox{$\vcenter{\copy\TREE@box}$}%
- \ebproof@localbox{@LEFT}=%
- \hbox{$#1\vrule height \ht\@SHIFTED depth \dp\@SHIFTED width 0pt\right.$}%
- \ebproof@localbox{@RIGHT}=%
- \hbox{$\left.\vrule height \ht\@SHIFTED depth \dp\@SHIFTED width 0pt#2$}%
- \ebproof@localdimen{dy}
- \dy=\dp\@SHIFTED
- \advance\dy-\dp\TREE@box
- \ebproof@alloc{A}=%
- \hbox{\raise\dy\hbox{\copy\@LEFT\box\@SHIFTED\copy\@RIGHT}}%
- \A@left=\wd\@LEFT \advance\A@left\TREE@left
- \A@right=\wd\@RIGHT \advance\A@right\TREE@right
- \A@axis=\wd\@LEFT \advance\A@axis\TREE@axis
- \ebproof@push{A}%
- \endgroup}
+\cs_new:Nn \ebproof_pop:N {
+ \int_compare:nNnTF { \g_ebproof_level_int } > { 0 } {
+ \int_gdecr:N \g_ebproof_level_int
+ \hbox_gset:Nn \g_ebproof_stack_box {
+ \hbox_unpack:N \g_ebproof_stack_box
+ \box_gset_to_last:N \g_tmpa_box
+ }
+ \box_set_eq_clear:NN #1 \g_tmpa_box
+ \seq_gpop_left:NN \g_ebproof_stack_seq \l_tmpa_tl
+ \tl_set_eq:cN { l_ebproof_marks_ \__int_value:w #1 _prop } \l_tmpa_tl
+ } {
+ \PackageError{ebproof}{Missing~premiss~in~a~proof~tree}{}
+ \ebproof_clear:N #1
+ }
+}
+
+%%% Assembling trees
+
+\ebproof_new:N \l_ebproof_a_box
+\ebproof_new:N \l_ebproof_b_box
+\ebproof_new:N \l_ebproof_c_box
+\ebproof_new:N \l_ebproof_d_box
+
+% Join horizontally a number of elements at the top of the stack. If several
+% trees are joined, use the left mark of the left tree, the right mark of the
+% right tree and set the axis in the middle of these marks.
+
+\cs_new:Nn \ebproof_join_horizontal:n {
+ \int_case:nnF { #1 } {
+ { 0 } {
+ \group_begin:
+ \ebproof_clear:N \l_ebproof_a_box
+ \ebproof_push:N \l_ebproof_a_box
+ \group_end:
+ }
+ { 1 } { }
+ } {
+ \group_begin:
+ \ebproof_pop:N \l_ebproof_a_box
+ \prg_replicate:nn { #1 - 1 } {
+ \ebproof_pop:N \l_ebproof_b_box
+ \ebproof_append_left:NnN
+ \l_ebproof_a_box \l_ebproof_separation_dim \l_ebproof_b_box
+ }
+ \ebproof_set_mark:Nnn \l_ebproof_a_box { left }
+ { \ebproof_mark:Nn \l_ebproof_b_box { left } }
+ \ebproof_set_mark:Nnn \l_ebproof_a_box { axis }
+ { ( \ebproof_mark:Nn \l_ebproof_a_box { left }
+ + \ebproof_mark:Nn \l_ebproof_a_box { right } ) / 2 }
+ \ebproof_push:N \l_ebproof_a_box
+ \group_end:
+ }
+}
+
+% Join vertically the two elements at the top of the stack, with a horizontal
+% rule of the appropriate size.
+
+\cs_new:Nn \ebproof_join_vertical: {
+ \group_begin:
+ \ebproof_pop:N \l_ebproof_a_box
+ \ebproof_pop:N \l_ebproof_b_box
+ \ebproof_enlarge_conclusion:NN \l_ebproof_b_box \l_ebproof_a_box
+ \ebproof_make_rule_for:NNN \l_ebproof_c_box \l_ebproof_b_box
+ \l_ebproof_d_box
+ \ebproof_append_vertical:NN \l_ebproof_a_box \l_ebproof_c_box
+ \ebproof_append_vertical:NN \l_ebproof_a_box \l_ebproof_b_box
+ \ebproof_push:N \l_ebproof_a_box
+ \group_end:
+}
%%% High-level commands
% Push a box with default formatting, using explicit alignment if the code
% contains a |&| character
-\def\ebproof@hypo@parse#1\ebproof@hypo@stop{
- {\def\ARG{#3}\ifx\ARG\@empty
- \aftergroup\iftrue\@gobble\fi
- \else\aftergroup\iffalse\@gobble\fi\fi}%
- % The above code has produced \iftrue or \iffalse here.
- \ebproof@pushsimple%
- {\def\inserttext{#1}\pgfkeysvalueof{/ebproof/template}}%
- \else
- \ebproof@pushsplit
- {\def\inserttext{#1}\pgfkeysvalueof{/ebproof/left template}}%
- {\def\inserttext{#2}\pgfkeysvalueof{/ebproof/right template}}%
- \fi}
-
-\newcommand\ebproof@hypo[2][]{%
- {\ebproofset{#1}\ebproof@hypo@parse#2&&\ebproof@hypo@stop}}
-
-% Build a n-ary rule
-
-\def\ebproof@infer{%
- \@ifnextchar[{\ebproof@infer@}{\ebproof@infer@[]}}
-\def\ebproof@infer@[#1]#2{%
- \@ifnextchar[%
- {\ebproof@infer@with@label{#1}{#2}}%
- {\ebproof@infer@@{#1}{#2}}}
-\def\ebproof@infer@with@label#1#2[#3]{%
- \ebproof@infer@@{#1,right label={#3}}{#2}}
-\def\ebproof@infer@@#1#2#3{{%
- \pgfqkeys{/ebproof/rule style}{.search also=/ebproof,#1}%
- \ebproof@joinh@multi{#2}%
- \ebproof@hypo{#3}%
- \ebproof@joinv}}
-
-% Ellipsis with vertical dots
-
-\def\ebproof@ellipsis#1#2{{%
- \ebproofset{rule code=}%
- \ebproof@pushsplit{}{%
- \setbox0=\vbox{\kern1.2ex\hbox{\ignorespaces#1}\hrule height 0pt\kern1.2ex}%
- \vbox to\ht0{\xleaders\vbox to .8ex{\vss\hbox{.}\vss}\vfill}%
- \rlap{ \box0}}%
- \ebproof@joinv
- \ebproof@hypo{#2}%
- \ebproof@joinv}}
+\cs_new:Npn \ebproof_statement_parse:w #1\ebproof_statement_stop: {
+ \tl_if_empty:nTF { #3 } {
+ \ebproof_make_simple:Nn \l_ebproof_a_box
+ { \cs_set:Npn \inserttext { #1 } \tl_use:N \l_ebproof_template_tl }
+ } {
+ \ebproof_make_split:Nnn \l_ebproof_a_box
+ { \cs_set:Npn \inserttext { #1 } \tl_use:N \l_ebproof_left_template_tl }
+ { \cs_set:Npn \inserttext { #2 } \tl_use:N \l_ebproof_right_template_tl }
+ }
+ \ebproof_push:N \l_ebproof_a_box
+}
+
+\cs_new:Nn \ebproof_push_statement:n {
+ \ebproof_statement_parse:w #1&& \ebproof_statement_stop:
+}
+
+
+%% Document interface
+
+%%% Functions to define statements
+
+% The |\g_ebproof_stack_seq| variable contains the list of all defined
+% statements. For each statement |X|, there is a document command |\ebproofX|
+% and the alias |\X| is defined when entering a |prooftree| environment.
+
+\seq_new:N \g_ebproof_statements_seq
+
+% Install the aliases for statements, saving the original value of the control
+% sequences.
+
+\cs_new:Nn \ebproof_setup_statements: {
+ \seq_map_inline:Nn \g_ebproof_statements_seq {
+ \cs_set_eq:cc { ebproof_saved_ ##1 } { ##1 }
+ \cs_set_eq:cc { ##1 } { ebproof ##1 }
+ }
+}
+
+% Restore the saved meanings of the control sequences. This is useful when
+% interpreting user-provided code in statement arguments. The meanings are
+% automatically restored when leaving a |prooftree| environment because of
+% grouping.
+
+\cs_new:Nn \ebproof_restore_statements: {
+ \seq_map_inline:Nn \g_ebproof_statements_seq {
+ \cs_set_eq:cc { ##1 } { ebproof_saved_ ##1 }
+ }
+}
+
+% Define a new statement. The first argument is the name, the second one is an
+% argument specifier as used by |xparse| and the third one is the body of the
+% command.
+
+\cs_new:Nn \ebproof_new_statement:nnn {
+ \exp_args:Nc \NewDocumentCommand { ebproof#1 }{ #2 } { #3 }
+ \seq_put_right:Nn \g_ebproof_statements_seq { #1 }
+}
+
+% Define a deprecated statement. The syntax is the same as above except that
+% an extra argument in third position indicates what should be used instead.
+% The effect is the same except that a warning message is issued the first
+% time the statement is used.
+
+\cs_new:Nn \ebproof_new_deprecated_statement:nnnn {
+ \cs_new:cpn { ebproof_#1_warning: } {
+ \PackageWarning { ebproof } { \token_to_str:c{#1}~is~deprecated,~#3 }
+ \cs_gset:cn { ebproof_#1_warning: } { }
+ }
+ \ebproof_new_statement:nnn { #1 } { #2 }
+ { \use:c { ebproof_#1_warning: } #4 }
+}
+
+
+%%% Basic commands
+
+\ebproof_new_statement:nnn { set } { m } {
+ \keys_set:nn { ebproof } { #1 }
+}
+
+\ebproof_new_statement:nnn { hypo } { O{} m } {
+ \group_begin:
+ \ebproof_restore_statements:
+ \keys_set:nn { ebproof } { #1 }
+ \ebproof_push_statement:n { #2 }
+ \group_end:
+}
+
+\ebproof_new_statement:nnn { infer } { O{} m O{} m } {
+ \group_begin:
+ \ebproof_restore_statements:
+ \keys_set_known:nnN { ebproof / rule~style } { #1 } \l_tmpa_tl
+ \keys_set:nV { ebproof } \l_tmpa_tl
+ \tl_set:Nn \l_ebproof_right_label_tl { #3 }
+ \ebproof_join_horizontal:n { #2 }
+ \ebproof_push_statement:n { #4 }
+ \ebproof_join_vertical:
+ \group_end:
+}
+
+\ebproof_new_statement:nnn { ellipsis } { m m } {
+ \group_begin:
+ \ebproof_restore_statements:
+ \tl_clear:N \l_ebproof_rule_code_tl
+ \ebproof_make_split:Nnn \l_ebproof_a_box { } {
+ \vbox_set:Nn \l_tmpa_box {
+ \skip_vertical:n { 1.2ex }
+ \hbox:n { \tex_ignorespaces:D #1 }
+ \skip_vertical:n { 1.2ex }
+ }
+ \vbox_to_ht:nn { \box_ht:N \l_tmpa_box } {
+ \tex_xleaders:D \vbox_to_ht:nn { .8ex }
+ { \tex_vss:D \hbox:n { . } \tex_vss:D }
+ \tex_vfill:D
+ }
+ \hbox_overlap_right:n { ~ \box_use:N \l_tmpa_box }
+ }
+ \ebproof_push:N \l_ebproof_a_box
+ \ebproof_join_vertical:
+ \ebproof_push_statement:n {#2}
+ \ebproof_join_vertical:
+ \group_end:
+}
+
+
+%%% Modifying trees
+
+% Rewrite the box at the top of the stack while preserving its dimensions an
+% marks. The code is typeset in horizontal mode, with control sequences to
+% access the original box and its marks:
+% - \treebox is a box register with the original material
+% - \treemark{NAME} provides the value of a given mark
+
+\ebproof_new_statement:nnn { rewrite } { m } {
+ \group_begin:
+ \ebproof_restore_statements:
+ \ebproof_pop:N \l_ebproof_a_box
+ \box_set_eq:NN \l_tmpa_box \l_ebproof_a_box
+ \hbox_set:Nn \l_tmpb_box {
+ \cs_set_eq:NN \treebox \l_tmpa_box
+ \cs_set:Npn \treemark { \ebproof_mark:Nn \l_ebproof_a_box }
+ { #1 }
+ }
+ \box_set_wd:Nn \l_tmpb_box { \box_wd:N \l_ebproof_a_box }
+ \box_set_ht:Nn \l_tmpb_box { \box_ht:N \l_ebproof_a_box }
+ \box_set_dp:Nn \l_tmpb_box { \box_dp:N \l_ebproof_a_box }
+ \box_set_eq:NN \l_ebproof_a_box \l_tmpb_box
+ \ebproof_push:N \l_ebproof_a_box
+ \group_end:
+}
+
+% Insert |\left| and |\right| delimiters without changing the alignment
+
+\ebproof_new_statement:nnn { delims } { m m } {
+ \group_begin:
+ \ebproof_restore_statements:
+ \ebproof_pop:N \l_ebproof_a_box
+ \hbox_set:Nn \l_tmpa_box
+ { $ \tex_vcenter:D { \box_use:N \l_ebproof_a_box } $ }
+ \dim_set:Nn \l_tmpa_dim
+ { \box_ht:N \l_tmpa_box - \box_ht:N \l_ebproof_a_box }
+ \hbox_set:Nn \l_ebproof_a_box {
+ $ #1 \tex_vrule:D
+ height \box_ht:N \l_tmpa_box depth \box_dp:N \l_tmpa_box width 0pt
+ \tex_right:D . $
+ }
+ \ebproof_shift_x:Nn \l_ebproof_a_box { \box_wd:N \l_ebproof_a_box }
+ \hbox_set:Nn \l_ebproof_a_box {
+ \hbox_unpack:N \l_ebproof_a_box
+ $ \tex_left:D . \box_use:N \l_tmpa_box #2 $
+ }
+ \hbox_set:Nn \l_ebproof_a_box
+ { \box_move_down:nn { \l_tmpa_dim } { \box_use:N \l_ebproof_a_box } }
+ \ebproof_push:N \l_ebproof_a_box
+ \group_end:
+}
+
+
+%%% Deprecated statements
+
+% These statements were defined in versions 1.x of the package, they are
+% preserved for temporary upwards compatibility and will be removed in a
+% future version.
+
+\ebproof_new_deprecated_statement:nnnn { Alter } { m }
+ { use~\token_to_str:c{rewrite}~instead } { \ebproofrewrite{ #1 \box\treebox } }
+\ebproof_new_deprecated_statement:nnnn { Delims } { }
+ { use~\token_to_str:c{delims}~instead } { \ebproofdelims }
+\ebproof_new_deprecated_statement:nnnn { Ellipsis } { }
+ { use~\token_to_str:c{ellipsis}~instead } { \ebproofellipsis }
+\ebproof_new_deprecated_statement:nnnn { Hypo } { }
+ { use~\token_to_str:c{hypo}~instead } { \ebproofhypo }
+\ebproof_new_deprecated_statement:nnnn { Infer } { }
+ { use~\token_to_str:c{infer}~instead } { \ebproofinfer }
+
%%% Environment interface
-\ebproof@clear
+\ebproof_clear_stack:
+
+\tl_new:N \l_ebproof_start_level_tl
+
+\NewDocumentEnvironment { prooftree } { s O{} } {
+ \keys_set_known:nnN { ebproof / proof~style } { #2 } \l_tmpa_tl
+ \keys_set:nV { ebproof } \l_tmpa_tl
+ \tl_set:Nx \l_ebproof_start_level_tl { \int_use:N \g_ebproof_level_int }
+ \vbox_set:Nw \l_tmpa_box
+ \ebproof_setup_statements:
+} {
+ \vbox_set_end:
+ \ebproof_pop:N \l_ebproof_a_box
+ \int_compare:nNnF { \g_ebproof_level_int } = { \tl_use:N \l_ebproof_start_level_tl } {
+ \PackageError{ebproof}{Malformed~proof~tree}{
+ Some~hypotheses~were~declared~but~not~used~in~this~tree.}
+ }
+ \IfBooleanTF { #1 } {
+ \[ \box_use:N \l_ebproof_a_box \]
+ \ignorespacesafterend
+ } {
+ \hbox_unpack:N \c_empty_box
+ \bool_if:NTF \l_ebproof_center_bool {
+ \hbox:n { $ \tex_vcenter:D { \box_use:N \l_ebproof_a_box } $ }
+ } {
+ \box_use:N \l_ebproof_a_box
+ }
+ }
+}
-\def\ebproof@begin{%
- \edef\ebproof@start@level{\the\ebproof@level}%
- \setbox1=\vbox\bgroup
- \let\Hypo=\ebproof@hypo
- \let\Infer=\ebproof@infer
- \let\Ellipsis=\ebproof@ellipsis
- \let\Alter=\ebproof@alter
- \let\Delims=\ebproof@delims}
-\def\ebproof@end{%
- \egroup
- \ebproof@pop{X}%
- \ifnum\ebproof@level=\ebproof@start@level\else
- \PackageError{ebproof}{Malformed proof tree}{%
- Some hypotheses were declared but not used in this tree.}%
- \fi
- \ifebproof@center
- \hbox{$\vcenter{\hbox{\box\X@box}}$}%
- \else
- \box\X@box
- \fi
- \global\setbox\ebproof@box@temp=\box1}
-
-\newenvironment{prooftree}[1][]{%
- \pgfqkeys{/ebproof/proof style}{.search also=/ebproof,#1}%
- \leavevmode\ebproof@begin
-}{%
- \ebproof@end}
-
-\newenvironment{prooftree*}[1][]{%
- \center
- \pgfqkeys{/ebproof/proof style}{.search also=/ebproof,#1}%
- \leavevmode\ebproof@begin
-}{%
- \ebproof@end
- \endcenter}
+% A trick for the starred version:
+\cs_new:cpn { prooftree* } { \prooftree* }
+\cs_new:cpn { endprooftree* } { \endprooftree }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebproof.tlpobj new/tlpkg/tlpobj/ebproof.tlpobj
--- old/tlpkg/tlpobj/ebproof.tlpobj 2016-04-14 18:59:04.000000000 +0200
+++ new/tlpkg/tlpobj/ebproof.tlpobj 2017-05-18 02:22:02.000000000 +0200
@@ -1,6 +1,6 @@
name ebproof
category Package
-revision 36595
+revision 44392
shortdesc Formal proofs in the style of sequent calculus
relocated 1
longdesc This package provides commands to typeset proof trees in the
@@ -9,12 +9,12 @@
longdesc alignment of successive formulas on an arbitrary point. Various
longdesc options allow complete control over spacing, styles of
longdesc inference rules, placement of labels, etc. The package requires
-longdesc pgfkeys (from the PGF/TikZ bundle) for the option system.
-runfiles size=4
+longdesc expl3 and xparse.
+runfiles size=6
RELOC/tex/latex/ebproof/ebproof.sty
catalogue-also bussproofs
catalogue-ctan /macros/latex/contrib/ebproof
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2017-05-17 18:37:56 +0200
catalogue-license lppl1.3
catalogue-topics maths proof
-catalogue-version 1.1
+catalogue-version 2.0
++++++ ebsthesis.doc.tar.xz ++++++
++++++ ebsthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ebsthesis.tlpobj new/tlpkg/tlpobj/ebsthesis.tlpobj
--- old/tlpkg/tlpobj/ebsthesis.tlpobj 2016-04-14 18:59:04.000000000 +0200
+++ new/tlpkg/tlpobj/ebsthesis.tlpobj 2017-04-14 17:39:05.000000000 +0200
@@ -10,7 +10,7 @@
runfiles size=6
RELOC/tex/latex/ebsthesis/ebsthesis.cls
catalogue-ctan /macros/latex/contrib/ebsthesis
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics dissertation class
catalogue-version 1.0
++++++ ec.doc.tar.xz ++++++
++++++ ec.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ec.tlpobj new/tlpkg/tlpobj/ec.tlpobj
--- old/tlpkg/tlpobj/ec.tlpobj 2016-04-14 18:59:04.000000000 +0200
+++ new/tlpkg/tlpobj/ec.tlpobj 2017-04-14 17:39:05.000000000 +0200
@@ -1251,7 +1251,7 @@
RELOC/fonts/tfm/jknappen/ec/tcvt3583.tfm
catalogue-also eco
catalogue-ctan /fonts/ec
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
catalogue-topics font font-mf font-serif font-sans font-proportional font-mono font-cm
catalogue-version 1.0
++++++ ecc.doc.tar.xz ++++++
++++++ ecc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ecc.tlpobj new/tlpkg/tlpobj/ecc.tlpobj
--- old/tlpkg/tlpobj/ecc.tlpobj 2016-04-14 18:59:08.000000000 +0200
+++ new/tlpkg/tlpobj/ecc.tlpobj 2017-04-14 17:39:06.000000000 +0200
@@ -74,6 +74,6 @@
RELOC/fonts/tfm/public/ecc/toti10.tfm
catalogue-also ccfonts
catalogue-ctan /fonts/ecc
-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-t1enc
++++++ ecclesiastic.doc.tar.xz ++++++
++++++ ecclesiastic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ecclesiastic.tlpobj new/tlpkg/tlpobj/ecclesiastic.tlpobj
--- old/tlpkg/tlpobj/ecclesiastic.tlpobj 2016-04-14 18:59:08.000000000 +0200
+++ new/tlpkg/tlpobj/ecclesiastic.tlpobj 2017-04-14 17:39:06.000000000 +0200
@@ -11,7 +11,7 @@
runfiles size=2
RELOC/tex/latex/ecclesiastic/ecclesiastic.sty
catalogue-ctan /macros/latex/contrib/ecclesiastic
-catalogue-date 2015-08-21 17:57:17 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics multilingual-addon
catalogue-version 0.3
++++++ ecltree.doc.tar.xz ++++++
++++++ ecltree.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ecltree.tlpobj new/tlpkg/tlpobj/ecltree.tlpobj
--- old/tlpkg/tlpobj/ecltree.tlpobj 2016-04-14 18:59:08.000000000 +0200
+++ new/tlpkg/tlpobj/ecltree.tlpobj 2017-04-14 17:39:07.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/latex/ecltree/ecltree.sty
catalogue-also epic eepic
catalogue-ctan /macros/latex/contrib/eclbip
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics tree linguistic
catalogue-version 1.1a
++++++ eco.doc.tar.xz ++++++
++++++ eco.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eco.tlpobj new/tlpkg/tlpobj/eco.tlpobj
--- old/tlpkg/tlpobj/eco.tlpobj 2016-04-14 18:59:08.000000000 +0200
+++ new/tlpkg/tlpobj/eco.tlpobj 2017-04-14 17:39:07.000000000 +0200
@@ -510,7 +510,7 @@
RELOC/tex/latex/eco/T1cmovt.fd
RELOC/tex/latex/eco/eco.sty
catalogue-ctan /fonts/eco
-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-virtual
catalogue-version 1.3
++++++ ecobiblatex.doc.tar.xz ++++++
++++++ ecobiblatex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ecobiblatex.tlpobj new/tlpkg/tlpobj/ecobiblatex.tlpobj
--- old/tlpkg/tlpobj/ecobiblatex.tlpobj 2016-04-14 18:59:10.000000000 +0200
+++ new/tlpkg/tlpobj/ecobiblatex.tlpobj 2017-04-14 17:39:07.000000000 +0200
@@ -12,7 +12,7 @@
RELOC/tex/latex/ecobiblatex/ecobiblatex.bbx
RELOC/tex/latex/ecobiblatex/ecobiblatex.cbx
catalogue-ctan /macros/latex/contrib/biblatex-contrib/ecobiblatex
-catalogue-date 2016-01-04 06:20:16 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics biblatex
catalogue-version 1.0
++++++ econometrics.doc.tar.xz ++++++
++++++ econometrics.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/econometrics.tlpobj new/tlpkg/tlpobj/econometrics.tlpobj
--- old/tlpkg/tlpobj/econometrics.tlpobj 2016-04-14 18:59:11.000000000 +0200
+++ new/tlpkg/tlpobj/econometrics.tlpobj 2017-04-14 17:39:08.000000000 +0200
@@ -14,7 +14,7 @@
runfiles size=2
RELOC/tex/latex/econometrics/econometrics.sty
catalogue-ctan /macros/latex/contrib/econometrics
-catalogue-date 2016-01-20 05:05:00 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics statistics
catalogue-version 1.0
++++++ economic.doc.tar.xz ++++++
++++++ economic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/economic.tlpobj new/tlpkg/tlpobj/economic.tlpobj
--- old/tlpkg/tlpobj/economic.tlpobj 2016-04-14 18:59:11.000000000 +0200
+++ new/tlpkg/tlpobj/economic.tlpobj 2017-04-14 17:39:08.000000000 +0200
@@ -45,6 +45,6 @@
RELOC/tex/latex/economic/regstud.cls
RELOC/tex/latex/economic/worlddev.cls
catalogue-ctan /biblio/bibtex/contrib/economic
-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
++++++ ecv.doc.tar.xz ++++++
++++++ ecv.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ecv.tlpobj new/tlpkg/tlpobj/ecv.tlpobj
--- old/tlpkg/tlpobj/ecv.tlpobj 2016-04-14 18:59:12.000000000 +0200
+++ new/tlpkg/tlpobj/ecv.tlpobj 2017-04-14 17:39:08.000000000 +0200
@@ -14,7 +14,7 @@
RELOC/tex/latex/ecv/ecvNLS.sty
catalogue-also curve europecv
catalogue-ctan /macros/latex/contrib/ecv
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
catalogue-topics cv class
catalogue-version 0.3
++++++ ed.doc.tar.xz ++++++
++++++ ed.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ed.tlpobj new/tlpkg/tlpobj/ed.tlpobj
--- old/tlpkg/tlpobj/ed.tlpobj 2016-04-14 18:59:13.000000000 +0200
+++ new/tlpkg/tlpobj/ed.tlpobj 2017-04-14 17:39:08.000000000 +0200
@@ -11,7 +11,7 @@
runfiles size=2
RELOC/tex/latex/ed/ed.sty
catalogue-ctan /macros/latex/contrib/ed
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-30 10:23:22 +0200
catalogue-license lppl1
catalogue-topics editorial
catalogue-version 1.8
++++++ edfnotes.doc.tar.xz ++++++
++++++ edfnotes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/edfnotes.tlpobj new/tlpkg/tlpobj/edfnotes.tlpobj
--- old/tlpkg/tlpobj/edfnotes.tlpobj 2016-04-14 18:59:13.000000000 +0200
+++ new/tlpkg/tlpobj/edfnotes.tlpobj 2017-04-14 17:39:08.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=11
RELOC/tex/latex/edfnotes/edfnotes.sty
catalogue-ctan /macros/latex/contrib/edfnotes
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics crit-ed footnote
catalogue-version 0.6b
++++++ edmac.doc.tar.xz ++++++
++++++ edmac.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/edmac.tlpobj new/tlpkg/tlpobj/edmac.tlpobj
--- old/tlpkg/tlpobj/edmac.tlpobj 2016-04-14 18:59:13.000000000 +0200
+++ new/tlpkg/tlpobj/edmac.tlpobj 2017-04-14 17:39:09.000000000 +0200
@@ -12,7 +12,7 @@
RELOC/tex/generic/edmac/tabmac.tex
catalogue-also ledmac ednotes manyfoot lineno poemscol
catalogue-ctan /macros/plain/contrib/edmac
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl2
catalogue-topics crit-ed
catalogue-version 3.17
++++++ edmargin.doc.tar.xz ++++++
++++++ edmargin.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/edmargin.tlpobj new/tlpkg/tlpobj/edmargin.tlpobj
--- old/tlpkg/tlpobj/edmargin.tlpobj 2016-04-14 18:59:14.000000000 +0200
+++ new/tlpkg/tlpobj/edmargin.tlpobj 2017-04-14 17:39:09.000000000 +0200
@@ -15,7 +15,7 @@
runfiles size=6
RELOC/tex/latex/edmargin/edmargin.sty
catalogue-ctan /macros/latex/contrib/edmargin
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics crit-ed notes
catalogue-version 1.2
++++++ ednotes.doc.tar.xz ++++++
++++++ ednotes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ednotes.tlpobj new/tlpkg/tlpobj/ednotes.tlpobj
--- old/tlpkg/tlpobj/ednotes.tlpobj 2016-04-14 18:59:14.000000000 +0200
+++ new/tlpkg/tlpobj/ednotes.tlpobj 2017-04-14 17:39:09.000000000 +0200
@@ -15,7 +15,7 @@
RELOC/tex/latex/ednotes/mfparxsp.sty
catalogue-also edmac ledmac manyfoot lineno poemscol
catalogue-ctan /macros/latex/contrib/ednotes
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics crit-ed
catalogue-version 1.3a
++++++ eemeir.doc.tar.xz ++++++
++++++ eemeir.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eemeir.tlpobj new/tlpkg/tlpobj/eemeir.tlpobj
--- old/tlpkg/tlpobj/eemeir.tlpobj 2016-04-14 18:59:15.000000000 +0200
+++ new/tlpkg/tlpobj/eemeir.tlpobj 2017-04-14 17:39:09.000000000 +0200
@@ -16,7 +16,7 @@
RELOC/tex/latex/eemeir/eemeir.sty
catalogue-also he-she gender
catalogue-ctan /macros/latex/contrib/eemeir
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics linguistic typesetting
catalogue-version 1.1b
++++++ eepic.doc.tar.xz ++++++
++++++ eepic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eepic.tlpobj new/tlpkg/tlpobj/eepic.tlpobj
--- old/tlpkg/tlpobj/eepic.tlpobj 2016-04-14 18:59:15.000000000 +0200
+++ new/tlpkg/tlpobj/eepic.tlpobj 2017-04-14 17:39:09.000000000 +0200
@@ -15,7 +15,7 @@
RELOC/tex/latex/eepic/eepicemu.sty
RELOC/tex/latex/eepic/epic.sty
catalogue-ctan /macros/latex/contrib/eepic
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics graphics-in-tex
catalogue-version 1.1e
++++++ efbox.doc.tar.xz ++++++
++++++ efbox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/efbox.tlpobj new/tlpkg/tlpobj/efbox.tlpobj
--- old/tlpkg/tlpobj/efbox.tlpobj 2016-04-14 18:59:15.000000000 +0200
+++ new/tlpkg/tlpobj/efbox.tlpobj 2017-04-14 17:39:09.000000000 +0200
@@ -10,7 +10,7 @@
runfiles size=2
RELOC/tex/latex/efbox/efbox.sty
catalogue-ctan /macros/latex/contrib/efbox
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics boxing
catalogue-version 1.0
++++++ egameps.doc.tar.xz ++++++
++++++ egameps.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/egameps.tlpobj new/tlpkg/tlpobj/egameps.tlpobj
--- old/tlpkg/tlpobj/egameps.tlpobj 2016-04-14 18:59:15.000000000 +0200
+++ new/tlpkg/tlpobj/egameps.tlpobj 2017-04-14 17:39:10.000000000 +0200
@@ -12,7 +12,7 @@
runfiles size=11
RELOC/tex/latex/egameps/egameps.sty
catalogue-ctan /macros/latex/contrib/egameps
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics games graphics-in-tex
catalogue-version 1.1
++++++ egplot.doc.tar.xz ++++++
++++++ egplot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/egplot.tlpobj new/tlpkg/tlpobj/egplot.tlpobj
--- old/tlpkg/tlpobj/egplot.tlpobj 2016-04-14 18:59:16.000000000 +0200
+++ new/tlpkg/tlpobj/egplot.tlpobj 2017-04-14 17:39:10.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=3
RELOC/tex/latex/egplot/egplot.sty
catalogue-ctan /macros/latex/contrib/egplot
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics graphics-inline
catalogue-version 1.02a
++++++ eiad-ltx.doc.tar.xz ++++++
++++++ eiad-ltx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eiad-ltx.tlpobj new/tlpkg/tlpobj/eiad-ltx.tlpobj
--- old/tlpkg/tlpobj/eiad-ltx.tlpobj 2016-04-14 18:59:17.000000000 +0200
+++ new/tlpkg/tlpobj/eiad-ltx.tlpobj 2017-04-14 17:39:10.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/fonts/source/public/eiad-ltx/Fr10.mf
RELOC/tex/latex/eiad-ltx/eiad.sty
catalogue-ctan /macros/latex/contrib/eiad
-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 irish-gaelic
catalogue-version 1.0
++++++ eiad.doc.tar.xz ++++++
++++++ eiad.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eiad.tlpobj new/tlpkg/tlpobj/eiad.tlpobj
--- old/tlpkg/tlpobj/eiad.tlpobj 2016-04-14 18:59:16.000000000 +0200
+++ new/tlpkg/tlpobj/eiad.tlpobj 2017-04-14 17:39:10.000000000 +0200
@@ -82,6 +82,6 @@
RELOC/tex/latex/eiad/OT1eiadss.fd
RELOC/tex/latex/eiad/OT1eiadtt.fd
catalogue-ctan /fonts/eiad
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics font irish-gaelic
++++++ eijkhout.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eijkhout.tlpobj new/tlpkg/tlpobj/eijkhout.tlpobj
--- old/tlpkg/tlpobj/eijkhout.tlpobj 2016-04-14 18:59:17.000000000 +0200
+++ new/tlpkg/tlpobj/eijkhout.tlpobj 2017-04-14 17:39:10.000000000 +0200
@@ -12,6 +12,6 @@
RELOC/tex/generic/eijkhout/DB_process.tex
RELOC/tex/generic/eijkhout/repeat.tex
catalogue-ctan /macros/generic/eijkhout
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license collection
catalogue-topics collection
++++++ einfuehrung.doc.tar.xz ++++++
++++++ einfuehrung2.doc.tar.xz ++++++
++++++ ejpecp.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ejpecp/README new/doc/latex/ejpecp/README
--- old/doc/latex/ejpecp/README 2016-04-07 22:54:11.000000000 +0200
+++ new/doc/latex/ejpecp/README 2016-11-25 19:28:42.000000000 +0100
@@ -51,6 +51,8 @@
http:/mirror.ctan.org/macros/latex/contrib/ejpecp/
CHANGELOG
+ 2016/09/06 v1.5
+ hypertexnames=false configuration for hyperref package
2016/04/06 v1.4
Abstract baselineskip correction - paragraph ending inserted at the end of abstract
2016/02/23 v1.3
Binary files old/doc/latex/ejpecp/ejpecp.pdf and new/doc/latex/ejpecp/ejpecp.pdf differ
Binary files old/doc/latex/ejpecp/sample.pdf and new/doc/latex/ejpecp/sample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ejpecp/sample.tex new/doc/latex/ejpecp/sample.tex
--- old/doc/latex/ejpecp/sample.tex 2016-04-07 22:54:11.000000000 +0200
+++ new/doc/latex/ejpecp/sample.tex 2016-11-25 19:28:42.000000000 +0100
@@ -51,7 +51,7 @@
\SHORTTITLE{Introduction to the \emph{ejpecp} Class}
-\TITLE{Introduction to the \emph{ejpecp} Class Version 1.4\thanks{Supported
+\TITLE{Introduction to the \emph{ejpecp} Class Version 1.5\thanks{Supported
by the Institute of Mathematical Statistics (IMS) and the Bernoulli
Society.}\
\thanks{Current maintainer of class file is
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ejpecp.doc.tlpobj new/tlpkg/tlpobj/ejpecp.doc.tlpobj
--- old/tlpkg/tlpobj/ejpecp.doc.tlpobj 2016-04-14 18:59:22.000000000 +0200
+++ new/tlpkg/tlpobj/ejpecp.doc.tlpobj 2017-04-14 17:39:12.000000000 +0200
@@ -1,6 +1,6 @@
name ejpecp.doc
category Package
-revision 40331
+revision 42003
shortdesc doc files of ejpecp
relocated 1
docfiles size=86
++++++ ejpecp.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ejpecp/ejpecp.cls new/tex/latex/ejpecp/ejpecp.cls
--- old/tex/latex/ejpecp/ejpecp.cls 2016-04-07 22:54:11.000000000 +0200
+++ new/tex/latex/ejpecp/ejpecp.cls 2016-11-25 19:33:47.000000000 +0100
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{ejpecp}
- [2016/04/06 v1.4 .dtx ejpecp file]
+ [2016/09/06 v1.5 .dtx ejpecp file]
\ClassInfo{ejpecp}{Copyright (c) 2016 Eimantas GUMBAKIS, VTeX, Lithuania for EJP-ECP.}
\ClassInfo{ejpecp}{Copyright (c), 2011-2015 BURDZY and CHAFAI for EJP-ECP.}
%% We declare and handle our class options
@@ -95,6 +95,7 @@
\fi
\hypersetup{pdfborder=0 0 0}
\hypersetup{pdfstartview={FitH}}
+\hypersetup{hypertexnames=false}
%%%% Macros et Environments
%% General macros
\newcommand{\@TITLE}{FIXME!}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ejpecp.tlpobj new/tlpkg/tlpobj/ejpecp.tlpobj
--- old/tlpkg/tlpobj/ejpecp.tlpobj 2016-04-14 18:59:23.000000000 +0200
+++ new/tlpkg/tlpobj/ejpecp.tlpobj 2017-04-14 17:39:12.000000000 +0200
@@ -1,6 +1,6 @@
name ejpecp
category Package
-revision 40331
+revision 42003
shortdesc Class for EJP and ECP
relocated 1
longdesc The class is designed for typesetting articles for the
@@ -10,7 +10,7 @@
runfiles size=4
RELOC/tex/latex/ejpecp/ejpecp.cls
catalogue-ctan /macros/latex/contrib/ejpecp
-catalogue-date 2016-04-06 19:39:54 +0200
+catalogue-date 2016-09-06 13:18:13 +0200
catalogue-license lppl1.2
catalogue-topics journalpub class
-catalogue-version 1.4
+catalogue-version 1.5
++++++ ekaia.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ekaia/README new/doc/latex/ekaia/README
--- old/doc/latex/ekaia/README 2014-12-30 18:13:24.000000000 +0100
+++ new/doc/latex/ekaia/README 2016-11-26 01:09:05.000000000 +0100
@@ -1,7 +1,7 @@
-The ekaia package v1.00
+The ekaia package v1.04
=============================
-Copyright (C) 2014, Edorta Ibarra & the Ekaia Journal (UPV/EHU)
+Copyright (C) 2014-2016, Edorta Ibarra & the Ekaia Journal (UPV/EHU)
---------------------------------------------------------------
Description
@@ -34,7 +34,8 @@
Commands
--------
-\izenburua Prints the document title accordint to the Ekaia journal style
+\izenburua Prints the document title in Basque accordint to the Ekaia journal style
+\azpiizenburua Prints the document title in English accordint to the Ekaia journal style
\datak Prints the reception and acceptation dates of the submited article
Binary files old/doc/latex/ekaia/ekaia.pdf and new/doc/latex/ekaia/ekaia.pdf differ
Binary files old/doc/latex/ekaia/ekaia_EUS.pdf and new/doc/latex/ekaia/ekaia_EUS.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ekaia/ekaia_EUS.tex new/doc/latex/ekaia/ekaia_EUS.tex
--- old/doc/latex/ekaia/ekaia_EUS.tex 2014-12-30 18:13:24.000000000 +0100
+++ new/doc/latex/ekaia/ekaia_EUS.tex 2016-11-26 01:09:05.000000000 +0100
@@ -1,12 +1,12 @@
%%
-%% This is file `ekaia_[EUS].tex',
+%% This is file `ekaia_EUS.tex',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
%% ekaia.dtx (with options: `basque')
%%
-%% Copyright (C) 2014 by Edorta Ibarra and the Ekaia Journal (UPV/EHU)
+%% Copyright (C) 2014-2016 Edorta Ibarra and the Ekaia Journal (UPV/EHU)
%% -------------------------------------------------------------------
%%
%% This file may be distributed and/or modified under the
@@ -59,9 +59,9 @@
\begin{document}
\title{\textsf{ekaia} paketea\thanks{Fitxategi honek (\textsf{ekaia.dtx})
- 1.02. bertsioa du. Azken aldiz errebisatua: 14-12-26.}}
- \author{Edorta Ibarra eta Ekaia Aldizkaria (UPV/EHU)\\\texttt{ekaia@ehu.es}}
- \date{2014-12-26}
+ 1.04. bertsioa du. Azken aldiz errebisatua: 16-11-25.}}
+ \author{Edorta Ibarra eta Ekaia Aldizkaria (UPV/EHU)\\\texttt{ekaia@ehu.eus}}
+ \date{2016-11-25}
\renewcommand{\contentsname}{Aurkibidea}
\renewcommand{\refname}{Bibliografia}
\renewcommand\thesection{\arabic{section}.}
@@ -127,7 +127,9 @@
artikuluak prestatzeko:
\begin{itemize}
- \item \verb|\izenburua{}|: Artikuluaren izenburua sortzeko erabiltzen da
+ \item \verb|\izenburua{}|: Artikuluaren izenburua euskaraz sortzeko erabiltzen da
+ komando hori.
+ \item \verb|\azpiizenburua{}|: Artikuluaren izenburua ingelesez sortzeko erabiltzen da
komando hori.
\item \verb|\datak{}{}|: bidalpen- eta onarpen-datak inprimatzen ditu
komando ho\-rrek, hurrenez hurren.
@@ -140,11 +142,11 @@
eta kontakturako informazioa) sortzeko erabiltzen da ingurune hori.
\item \texttt{laburpena}: Artikuluaren laburpena euskaraz sortzeko erabiltzen da
ingurune hori.
- \item \texttt{hitz-gakoak}: Artikuluaren hitz-gakoak euskaraz sortzeko erabiltzen
+ \item \texttt{hitz-gakoak}: Artikuluaren hitz gakoak euskaraz sortzeko erabiltzen
da ingurune hori.
\item \texttt{abstract}: Artikuluaren laburpena ingelesez sortzeko erabiltzen da
ingurune hori.
- \item \texttt{keywords}: Artikuluaren hitz-gakoak ingelesez sortzeko erabiltzen
+ \item \texttt{keywords}: Artikuluaren hitz gakoak ingelesez sortzeko erabiltzen
da ingurune hori.
\end{itemize}
@@ -161,6 +163,9 @@
\verb|\izenburua{\LaTeX{}: euskarazko dokumentu|\\
\verb|zientifiko-teknikoen ediziorako baliabideak}|\\
\verb| |\\
+ \verb|\azpiizenburua{\LaTeX{}: resources for the edition|\\
+ \verb|of scientific and technical documents in Basque}|\\
+ \verb| |\\
\verb|\begin{autoreak}|\\
\verb|\textit{Edorta Ibarra$^1$, Jose Ramon Etxebarria$^2$}|\\
\verb|\linebreak|\\
@@ -242,6 +247,8 @@
ez publikoa.
\item \textbf{v1.02. bertsioa (14/12/26).} Lehen bertsio
publikoa.
+ \item \textbf{v1.04. bertsioa (16/11/04).} \verb|azpiizenburua| komandoa
+ gehitu da izenburua ingelesez sortzeko. Errore txikiak zuzenduta.
\end{itemize}
\subsection{Inplementazioa}
@@ -325,6 +332,12 @@
\end{flushleft}
}
+\newcommand{\azpiizenburua}[1]{
+\begin{flushleft}
+\fontsize{12}{11}\textit{(#1)}\linebreak\fontsize{12}{11}
+\end{flushleft}
+}
+
\newcommand{\datak}[2]{
\begin{flushleft}
Jasoa:~{#1}
@@ -355,7 +368,7 @@
\newenvironment{hitz-gakoak}{
\setlength{\parindent}{0pt}
-\textbf{Hitz-gakoak:}~
+\textbf{Hitz gakoak:}~
}{\setlength{\parindent}{0.8cm}\\ }
\newenvironment{keywords}{
@@ -365,4 +378,4 @@
\endinput
%%
-%% End of file `ekaia_[EUS].tex'.
+%% End of file `ekaia_EUS.tex'.
Binary files old/doc/latex/ekaia/ekaia_example.pdf and new/doc/latex/ekaia/ekaia_example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ekaia/ekaia_example.tex new/doc/latex/ekaia/ekaia_example.tex
--- old/doc/latex/ekaia/ekaia_example.tex 2014-12-30 18:13:24.000000000 +0100
+++ new/doc/latex/ekaia/ekaia_example.tex 2016-11-26 01:09:05.000000000 +0100
@@ -6,7 +6,7 @@
%%
%% ekaia.dtx (with options: `example')
%%
-%% Copyright (C) 2014 by Edorta Ibarra and the Ekaia Journal (UPV/EHU)
+%% Copyright (C) 2014-2016 Edorta Ibarra and the Ekaia Journal (UPV/EHU)
%% -------------------------------------------------------------------
%%
%% This file may be distributed and/or modified under the
@@ -59,13 +59,14 @@
\begin{document}
\izenburua{Ekaia Aldizkariko egileentzako gidalerroak}
+ \azpiizenburua{Ekaia: Guidelines for authors}
\begin{autoreak}
\textit{Edorta Ibarra Basabe$^1$, Ekaiako Erredakzio Batzordea}
\linebreak
$^1$Ekaia Aldizkariko kidea.
\linebreak
- ekaia@ehu.es
+ ekaia@ehu.eus
\linebreak
\end{autoreak}
@@ -268,6 +269,12 @@
\end{flushleft}
}
+\newcommand{\azpiizenburua}[1]{
+\begin{flushleft}
+\fontsize{12}{11}\textit{(#1)}\linebreak\fontsize{12}{11}
+\end{flushleft}
+}
+
\newcommand{\datak}[2]{
\begin{flushleft}
Jasoa:~{#1}
@@ -298,7 +305,7 @@
\newenvironment{hitz-gakoak}{
\setlength{\parindent}{0pt}
-\textbf{Hitz-gakoak:}~
+\textbf{Hitz gakoak:}~
}{\setlength{\parindent}{0.8cm}\\ }
\newenvironment{keywords}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ekaia.doc.tlpobj new/tlpkg/tlpobj/ekaia.doc.tlpobj
--- old/tlpkg/tlpobj/ekaia.doc.tlpobj 2016-04-14 18:59:23.000000000 +0200
+++ new/tlpkg/tlpobj/ekaia.doc.tlpobj 2017-04-14 17:39:12.000000000 +0200
@@ -1,9 +1,9 @@
name ekaia.doc
category Package
-revision 35927
+revision 42578
shortdesc doc files of ekaia
relocated 1
-docfiles size=136
+docfiles size=140
RELOC/doc/latex/ekaia/README
RELOC/doc/latex/ekaia/ekaia.pdf
RELOC/doc/latex/ekaia/ekaia_EUS.pdf
++++++ ekaia.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ekaia/ekaia.sty new/tex/latex/ekaia/ekaia.sty
--- old/tex/latex/ekaia/ekaia.sty 2014-12-30 18:13:24.000000000 +0100
+++ new/tex/latex/ekaia/ekaia.sty 2016-11-26 01:09:05.000000000 +0100
@@ -6,7 +6,7 @@
%%
%% ekaia.dtx (with options: `package')
%%
-%% Copyright (C) 2014 by Edorta Ibarra and the Ekaia Journal (UPV/EHU)
+%% Copyright (C) 2014-2016 Edorta Ibarra and the Ekaia Journal (UPV/EHU)
%% -------------------------------------------------------------------
%%
%% This file may be distributed and/or modified under the
@@ -38,7 +38,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{ekaia}
- [2014/07/20 v1.00 ekaia Package]
+ [2016/11/25 v1.04 ekaia Package]
%% \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
@@ -132,6 +132,12 @@
\end{flushleft}
}
+\newcommand{\azpiizenburua}[1]{
+\begin{flushleft}
+\fontsize{12}{11}\textit{(#1)}\linebreak\fontsize{12}{11}
+\end{flushleft}
+}
+
\newcommand{\datak}[2]{
\begin{flushleft}
Jasoa:~{#1}
@@ -162,7 +168,7 @@
\newenvironment{hitz-gakoak}{
\setlength{\parindent}{0pt}
-\textbf{Hitz-gakoak:}~
+\textbf{Hitz gakoak:}~
}{\setlength{\parindent}{0.8cm}\\ }
\newenvironment{keywords}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ekaia.tlpobj new/tlpkg/tlpobj/ekaia.tlpobj
--- old/tlpkg/tlpobj/ekaia.tlpobj 2016-04-14 18:59:23.000000000 +0200
+++ new/tlpkg/tlpobj/ekaia.tlpobj 2017-04-14 17:39:12.000000000 +0200
@@ -1,6 +1,6 @@
name ekaia
category Package
-revision 35927
+revision 42578
shortdesc Article format for publishing the Basque Country Science and Technology Journal "Ekaia"
relocated 1
longdesc The package provides the article format for publishing the
@@ -9,7 +9,7 @@
runfiles size=2
RELOC/tex/latex/ekaia/ekaia.sty
catalogue-ctan /macros/latex/contrib/ekaia
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-11-25 17:19:00 +0100
catalogue-license lppl1.2
catalogue-topics journalpub
-catalogue-version 1.02
+catalogue-version 1.04
++++++ elbioimp.doc.tar.xz ++++++
++++++ elbioimp.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elbioimp.tlpobj new/tlpkg/tlpobj/elbioimp.tlpobj
--- old/tlpkg/tlpobj/elbioimp.tlpobj 2016-04-14 18:59:23.000000000 +0200
+++ new/tlpkg/tlpobj/elbioimp.tlpobj 2017-04-14 17:39:12.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=2
RELOC/tex/latex/elbioimp/elbioimp.cls
catalogue-ctan /macros/latex/contrib/elbioimp
-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 1.2
++++++ electrum.doc.tar.xz ++++++
++++++ electrum.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/electrum.tlpobj new/tlpkg/tlpobj/electrum.tlpobj
--- old/tlpkg/tlpobj/electrum.tlpobj 2016-04-14 18:59:24.000000000 +0200
+++ new/tlpkg/tlpobj/electrum.tlpobj 2017-04-14 17:39:12.000000000 +0200
@@ -292,7 +292,7 @@
RELOC/tex/latex/electrum/ts1yesjw.fd
RELOC/tex/latex/electrum/ts1yesw.fd
catalogue-ctan /fonts/electrumadf
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
catalogue-topics font font-type1
catalogue-version 1.005-b
++++++ eledform.doc.tar.xz ++++++
++++++ eledform.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eledform.tlpobj new/tlpkg/tlpobj/eledform.tlpobj
--- old/tlpkg/tlpobj/eledform.tlpobj 2016-04-14 18:59:26.000000000 +0200
+++ new/tlpkg/tlpobj/eledform.tlpobj 2017-04-14 17:39:13.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=1
RELOC/tex/latex/eledform/eledform.sty
catalogue-ctan /macros/latex/contrib/eledform
-catalogue-date 2015-08-13 14:25:03 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics crit-ed
catalogue-version 1.1a
++++++ eledmac.doc.tar.xz ++++++
++++++ eledmac.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eledmac.tlpobj new/tlpkg/tlpobj/eledmac.tlpobj
--- old/tlpkg/tlpobj/eledmac.tlpobj 2016-04-14 18:59:29.000000000 +0200
+++ new/tlpkg/tlpobj/eledmac.tlpobj 2017-04-14 17:39:14.000000000 +0200
@@ -15,7 +15,7 @@
RELOC/tex/latex/eledmac/eledpar.sty
catalogue-also ednotes poemscol ledmac
catalogue-ctan /macros/latex/contrib/eledmac
-catalogue-date 2015-10-14 20:57:29 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics crit-ed
catalogue-version 1.24.11
++++++ elements.doc.tar.xz ++++++
++++++ elements.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elements.tlpobj new/tlpkg/tlpobj/elements.tlpobj
--- old/tlpkg/tlpobj/elements.tlpobj 2016-05-16 00:51:43.000000000 +0200
+++ new/tlpkg/tlpobj/elements.tlpobj 2017-04-14 17:39:14.000000000 +0200
@@ -15,7 +15,7 @@
RELOC/tex/latex/elements/elements_names_german.def
RELOC/tex/latex/elements/elements_names_spanish.def
catalogue-ctan /macros/latex/contrib/elements
-catalogue-date 2016-05-15 15:17:58 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics chemistry
catalogue-version 0.2
++++++ ellipse.doc.tar.xz ++++++
++++++ ellipse.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ellipse.tlpobj new/tlpkg/tlpobj/ellipse.tlpobj
--- old/tlpkg/tlpobj/ellipse.tlpobj 2016-04-14 18:59:30.000000000 +0200
+++ new/tlpkg/tlpobj/ellipse.tlpobj 2017-04-14 17:39:14.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=3
RELOC/tex/latex/ellipse/ellipse.sty
catalogue-ctan /graphics/ellipse
-catalogue-date 2015-12-09 05:49:08 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics graphics
catalogue-version 1.0
++++++ ellipsis.doc.tar.xz ++++++
++++++ ellipsis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ellipsis.tlpobj new/tlpkg/tlpobj/ellipsis.tlpobj
--- old/tlpkg/tlpobj/ellipsis.tlpobj 2016-04-14 18:59:30.000000000 +0200
+++ new/tlpkg/tlpobj/ellipsis.tlpobj 2017-04-14 17:39:15.000000000 +0200
@@ -11,6 +11,6 @@
RELOC/tex/latex/ellipsis/ellipsis.sty
catalogue-also lips
catalogue-ctan /macros/latex/contrib/ellipsis
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics typesetting
++++++ elmath.doc.tar.xz ++++++
++++++ elmath.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elmath.tlpobj new/tlpkg/tlpobj/elmath.tlpobj
--- old/tlpkg/tlpobj/elmath.tlpobj 2016-04-14 18:59:30.000000000 +0200
+++ new/tlpkg/tlpobj/elmath.tlpobj 2017-04-14 17:39:15.000000000 +0200
@@ -10,7 +10,7 @@
runfiles size=3
RELOC/tex/latex/elmath/elmath.sty
catalogue-ctan /macros/latex/contrib/elmath
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics greek maths
catalogue-version 1.2
++++++ elocalloc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/elocalloc/README new/doc/latex/elocalloc/README
--- old/doc/latex/elocalloc/README 2015-05-11 23:08:51.000000000 +0200
+++ new/doc/latex/elocalloc/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-elocalloc package
-
-Local allocation macros, with names taken from etex.sty
-but with implementation based on the LaTeX 2015 allocation macros.
-
-To produce typeset documentation:
-pdflatex elocalloc.dtx
-
-To extract the elocalloc.sty package:
-tex elocalloc.ins
-
-David Carlisle
-LPPL licenced (status: maintained)
-
-Please report any issues at
-
-https://github.com/davidcarlisle/dpctex/issues
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/elocalloc/README.txt new/doc/latex/elocalloc/README.txt
--- old/doc/latex/elocalloc/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/elocalloc/README.txt 2016-12-16 00:01:03.000000000 +0100
@@ -0,0 +1,17 @@
+elocalloc package
+
+Local allocation macros, with names taken from etex.sty
+but with implementation based on the LaTeX 2015 allocation macros.
+
+To produce typeset documentation:
+pdflatex elocalloc.dtx
+
+To extract the elocalloc.sty package:
+tex elocalloc.ins
+
+David Carlisle
+LPPL licenced (status: maintained)
+
+Please report any issues at
+
+https://github.com/davidcarlisle/dpctex/issues
Binary files old/doc/latex/elocalloc/elocalloc.pdf and new/doc/latex/elocalloc/elocalloc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elocalloc.doc.tlpobj new/tlpkg/tlpobj/elocalloc.doc.tlpobj
--- old/tlpkg/tlpobj/elocalloc.doc.tlpobj 2016-04-14 18:59:30.000000000 +0200
+++ new/tlpkg/tlpobj/elocalloc.doc.tlpobj 2017-04-14 17:39:15.000000000 +0200
@@ -1,8 +1,8 @@
name elocalloc.doc
category Package
-revision 37644
+revision 42712
shortdesc doc files of elocalloc
relocated 1
docfiles size=39
- RELOC/doc/latex/elocalloc/README
+ RELOC/doc/latex/elocalloc/README.txt
RELOC/doc/latex/elocalloc/elocalloc.pdf
++++++ elocalloc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/elocalloc/elocalloc.sty new/tex/latex/elocalloc/elocalloc.sty
--- old/tex/latex/elocalloc/elocalloc.sty 2015-06-23 17:54:21.000000000 +0200
+++ new/tex/latex/elocalloc/elocalloc.sty 2016-12-16 00:01:04.000000000 +0100
@@ -7,13 +7,13 @@
%% elocalloc.dtx (with options: `package')
%%
%% Source File: textcase.dtx
-%% Copyright 2015 David Carlisle
+%% Copyright 2015-2016 David Carlisle
%%
%% This file may be distributed under the terms of the LPPL.
%% See README for details.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{elocalloc}
- [2015/06/21 v0.02 local allocation for LaTeX 2015+ (DPC)]
+ [2016/12/15 v0.03 local allocation for LaTeX 2015+ (DPC)]
\ifx\e@alloc\@undefined
\RequirePackage{etex}
\expandafter\endinput
@@ -37,7 +37,7 @@
\def\locmuskip{\eloc@lloc{\count 13}\e@alloc@top\muskipdef\muskip}
\def\locbox {\eloc@lloc{\count 14}\float@count\e@alloc@chardef\box}
\def\loctoks {\eloc@lloc{\count 15}\e@alloc@top\toksdef\toks}
-\def\locmarks {\eloc@lloc{\count256}\e@alloc@topt\e@alloc@chardef\marks}
+\def\locmarks {\eloc@lloc{\count256}\e@alloc@top\e@alloc@chardef\marks}
\endinput
%%
%% End of file `elocalloc.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elocalloc.tlpobj new/tlpkg/tlpobj/elocalloc.tlpobj
--- old/tlpkg/tlpobj/elocalloc.tlpobj 2016-04-14 18:59:30.000000000 +0200
+++ new/tlpkg/tlpobj/elocalloc.tlpobj 2017-04-14 17:39:15.000000000 +0200
@@ -1,6 +1,6 @@
name elocalloc
category Package
-revision 37644
+revision 42712
shortdesc Local allocation macros for LaTeX 2015
relocated 1
longdesc Local allocation macros, with names taken from etex.sty but
@@ -9,7 +9,7 @@
RELOC/tex/latex/elocalloc/elocalloc.sty
catalogue-also etex-pkg
catalogue-ctan /macros/latex/contrib/elocalloc
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-12-15 10:25:53 +0100
catalogue-license lppl
catalogue-topics macro-supp
-catalogue-version 0.02
+catalogue-version 0.03
++++++ elpres.doc.tar.xz ++++++
++++++ elpres.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elpres.tlpobj new/tlpkg/tlpobj/elpres.tlpobj
--- old/tlpkg/tlpobj/elpres.tlpobj 2016-04-14 18:59:31.000000000 +0200
+++ new/tlpkg/tlpobj/elpres.tlpobj 2017-04-14 17:39:15.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=1
RELOC/tex/latex/elpres/elpres.cls
catalogue-ctan /macros/latex/contrib/elpres
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics presentation class
catalogue-version 0.3
++++++ elsarticle.doc.tar.xz ++++++
++++++ elsarticle.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elsarticle.tlpobj new/tlpkg/tlpobj/elsarticle.tlpobj
--- old/tlpkg/tlpobj/elsarticle.tlpobj 2016-04-14 18:59:32.000000000 +0200
+++ new/tlpkg/tlpobj/elsarticle.tlpobj 2017-04-14 17:39:15.000000000 +0200
@@ -12,7 +12,7 @@
RELOC/bibtex/bst/elsarticle/elsarticle-num.bst
RELOC/tex/latex/elsarticle/elsarticle.cls
catalogue-ctan /macros/latex/contrib/elsarticle
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.2
catalogue-topics journalpub class
catalogue-version 1.20
++++++ elteikthesis.doc.tar.xz ++++++
++++++ elteikthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elteikthesis.tlpobj new/tlpkg/tlpobj/elteikthesis.tlpobj
--- old/tlpkg/tlpobj/elteikthesis.tlpobj 2016-04-14 18:59:35.000000000 +0200
+++ new/tlpkg/tlpobj/elteikthesis.tlpobj 2017-04-14 17:39:17.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=1
RELOC/tex/latex/elteikthesis/elteikthesis.cls
catalogue-ctan /macros/latex/contrib/elteikthesis
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.2
catalogue-topics dissertation hungarian class
catalogue-version 1.2
++++++ eltex.doc.tar.xz ++++++
++++++ eltex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eltex.tlpobj new/tlpkg/tlpobj/eltex.tlpobj
--- old/tlpkg/tlpobj/eltex.tlpobj 2016-04-14 18:59:36.000000000 +0200
+++ new/tlpkg/tlpobj/eltex.tlpobj 2017-04-14 17:39:17.000000000 +0200
@@ -18,7 +18,7 @@
RELOC/tex/latex/eltex/eltex7.tex
catalogue-also circuit-macros circuitikz
catalogue-ctan /macros/latex/contrib/eltex
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics diagram-circ
catalogue-version 2.0
++++++ elvish.doc.tar.xz ++++++
++++++ elvish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elvish.tlpobj new/tlpkg/tlpobj/elvish.tlpobj
--- old/tlpkg/tlpobj/elvish.tlpobj 2016-04-14 18:59:36.000000000 +0200
+++ new/tlpkg/tlpobj/elvish.tlpobj 2017-04-14 17:39:17.000000000 +0200
@@ -18,6 +18,6 @@
RELOC/fonts/tfm/public/elvish/teng10.tfm
catalogue-also tengwar
catalogue-ctan /fonts/elvish
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
catalogue-topics font font-mf font-invented
++++++ elzcards.doc.tar.xz ++++++
++++++ elzcards.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/elzcards.tlpobj new/tlpkg/tlpobj/elzcards.tlpobj
--- old/tlpkg/tlpobj/elzcards.tlpobj 2016-04-14 18:59:36.000000000 +0200
+++ new/tlpkg/tlpobj/elzcards.tlpobj 2017-04-14 17:39:17.000000000 +0200
@@ -12,7 +12,7 @@
runfiles size=4
RELOC/tex/latex/elzcards/elzcards.sty
catalogue-ctan /macros/latex/contrib/elzcards
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics card-gen
catalogue-version 1.20
++++++ emarks.doc.tar.xz ++++++
++++++ emarks.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/emarks.tlpobj new/tlpkg/tlpobj/emarks.tlpobj
--- old/tlpkg/tlpobj/emarks.tlpobj 2016-04-14 18:59:37.000000000 +0200
+++ new/tlpkg/tlpobj/emarks.tlpobj 2017-04-14 17:39:18.000000000 +0200
@@ -17,7 +17,7 @@
runfiles size=1
RELOC/tex/latex/emarks/emarks.sty
catalogue-ctan /macros/latex/contrib/emarks
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics typesetting
catalogue-version 1.0
++++++ embedall.doc.tar.xz ++++++
++++++ embedall.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/embedall.tlpobj new/tlpkg/tlpobj/embedall.tlpobj
--- old/tlpkg/tlpobj/embedall.tlpobj 2016-04-14 18:59:38.000000000 +0200
+++ new/tlpkg/tlpobj/embedall.tlpobj 2017-04-14 17:39:18.000000000 +0200
@@ -11,7 +11,7 @@
runfiles size=1
RELOC/tex/latex/embedall/embedall.sty
catalogue-ctan /macros/latex/contrib/embedall
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.2
catalogue-topics pdf-feat archival
catalogue-version 1.0
++++++ embrac.doc.tar.xz ++++++
++++++ embrac.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/embrac.tlpobj new/tlpkg/tlpobj/embrac.tlpobj
--- old/tlpkg/tlpobj/embrac.tlpobj 2016-04-14 18:59:38.000000000 +0200
+++ new/tlpkg/tlpobj/embrac.tlpobj 2017-04-14 17:39:18.000000000 +0200
@@ -11,7 +11,7 @@
runfiles size=4
RELOC/tex/latex/embrac/embrac.sty
catalogue-ctan /macros/latex/contrib/embrac
-catalogue-date 2016-01-09 15:46:24 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics typesetting expl3
catalogue-version 0.6d
++++++ esami.doc.tar.xz -> emf.doc.tar.xz ++++++
++++ 4238 lines of diff (skipped)
++++++ esami.doc.tar.xz -> emf.tar.xz ++++++
++++ 3499 lines of diff (skipped)
++++++ emisa.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/emisa/README.md new/doc/latex/emisa/README.md
--- old/doc/latex/emisa/README.md 2016-04-07 22:52:37.000000000 +0200
+++ new/doc/latex/emisa/README.md 2016-11-25 19:28:44.000000000 +0100
@@ -5,7 +5,7 @@
Enterprise Modelling and Information Systems Architectures -
An International Journal (EMISA)
(c) 2015, 2016
-Version: 2.1
+Version: 2.1.1
Maintainer: Stefan Strecker and Martin Sievers
Email: stefan.strecker@fernuni-hagen.de
martin.sievers@schoenerpublizieren.de
@@ -27,12 +27,15 @@
```
## Changelog
+### 2.1.1 to 2.1
-### 2.1 to 2.01
+* Fixed a bug introduced with version 2.1. Undefined macro \ifempty was changed to \ifdefvoid
+
+### 2.1 to 2.0.1
* Fixed a bug introduced by incompatible changes of latest biblatex packages (>3.3)
-### 2.01 to 2.0
+### 2.0.1 to 2.0
* Set uniquelist option to false in order to change the cite output
* Changed maxcitenames=3 to maxcitenames=2
Binary files old/doc/latex/emisa/emisa.pdf and new/doc/latex/emisa/emisa.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/emisa/manifest.txt new/doc/latex/emisa/manifest.txt
--- old/doc/latex/emisa/manifest.txt 2016-04-07 22:52:37.000000000 +0200
+++ new/doc/latex/emisa/manifest.txt 2016-11-25 19:28:44.000000000 +0100
@@ -24,7 +24,7 @@
used in the LaTeX Project Public License, are to be interpreted
in the case of this work.
-March 31, 2016 (version 2.1)
+July, 18th 2016 (version 2.1.1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/emisa.doc.tlpobj new/tlpkg/tlpobj/emisa.doc.tlpobj
--- old/tlpkg/tlpobj/emisa.doc.tlpobj 2016-04-14 18:59:38.000000000 +0200
+++ new/tlpkg/tlpobj/emisa.doc.tlpobj 2017-04-14 17:39:18.000000000 +0200
@@ -1,6 +1,6 @@
name emisa.doc
category Package
-revision 40326
+revision 41731
shortdesc doc files of emisa
relocated 1
docfiles size=109
++++++ emisa.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/emisa/emisa.bbx new/tex/latex/emisa/emisa.bbx
--- old/tex/latex/emisa/emisa.bbx 2016-04-07 22:52:37.000000000 +0200
+++ new/tex/latex/emisa/emisa.bbx 2016-11-25 19:33:47.000000000 +0100
@@ -10,7 +10,7 @@
%% See there for more information.
%% ------------------------------------------------------------------------
%%
-\ProvidesFile{emisa.bbx}[2016/03/31 2.1 EMISA bibliography style]
+\ProvidesFile{emisa.bbx}[2016/07/18 2.1.1 EMISA bibliography style]
\RequireBibliographyStyle{authoryear}
\newcommand*{\bibitemlabel}[1]{%
\normalfont #1}
@@ -127,14 +127,14 @@
\newbibmacro*{name:family-giveninit}[4]{%
\usebibmacro{name:delim}{#2#3#1}%
\usebibmacro{name:hook}{#2#3#1}%
- \ifempty{#3}{}{%
+ \ifdefvoid{#3}{}{%
\mkbibnameprefix{#3}%\isdot
\ifprefchar% replaces \ifpunctmark{'}%
{}%
{\ifuseprefix{\addhighpenspace}{\addlowpenspace}}}%
\mkbibnamefamily{#1}\addhighpenspace%
- \ifempty{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\addlowpenspace}%
- \ifempty{#2}{}{\mkbibnamegiven{#2}\isdot}%
+ \ifdefvoid{#4}{}{\addlowpenspace\mkbibnameaffix{#4}\addlowpenspace}%
+ \ifdefvoid{#2}{}{\mkbibnamegiven{#2}\isdot}%
}%
}%
{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/emisa/emisa.cbx new/tex/latex/emisa/emisa.cbx
--- old/tex/latex/emisa/emisa.cbx 2016-04-07 22:52:37.000000000 +0200
+++ new/tex/latex/emisa/emisa.cbx 2016-11-25 19:33:47.000000000 +0100
@@ -10,7 +10,7 @@
%% See there for more information.
%% ------------------------------------------------------------------------
%%
-\ProvidesFile{emisa.cbx}[2016/03/31 2.1 EMISA citation style]
+\ProvidesFile{emisa.cbx}[2016/07/18 2.1.1 EMISA citation style]
\RequireCitationStyle{authoryear-comp}
\renewcommand*{\nameyeardelim}{\addspace}
\DeclareRangeChars*{f}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/emisa/emisa.cls new/tex/latex/emisa/emisa.cls
--- old/tex/latex/emisa/emisa.cls 2016-04-07 22:52:37.000000000 +0200
+++ new/tex/latex/emisa/emisa.cls 2016-11-25 19:33:47.000000000 +0100
@@ -31,7 +31,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{emisa}%
-[2016/03/31 2.1 LaTeX class EMISA]
+[2016/07/18 2.1.1 LaTeX class EMISA]
\def\@clearglobaloption#1{%
\def\@tempa{#1}%
\def\@tempb{\@gobble}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/emisa.tlpobj new/tlpkg/tlpobj/emisa.tlpobj
--- old/tlpkg/tlpobj/emisa.tlpobj 2016-04-14 18:59:39.000000000 +0200
+++ new/tlpkg/tlpobj/emisa.tlpobj 2017-04-14 17:39:18.000000000 +0200
@@ -1,6 +1,6 @@
name emisa
category Package
-revision 40326
+revision 41731
shortdesc A LaTeX package for preparing manuscripts for the journal EMISA
relocated 1
longdesc The EMISA LaTeX package is provided for preparing manuscripts
@@ -13,7 +13,7 @@
RELOC/tex/latex/emisa/emisa.cbx
RELOC/tex/latex/emisa/emisa.cls
catalogue-ctan /macros/latex/contrib/emisa
-catalogue-date 2016-04-13 06:31:06 +0200
+catalogue-date 2016-07-19 08:55:14 +0200
catalogue-license lppl1.3
catalogue-topics publisher class
-catalogue-version 2.1
+catalogue-version 2.1.1
++++++ emp.doc.tar.xz ++++++
++++++ emp.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/emp.tlpobj new/tlpkg/tlpobj/emp.tlpobj
--- old/tlpkg/tlpobj/emp.tlpobj 2016-04-14 18:59:39.000000000 +0200
+++ new/tlpkg/tlpobj/emp.tlpobj 2017-04-14 17:39:18.000000000 +0200
@@ -17,6 +17,6 @@
RELOC/tex/latex/emp/emp.sty
catalogue-also metatex
catalogue-ctan /macros/latex/contrib/emp
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics graphics-inline
++++++ emptypage.doc.tar.xz ++++++
++++++ emptypage.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/emptypage.tlpobj new/tlpkg/tlpobj/emptypage.tlpobj
--- old/tlpkg/tlpobj/emptypage.tlpobj 2016-04-14 18:59:39.000000000 +0200
+++ new/tlpkg/tlpobj/emptypage.tlpobj 2017-04-14 17:39:18.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=1
RELOC/tex/latex/emptypage/emptypage.sty
catalogue-ctan /macros/latex/contrib/emptypage
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.2
catalogue-topics layout
catalogue-version 1.2
++++++ emulateapj.doc.tar.xz ++++++
++++++ emulateapj.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/emulateapj.tlpobj new/tlpkg/tlpobj/emulateapj.tlpobj
--- old/tlpkg/tlpobj/emulateapj.tlpobj 2016-04-14 18:59:39.000000000 +0200
+++ new/tlpkg/tlpobj/emulateapj.tlpobj 2017-04-14 17:39:19.000000000 +0200
@@ -9,6 +9,6 @@
runfiles size=16
RELOC/tex/latex/emulateapj/emulateapj.cls
catalogue-ctan /macros/latex/contrib/emulateapj
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics journalpub astronomy class
++++++ enctex.doc.tar.xz ++++++
++++++ enctex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enctex.tlpobj new/tlpkg/tlpobj/enctex.tlpobj
--- old/tlpkg/tlpobj/enctex.tlpobj 2016-04-14 18:59:40.000000000 +0200
+++ new/tlpkg/tlpobj/enctex.tlpobj 2017-04-14 17:39:19.000000000 +0200
@@ -49,6 +49,6 @@
RELOC/tex/generic/enctex/utf8unkn.tex
RELOC/tex/generic/enctex/utf8warn.tex
catalogue-ctan /systems/enctex
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics engine
++++++ encxvlna.doc.tar.xz ++++++
++++++ encxvlna.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/encxvlna.tlpobj new/tlpkg/tlpobj/encxvlna.tlpobj
--- old/tlpkg/tlpobj/encxvlna.tlpobj 2016-04-14 18:59:40.000000000 +0200
+++ new/tlpkg/tlpobj/encxvlna.tlpobj 2017-04-14 17:39:19.000000000 +0200
@@ -13,7 +13,7 @@
RELOC/tex/latex/encxvlna/encxvlna.sty
RELOC/tex/plain/encxvlna/encxvlna.tex
catalogue-ctan /macros/generic/encxvlna
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics typesetting czech slovak
catalogue-version 1.1
++++++ endfloat.doc.tar.xz ++++++
++++++ endfloat.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/endfloat.tlpobj new/tlpkg/tlpobj/endfloat.tlpobj
--- old/tlpkg/tlpobj/endfloat.tlpobj 2016-04-14 18:59:40.000000000 +0200
+++ new/tlpkg/tlpobj/endfloat.tlpobj 2017-04-14 17:39:19.000000000 +0200
@@ -14,7 +14,7 @@
RELOC/tex/latex/endfloat/efxmpl.cfg
RELOC/tex/latex/endfloat/endfloat.sty
catalogue-ctan /macros/latex/contrib/endfloat
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics float
catalogue-version 2.5d
++++++ endheads.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/endheads/README.md new/doc/latex/endheads/README.md
--- old/doc/latex/endheads/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/endheads/README.md 2017-04-10 03:16:45.000000000 +0200
@@ -0,0 +1,7 @@
+Readme for endheads
+
+Endheads makes running headers of the form ``Notes to pp.~xx--yy'' for
+users of endnotes.sty. It also enables one to reset the endnotes counter
+by chapter. endheads requires fancyhdr, endnotes, and ifthen. Endheads will also work for memoir class, but in that case it won't require fancyhdr.
+
+This material is subject to the LATEX Project Public License 1.3c.
\ No newline at end of file
Binary files old/doc/latex/endheads/endheads.pdf and new/doc/latex/endheads/endheads.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/endheads.doc.tlpobj new/tlpkg/tlpobj/endheads.doc.tlpobj
--- old/tlpkg/tlpobj/endheads.doc.tlpobj 2016-04-14 18:59:41.000000000 +0200
+++ new/tlpkg/tlpobj/endheads.doc.tlpobj 2017-04-14 17:39:19.000000000 +0200
@@ -1,7 +1,8 @@
name endheads.doc
category Package
-revision 31921
+revision 43750
shortdesc doc files of endheads
relocated 1
-docfiles size=61
+docfiles size=57
+ RELOC/doc/latex/endheads/README.md
RELOC/doc/latex/endheads/endheads.pdf
++++++ endheads.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/endheads/endheads.sty new/tex/latex/endheads/endheads.sty
--- old/tex/latex/endheads/endheads.sty 2013-10-17 00:59:06.000000000 +0200
+++ new/tex/latex/endheads/endheads.sty 2017-04-10 03:16:45.000000000 +0200
@@ -22,7 +22,7 @@
%% in the same archive or directory.)
\NeedsTeXFormat{LaTeX2e}[1997/12/01]
\ProvidesPackage{endheads}
- [2013/10/14 v1.55 endheads file]
+ [2017/4/6 v1.6 endheads file]
\providecommand*{\ifrefundefined}[1]{%
\expandafter\ifx\csname r@#1\endcsname\relax
\expandafter\@firstoftwo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/endheads.tlpobj new/tlpkg/tlpobj/endheads.tlpobj
--- old/tlpkg/tlpobj/endheads.tlpobj 2016-04-14 18:59:41.000000000 +0200
+++ new/tlpkg/tlpobj/endheads.tlpobj 2017-04-14 17:39:19.000000000 +0200
@@ -1,6 +1,6 @@
name endheads
category Package
-revision 31921
+revision 43750
shortdesc Running headers of the form "Notes to pp.xx-yy"
relocated 1
longdesc Endheads provides running headers of the form "Notes to pp. xx-
@@ -12,7 +12,7 @@
runfiles size=2
RELOC/tex/latex/endheads/endheads.sty
catalogue-ctan /macros/latex/contrib/endheads
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2017-04-08 06:57:54 +0200
catalogue-license lppl
catalogue-topics endnote page-hf
-catalogue-version 1.5
+catalogue-version 1.6
++++++ endiagram.doc.tar.xz ++++++
++++++ endiagram.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/endiagram.tlpobj new/tlpkg/tlpobj/endiagram.tlpobj
--- old/tlpkg/tlpobj/endiagram.tlpobj 2016-04-14 18:59:41.000000000 +0200
+++ new/tlpkg/tlpobj/endiagram.tlpobj 2017-04-14 17:39:19.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=17
RELOC/tex/latex/endiagram/endiagram.sty
catalogue-ctan /macros/latex/contrib/endiagram
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics chemistry expl3
catalogue-version 0.1d
++++++ endnotes.doc.tar.xz ++++++
++++++ endnotes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/endnotes.tlpobj new/tlpkg/tlpobj/endnotes.tlpobj
--- old/tlpkg/tlpobj/endnotes.tlpobj 2016-04-14 18:59:41.000000000 +0200
+++ new/tlpkg/tlpobj/endnotes.tlpobj 2017-04-14 17:39:20.000000000 +0200
@@ -10,6 +10,6 @@
RELOC/tex/latex/endnotes/endnotes.sty
catalogue-also fnpara footmisc footnpag
catalogue-ctan /macros/latex/contrib/endnotes
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.2
catalogue-topics endnote
++++++ engpron.doc.tar.xz ++++++
++++++ engpron.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/engpron.tlpobj new/tlpkg/tlpobj/engpron.tlpobj
--- old/tlpkg/tlpobj/engpron.tlpobj 2016-04-14 18:59:43.000000000 +0200
+++ new/tlpkg/tlpobj/engpron.tlpobj 2017-04-14 17:39:20.000000000 +0200
@@ -3,7 +3,7 @@
revision 16558
shortdesc Helps to type the pronunciation of English words
relocated 1
-longdesc This package provides macros beginning with the 'PS' character,
+longdesc This package provides macros beginning with the PS character,
longdesc made active, which enable us to write the British or American
longdesc English pronunciation as one can find it in the 'English
longdesc Pronouncing Dictionary' by Daniel Jones. There is an option to
@@ -12,7 +12,7 @@
RELOC/tex/latex/engpron/engpron-tools.sty
RELOC/tex/latex/engpron/engpron.sty
catalogue-ctan /macros/latex/contrib/engpron
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics phonetic linguistic
catalogue-version 2
++++++ engrec.doc.tar.xz ++++++
++++++ engrec.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/engrec.tlpobj new/tlpkg/tlpobj/engrec.tlpobj
--- old/tlpkg/tlpobj/engrec.tlpobj 2016-04-14 18:59:43.000000000 +0200
+++ new/tlpkg/tlpobj/engrec.tlpobj 2017-04-14 17:39:20.000000000 +0200
@@ -12,7 +12,7 @@
RELOC/tex/latex/engrec/engrec.sty
catalogue-also greekctr
catalogue-ctan /macros/latex/contrib/engrec
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics list list-enum greek
catalogue-version 1.1
++++++ engtlc.doc.tar.xz ++++++
++++++ engtlc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/engtlc.tlpobj new/tlpkg/tlpobj/engtlc.tlpobj
--- old/tlpkg/tlpobj/engtlc.tlpobj 2016-04-14 18:59:44.000000000 +0200
+++ new/tlpkg/tlpobj/engtlc.tlpobj 2017-04-14 17:39:21.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=4
RELOC/tex/latex/engtlc/engtlc.sty
catalogue-ctan /macros/latex/contrib/engtlc
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics engineering
catalogue-version 3.2
++++++ enigma.doc.tar.xz ++++++
++++++ enigma.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enigma.tlpobj new/tlpkg/tlpobj/enigma.tlpobj
--- old/tlpkg/tlpobj/enigma.tlpobj 2016-04-14 18:59:44.000000000 +0200
+++ new/tlpkg/tlpobj/enigma.tlpobj 2017-04-14 17:39:21.000000000 +0200
@@ -12,7 +12,7 @@
RELOC/tex/latex/enigma/enigma.sty
RELOC/tex/plain/enigma/enigma.tex
catalogue-ctan /macros/luatex/generic/enigma
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license bsd
catalogue-topics security luatex
catalogue-version 0.1
++++++ enotez.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/enotez/README new/doc/latex/enotez/README
--- old/doc/latex/enotez/README 2016-01-09 23:30:22.000000000 +0100
+++ new/doc/latex/enotez/README 2017-04-24 23:26:18.000000000 +0200
@@ -1,15 +1,15 @@
--------------------------------------------------------------------------
-the ENOTEZ package v0.8b
+the ENOTEZ package v0.9a
Endnotes for LaTeX2e
-2016/01/07
+2017/04/24
--------------------------------------------------------------------------
Clemens Niederberger
Web: https://bitbucket.org/cgnieder/enotez/
E-Mail: contact@mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2012-2016 Clemens Niederberger
+Copyright 2012-2017 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
Binary files old/doc/latex/enotez/enotez_en.pdf and new/doc/latex/enotez/enotez_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/enotez/enotez_en.tex new/doc/latex/enotez/enotez_en.tex
--- old/doc/latex/enotez/enotez_en.tex 2015-07-29 22:45:10.000000000 +0200
+++ new/doc/latex/enotez/enotez_en.tex 2017-04-24 23:26:18.000000000 +0200
@@ -12,7 +12,7 @@
% Web: http://www.mychemistry.eu/forums/forum/enotez/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2015 Clemens Niederberger
+% Copyright 2012-2017 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -41,7 +41,7 @@
info = {Endnotes for \LaTeXe} ,
authors = Clemens Niederberger ,
email = contact@mychemistry.eu ,
- url = http://www.mychemistry.eu/forums/forum/enotez/ ,
+ url = https://bitbucket.org/cgnieder/enotez/ ,
pre-output = \setfnpct{dont-mess-around} ,
add-cmds = {
@endnotemark,
@@ -69,7 +69,7 @@
index-setup = {
othercode = \footnotesize ,
level = \addsec ,
- noclearpage
+ % noclearpage
} ,
makeindex-setup = {
columns = 3 ,
@@ -128,23 +128,28 @@
\begin{commands}
\command{endnote}[\oarg{mark}\marg{text}]
Add an endnote in the text.
+ \command{endnotemark}[\oarg{mark}]
+ \sinceversion{0.9}Add an endnotemark.
+ \command{endnotetext}[\marg{text}]
+ \sinceversion{0.9}Add text to an endnote placed with \cs{endnotemark}.
\end{commands}
\begin{example}
This is some text.\endnote{With an endnote.}
\end{example}
There's not really much more to it. It is possible to add a custom mark by
using the optional argument but that shouldn't be needed too often.
-\cs{endnote} works fine inside tables, minipages, floats and
-captions\footnote{This has been tested with the standard classes,
- \cls{memoir}, and the \cls{KOMA-Script} classes, with and without the
- \pkg*{caption} package. If you're using another package that redefines
- \cs*{caption} or are using another class it might not work. Before you
- place a note in a caption you should re-think the idea anyway.}. Endnotes
+% \cs{endnote} works fine inside tables, minipages, floats and
+% captions\footnote{This has been tested with the standard classes,
+% \cls{memoir}, and the \cls{KOMA-Script} classes, with and without the
+% \pkg*{caption} package. If you're using another package that redefines
+% \cs*{caption} or are using another class it might not work. Before you
+% place a note in a caption you should re-think the idea anyway.}.
+Endnotes
can also be nested.
-Since this functionality seemed making a pair
-\cs{endnotemark}/\cs{endnotetext} superfluous they are \emph{not} defined by
-\enotez.
+% Since this functionality seemed making a pair
+% \cs{endnotemark}/\cs{endnotetext} superfluous they are \emph{not} defined by
+% \enotez.
\begin{example}
This is some text.\endnote{With another endnote.\endnote{This is a
nested\endnote{And another level deeper\ldots} endnote!}}
@@ -157,32 +162,32 @@
contains the current mark which is preceded by \cs{enmarkstyle}. Both of
these commands can be redefined of course to adapt to custom settings. This
can also be done using options, see section~\ref{sec:options}. The mark of
-the endnote that has been set last is stored in \cs{theendnote} and in
+the endnote that has been set last is stored in % \cs{theendnote} and in
\verbcode+\@currentlabel+.\sinceversion{0.6}
-This could be used to define a command which writes a mark:
-\begin{example}
- % we cannot use \newcommand -- the command starts with \end...
- \makeatletter
- \def\endnotemark{\@ifnextchar[{\@endnotemark}{\@endnotemark[\theendnote]}}
- \def\@endnotemark[#1]{\enotezwritemark{\enmarkstyle#1}}
- \makeatother
- Text\endnotemark
-\end{example}
-Please note that this definition \emph{does not} step the endnote counter but
-either refers to the last number (no optional argument) or uses the one
-provided in the optional argument.
-
-\makeatletter
-\def\endnotemark{\@ifnextchar[{\@endnotemark}{\@endnotemark[\theendnote]}}
-\def\@endnotemark[#1]{\enotezwritemark{\enmarkstyle#1}}
-\makeatother
+% This could be used to define a command which writes a mark:
+% \begin{example}
+% % we cannot use \newcommand -- the command starts with \end...
+% \makeatletter
+% \def\endnotemark{\@ifnextchar[{\@endnotemark}{\@endnotemark[\theendnote]}}
+% \def\@endnotemark[#1]{\enotezwritemark{\enmarkstyle#1}}
+% \makeatother
+% Text\endnotemark
+% \end{example}
+% Please note that this definition \emph{does not} step the endnote counter but
+% either refers to the last number (no optional argument) or uses the one
+% provided in the optional argument.
+
+% \makeatletter
+% \def\endnotemark{\@ifnextchar[{\@endnotemark}{\@endnotemark[\theendnote]}}
+% \def\@endnotemark[#1]{\enotezwritemark{\enmarkstyle#1}}
+% \makeatother
Endnotes can also be labelled and later be referred to:
\begin{example}
The next endnote\endnote{This endnote gets a label.}\label{en:test} has
- the number~\ref{en:test}. We can use this with the previous definition
- of \cs{endnotemark}\endnotemark[\ref{en:test}].
+ the number~\ref{en:test}. Let's now test
+ \cs{endnotemark}\endnotemark[\ref{en:test}].
\end{example}
\subsection{Printing the Notes}
@@ -515,4 +520,3 @@
\printendnotes[addsec]
\end{document}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/enotez/enotez_split_example.tex new/doc/latex/enotez/enotez_split_example.tex
--- old/doc/latex/enotez/enotez_split_example.tex 2015-07-29 22:45:10.000000000 +0200
+++ new/doc/latex/enotez/enotez_split_example.tex 2016-11-25 19:28:45.000000000 +0100
@@ -1,8 +1,8 @@
-\documentclass{scrartcl}
+\documentclass{article}
+% \documentclass{scrartcl}
% \documentclass{memoir}
-% \documentclass{article}
\usepackage[english]{babel}
-\usepackage{caption}
+% \usepackage{caption}
\usepackage[T1]{fontenc}
\usepackage{libertine}
@@ -14,21 +14,18 @@
split=section,
list-style=section,
reset,
+ backref
% customize the titles in between, e.g.:
% split-sectioning=addsec,
% split-title=\par\noindent<name> <ref>:
}
\usepackage{fnpct}
-% \AdaptNote\endnote\multendnote
\usepackage{mwe}
\usepackage[colorlinks]{hyperref}
\begin{document}
-\makeatletter
-% \texttt{\meaning\@@makecaption}
-\makeatother
\tableofcontents
@@ -38,10 +35,14 @@
Text\multendnote{\kant[5];\kant[6]}.
\begin{figure}[htp]
- \centering
- \includegraphics[width=.4\linewidth]{example-image-a}
- \caption[caption]{Some text\endnote{An endnote with a nested endnote\endnote{\kant[7]}
- inside a figure caption.}.}
+ \centering
+ \includegraphics[width=.4\linewidth]{example-image-a}
+ % \addtocounter{endnote}{-1} % <<< need this in memoir class and with
+ % `caption' package when using an endnote
+ % inside a caption
+ \caption[caption]{Some text\endnotemark.}
+ \endnotetext{An endnote with a nested endnote\endnote{\kant[7]} inside a
+ figure caption.}
\end{figure}
\appendix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enotez.doc.tlpobj new/tlpkg/tlpobj/enotez.doc.tlpobj
--- old/tlpkg/tlpobj/enotez.doc.tlpobj 2016-04-14 18:59:44.000000000 +0200
+++ new/tlpkg/tlpobj/enotez.doc.tlpobj 2017-04-25 02:07:20.000000000 +0200
@@ -1,9 +1,9 @@
name enotez.doc
category Package
-revision 39335
+revision 44024
shortdesc doc files of enotez
relocated 1
-docfiles size=122
+docfiles size=121
RELOC/doc/latex/enotez/README
RELOC/doc/latex/enotez/enotez_en.pdf
RELOC/doc/latex/enotez/enotez_en.tex
++++++ enotez.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/enotez/enotez.sty new/tex/latex/enotez/enotez.sty
--- old/tex/latex/enotez/enotez.sty 2016-01-09 23:30:22.000000000 +0100
+++ new/tex/latex/enotez/enotez.sty 2017-04-24 23:26:18.000000000 +0200
@@ -8,7 +8,7 @@
% Web: https://bitbucket.org/cgnieder/enotez/
% E-Mail: contact@mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2016 Clemens Niederberger
+% Copyright 2012-2017 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -31,36 +31,21 @@
\RequirePackage{ expl3 , xparse , l3keys2e , xtemplate , etoolbox , xpatch , scrlfile }
\ProvidesExplPackage
{enotez}
- {2016/01/07}
- {0.8b}
+ {2017/04/24}
+ {0.9a}
{Endnotes for LaTeX2e}
% --------------------------------------------------------------------------
-% check expl3 version:
-\@ifpackagelater { expl3 } { 2012/11/21 }
- { }
- {
- \PackageError {enotez} { Support~package~expl3~too~old }
- {
- You~need~to~update~your~installation~of~the~bundles~'l3kernel'~and~
- 'l3packages'.\MessageBreak
- Loading~enotez~will~abort!
- }
- \tex_endinput:D
- }
-
-% --------------------------------------------------------------------------
% messages
-\msg_new:nnnn {enotez} { captions }
- { Endnotes~might~not~work~in~captions. }
- {
- Endnotes~might~not~work~inside~captions.~You~might~try~to~use~the~caption~
- package~if~you~encounter~problems~but~that's~not~a~promise~that~things~
- will~work~then.
- }
-
+% \msg_new:nnnn {enotez} {captions}
+% { Endnotes~might~not~work~in~captions. }
+% {
+% Endnotes~might~not~work~inside~captions.~You~might~try~to~use~the~caption~
+% package~if~you~encounter~problems~but~that's~not~a~promise~that~things~
+% will~work~then.
+% }
-\msg_new:nnnn {enotez} { deprecated }
+\msg_new:nnnn {enotez} {deprecated}
{ The~#1~`#2'~is~deprecated.~Use~`#3'~instead~\msg_line_context:. }
{
The~#1~`#2'~you~used~\msg_line_context: \c_space_tl is~deprecated~and~has~
@@ -69,15 +54,14 @@
}
\cs_new:Npn \enotez_option_deprecated:nn #1#2
- { \msg_warning:nnnnn {enotez} { deprecated } { option } {#1} {#2} }
+ { \msg_warning:nnnnn {enotez} {deprecated} {option} {#1} {#2} }
\cs_new:Npn \enotez_command_deprecated:NN #1#2
{
- \msg_warning:nnnnn {enotez} { deprecated } { command }
+ \msg_warning:nnnnn {enotez} {deprecated} {command}
{ \token_to_str:N #1 } { \token_to_str:N #2 }
}
-
% --------------------------------------------------------------------------
% variants of kernel functions
\cs_generate_variant:Nn \tl_if_eq:nnTF { Vn , nx }
@@ -92,28 +76,30 @@
\bool_new:N \l__enotez_hyperfootnotes_bool
\bool_new:N \l__enotez_hyperbackref_bool
\bool_new:N \l__enotez_split_bool
-\bool_new:N \l__enotez_caption_patched_bool
-\bool_new:N \l__enotez_koma_patched_bool
-\bool_new:N \l__enotez_memoir_patched_bool
+% \bool_new:N \l__enotez_caption_patched_bool
+% \bool_new:N \l__enotez_koma_patched_bool
+% \bool_new:N \l__enotez_memoir_patched_bool
+\bool_new:N \l__enotez_disable_bool
\tl_new:N \l__enotez_tmpa_tl
\tl_new:N \l__enotez_tmpb_tl
\tl_new:N \l__enotez_tmpc_tl
+\tl_new:N \l__enotez_change_tl
\tl_new:N \l__enotez_totoc_tl
\tl_new:N \l__enotez_list_name_tl
-\tl_set:Nn \l__enotez_list_name_tl { Notes }
+\tl_set:Nn \l__enotez_list_name_tl {Notes}
\tl_new:N \l__enotez_endnote_text_tl
\tl_new:N \l__enotez_endnote_mark_tl
\tl_new:N \l__enotez_list_instance_tl
-\tl_set:Nn \l__enotez_list_instance_tl { plain }
+\tl_set:Nn \l__enotez_list_instance_tl {plain}
\tl_new:N \l__enotez_split_tl
\tl_new:N \l__enotez_splitted_list_sectioning_tl
\tl_new:N \l__enotez_splitted_title_tl
-\tl_set:Nn \l__enotez_splitted_title_tl { Notes~for~<name>~<ref> }
+\tl_set:Nn \l__enotez_splitted_title_tl {Notes~for~<name>~<ref>}
\tl_new:N \l__enotez_section_tl
-\tl_set:Nn \l__enotez_section_tl { section }
+\tl_set:Nn \l__enotez_section_tl {section}
\tl_new:N \l__enotez_chapter_tl
-\tl_set:Nn \l__enotez_chapter_tl { chapter }
+\tl_set:Nn \l__enotez_chapter_tl {chapter}
\tl_new:N \g__enotez_actual_sectioning_tl
\tl_new:N \l__enotez_list_splitted_title_tl
\tl_new:N \g__enotez_list_next_preamble_tl
@@ -133,6 +119,7 @@
\int_zero:N \g__enotez_endnote_id_int
\int_new:N \g__enotez_endnote_mark_int
\int_zero:N \g__enotez_endnote_mark_int
+\newcounter {endnote}
\int_new:N \g__enotez_list_printed_int
\int_zero:N \g__enotez_list_printed_int
\int_new:N \l__enotez_tmpa_int
@@ -144,32 +131,10 @@
\prop_new:N \g__enotez_endnote_sect_id_prop
\prop_new:N \g__enotez_endnote_man_prop
+\cs_new_protected:Npn \enotez_nobreak: { \tex_penalty:D \c_ten_thousand }
+
% --------------------------------------------------------------------------
% options:
-\cs_new_eq:NN \enotez_counter_format:n \int_to_arabic:n
-\cs_generate_variant:Nn \enotez_counter_format:n { V }
-
-\cs_new_eq:NN \__enotez_int_to_arabic:n \int_to_arabic:n
-\cs_new_eq:NN \__enotez_int_to_roman:n \int_to_roman:n
-\cs_new_eq:NN \__enotez_int_to_Roman:n \int_to_Roman:n
-\cs_new_eq:NN \__enotez_int_to_alph:n \int_to_alph:n
-\cs_new_eq:NN \__enotez_int_to_Alph:n \int_to_Alph:n
-\cs_new:Npn \__enotez_int_to_symbols:n #1
- {
- \int_to_symbols:nnn {#1} { 9 }
- {
- { 1 } { \mode_if_math:TF { * } { \textasteriskcentered } }
- { 2 } { \mode_if_math:TF { \dagger } { \textdagger } }
- { 3 } { \mode_if_math:TF { \ddagger } { \textdaggerdbl } }
- { 4 } { \mode_if_math:TF { \mathsection } { \textsection } }
- { 5 } { \mode_if_math:TF { \mathparagraph } { \textparagraph } }
- { 6 } { \mode_if_math:TF { \| } { \textbardbl } }
- { 7 } { \mode_if_math:TF { ** } { \textasteriskcentered\textasteriskcentered } }
- { 8 } { \mode_if_math:TF { \dagger\dagger } { \textdagger\textdagger } }
- { 9 } { \mode_if_math:TF { \ddagger\ddagger } { \textdaggerdbl\textdaggerdbl } }
- }
- }
-
\keys_define:nn {enotez}
{
backref .bool_set:N = \l__enotez_hyperbackref_bool ,
@@ -177,12 +142,13 @@
list-name .tl_set:N = \l__enotez_list_name_tl ,
reset .bool_set:N = \l__enotez_reset_bool ,
% TODO: add symbols and other possible formats, use cntformats?
- counter-format .choices:nn =
- { arabic , alph , Alph , roman , Roman , symbols }
- {
- \cs_set_eq:Nc \enotez_counter_format:n
- { __enotez_int_to_ \l_keys_choice_tl :n }
- } ,
+ counter-format .choice: ,
+ counter-format / arabic .code:n = \cs_set:Npn \theendnote {\arabic{endnote}} ,
+ counter-format / alph .code:n = \cs_set:Npn \theendnote {\alph{endnote}} ,
+ counter-format / Alph .code:n = \cs_set:Npn \theendnote {\Alph{endnote}} ,
+ counter-format / roman .code:n = \cs_set:Npn \theendnote {\roman{endnote}} ,
+ counter-format / Roman .code:n = \cs_set:Npn \theendnote {\Roman{endnote}} ,
+ counter-format / symbols .code:n = \cs_set:Npn \theendnote {\fnsymbol{endnote}} ,
mark-format .code:n = \cs_set:Npn \enmarkstyle {#1} ,
mark-cs .code:n = \cs_set:Npn \enotezwritemark {#1} ,
totoc .choices:nn =
@@ -222,19 +188,20 @@
% typeset the actual mark:
% #1: id
% #2: mark
-\cs_new:Npn \enotez_write_mark:nn #1#2
+\cs_new_protected:Npn \enotez_write_mark:nn #1#2
{
\bool_if:NTF \l__enotez_hyperfootnotes_bool
{
- \enotezwritemark { \hyperlink { enz.#1 } { \enmarkstyle #2 } }
+ \enotezwritemark { \hyperlink {enz.#1} { \enmarkstyle #2 } }
\bool_if:NT \l__enotez_hyperbackref_bool
{
- \box_move_up:nn { 1em }
- { \hbox:n { \hypertarget { enz.#1.backref } { } } }
+ \box_move_up:nn {1em}
+ { \hbox:n { \hypertarget {enz.#1.backref} { } } }
}
}
{ \enotezwritemark { \enmarkstyle #2 } }
}
+\cs_generate_variant:Nn \enotez_write_mark:nn {x}
% the internal endnote:
\cs_new_protected:Npn \enotez_endnote:nn #1#2
@@ -248,24 +215,33 @@
\int_gincr:N \g__enotez_endnote_id_int
\quark_if_no_value:nTF {#1}
{
- \int_gincr:N \g__enotez_endnote_mark_int
- \cs_gset:cpx { @currentlabel }
- { \enotez_counter_format:V \g__enotez_endnote_mark_int }
- \cs_gset_eq:NN \theendnote \@currentlabel
- \enotez_write_mark:nn
+ \stepcounter {endnote}% problem with option `reset'
+ % \show \theendnote
+ \cs_gset:cpx {@currentlabel} {\theendnote}
+ \enotez_write_mark:xn
{ \int_use:N \g__enotez_endnote_id_int }
- { \enotez_counter_format:V \g__enotez_endnote_mark_int }
+ { \theendnote }
}
{
- \cs_gset:cpx { @currentlabel } {#1}
- \cs_gset_eq:NN \theendnote \@currentlabel
- \enotez_write_mark:nn { \int_use:N \g__enotez_endnote_id_int } {#1}
+ \cs_gset:cpn {@currentlabel} {#1}
+ % \cs_gset_eq:NN \theendnote \@currentlabel
+ \enotez_write_mark:xn { \int_use:N \g__enotez_endnote_id_int } {#1}
+ }
+ \bool_if:NT \l__enotez_disable_bool
+ {
+ \int_gdecr:N \g__enotez_endnote_id_int
+ \addtocounter {endnote} {-1}
}
}
+\cs_new_protected:Npn \enotez_disable:
+ { \bool_set_true:N \l__enotez_disable_bool }
+
+\NewDocumentCommand \enotezdisable {} { \enotez_disable: }
+
\cs_new_protected:Npn \enotez_endnote_text:nn #1#2
{
- \tl_set:Nn \l__enotez_tmpa_tl { chapter }
+ \tl_set:Nn \l__enotez_tmpa_tl {chapter}
\quark_if_no_value:nTF {#1}
{
\bool_if:nTF
@@ -277,7 +253,8 @@
{
\enotez_save_note:xxxxxnn
{ \int_use:N \g__enotez_endnote_id_int }
- { \int_use:N \g__enotez_endnote_mark_int }
+ { \theendnote }
+ % { \int_use:N \g__enotez_endnote_mark_int }
{ \int_use:N \g__enotez_list_printed_int }
{ \thechapter }
{ \int_eval:n { \value{chapter} } }
@@ -287,7 +264,8 @@
{
\enotez_save_note:xxxxxnn
{ \int_use:N \g__enotez_endnote_id_int }
- { \int_use:N \g__enotez_endnote_mark_int }
+ { \theendnote }
+ % { \int_use:N \g__enotez_endnote_mark_int }
{ \int_use:N \g__enotez_list_printed_int }
{ \thesection }
{ \int_eval:n { \value{section} } }
@@ -326,95 +304,6 @@
}
% --------------------------------------------------------------------------
-% in some cases caption making commands need to be patched. preparations:
-\cs_new:Npn \__enotez_tmp_endnote:nn {}
-
-\cs_new_protected:Npn \enotez_caption_endnote:nn #1#2
- {
- \quark_if_no_value:nTF {#1}
- {
- \enotez_write_mark:nn
- { \int_use:N \g__enotez_endnote_id_int }
- { \enotez_counter_format:V \g__enotez_endnote_mark_int }
- }
- { \enotez_write_mark:nn { \int_use:N \g__enotez_endnote_id_int } {#1} }
- }
-
-\cs_new_protected:Npn \enotez@koma@disable
- { \cs_set_eq:NN \enotez_endnote:nn \enotez_caption_endnote:nn }
-
-\cs_new_protected:Npn \enotez@memoir@disable
- {
- \cs_set_eq:NN \__enotez_tmp_endnote:nn \enotez_endnote:nn
- \cs_set_eq:NN \enotez_endnote:nn \enotez_caption_endnote:nn
- }
-
-\cs_new_protected:Npn \enotez@memoir@enable
- { \cs_set_eq:NN \enotez_endnote:nn \__enotez_tmp_endnote:nn }
-
-\cs_new_protected:Npn \enotez@caption@disable
- {
- \xpatchcmd \caption@@make
- { \caption@@@make }
- { \enotez@koma@disable\caption@@@make }
- { \bool_set_true:N \l__enotez_caption_patched_bool }
- { \bool_set_false:N \l__enotez_caption_patched_bool }
- }
-
-% if we're in a KOMA class, \@@makecaption needs to be patched:
-\cs_if_free:NF \KOMAClassName
- {
- \xpatchcmd \@@makecaption
- { \setlength{\@tempdima}{\cap@width} }
- { \enotez@koma@disable\setlength{\@tempdima}{\cap@width} }
- { \bool_set_true:N \l__enotez_koma_patched_bool }
- { \bool_set_false:N \l__enotez_koma_patched_bool }
- \AfterPackage+ { caption } { \enotez@caption@disable }
- }
-
-% if we're in memoir, \@makecaption needs to be patched:
-% TODO: fails when caption has been loaded, needs to be reworked
-\AfterClass+ { memoir }
- {
- \AtEndPreamble
- {
- \cs_if_exist:cF { ver@caption.sty }
- {
- \xpatchcmd \@makecaption
- { \let\@contfnote\footnote }
- { \enotez@memoir@disable\let\@contfnote\footnote }
- { \bool_set_true:N \l__enotez_memoir_patched_bool }
- { \bool_set_false:N \l__enotez_memoir_patched_bool }
- \xpatchcmd \@makecaption
- { \let\footnote\@contfnote }
- { \enotez@memoir@enable\let\footnote\@contfnote }
- { \bool_set_true:N \l__enotez_memoir_patched_bool }
- { \bool_set_false:N \l__enotez_memoir_patched_bool }
- }
- }
- }
-
-\AtBeginDocument
- {
- \bool_if:nT
- { \cs_if_exist_p:c { ver@caption.sty } && !\l__enotez_caption_patched_bool }
- { \AfterPackage+ { caption } { \enotez@caption@disable } }
- \bool_if:nT
- {
- ( \cs_if_exist_p:c { ver@memoir.cls } && !\l__enotez_memoir_patched_bool )
- ||
- (
- !\cs_if_exist_p:c { ver@memoir.cls } &&
- \cs_if_exist_p:c { ver@caption.sty } &&
- !\l__enotez_caption_patched_bool
- )
- ||
- ( \cs_if_exist_p:N \KOMAClassName && !\l__enotez_koma_patched_bool )
- }
- { \msg_warning:nn {enotez} { captions } }
- }
-
-% --------------------------------------------------------------------------
% save the notes to the aux file:
% #1: global id
% #2: mark
@@ -439,8 +328,6 @@
}
% a try to check if a rerun is necessary:
-\tl_new:N \l__enotez_change_tl
-
\AtEndDocument
{
\cs_set_protected:Npn \enotez@note #1#2#3#4#5#6#7
@@ -459,6 +346,7 @@
% disable compatibility with `fnpct'
\cs_new_protected:Npn \endnote
{
+ \enotez_nobreak:
\peek_meaning_ignore_spaces:NTF [
{ \enotez_endnote_aux:w }
{ \enotez_endnote:nn { \q_no_value } }
@@ -467,25 +355,25 @@
\cs_new:Npn \enotez_endnote_aux:w [#1]#2
{ \enotez_endnote:nn {#1} {#2} }
-% \cs_new_protected:Npn \endnotemark
-% {
-% \peek_meaning_ignore_spaces:NTF [
-% { \enotez_endnote_mark_aux:w }
-% { \enotez_endnote_mark:n { \q_no_value } }
-% }
+\cs_new_protected:Npn \endnotemark
+ {
+ \peek_meaning_ignore_spaces:NTF [
+ { \enotez_endnote_mark_aux:w }
+ { \enotez_endnote_mark:n { \q_no_value } }
+ }
-% \cs_new:Npn \enotez_endnote_mark_aux:w [#1]
-% { \enotez_endnote_mark:n {#1} }
+\cs_new:Npn \enotez_endnote_mark_aux:w [#1]
+ { \enotez_endnote_mark:n {#1} }
-% \cs_new_protected:Npn \endnotetext
-% {
-% \peek_meaning_ignore_spaces:NTF [
-% { \enotez_endnote_text_aux:w }
-% { \enotez_endnote_text:nn { \q_no_value } }
-% }
+\cs_new_protected:Npn \endnotetext
+ {
+ \peek_meaning_ignore_spaces:NTF [
+ { \enotez_endnote_text_aux:w }
+ { \enotez_endnote_text:nn { \q_no_value } }
+ }
-% \cs_new:Npn \enotez_endnote_text_aux:w [#1]#2
-% { \enotez_endnote_text:nn {#1} {#2} }
+\cs_new:Npn \enotez_endnote_text_aux:w [#1]#2
+ { \enotez_endnote_text:nn {#1} {#2} }
% --------------------------------------------------------------------------
% the list of notes
@@ -498,9 +386,9 @@
% \cs_new:Npn \enotezsplitlistheading
% { \use:c { \l__enotez_splitted_list_sectioning_tl } }
-\DeclareObjectType { enotez-list } { 1 }
+\DeclareObjectType {enotez-list} {1}
-\DeclareTemplateInterface { enotez-list } { paragraph } { 1 }
+\DeclareTemplateInterface {enotez-list} {paragraph} {1}
{
heading : function 1 = \enotezlistheading{#1} ,
format : tokenlist = \footnotesize ,
@@ -509,7 +397,7 @@
notes-sep : length = .5\baselineskip ,
}
-\DeclareTemplateCode { enotez-list } { paragraph } { 1 }
+\DeclareTemplateCode {enotez-list} {paragraph} {1}
{
heading = \enotez_list_heading:n ,
format = \l__enotez_list_format_tl ,
@@ -522,7 +410,7 @@
\bool_if:NT \l__enotez_totoc_bool
{
\bool_if:NT \l__enotez_hyperref_bool { \phantomsection }
- \addcontentsline { toc } { \l__enotez_totoc_tl } { \l__enotez_list_name_tl }
+ \addcontentsline {toc} { \l__enotez_totoc_tl } { \l__enotez_list_name_tl }
}
\enotez_list_heading:n { \l__enotez_list_name_tl }
\enotez_list_preamble:
@@ -562,7 +450,7 @@
\enotez_list_postamble:
}
-\DeclareTemplateInterface { enotez-list } { list } { 1 }
+\DeclareTemplateInterface {enotez-list} {list} {1}
{
heading : function 1 = \enotezlistheading{#1} ,
format : tokenlist = \footnotesize ,
@@ -571,7 +459,7 @@
list-type : tokenlist = description ,
}
-\DeclareTemplateCode { enotez-list } { list } { 1 }
+\DeclareTemplateCode {enotez-list} {list} {1}
{
heading = \enotez_list_heading:n ,
format = \l__enotez_list_format_tl ,
@@ -629,36 +517,36 @@
}
% some default styles:
-\DeclareInstance { enotez-list } { plain } { paragraph } { }
-\DeclareInstance { enotez-list } { description } { list } { }
-\DeclareInstance { enotez-list } { itemize } { list } { list-type = itemize }
+\DeclareInstance {enotez-list} {plain} {paragraph } { }
+\DeclareInstance {enotez-list} {description} {list} { }
+\DeclareInstance {enotez-list} {itemize} {list} { list-type = itemize }
% --------------------------------------------------------------------------
% write the mark in the lists:
\cs_new_protected:Npn \enotez_write_list_number:n #1
{
\bool_if:NT \l__enotez_hyperfootnotes_bool
- { \box_move_up:nn { 1em } { \hbox:n { \hypertarget { enz.#1 } { } } } }
+ { \box_move_up:nn {1em} { \hbox:n { \hypertarget {enz.#1} { } } } }
\tl_use:N \l__enotez_list_number_format_tl
- \tl_if_eq:nxTF { a }
+ \tl_if_eq:nxTF {a}
{ \prop_item:Nn \g__enotez_endnote_man_prop {#1} }
{
\bool_if:nTF
{ \l__enotez_hyperfootnotes_bool && \l__enotez_hyperbackref_bool }
{
\exp_args:Nnx
- \hyperlink { enz.#1.backref }
- { \enotez_counter_format:V \l__enotez_endnote_mark_tl }
+ \hyperlink {enz.#1.backref}
+ { \exp_not:V \l__enotez_endnote_mark_tl }
}
- { \enotez_counter_format:V \l__enotez_endnote_mark_tl }
+ { \prop_item:Nn \g__enotez_endnote_mark_prop {#1} }
}
{
\bool_if:nTF
{ \l__enotez_hyperfootnotes_bool && \l__enotez_hyperbackref_bool }
{
\exp_args:Nnx
- \hyperlink { enz.#1.backref }
- { \tl_use:N \l__enotez_endnote_mark_tl }
+ \hyperlink {enz.#1.backref}
+ { \exp_not:V \l__enotez_endnote_mark_tl }
}
{ \tl_use:N \l__enotez_endnote_mark_tl }
}
@@ -679,23 +567,31 @@
\bool_if:NTF \l__enotez_split_bool
{
\bool_set_true:N \l__enotez_print_note_bool
- \prop_gpop:NnN \g__enotez_endnote_mark_prop
- {#2}
- \l__enotez_endnote_mark_tl
- \prop_gpop:NnN \g__enotez_endnote_text_prop
- {#2}
- \l__enotez_endnote_text_tl
+ \tl_set:Nx \l__enotez_endnote_mark_tl
+ { \prop_item:Nn \g__enotez_endnote_mark_prop {#2} }
+ \tl_set:Nx \l__enotez_endnote_text_tl
+ { \prop_item:Nn \g__enotez_endnote_text_prop {#2} }
+ % \prop_gpop:NnN \g__enotez_endnote_mark_prop
+ % {#2}
+ % \l__enotez_endnote_mark_tl
+ % \prop_gpop:NnN \g__enotez_endnote_text_prop
+ % {#2}
+ % \l__enotez_endnote_text_tl
}
{
\int_compare:nTF { \l__enotez_tmpa_tl = \g__enotez_list_printed_int }
{
\bool_set_true:N \l__enotez_print_note_bool
- \prop_gpop:NnN \g__enotez_endnote_mark_prop
- {#2}
- \l__enotez_endnote_mark_tl
- \prop_gpop:NnN \g__enotez_endnote_text_prop
- {#2}
- \l__enotez_endnote_text_tl
+ \tl_set:Nx \l__enotez_endnote_mark_tl
+ { \prop_item:Nn \g__enotez_endnote_mark_prop {#2} }
+ \tl_set:Nx \l__enotez_endnote_text_tl
+ { \prop_item:Nn \g__enotez_endnote_text_prop {#2} }
+ % \prop_gpop:NnN \g__enotez_endnote_mark_prop
+ % {#2}
+ % \l__enotez_endnote_mark_tl
+ % \prop_gpop:NnN \g__enotez_endnote_text_prop
+ % {#2}
+ % \l__enotez_endnote_text_tl
\prop_gremove:Nn \g__enotez_endnote_split_prop {#2}
}
{ \bool_set_false:N \l__enotez_print_note_bool }
@@ -803,18 +699,31 @@
% internal printendnotes:
\cs_new_protected:Npn \enotez_print_endnotes:nn #1#2
{
- \tl_if_blank:nTF {#2}
- { \UseInstance { enotez-list } { \l__enotez_list_instance_tl } }
- { \UseInstance { enotez-list } {#2} }
- {#1}
- \bool_if:NF \l__enotez_split_bool
- {
- \bool_if:NT \l__enotez_reset_bool
- { \int_gzero:N \g__enotez_endnote_mark_int }
- \int_gincr:N \g__enotez_list_printed_int
+ \enotez_if_endnotes:T
+ {
+ \tl_if_blank:nTF {#2}
+ { \UseInstance {enotez-list} { \l__enotez_list_instance_tl } }
+ { \UseInstance {enotez-list} {#2} }
+ {#1}
+ \bool_if:NF \l__enotez_split_bool
+ {
+ \bool_if:NT \l__enotez_reset_bool
+ {
+ \setcounter {endnote} {0}
+ % \int_gzero:N \g__enotez_endnote_mark_int
+ }
+ \int_gincr:N \g__enotez_list_printed_int
+ }
}
}
+\prg_new_conditional:Npnn \enotez_if_endnotes: {p,T,F,TF}
+ {
+ \int_compare:nTF { \value {endnote} > 0 }
+ { \prg_return_true: }
+ { \prg_return_false: }
+ }
+
% the user command:
\NewDocumentCommand \printendnotes { so }
{
@@ -883,16 +792,16 @@
\cs_new_protected:Npn \enotez_set_every_postamble:n #1
{ \tl_gset:Nn \g__enotez_list_every_postamble_tl {#1} }
-\NewDocumentCommand \AtNextEndnotesList { +m }
+\NewDocumentCommand \AtNextEndnotesList {+m}
{ \enotez_set_next_preamble:n {#1} }
-\NewDocumentCommand \AtEveryEndnotesList { +m }
+\NewDocumentCommand \AtEveryEndnotesList {+m}
{ \enotez_set_every_preamble:n {#1} }
-\NewDocumentCommand \AfterNextEndnotesList { +m }
+\NewDocumentCommand \AfterNextEndnotesList {+m}
{ \enotez_set_next_postamble:n {#1} }
-\NewDocumentCommand \AfterEveryEndnotesList { +m }
+\NewDocumentCommand \AfterEveryEndnotesList {+m}
{ \enotez_set_every_postamble:n {#1} }
% --------------------------------------------------------------------------
@@ -921,10 +830,10 @@
\cs_new_protected:Npn \enotez_set_every_split_postamble:n #1
{ \tl_gset:Nn \g__enotez_split_list_postamble_tl {#1} }
-\NewDocumentCommand \AtEveryListSplit { +m }
+\NewDocumentCommand \AtEveryListSplit {+m}
{ \enotez_set_every_split_preamble:n {#1} }
-\NewDocumentCommand \AfterEveryListSplit { +m }
+\NewDocumentCommand \AfterEveryListSplit {+m}
{ \enotez_set_every_split_postamble:n {#1} }
\cs_new:Npn \EnotezCurrentSplitTitle {}
@@ -937,13 +846,16 @@
{
\bool_if:NT \l__enotez_split_bool
{
- \tl_if_eq:VnTF \l__enotez_split_tl { section }
+ \tl_if_eq:VnTF \l__enotez_split_tl {section}
{
\tl_put_left:Nn \section
{
\int_gincr:N \g__enotez_list_printed_int
\bool_if:NT \l__enotez_reset_bool
- { \int_gzero:N \g__enotez_endnote_mark_int }
+ {
+ \setcounter {endnote} {0}
+ % \int_gzero:N \g__enotez_endnote_mark_int
+ }
}
}
{
@@ -951,11 +863,14 @@
{
\int_gincr:N \g__enotez_list_printed_int
\bool_if:NT \l__enotez_reset_bool
- { \int_gzero:N \g__enotez_endnote_mark_int }
+ {
+ \setcounter {endnote} {0}
+ % \int_gzero:N \g__enotez_endnote_mark_int
+ }
}
}
}
- \@ifpackageloaded { hyperref }
+ \@ifpackageloaded {hyperref}
{
\bool_set_true:N \l__enotez_hyperref_bool
\ifHy@hyperfootnotes
@@ -972,60 +887,60 @@
% --------------------------------------------------------------------------
% the setup command:
-\NewDocumentCommand \setenotez { +m }
- { \keys_set:nn {enotez} {#1} \ignorespaces }
+\NewDocumentCommand \setenotez {m}
+ { \keys_set:nn {enotez} {#1} }
% --------------------------------------------------------------------------
% language support
-\RequirePackage { translations }
-\DeclareTranslationFallback { enotez-title } { Notes }
-\DeclareTranslation { Catalan } { enotez-title } { Notes }
-\DeclareTranslation { Croatian } { enotez-title } { Bilje\v{s}ke }
-\DeclareTranslation { English } { enotez-title } { Notes }
-\DeclareTranslation { French } { enotez-title } { Remarques }
-\DeclareTranslation { German } { enotez-title } { Anmerkungen }
-\DeclareTranslation { Hungarian } { enotez-title } { Megjegyz\'{e}sek }
-\DeclareTranslation { Italian } { enotez-title } { Note }
-\DeclareTranslation { Spanish } { enotez-title } { Notas }
-\DeclareTranslation { Turkish } { enotez-title } { Notlar }
-
-\DeclareTranslationFallback { enotez-splitted-title } { Notes~for~<name>~<ref> }
-\DeclareTranslation { Catalan } { enotez-splitted-title } { Notes~del~<name>~<ref> }
-\DeclareTranslation { Croatian } { enotez-splitted-title } { Bilje\v{s}ke~uz~<name>~<ref> }
-\DeclareTranslation { English } { enotez-splitted-title } { Notes~for~<name>~<ref> }
-\DeclareTranslation { French } { enotez-splitted-title } { Remarques~aux~<name>~<ref> }
-\DeclareTranslation { German } { enotez-splitted-title } { Anmerkungen~zu~<name>~<ref> }
-\DeclareTranslation { Hungarian } { enotez-splitted-title } { Megjegyz\'{e}sek~a~<ref>.~<name> }
-\DeclareTranslation { Italian } { enotez-splitted-title } { Note~per~il~<name>~<ref> }
-\DeclareTranslation { Spanish } { enotez-splitted-title } { Notas~del~<name>~<ref> }
-\DeclareTranslation { Turkish } { enotez-splitted-title } { <name>~<ref>~notlar }
-
-\DeclareTranslationFallback { enotez-section } { section }
-\DeclareTranslation { Catalan } { enotez-section } { secci\'{o} }
-\DeclareTranslation { Croatian } { enotez-section } { odjeljak }
-\DeclareTranslation { English } { enotez-section } { section }
-\DeclareTranslation { French } { enotez-section } { section }
-\DeclareTranslation { German } { enotez-section } { Abschnitt }
-\DeclareTranslation { Hungarian } { enotez-section } { szakasz }
-\DeclareTranslation { Italian } { enotez-section } { sezione }
-\DeclareTranslation { Spanish } { enotez-section } { secci\'{o}n }
-\DeclareTranslation { Turkish } { enotez-section } { B\"{o}l\"{u}m }
-
-\DeclareTranslationFallback { enotez-chapter } { chapter }
-\DeclareTranslation { Catalan } { enotez-chapter } { cap\'{\i}tol }
-\DeclareTranslation { Croatian } { enotez-chapter } { poglavlje }
-\DeclareTranslation { English } { enotez-chapter } { chapter }
-\DeclareTranslation { French } { enotez-chapter } { chapitre }
-\DeclareTranslation { German } { enotez-chapter } { Kapitel }
-\DeclareTranslation { Hungarian } { enotez-chapter } { fejezet }
-\DeclareTranslation { Italian } { enotez-chapter } { capitolo }
-\DeclareTranslation { Spanish } { enotez-chapter } { cap\'{\i}tulo }
-\DeclareTranslation { Turkish } { enotez-chapter } { B\"{o}l\"{u}m }
-
-\tl_set:Nn \l__enotez_splitted_title_tl { \GetTranslation { enotez-splitted-title } }
-\tl_set:Nn \l__enotez_list_name_tl { \GetTranslation { enotez-title } }
-\tl_set:Nn \l__enotez_section_tl { \GetTranslation { enotez-section } }
-\tl_set:Nn \l__enotez_chapter_tl { \GetTranslation { enotez-chapter } }
+\RequirePackage {translations}
+\DeclareTranslationFallback {enotez-title} {Notes}
+\DeclareTranslation {Catalan} {enotez-title} {Notes}
+\DeclareTranslation {Croatian} {enotez-title} {Bilje\v{s}ke}
+\DeclareTranslation {English} {enotez-title} {Notes}
+\DeclareTranslation {French} {enotez-title} {Remarques}
+\DeclareTranslation {German} {enotez-title} {Anmerkungen}
+\DeclareTranslation {Hungarian} {enotez-title} {Megjegyz\'{e}sek}
+\DeclareTranslation {Italian} {enotez-title} {Note}
+\DeclareTranslation {Spanish} {enotez-title} {Notas}
+\DeclareTranslation {Turkish} {enotez-title} {Notlar}
+
+\DeclareTranslationFallback {enotez-splitted-title} {Notes~for~<name>~<ref>}
+\DeclareTranslation {Catalan} {enotez-splitted-title} {Notes~del~<name>~<ref>}
+\DeclareTranslation {Croatian} {enotez-splitted-title} {Bilje\v{s}ke~uz~<name>~<ref>}
+\DeclareTranslation {English} {enotez-splitted-title} {Notes~for~<name>~<ref>}
+\DeclareTranslation {French} {enotez-splitted-title} {Remarques~aux~<name>~<ref>}
+\DeclareTranslation {German} {enotez-splitted-title} {Anmerkungen~zu~<name>~<ref>}
+\DeclareTranslation {Hungarian} {enotez-splitted-title} {Megjegyz\'{e}sek~a~<ref>.~<name>}
+\DeclareTranslation {Italian} {enotez-splitted-title} {Note~per~il~<name>~<ref>}
+\DeclareTranslation {Spanish} {enotez-splitted-title} {Notas~del~<name>~<ref>}
+\DeclareTranslation {Turkish} {enotez-splitted-title} {<name>~<ref>~notlar}
+
+\DeclareTranslationFallback {enotez-section} {section}
+\DeclareTranslation {Catalan} {enotez-section} {secci\'{o}}
+\DeclareTranslation {Croatian} {enotez-section} {odjeljak}
+\DeclareTranslation {English} {enotez-section} {section}
+\DeclareTranslation {French} {enotez-section} {section}
+\DeclareTranslation {German} {enotez-section} {Abschnitt}
+\DeclareTranslation {Hungarian} {enotez-section} {szakasz}
+\DeclareTranslation {Italian} {enotez-section} {sezione}
+\DeclareTranslation {Spanish} {enotez-section} {secci\'{o}n}
+\DeclareTranslation {Turkish} {enotez-section} {B\"{o}l\"{u}m}
+
+\DeclareTranslationFallback {enotez-chapter} {chapter}
+\DeclareTranslation {Catalan} {enotez-chapter} {cap\'{\i}tol}
+\DeclareTranslation {Croatian} {enotez-chapter} {poglavlje}
+\DeclareTranslation {English} {enotez-chapter} {chapter}
+\DeclareTranslation {French} {enotez-chapter} {chapitre}
+\DeclareTranslation {German} {enotez-chapter} {Kapitel}
+\DeclareTranslation {Hungarian} {enotez-chapter} {fejezet}
+\DeclareTranslation {Italian} {enotez-chapter} {capitolo}
+\DeclareTranslation {Spanish} {enotez-chapter} {cap\'{\i}tulo}
+\DeclareTranslation {Turkish} {enotez-chapter} {B\"{o}l\"{u}m}
+
+\tl_set:Nn \l__enotez_splitted_title_tl { \GetTranslation {enotez-splitted-title} }
+\tl_set:Nn \l__enotez_list_name_tl { \GetTranslation {enotez-title} }
+\tl_set:Nn \l__enotez_section_tl { \GetTranslation {enotez-section} }
+\tl_set:Nn \l__enotez_chapter_tl { \GetTranslation {enotez-chapter} }
\tex_endinput:D
% --------------------------------------------------------------------------
@@ -1066,6 +981,9 @@
- new command \NewSplitTitleTag
2015/07/29 v0.8a - adapt to deprecated choice selection in keys
2016/01/07 v0.8b - \prop_get:Nn => \prop_item:Nn
+2016/11/08 v0.9 - fix issues #6, #7, and #8
+ - remove caption patching and add \endnotemark and \endnotetext
+2017/04/24 v0.9a - fix wrong format of number in list
% --------------------------------------------------------------------------
% TODO:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enotez.tlpobj new/tlpkg/tlpobj/enotez.tlpobj
--- old/tlpkg/tlpobj/enotez.tlpobj 2016-04-14 18:59:45.000000000 +0200
+++ new/tlpkg/tlpobj/enotez.tlpobj 2017-04-25 02:07:20.000000000 +0200
@@ -1,6 +1,6 @@
name enotez
category Package
-revision 39335
+revision 44024
shortdesc Support for end-notes
relocated 1
longdesc The package allows nested endnotes, supports hyperref and
@@ -11,7 +11,7 @@
RELOC/tex/latex/enotez/enotez.sty
catalogue-also endnote endnotes
catalogue-ctan /macros/latex/contrib/enotez
-catalogue-date 2016-01-09 15:32:41 +0100
+catalogue-date 2017-04-24 19:51:11 +0200
catalogue-license lppl1.3
catalogue-topics endnote expl3
-catalogue-version 0.8b
+catalogue-version 0.9a
++++++ enumitem-zref.doc.tar.xz ++++++
++++++ enumitem-zref.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enumitem-zref.tlpobj new/tlpkg/tlpobj/enumitem-zref.tlpobj
--- old/tlpkg/tlpobj/enumitem-zref.tlpobj 2016-04-14 18:59:46.000000000 +0200
+++ new/tlpkg/tlpobj/enumitem-zref.tlpobj 2017-04-14 17:39:21.000000000 +0200
@@ -16,7 +16,7 @@
runfiles size=7
RELOC/tex/latex/enumitem-zref/enumitem-zref.sty
catalogue-ctan /macros/latex/contrib/enumitem-zref
-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 list
catalogue-version 1.8
++++++ enumitem.doc.tar.xz ++++++
++++++ enumitem.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/enumitem.tlpobj new/tlpkg/tlpobj/enumitem.tlpobj
--- old/tlpkg/tlpobj/enumitem.tlpobj 2016-04-14 18:59:45.000000000 +0200
+++ new/tlpkg/tlpobj/enumitem.tlpobj 2017-04-14 17:39:21.000000000 +0200
@@ -13,7 +13,7 @@
runfiles size=11
RELOC/tex/latex/enumitem/enumitem.sty
catalogue-ctan /macros/latex/contrib/enumitem
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics list
catalogue-version 3.5.2
++++++ envbig.doc.tar.xz ++++++
++++++ envbig.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/envbig.tlpobj new/tlpkg/tlpobj/envbig.tlpobj
--- old/tlpkg/tlpobj/envbig.tlpobj 2016-04-14 18:59:46.000000000 +0200
+++ new/tlpkg/tlpobj/envbig.tlpobj 2017-04-14 17:39:21.000000000 +0200
@@ -7,6 +7,6 @@
runfiles size=1
RELOC/tex/latex/envbig/envbig.sty
catalogue-ctan /macros/latex/contrib/envbig
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics letter
++++++ environ.doc.tar.xz ++++++
++++++ environ.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/environ.tlpobj new/tlpkg/tlpobj/environ.tlpobj
--- old/tlpkg/tlpobj/environ.tlpobj 2016-04-14 18:59:46.000000000 +0200
+++ new/tlpkg/tlpobj/environ.tlpobj 2017-04-14 17:39:21.000000000 +0200
@@ -13,7 +13,7 @@
runfiles size=2
RELOC/tex/latex/environ/environ.sty
catalogue-ctan /macros/latex/contrib/environ
-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 0.3
++++++ envlab.doc.tar.xz ++++++
++++++ envlab.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/envlab.tlpobj new/tlpkg/tlpobj/envlab.tlpobj
--- old/tlpkg/tlpobj/envlab.tlpobj 2016-04-14 18:59:47.000000000 +0200
+++ new/tlpkg/tlpobj/envlab.tlpobj 2017-04-14 17:39:22.000000000 +0200
@@ -12,7 +12,7 @@
RELOC/tex/latex/envlab/envlab.sty
catalogue-also akletter dinbrief formlett
catalogue-ctan /macros/latex/contrib/envlab
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics letter barcode class
catalogue-version 1.2
++++++ epigrafica.doc.tar.xz ++++++
++++++ epigrafica.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epigrafica.tlpobj new/tlpkg/tlpobj/epigrafica.tlpobj
--- old/tlpkg/tlpobj/epigrafica.tlpobj 2016-04-14 18:59:47.000000000 +0200
+++ new/tlpkg/tlpobj/epigrafica.tlpobj 2017-04-14 17:39:22.000000000 +0200
@@ -68,7 +68,7 @@
RELOC/tex/latex/epigrafica/lgrepigrafica.fd
RELOC/tex/latex/epigrafica/ot1epigrafica.fd
catalogue-ctan /fonts/greek/epigrafica
-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-greek font-sans
catalogue-version 1.01
++++++ epigram.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epigram.tlpobj new/tlpkg/tlpobj/epigram.tlpobj
--- old/tlpkg/tlpobj/epigram.tlpobj 2016-04-14 18:59:47.000000000 +0200
+++ new/tlpkg/tlpobj/epigram.tlpobj 2017-04-14 17:39:22.000000000 +0200
@@ -9,6 +9,6 @@
runfiles size=1
RELOC/tex/generic/epigram/epigram.tex
catalogue-ctan /macros/generic/misc/epigram.tex
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics epigram
++++++ epigraph.doc.tar.xz ++++++
++++++ epigraph.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epigraph.tlpobj new/tlpkg/tlpobj/epigraph.tlpobj
--- old/tlpkg/tlpobj/epigraph.tlpobj 2016-04-14 18:59:47.000000000 +0200
+++ new/tlpkg/tlpobj/epigraph.tlpobj 2017-04-14 17:39:22.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=2
RELOC/tex/latex/epigraph/epigraph.sty
catalogue-ctan /macros/latex/contrib/epigraph
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics epigram
catalogue-version 1.5c
++++++ epiolmec.doc.tar.xz ++++++
++++++ epiolmec.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epiolmec.tlpobj new/tlpkg/tlpobj/epiolmec.tlpobj
--- old/tlpkg/tlpobj/epiolmec.tlpobj 2016-04-14 18:59:48.000000000 +0200
+++ new/tlpkg/tlpobj/epiolmec.tlpobj 2017-04-14 17:39:22.000000000 +0200
@@ -13,6 +13,6 @@
RELOC/fonts/type1/public/epiolmec/Epi-Olmec.pfb
RELOC/tex/latex/epiolmec/epiolmec.sty
catalogue-ctan /language/epiolmec
-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
++++++ eplain.doc.tar.xz ++++++
++++++ eplain.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eplain.tlpobj new/tlpkg/tlpobj/eplain.tlpobj
--- old/tlpkg/tlpobj/eplain.tlpobj 2016-05-16 00:51:45.000000000 +0200
+++ new/tlpkg/tlpobj/eplain.tlpobj 2017-04-14 17:39:23.000000000 +0200
@@ -11,6 +11,13 @@
longdesc graphics), color, autopict (a package instance of the LaTeX
longdesc picture code), psfrag, and url.
depend pdftex
+depend babel
+depend cm
+depend eplain
+depend hyphen-base
+depend knuth-lib
+depend latex-fonts
+depend plain
depend eplain.ARCH
execute AddFormat name=eplain engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx *eplain.ini" fmttriggers=babel,cm,eplain,hyphen-base,knuth-lib,latex-fonts,plain
runfiles size=50
@@ -20,7 +27,7 @@
texmf-dist/tex/eplain/eplain.ini
texmf-dist/tex/eplain/eplain.tex
catalogue-ctan /macros/eplain
-catalogue-date 2016-05-15 08:13:42 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl2
catalogue-topics plain-ext format
catalogue-version 3.8
++++++ epsdice.doc.tar.xz ++++++
++++++ epsdice.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epsdice.tlpobj new/tlpkg/tlpobj/epsdice.tlpobj
--- old/tlpkg/tlpobj/epsdice.tlpobj 2016-04-14 18:59:50.000000000 +0200
+++ new/tlpkg/tlpobj/epsdice.tlpobj 2017-04-14 17:39:23.000000000 +0200
@@ -15,7 +15,7 @@
RELOC/tex/latex/epsdice/epsdice.sty
catalogue-also dice
catalogue-ctan /macros/latex/contrib/epsdice
-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
catalogue-version 2.1
++++++ epsf-dvipdfmx.doc.tar.xz ++++++
++++++ epsf-dvipdfmx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epsf-dvipdfmx.tlpobj new/tlpkg/tlpobj/epsf-dvipdfmx.tlpobj
--- old/tlpkg/tlpobj/epsf-dvipdfmx.tlpobj 2016-04-14 18:59:51.000000000 +0200
+++ new/tlpkg/tlpobj/epsf-dvipdfmx.tlpobj 2017-04-14 17:39:24.000000000 +0200
@@ -11,7 +11,7 @@
runfiles size=1
RELOC/tex/plain/epsf-dvipdfmx/epsf-dvipdfmx.tex
catalogue-ctan /macros/plain/contrib/epsf-dvipdfmx
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics graphics-epspdf
catalogue-version 2014
++++++ epsf.doc.tar.xz ++++++
++++++ epsf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epsf.tlpobj new/tlpkg/tlpobj/epsf.tlpobj
--- old/tlpkg/tlpobj/epsf.tlpobj 2016-04-14 18:59:51.000000000 +0200
+++ new/tlpkg/tlpobj/epsf.tlpobj 2017-04-14 17:39:24.000000000 +0200
@@ -15,7 +15,7 @@
RELOC/tex/generic/epsf/epsf.tex
catalogue-also epsfx
catalogue-ctan /macros/generic/epsf
-catalogue-date 2016-02-05 09:55:11 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics graphics-incl
catalogue-version 2.7.4
++++++ epsincl.doc.tar.xz ++++++
++++++ epsincl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epsincl.tlpobj new/tlpkg/tlpobj/epsincl.tlpobj
--- old/tlpkg/tlpobj/epsincl.tlpobj 2016-04-14 18:59:51.000000000 +0200
+++ new/tlpkg/tlpobj/epsincl.tlpobj 2017-04-14 17:39:24.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=1
RELOC/metapost/epsincl/epsincl.mp
catalogue-ctan /graphics/metapost/contrib/macros/epsincl
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics graphics-prep
catalogue-version 0.2
++++++ epslatex-fr.doc.tar.xz ++++++
++++++ epspdf.doc.tar.xz ++++++
++++++ epspdf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epspdf.tlpobj new/tlpkg/tlpobj/epspdf.tlpobj
--- old/tlpkg/tlpobj/epspdf.tlpobj 2016-05-07 03:15:40.000000000 +0200
+++ new/tlpkg/tlpobj/epspdf.tlpobj 2017-04-14 17:39:25.000000000 +0200
@@ -14,7 +14,7 @@
texmf-dist/scripts/epspdf/epspdftk.tcl
catalogue-also epstopdf
catalogue-ctan /support/epspdf
-catalogue-date 2016-05-06 15:41:09 +0200
+catalogue-date 2016-08-10 05:02:09 +0200
catalogue-license gpl
catalogue-topics graphics-epspdf
catalogue-version 0.6.3
++++++ epspdfconversion.doc.tar.xz ++++++
++++++ epspdfconversion.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epspdfconversion.tlpobj new/tlpkg/tlpobj/epspdfconversion.tlpobj
--- old/tlpkg/tlpobj/epspdfconversion.tlpobj 2016-04-14 18:59:54.000000000 +0200
+++ new/tlpkg/tlpobj/epspdfconversion.tlpobj 2017-04-14 17:39:25.000000000 +0200
@@ -10,7 +10,7 @@
runfiles size=3
RELOC/tex/latex/epspdfconversion/epspdfconversion.sty
catalogue-ctan /macros/latex/contrib/epspdfconversion
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-epspdf callback
catalogue-version 0.61
++++++ epstopdf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/epstopdf.1 new/texmf-dist/doc/man/man1/epstopdf.1
--- old/texmf-dist/doc/man/man1/epstopdf.1 2014-01-17 23:34:12.000000000 +0100
+++ new/texmf-dist/doc/man/man1/epstopdf.1 2017-01-09 00:01:04.000000000 +0100
@@ -1,9 +1,9 @@
-.TH EPSTOPDF 1 "17 January 2014"
-.\" $Id: epstopdf.1 32701 2014-01-17 18:09:54Z karl $
+.TH EPSTOPDF 1 "7 January 2017"
+.\" $Id: epstopdf.1 41288 2016-05-29 16:50:38Z karl $
.SH NAME
epstopdf, repstopdf \- convert an EPS file to PDF
.SH SYNOPSIS
-\fBepstopdf\fP [\fIoptions\fP] [\fIepsfile\fP]
+\fBepstopdf\fP [\fIoptions\fP] [\fIepsfile\fP [\fIpdffile\fP.pdf]]
.SH DESCRIPTION
By default, \fBepstopdf\fP converts the input PostScript file to PDF,
using Ghostscript.
@@ -14,6 +14,11 @@
BoundingBox. Thus, the result needs no cropping, and the PDF MediaBox
is correct.
.PP
+By default, the output name is the input name with any extension
+replaced by \fB.pdf\fP. An output name ending with .pdf can also be given
+as a second argument on the command line, or the \fB--outfile\fP
+(\fB-o\fP) option can be used with any name.
+.PP
PJL commands at the start of a file are removed. DOS EPS binary files
(TN 5002) are supported.
.PP
@@ -22,8 +27,7 @@
.SH OPTIONS
Options may start with either "\fB-\fP" or "\fB--\fP", and may be
unambiguously abbreviated. It is best to use the full option name in
-scripts, though, to avoid possible collisions with new options in the
-future.
+scripts to avoid possible collisions with new options in the future.
.PP
General script options:
.IP "\fB--help\fP
@@ -36,21 +40,21 @@
otherwise, the default is to construct the output file name by replacing
any extension in the input file with `.pdf'.
.IP "\fB--\fP[\fBno\fP]\fBdebug\fP"
-write debugging info (default: off).
+write debugging info (default: false).
.IP "\fB--\fP[\fBno\fP]\fBexact\fP"
-scan ExactBoundingBox (default: off).
+scan ExactBoundingBox (default: false).
.IP "\fB--\fP[\fBno\fP]\fBfilter\fP"
read standard input and (unless \fB--outfile\fP is given) write standard
-output (default: off).
+output (default: false).
.IP "\fB--\fP[\fBno\fP]\fBgs\fP"
-run Ghostscript (default: on). With \fB--nogs\fP, output (to standard
+run Ghostscript (default: true). With \fB--nogs\fP, output (to standard
output by default) the PostScript that would normally be converted; that
is, the input PostScript as modified by \fBepstopdf\fP.
.IP "\fB--\fP[\fBno\fP]\fBhires\fP"
-scan HiresBoundingBox (default: off).
+scan HiresBoundingBox (default: false).
.IP "\fB--restricted\fP=\fIval\fP"
-turn on restricted mode (default: [on for repstopdf, else off]);
-this forbids the use of \fB--gscmd\fP and \fB--gsopt\fP and imposes
+turn on restricted mode (default: [true for repstopdf, else false]);
+this forbids the use of \fB--gscmd\fP and other options and imposes
restrictions on the input and output file names according to the values
of openin_any and openout_any (see the Web2c manual, http://tug.org/web2c).
.PP
@@ -58,26 +62,30 @@
.IP "\fB--gscmd\fP=\fIval\fP"
pipe output to \fIval\fP (default: [\fBgswin32c\fP on Windows, else \fBgs\fP])
.IP "\fB--gsopt\fP=\fIval\fP"
-include \fIval\fP as one argument in the gs command (can be repeated),
+include \fIval\fP as one argument in the gs command (can be repeated).
.IP "\fB--gsopts\fP=\fIval\fP"
-split \fIval\fP at whitespace, include each resulting word as an
-argument in the gs command (can be repeated)
+split \fIval\fP at whitespace and include each resulting word as an
+argument in the gs command (can be repeated).
.IP "\fB--autorotate\fP=\fIval\fP"
set AutoRotatePages (default: None); recognized \fIval\fP choices:
None, All, PageByPage. For EPS files, PageByPage is equivalent to All.
.IP "\fB--\fP[\fBno\fP]\fBcompress\fP"
-use compression in the output (default: on).
+use compression in the output (default: true); if turned off, passes
+.IR -dUseFlateCompression=false .
.IP "\fB--device\fP=\fIdev\fP"
-use -sDEVICE=\fIdev\fP (default: pdfwrite); not all devices are allowed
-in restricted mode.
+use -sDEVICE=\fIdev\fP (default: pdfwrite); not allowed in restricted mode.
.IP "\fB--\fP[\fBno\fP]\fBembed\fP"
-embed fonts (default: on).
+embed fonts (default: true); passes
+.I -dMaxSubsetPct=100 -dSubsetFonts=true -dEmbedAllFonts=true.
+.IP "\fB--\fP[\fBno\fP]\fBgray\fP"
+grayscale output (default: false); passes
+.I -sColorConversionStrategy=Gray -dProcessColorModel=/DeviceGray.
.IP "\fB--pdfsettings\fP=\fIval\fP"
use -dPDFSETTINGS=/\fIval\fP (default is `prepress' if \fB--embed\fP,
else empty); recognized \fIval\fP choices: screen, ebook, printer,
prepress, default.
.IP "\fB--\fP[\fBno\fP]\fBquiet\fP"
-use -q, a.k.a. -dQUIET (default: off).
+use -q, a.k.a. -dQUIET (default: false).
.IP "\fB--res\fP=\fIdpi, dpi\fPx\fIdpi\fP"
set image resolution (default: [use gs default]); ignored if
\fB--debug\fP is set.
@@ -97,13 +105,14 @@
and is necessary if an option or its value contains whitespace.
.PP
In restricted mode, options are limited to those with names and values
-known to be safe; some options taking booleans, integers or fixed
+known to be safe. Some options taking booleans, integers or fixed
names are allowed, those taking general strings are not.
.SH EXAMPLES
-Examples all equivalently converting `test.eps' to `test.pdf':
+These examples all equivalently convert `test.eps' to `test.pdf':
.nf
epstopdf test.eps
+epstopdf test.eps test.pdf
cat test.eps | epstopdf --filter >test.pdf
cat test.eps | epstopdf -f -o=test.pdf
.fi
@@ -113,7 +122,7 @@
epstopdf --hires test.eps
.fi
.PP
-Example for producing \fBepstopdf\fP's attempt at corrected PostScript:
+Example for \fBepstopdf\fP's attempt at correcting PostScript:
.nf
$program --nogs test.ps >testcorr.ps
.fi
Binary files old/texmf-dist/doc/man/man1/epstopdf.man1.pdf and new/texmf-dist/doc/man/man1/epstopdf.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/repstopdf.man1.pdf and new/texmf-dist/doc/man/man1/repstopdf.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epstopdf.doc.tlpobj new/tlpkg/tlpobj/epstopdf.doc.tlpobj
--- old/tlpkg/tlpobj/epstopdf.doc.tlpobj 2016-04-14 18:59:54.000000000 +0200
+++ new/tlpkg/tlpobj/epstopdf.doc.tlpobj 2017-04-14 17:39:25.000000000 +0200
@@ -1,6 +1,6 @@
name epstopdf.doc
category Package
-revision 36139
+revision 42905
shortdesc doc files of epstopdf
docfiles size=10
texmf-dist/doc/man/man1/epstopdf.1
++++++ epstopdf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/epstopdf/epstopdf.pl new/texmf-dist/scripts/epstopdf/epstopdf.pl
--- old/texmf-dist/scripts/epstopdf/epstopdf.pl 2015-01-25 01:05:46.000000000 +0100
+++ new/texmf-dist/scripts/epstopdf/epstopdf.pl 2017-01-09 00:01:08.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: epstopdf.pl 36129 2015-01-24 00:30:11Z karl $
+# $Id: epstopdf.pl 41577 2016-06-30 16:38:01Z karl $
# (Copyright lines below.)
#
# Redistribution and use in source and binary forms, with or without
@@ -34,9 +34,21 @@
# "%%BoundingBox: (atend)" when input is not seekable (e.g., from a pipe),
#
# emacs-page
-my $ver = "2.23";
-
-# History
+#
+my $ver = "2.26";
+# 2017/01/07 v2.26 (Norbert Preining, Karl Berry)
+# * allow cmdline of infile outfile.pdf.
+# * explicitly allow -o as abbreviation for --outfile,
+# to guard against future --options. (Also --output.)
+# 2016/06/30 v2.25 (Norbert Preining, Karl Berry)
+# * don't set (default) device until after restricted check.
+# * a few more debugging lines.
+# 2016/05/29 v2.24 (Karl Berry)
+# * new option --gray; patch from William Bader,
+# tex-k mail 9 Feb 2016 19:37:08.
+# * disallow --device completely in restricted mode,
+# to avoid maintenance of device list.
+# tex-live mail 10 Feb 2016 10:36:26.
# 2015/01/22 v2.23 (Karl Berry)
# * use # instead of = to placate msys; report from KUROKI Yusuke,
# tex-k mail 20 Jan 2015 12:40:16.
@@ -171,9 +183,9 @@
### emacs-page
### program identification
my $program = "epstopdf";
-my $ident = '($Id: epstopdf.pl 36129 2015-01-24 00:30:11Z karl $)' . " $ver";
+my $ident = '($Id: epstopdf.pl 41577 2016-06-30 16:38:01Z karl $)' . " $ver";
my $copyright = <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5
@@ -199,10 +211,11 @@
$::opt_autorotate = "None";
$::opt_compress = 1;
$::opt_debug = 0;
-$::opt_device= $default_device;
+$::opt_device = "";
$::opt_embed = 1;
$::opt_exact = 0;
$::opt_filter = 0;
+$::opt_gray = 0;
$::opt_gs = 1;
$::opt_gscmd = "";
@::opt_gsopt = ();
@@ -315,36 +328,20 @@
# In any case not suitable for restricted:
# -dDOPS
-### restricted devices
-# More or less copied from ghostscript's configure:
-# BMP_DEVS, JPEG_DEVS, PNG_DEVS, TIFF_DEVS, PCX_DEVS, PBM_DEVS
-# PS_DEVS (without text devices)
-my @restricted_devlist = ($default_device);
-my @restricted_devlist_ext = qw[
- bmpmono bmpgray bmpsep1 bmpsep8 bmp16 bmp256 bmp16m bmp32b
- jpeg jpeggray jpegcmyk
- pbm pbmraw pgm pgmraw pgnm pgnmraw pnm pnmraw ppm ppmraw
- pkm pkmraw pksm pksmraw pam pamcmyk4 pamcmyk32 plan plang
- planm planc plank
- pcxmono pcxgray pcx16 pcx256 pcx24b pcxcmyk pcx2up
- png16 png16m png256 png48 pngalpha pnggray pngmono
- psdf psdcmyk psdrgb pdfwrite pswrite ps2write epswrite psgray psmono psrgb
- tiffs tiff12nc tiff24nc tiff48nc tiff32nc tiff64nc tiffcrle tifflzw
- tiffpack tiffgray tiffsep tiffsep1 tiffscaled tiffscaled8 tiffscaled24
- svg svgwrite
-];
-push (@restricted_devlist, @restricted_devlist_ext);
-my %restricted_devlist = ( map {$_, 1} @restricted_devlist );
-
### usage
my @bool = ("false", "true");
my $resmsg = $::opt_res ? $::opt_res : "[use gs default]";
my $rotmsg = $::opt_autorotate ? $::opt_autorotate : "[use gs default]";
-my $defgsopts = "-q -dNOPAUSE -sDEVICE=pdfwrite";
+
my $usage = <<"END_OF_USAGE";
-${title}Usage: $program [OPTION]... [EPSFILE]
+${title}Usage: $program [OPTION]... [EPSFILE [PDFFILE.pdf]]
+
+Convert an EPS file to PDF (or other formats), by default using Ghostscript.
-Convert EPS to PDF (or other formats), by default using Ghostscript.
+By default, the output name is the input name with any extension
+replaced by ".pdf". An output name ending with .pdf can also be given
+as a second argument on the command line, or the --outfile (-o) option
+can be used with any name.
The resulting output is guaranteed to start at the 0,0 coordinate, and
sets a page size exactly corresponding to the BoundingBox. Thus, the
@@ -357,7 +354,7 @@
--help display this help and exit
--version display version information and exit
- --outfile=FILE write result to FILE (default based on input name)
+ -o, --outfile=FILE write result to FILE (default based on input name)
--restricted use restricted mode (default: $bool[$restricted])
--(no)debug output debugging info (default: $bool[$::opt_debug])
@@ -374,8 +371,9 @@
recognized VAL choices: None, All, PageByPage;
for EPS files, PageByPage is equivalent to All.
--(no)compress use compression (default: $bool[$::opt_compress])
- --device=DEV use -sDEVICE=DEV (default: $::opt_device)
+ --device=DEV use -sDEVICE=DEV (default: $default_device)
--(no)embed embed fonts (default: $bool[$::opt_embed])
+ --(no)gray grayscale output (default: $bool[$::opt_gray])
--pdfsettings=VAL use -dPDFSETTINGS=/VAL (default is prepress if --embed,
else empty); recognized VAL choices:
screen, ebook, printer, prepress, default.
@@ -386,6 +384,7 @@
Examples all equivalently converting test.eps to test.pdf:
\$ $program test.eps
+ \$ $program test.eps test.pdf
\$ cat test.eps | $program --filter >test.pdf
\$ cat test.eps | $program -f -o=test.pdf
@@ -401,21 +400,20 @@
More about the options for Ghostscript:
Additional options to be used with gs can be specified
with either or both of the two cumulative options --gsopts and --gsopt.
- --gsopts takes a single string of options, which is split at whitespace,
- each resulting word then added to the gs command line individually.
+ --gsopts takes a single string of options, which is split at whitespace
+ and each resulting word then added to the gs command line individually.
--gsopt adds its argument as a single option to the gs command line.
It can be used multiple times to specify options separately,
and is necessary if an option or its value contains whitespace.
In restricted mode, options are limited to those with names and values
- known to be safe; some options taking booleans, integers or fixed
+ known to be safe. Some options taking booleans, integers or fixed
names are allowed, those taking general strings are not.
All options to epstopdf may start with either - or --, and may be
unambiguously abbreviated. It is best to use the full option name in
-scripts, though, to avoid possible collisions with new options in the
-future.
+scripts to avoid possible collisions with new options in the future.
-When reporting bugs, please include an input file and command line
+When reporting bugs, please include an input file and all command line
options so the problem can be reproduced.
Report bugs to: tex-k\@tug.org
@@ -431,6 +429,7 @@
"device=s",
"embed!",
"exact!",
+ "gray!",
"filter!",
"gs!",
"gscmd=s", # \ref{val_gscmd}
@@ -438,7 +437,7 @@
"gsopts=s" => \&gsopts, # \ref{val_gsopts}
"help|h",
"hires!",
- "outfile=s", # \ref{openout_any}
+ "outfile|output|o=s", # \ref{openout_any}
"pdfsettings=s",
"quiet",
"res=s",
@@ -457,7 +456,7 @@
sub debug { print STDERR "* @_\n" if $::opt_debug; }
sub warning { print STDERR "==> Warning: @_\n"; }
sub error { die "$title!!! Error: @_\n"; }
-sub errorUsage { die "Error: @_ (try --help for more information)\n"; }
+sub errorUsage { die "$program: Error: @_ (try --help for more information)\n"; }
sub warnerr { $restricted ? error(@_) : warning(@_); }
### debug messages
@@ -490,13 +489,13 @@
### help, version options.
if ($::opt_help) {
print $usage;
- exit (0);
+ exit 0;
}
if ($::opt_version) {
print $title;
print $copyright;
- exit (0);
+ exit 0;
}
### get input filename (\ref{openin_any} for validation)
@@ -506,16 +505,29 @@
errorUsage "Input file cannot be used with filter option";
debug "Filtering: will read standard input";
} else {
+ # not filtering.
@ARGV > 0 or errorUsage "Input filename missing";
- @ARGV < 2 or errorUsage "Unknown option or too many input files";
+ # allow infile outfile.pdf.
+ if (@ARGV == 2) {
+ if ($::opt_outfile) {
+ errorUsage ("Multiple output specifications: second arg=$ARGV[1],"
+ . " --outfile=$::opt_outfile");
+ }
+ if ($ARGV[1] !~ m/\.pdf$/i) {
+ errorUsage "Output file argument requires .pdf extension: $ARGV[1]";
+ }
+ # seems we can use it.
+ $::opt_outfile = $ARGV[1];
+ debug "Output filename from argv:", $::opt_outfile;
+ }
+ @ARGV > 2 and errorUsage "Too many arguments: @ARGV";
+
$InputFilename = $ARGV[0];
- #-r $InputFilename or error "\"$InputFilename\" not readable";
debug "Input filename:", $InputFilename;
}
### emacs-page
-### start building GS command line for the pipe
-### take --safer and --gsopts into account
+### building the gs invocation.
### option gscmd
if ($::opt_gscmd) {
@@ -534,12 +546,17 @@
push @GS, '-dNOPAUSE';
push @GS, '-dBATCH';
-if ($::opt_device and $restricted and
- not $restricted_devlist{$::opt_device}) {
- error "Option forbidden in restricted mode: --device=$::opt_device";
- $::opt_device = '';
+### option device
+if ($::opt_device) {
+ if ($restricted) {
+ error "Option forbidden in restricted mode: --device";
+ } else {
+ debug "Switching from $default_device to $::opt_device";
+ }
+} else {
+ $::opt_device = $default_device;
}
-$::opt_device = $default_device unless $::opt_device;
+
push @GS, "-sDEVICE=$::opt_device";
### option outfile
@@ -582,16 +599,18 @@
-dEmbedAllFonts=true
] if $::opt_embed;
-
push @GS, '-dUseFlateCompression=false' unless $::opt_compress;
+push @GS, qw(-sColorConversionStrategy=Gray -dProcessColorModel=/DeviceGray)
+ if $::opt_gray;
+
if ($::opt_res and
not $::opt_res =~ /^(\d+(x\d+)?)$/) {
warnerr "Invalid resolution: $opt_res";
$::opt_res = '';
}
push @GS, "-r$::opt_res" if $::opt_res;
-$resmsg= $::opt_res ? $::opt_res : "[use gs default]";
+$resmsg = $::opt_res ? $::opt_res : "[use gs default]";
# \label{val_autorotate}
if ($::opt_autorotate and
@@ -651,8 +670,10 @@
debug "Ghostscript command:", $GS;
debug "Compression:", ($::opt_compress) ? "on" : "off";
debug "Embedding:", ($::opt_embed) ? "on" : "off";
- debug "Rotation:", $rotmsg;
+ debug "Grayscale:", ($::opt_gray) ? "on" : "off";
+ debug "PDFSettings:", $::opt_pdfsettings;
debug "Resolution:", $resmsg;
+ debug "Rotation:", $rotmsg;
}
### emacs-page
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/epstopdf.tlpobj new/tlpkg/tlpobj/epstopdf.tlpobj
--- old/tlpkg/tlpobj/epstopdf.tlpobj 2016-04-14 18:59:54.000000000 +0200
+++ new/tlpkg/tlpobj/epstopdf.tlpobj 2017-04-14 17:39:25.000000000 +0200
@@ -1,7 +1,7 @@
name epstopdf
category Package
-revision 36139
-shortdesc Convert EPS to 'encapsulated' PDF using Ghostscript
+revision 42905
+shortdesc Convert EPS to PDF using Ghostscript
longdesc Epstopdf is a Perl script that converts an EPS file to an
longdesc 'encapsulated' PDF file (a single page file whose media box is
longdesc the same as the original EPS's bounding box). The resulting
@@ -19,7 +19,7 @@
texmf-dist/scripts/epstopdf/epstopdf.pl
catalogue-also epstopdf-pkg
catalogue-ctan /support/epstopdf
-catalogue-date 2015-08-08 19:53:23 +0200
+catalogue-date 2017-01-08 10:43:15 +0100
catalogue-license other-free
catalogue-topics graphics-epspdf
-catalogue-version 2.23
+catalogue-version 2.26
++++++ eqell.doc.tar.xz ++++++
++++++ eqell.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eqell.tlpobj new/tlpkg/tlpobj/eqell.tlpobj
--- old/tlpkg/tlpobj/eqell.tlpobj 2016-04-14 18:59:55.000000000 +0200
+++ new/tlpkg/tlpobj/eqell.tlpobj 2017-04-14 17:39:26.000000000 +0200
@@ -8,6 +8,6 @@
runfiles size=1
RELOC/tex/latex/eqell/eqell.sty
catalogue-ctan /macros/latex/contrib/eqell
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics typesetting
++++++ eqlist.doc.tar.xz ++++++
++++++ eqlist.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eqlist.tlpobj new/tlpkg/tlpobj/eqlist.tlpobj
--- old/tlpkg/tlpobj/eqlist.tlpobj 2016-04-14 18:59:55.000000000 +0200
+++ new/tlpkg/tlpobj/eqlist.tlpobj 2017-04-14 17:39:26.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=1
RELOC/tex/latex/eqlist/eqlist.sty
catalogue-ctan /macros/latex/contrib/eqlist
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics list list-descr
catalogue-version 2.1
++++++ eqname.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/eqname.tlpobj new/tlpkg/tlpobj/eqname.tlpobj
--- old/tlpkg/tlpobj/eqname.tlpobj 2016-04-14 18:59:55.000000000 +0200
+++ new/tlpkg/tlpobj/eqname.tlpobj 2017-04-14 17:39:26.000000000 +0200
@@ -9,6 +9,6 @@
runfiles size=1
RELOC/tex/latex/eqname/eqname.sty
catalogue-ctan /macros/latex/contrib/gene/eqname
-catalogue-date 2015-08-04 21:08:04 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
catalogue-topics maths