openSUSE Commits
Threads by month
- ----- 2024 -----
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
May 2020
- 1 participants
- 4645 discussions
Hello community,
here is the log from the commit of package texlive-specs-a for openSUSE:Factory checked in at 2020-05-29 21:16:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-a (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-a.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-a"
Fri May 29 21:16:42 2020 rev:41 rq:806868 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-a/texlive-specs-a.changes 2019-11-07 23:09:38.740073690 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-a.new.3606/texlive-specs-a.changes 2020-05-29 21:20:44.179664889 +0200
@@ -1,0 +2,60 @@
+Mon May 18 08:47:10 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Enhance spec file generator to find missing .so man page
+ links for better dependency resolution (bsc#1171682)
+
+-------------------------------------------------------------------
+Wed May 13 13:59:14 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Modify patch texdoc_cnf.dif to ignore tlpkg/texlive.tlpdb as
+ kpathsea uses the ls-R files as well
+
+-------------------------------------------------------------------
+Tue May 12 09:03:38 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Add Requires to tex(epstopdf-base.sty) to fix package split
+ of texlive-epstopdf
+
+-------------------------------------------------------------------
+Mon May 4 09:00:25 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Skip *-dev packages from file dependendcy scanner as otherwise
+ we see doubling name space for some style files like amsmath.sty
+
+-------------------------------------------------------------------
+Mon Apr 27 06:52:15 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Add patch pythontex_p2top3.dif and a removes file to fully
+ switch pythontex packages of TeXLive to python3
+
+-------------------------------------------------------------------
+Mon Apr 20 10:29:02 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Update to TeXLive 2020
+ * Port patches
+ kpathsea_cnf.dif
+ latexpand_perl.dif
+ luaotfload_varfonts.dif
+ luatex_cnf.dif
+ musixtex_various.dif
+ * Delete patches not needed anymore as files have moved
+ tetex_scripts.dif
+ * Delete patche updmap-map_roboto.dif as fixed upstream
+ * Add new patches to catch moved files
+ texlive-scripts-extra_scripts.dif
+ texlive-scripts_scripts.dif
+ * Add new patch xetex_conf.dif to fit FHS location
+ * Remove TeXLive installer files breaking rpm database
+ texlive-scripts.removes
+
+-------------------------------------------------------------------
Old:
----
FAQ-en.doc.tar.xz
aecc.doc.tar.xz
aecc.tar.xz
alterqcm.doc.tar.xz
alterqcm.tar.xz
New:
----
aaai-named.tar.xz
accents.doc.tar.xz
accents.tar.xz
accessibility.doc.tar.xz
accessibility.tar.xz
accsupp.doc.tar.xz
accsupp.tar.xz
addliga.doc.tar.xz
addliga.tar.xz
algxpar.doc.tar.xz
algxpar.tar.xz
almendra.doc.tar.xz
almendra.tar.xz
alphalph.doc.tar.xz
alphalph.tar.xz
amscdx.doc.tar.xz
amscdx.tar.xz
annee-scolaire.doc.tar.xz
annee-scolaire.tar.xz
annotate.tar.xz
apa7.doc.tar.xz
apa7.tar.xz
apprendre-a-programmer-en-tex.doc.tar.xz
arabicfront.doc.tar.xz
arabicfront.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-a.spec ++++++
++++ 20574 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-a/texlive-specs-a.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-a.new.3606/texlive-specs-a.spec
++++++ Asana-Math.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/Asana-Math/FontLog.txt new/doc/fonts/Asana-Math/FontLog.txt
--- old/doc/fonts/Asana-Math/FontLog.txt 2015-06-16 01:32:30.000000000 +0200
+++ new/doc/fonts/Asana-Math/FontLog.txt 2019-05-05 19:38:46.000000000 +0200
@@ -55,4 +55,8 @@
000.954 Added space characters HAIR SPACE, EN SPACE, etc.
-000.955 Line spacing is now correct for all versions of Gecko
\ No newline at end of file
+000.955 Line spacing is now correct for all versions of Gecko
+
+000.956 Added symbol BLACK RIGHTWARDS ARROW
+
+000.958 Added several circle symbols
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/Asana-Math/README new/doc/fonts/Asana-Math/README
--- old/doc/fonts/Asana-Math/README 2015-06-16 01:32:30.000000000 +0200
+++ new/doc/fonts/Asana-Math/README 2019-05-05 19:38:46.000000000 +0200
@@ -3,7 +3,7 @@
table, which is an extension to OpenType font technology, that
makes it possible to select glyphs for stretchy operators in a
not-so-font-specific manner. The font has been successfully tested
-with XeTeX 0.99992 and Word 2007/2010. It was constructed using
+with XeTeX 0.99999 and Word 2007/2010/2016. It was constructed using
glyphs from the pxfonts of Young Ryu while many symbols were designed
by the author. The name Asana (Ἀσάνα, Asána) is the name of the
mythological goddess Athena in the Doric dialect. The font is
@@ -22,4 +22,118 @@
Apostolos Syropoulos
Xanthi, Greece
-June 02, 2015
+April 14, 2019
+
+%%%% Copyright Information %%%%%%%%%%%%
+
+Family: Asana Math
+Subfamily: Regular
+Full name: Asana Math
+PostScript name: Asana-Math
+Preferred family: Asana Math
+Preferred subfamily: Regular
+Version: Version 000.958
+Unique ID: FontForge : Asana Math : 3-10-2007
+Copyright: Copyright (C) 2007-2019 Apostolos Syropoulos.
+Copyright (C) 2000 Young Ryu.
+Copyright (C) 1997, 1999 Claudio Beccari.
+License URL: http://scripts.sil.org/ofl
+License Description: Copyright (c) 2007-2019, Apostolos Syropoulos (<asyropoulos(a)yahoo.com),
+with Reserved Font Name Asana Math.
+Copyright (c) 2000 Young Ryu,
+with Reserved Font Name pxfonts.
+Copyright (c) 1997, 1999 Claudio Beccari,
+with Reserved Font Name gsmn1000.
+
+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.
+Vendor ID: PfEd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/Asana-Math.doc.tlpobj new/tlpkg/tlpobj/Asana-Math.doc.tlpobj
--- old/tlpkg/tlpobj/Asana-Math.doc.tlpobj 2019-02-28 03:13:34.000000000 +0100
+++ new/tlpkg/tlpobj/Asana-Math.doc.tlpobj 2019-05-06 01:38:15.000000000 +0200
@@ -1,8 +1,8 @@
name Asana-Math.doc
category Package
-revision 37556
+revision 50999
shortdesc doc files of Asana-Math
relocated 1
-docfiles size=2
+docfiles size=3
RELOC/doc/fonts/Asana-Math/FontLog.txt
RELOC/doc/fonts/Asana-Math/README
++++++ Asana-Math.tar.xz ++++++
Binary files old/fonts/opentype/public/Asana-Math/Asana-Math.otf and new/fonts/opentype/public/Asana-Math/Asana-Math.otf differ
Binary files old/fonts/truetype/public/Asana-Math/ASANA.TTC and new/fonts/truetype/public/Asana-Math/ASANA.TTC differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/Asana-Math.tlpobj new/tlpkg/tlpobj/Asana-Math.tlpobj
--- old/tlpkg/tlpobj/Asana-Math.tlpobj 2019-02-28 03:13:34.000000000 +0100
+++ new/tlpkg/tlpobj/Asana-Math.tlpobj 2019-05-06 01:38:16.000000000 +0200
@@ -1,6 +1,6 @@
name Asana-Math
category Package
-revision 37556
+revision 50999
shortdesc A font to typeset maths in Xe(La)TeX and Lua(La)TeX
relocated 1
longdesc The Asana-Math font is an OpenType font that includes almost
@@ -10,12 +10,12 @@
longdesc 2007). The font is beta software. Typesetting support for use
longdesc with LaTeX is provided by the fontspec and unicode-math
longdesc packages.
-runfiles size=294
+runfiles size=330
RELOC/fonts/opentype/public/Asana-Math/Asana-Math.otf
RELOC/fonts/truetype/public/Asana-Math/ASANA.TTC
catalogue-also stix xits
catalogue-ctan /fonts/Asana-Math
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-04-15 18:54:40 +0200
catalogue-license ofl
catalogue-topics font font-maths font-otf font-ttf
-catalogue-version 000.955
+catalogue-version 000.958
++++++ IEEEtran.doc.tar.xz ++++++
Binary files old/doc/latex/IEEEtran/IEEEtran_HOWTO.pdf and new/doc/latex/IEEEtran/IEEEtran_HOWTO.pdf differ
Binary files old/doc/latex/IEEEtran/IEEEtran_bst_HOWTO.pdf and new/doc/latex/IEEEtran/IEEEtran_bst_HOWTO.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/IEEEtran/README.TEXLIVE new/doc/latex/IEEEtran/README.TEXLIVE
--- old/doc/latex/IEEEtran/README.TEXLIVE 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/IEEEtran/README.TEXLIVE 2019-05-10 00:17:05.000000000 +0200
@@ -0,0 +1,8 @@
+The following files have been removed in the TeX Live installation of
+the current package, typically due to duplication, lack of space, or
+missing source code. You can find these files on CTAN at
+ http://mirror.ctan.org/macros/latex/contrib/IEEEtran
+If questions or concerns, email tex-live(a)tug.org.
+
+ IEEEtran_bst_HOWTO.pdf
+ IEEEtran_HOWTO.pdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/IEEEtran.doc.tlpobj new/tlpkg/tlpobj/IEEEtran.doc.tlpobj
--- old/tlpkg/tlpobj/IEEEtran.doc.tlpobj 2019-02-28 03:13:39.000000000 +0100
+++ new/tlpkg/tlpobj/IEEEtran.doc.tlpobj 2019-05-10 01:38:49.000000000 +0200
@@ -1,13 +1,12 @@
name IEEEtran.doc
category Package
-revision 38238
+revision 51065
shortdesc doc files of IEEEtran
relocated 1
-docfiles size=482
- RELOC/doc/latex/IEEEtran/IEEEtran_HOWTO.pdf
- RELOC/doc/latex/IEEEtran/IEEEtran_bst_HOWTO.pdf
+docfiles size=248
RELOC/doc/latex/IEEEtran/IEEEtrantools_doc.txt
RELOC/doc/latex/IEEEtran/README
+ RELOC/doc/latex/IEEEtran/README.TEXLIVE
RELOC/doc/latex/IEEEtran/README.bibtex
RELOC/doc/latex/IEEEtran/README.extras
RELOC/doc/latex/IEEEtran/README.testflow
++++++ IEEEtran.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/IEEEtran.tlpobj new/tlpkg/tlpobj/IEEEtran.tlpobj
--- old/tlpkg/tlpobj/IEEEtran.tlpobj 2019-02-28 03:13:39.000000000 +0100
+++ new/tlpkg/tlpobj/IEEEtran.tlpobj 2019-05-10 01:38:50.000000000 +0200
@@ -1,6 +1,6 @@
name IEEEtran
category Package
-revision 38238
+revision 51065
shortdesc Document class for IEEE Transactions journals and conferences
relocated 1
longdesc The class and its BibTeX style enable authors to produce
++++++ SIstyle.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/SIstyle.doc.tlpobj new/tlpkg/tlpobj/SIstyle.doc.tlpobj
--- old/tlpkg/tlpobj/SIstyle.doc.tlpobj 2019-02-28 03:13:40.000000000 +0100
+++ new/tlpkg/tlpobj/SIstyle.doc.tlpobj 2020-03-04 23:48:57.000000000 +0100
@@ -1,6 +1,6 @@
name SIstyle.doc
category Package
-revision 15878
+revision 54080
shortdesc doc files of SIstyle
relocated 1
docfiles size=126
++++++ SIstyle.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/SIstyle.tlpobj new/tlpkg/tlpobj/SIstyle.tlpobj
--- old/tlpkg/tlpobj/SIstyle.tlpobj 2019-02-28 03:13:40.000000000 +0100
+++ new/tlpkg/tlpobj/SIstyle.tlpobj 2020-03-04 23:48:57.000000000 +0100
@@ -1,6 +1,6 @@
name SIstyle
category Package
-revision 15878
+revision 54080
shortdesc Package to typeset SI units, numbers and angles
relocated 1
longdesc This package typesets SI units, numbers and angles according to
@@ -10,8 +10,7 @@
longdesc sistyle has maintenance-only support, now.
runfiles size=3
RELOC/tex/latex/SIstyle/sistyle.sty
-catalogue-ctan /macros/latex/contrib/SIstyle
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-ctan /macros/latex/contrib/sistyle
catalogue-license lppl
catalogue-topics typesetting scientific-docs
catalogue-version 2.3a
++++++ a0poster.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/a0poster.doc.tlpobj new/tlpkg/tlpobj/a0poster.doc.tlpobj
--- old/tlpkg/tlpobj/a0poster.doc.tlpobj 2019-02-28 03:13:41.000000000 +0100
+++ new/tlpkg/tlpobj/a0poster.doc.tlpobj 2020-03-04 23:48:57.000000000 +0100
@@ -1,6 +1,6 @@
name a0poster.doc
category Package
-revision 15878
+revision 54071
shortdesc doc files of a0poster
relocated 1
docfiles size=47
++++++ a0poster.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/a0poster.tlpobj new/tlpkg/tlpobj/a0poster.tlpobj
--- old/tlpkg/tlpobj/a0poster.tlpobj 2019-02-28 03:13:41.000000000 +0100
+++ new/tlpkg/tlpobj/a0poster.tlpobj 2020-03-04 23:48:57.000000000 +0100
@@ -1,6 +1,6 @@
name a0poster
category Package
-revision 15878
+revision 54071
shortdesc Support for designing posters on large paper
relocated 1
longdesc Provides fonts in sizes of 12pt up to 107pt and also makes sure
@@ -13,7 +13,6 @@
RELOC/tex/latex/a0poster/a0size.sty
catalogue-also sciposter
catalogue-ctan /macros/latex/contrib/a0poster
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics poster
catalogue-version 1.22b
++++++ a2ping.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/a2ping.1 new/texmf-dist/doc/man/man1/a2ping.1
--- old/texmf-dist/doc/man/man1/a2ping.1 2018-11-12 06:44:06.000000000 +0100
+++ new/texmf-dist/doc/man/man1/a2ping.1 2019-11-28 23:03:15.000000000 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "A2PING 1"
-.TH A2PING 1 "2018-11-12" "a2ping" "Peter Szabo"
+.TH A2PING 1 "2019-11-28" "a2ping" "Peter Szabo"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Binary files old/texmf-dist/doc/man/man1/a2ping.man1.pdf and new/texmf-dist/doc/man/man1/a2ping.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/a2ping/HISTORY.txt new/texmf-dist/doc/support/a2ping/HISTORY.txt
--- old/texmf-dist/doc/support/a2ping/HISTORY.txt 2018-03-09 00:39:23.000000000 +0100
+++ new/texmf-dist/doc/support/a2ping/HISTORY.txt 2019-11-28 23:03:15.000000000 +0100
@@ -139,4 +139,8 @@
(https://bugs.ghostscript.com/show_bug.cgi?id=699063).
Problem reported by Akira Yokosawa.
+=head2 2019-11-17 v2.84p (Péter Szabó and Akira Yokosawa)
+
+ * -dNOSAFER fix for Ghostscript 9.50 by Akira Yokosawa.
+
__END__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/a2ping.doc.tlpobj new/tlpkg/tlpobj/a2ping.doc.tlpobj
--- old/tlpkg/tlpobj/a2ping.doc.tlpobj 2019-02-28 03:13:41.000000000 +0100
+++ new/tlpkg/tlpobj/a2ping.doc.tlpobj 2019-11-29 01:53:33.000000000 +0100
@@ -1,6 +1,6 @@
name a2ping.doc
category TLCore
-revision 49161
+revision 52964
shortdesc doc files of a2ping
docfiles size=16
texmf-dist/doc/man/man1/a2ping.1
++++++ a2ping.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/a2ping/a2ping.pl new/texmf-dist/scripts/a2ping/a2ping.pl
--- old/texmf-dist/scripts/a2ping/a2ping.pl 2018-11-12 06:44:06.000000000 +0100
+++ new/texmf-dist/scripts/a2ping/a2ping.pl 2019-11-28 23:03:15.000000000 +0100
@@ -350,7 +350,7 @@
use strict;
use integer;
use Htex::papers;
-BEGIN { $Htex::a2ping::VERSION="2.83p" }
+BEGIN { $Htex::a2ping::VERSION="2.84p" }
# Imp: option to ignore `%%Orientation: Portrait', which gs respects and rotates by 90 degrees if necessary
# Imp: gs(704?!) sometimes finds too small bbox, see Univers.eps
@@ -399,7 +399,7 @@
### program identification
my $program = "a2ping.pl";
-my $filedate="2018-03-07"; # See also $Htex::a2ping::VERSION.
+my $filedate="2019-11-17"; # See also $Htex::a2ping::VERSION.
my $copyright = "Written by <pts\(a)fazekas.hu> from April 2003.
This is free software, GNU GPL >=2.0. There is NO WARRANTY.
(epstopdf 2.7 Copyright 1998-2001 by Sebastian Rahtz et al.)\n";
@@ -778,8 +778,9 @@
my $CGS=$GS;
$CGS=$::opt_gs_ccmd if defined $::opt_gs_ccmd;
# vvv SUXX: (r) file doesn't work with gs 8.5x -DSAFER
-#$GS.= " -dSAFER"; # -dWRITESYSTEMDICT
-#$CGS.=" -dSAFER"; # -dWRITESYSTEMDICT
+# -dNOSAFER to override SAFER activated by default since gs 9.50
+$GS.= " -dNOSAFER"; # -dWRITESYSTEMDICT
+$CGS.=" -dNOSAFER"; # -dWRITESYSTEMDICT
### get input and output filename
if (!defined $InputFilename and defined $OutputFilename) { # --filter
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/a2ping.tlpobj new/tlpkg/tlpobj/a2ping.tlpobj
--- old/tlpkg/tlpobj/a2ping.tlpobj 2019-02-28 03:13:41.000000000 +0100
+++ new/tlpkg/tlpobj/a2ping.tlpobj 2019-11-29 01:53:33.000000000 +0100
@@ -1,6 +1,6 @@
name a2ping
category TLCore
-revision 49161
+revision 52964
shortdesc Advanced PS, PDF, EPS converter
longdesc a2ping is a Perl script command line utility written for Unix
longdesc that converts many raster image and vector graphics formats to
@@ -18,7 +18,7 @@
texmf-dist/scripts/a2ping/a2ping.pl
catalogue-contact-repository https://github.com/pts/a2ping
catalogue-ctan /graphics/a2ping
-catalogue-date 2018-03-10 05:45:42 +0100
+catalogue-date 2019-11-28 19:38:29 +0100
catalogue-license gpl
catalogue-topics graphics-prep
-catalogue-version 2.83p
+catalogue-version 2.84p
++++++ aastex.doc.tar.xz ++++++
++++ 3746 lines of diff (skipped)
++++++ aastex.tar.xz ++++++
++++ 14599 lines of diff (skipped)
++++++ abnt.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/abnt/README.md new/doc/latex/abnt/README.md
--- old/doc/latex/abnt/README.md 2018-07-29 23:14:59.000000000 +0200
+++ new/doc/latex/abnt/README.md 2019-12-14 23:27:22.000000000 +0100
@@ -2,7 +2,7 @@
This package implements rules to typeset Brazilian academic texts.
-Copyright (c) Youssef Cherem <ycherem(at)gmail.com>, 2018
+Copyright (c) Youssef Cherem <ycherem(at)gmail.com>, 2019
This file is part of the abnt LaTeX2e package.
This work may be distributed and/or modified under the conditions of
Binary files old/doc/latex/abnt/abnt-doc.pdf and new/doc/latex/abnt/abnt-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/abnt/abnt-doc.tex new/doc/latex/abnt/abnt-doc.tex
--- old/doc/latex/abnt/abnt-doc.tex 2018-11-18 23:00:42.000000000 +0100
+++ new/doc/latex/abnt/abnt-doc.tex 2019-12-14 23:27:22.000000000 +0100
@@ -1,5 +1,6 @@
\documentclass{ltxdoc}
\usepackage[svgnames,dvipsnames]{xcolor}
+\usepackage{graphicx}
\usepackage{fontspec}
\setmainfont{Warnock Pro}
\setsansfont{Cronos Pro}
@@ -7,26 +8,27 @@
\usepackage{polyglossia}
\setmainlanguage{brazil}
\usepackage{tcolorbox}
-\tcbuselibrary{listings,skins,xparse}
+\tcbuselibrary{listings,skins,xparse,breakable}
\usepackage{tikz}
\usetikzlibrary{positioning,shapes,snakes}
-\newtcblisting[auto counter,list inside=codigo]{codigo}[2][]{%
- %title={Código~\thetcbcounter:~#2},
- title=#2,
- hbox,
+\newtcblisting[auto counter,list inside=codigo,number within=chapter]{codigo}[2][]{%
+ %title={Exemplo~\thetcbcounter:~#2},
+ %list entry={\protect\numberline{\thetcbcounter}#2},
+ title={#2},
center,
- colback=green!30,
+ colback=green!20,
colbacktitle=green!50,
colframe=green,
- listing only,fonttitle=\bfseries\sffamily\large,coltitle=black,titlerule=0pt,enhanced,drop fuzzy shadow%halign title=center
- }
+ listing only,
+ fonttitle=\bfseries\sffamily\large,coltitle=black,titlerule=0pt,enhanced,drop fuzzy shadow,breakable,#1%halign title=center
+}
\title{\tikz \node[inner sep=0pt,remember picture,overlay] at (0,1){\includegraphics[height=3cm,width=0.4\textwidth,keepaspectratio]{icone}};\\O pacote <<\texttt{abnt}>>}
\author{Youssef Cherem}
-\date{2018}
+\date{2019}
\begin{document}
\frenchspacing
@@ -34,7 +36,7 @@
\begin{center}
\tikz\node[diamond,shape aspect=1.2,%draw=green,ultra thick,
remember picture,overlay,%minimum size=0.6\textwidth,
- left color=SpringGreen,shading angle=45,align=center] at (0,0){\includegraphics[height=3cm,width=0.4\textwidth,keepaspectratio]{icone}\\{\Large O pacote <<\texttt{abnt}>>}\\[10pt]\large Youssef Cherem\\[6pt]2018};
+ left color=SpringGreen,shading angle=45,align=center] at (0,0){\includegraphics[height=3cm,width=0.4\textwidth,keepaspectratio]{icone}\\{\Large O pacote <<\texttt{abnt}>>}\\[10pt]\large Youssef Cherem\\[6pt]2019};
\end{center}
\vspace{4cm}
@@ -45,9 +47,9 @@
%\tcblistof[\section*]{codigo}{Lista de Códigos}
O pacote \tcboxverb[blank,fuzzy halo=.5mm with green]{abnt} é uma interpretação suficiente, mas não exaustiva, das normas da ABNT. É uma implementação concisa das normas, proporcionando \textit{facilidade} e \textit{flexibilidade} ao usuário. O uso deste pacote não dispensa conhecimento básico de \LaTeX, e não há qualquer garantia de que será aceito pela sua instituição sem nenhuma modificação. Seu objetivo é reduzir ao mínimo a interferência de comandos alheios às classes comuns.
-Sugere-se seu emprego com a classe \texttt{book}, mas também pode, porventura, funcionar com outras classes.
+Sugere-se seu emprego com a classe \tcboxverb[blank,fuzzy halo=.5mm with teal]{book} ou com a classe \tcboxverb[blank,fuzzy halo=.5mm with red]{scrbook}.
-Seus comandos são:
+Comandos para elementos na capa e folha de rosto:
\begin{codigo}{}
\orientador{} \orientadora{} \coorientador{} \coorientadora{}
@@ -61,6 +63,14 @@
\titlefont{} \authorfont{} \localfont{} \datefont{}
\end{codigo}
+Para elementos pré-textuais (sem números de página) e textuais (com números de página):
+
+\begin{codigo}{}
+\pretextual \textual
+\end{codigo}
+
+Esses comandos não são obrigatórios nem aplicados por padrão. O usuário pode redefinir o cabeçalho como quiser, usando os comandos do pacote \tcboxverb[blank,fuzzy halo=.5mm with green]{scrlayer-scrpage}.
+
Também são disponibilizados ambientes e listas para quadros e mapas, além das usuais figuras e tabelas. Assim, podem ser inseridas listas de “quadros” e “mapas”:
\begin{codigo}{}
@@ -99,6 +109,77 @@
Todos os outros comandos são os usuais das classes padrão. Recomenda-se o uso do pacote \texttt{biblatex-abnt} para as normas de citação e referências bibliográficas segundo a ABNT.
-Se porventura o usuário necessitar alterações, sugere-se empregar os pacotes \texttt{titlesec} e \texttt{sectsty}, para títulos, e o pacote \texttt{scrlayer-scrpage} para cabeçalhos, e o pacote \texttt{tocstyle} para listas e sumário, ou então redefinir os comandos de sua classe (p. ex., \texttt{book.cls}).
+Se o usuário necessitar alterações, uma das formas mais simples é usar os comandos das classes
+\tcboxverb[blank,fuzzy halo=.5mm with red]{KOMA-Script}:
+
+ \begin{codigo}{}
+ \documentclass[footsepline=true,headsepline=true]{scrbook}
+ \usepackage{abnt}
+ \usepackage{xcolor,xcolor-material}
+ \usepackage[sfdefault,lf]{FiraSans}
+
+ %se quiser linha no rodapé
+ \ModifyLayer[addvoffset=-.8ex]{scrheadings.foot.above.line}
+ \ModifyLayer[addvoffset=-.8ex]{plain.scrheadings.foot.above.line}
+
+%\pagestyle{scrheadings}
+%\clearscrheadfoot
+%\ihead{\headmark}
+%\ohead{\pagemark}
+% pretextual já faz isso.
+
+\setkomafont{footsepline}{\color{orange}}
+\setkomafont{headsepline}{\color{teal!50!yellow}}
+\setkomafont{pagenumber}{\normalfont\bfseries\sffamily\color{red}}
+
+\renewcommand*{\chapterpagestyle}{scrheadings} %not needed
+
+\RedeclareSectionCommands
+[beforeskip=\baselineskip, afterskip=\baselineskip,font=\normalsize\bfseries]
+{part,chapter,
+section,subsection,paragraph,subparagraph}
+
+\setkomafont{chapter}{\color{orange}} \setkomafont{section}{\color{teal}}
+\setkomafont{subsection}{\color{green!50!black}}
+
+ %\setkomafont{disposition}{\normalsize} %doesn't work
+
+ \KOMAoptions{headsepline=2pt:\textwidth,footsepline=2pt:\textwidth}
+
+%medidas
+\DeclareNewLayer[
+ background,
+ %outermargin,
+ %topmargin,
+ contents=\layercontentsmeasure
+ ]{measurelayer}
+\AddLayersToPageStyle{@everystyle@}{measurelayer}
+\usepackage{showframe}
+
+\begin{document}
+
+\pretextual
+
+\textual
+
+\chapter{Capítulo}
+\section{Seção}
+\subsection{Subseção}
+
+\chapter{Capítulo}
+\section{Seção}
+\subsection{Subseção}
+\newpage
+\subsection{title}
+\end{document}
+
+\end{codigo}
+
+
+\begin{tcolorbox}[center,width=.8\textwidth]
+\centering
+\includegraphics[width=\linewidth]{koma}
+\end{tcolorbox}
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/abnt.doc.tlpobj new/tlpkg/tlpobj/abnt.doc.tlpobj
--- old/tlpkg/tlpobj/abnt.doc.tlpobj 2019-02-28 03:13:42.000000000 +0100
+++ new/tlpkg/tlpobj/abnt.doc.tlpobj 2019-12-15 01:53:40.000000000 +0100
@@ -1,9 +1,9 @@
name abnt.doc
category Package
-revision 49188
+revision 53128
shortdesc doc files of abnt
relocated 1
-docfiles size=27
+docfiles size=32
RELOC/doc/latex/abnt/README.md
RELOC/doc/latex/abnt/abnt-doc.pdf
RELOC/doc/latex/abnt/abnt-doc.tex
++++++ abnt.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/abnt/abnt.sty new/tex/latex/abnt/abnt.sty
--- old/tex/latex/abnt/abnt.sty 2018-11-18 23:00:42.000000000 +0100
+++ new/tex/latex/abnt/abnt.sty 2019-12-14 23:27:22.000000000 +0100
@@ -1,5 +1,5 @@
%% abnt.sty
-%% Copyright (c) Youssef Cherem <ycherem(at)gmail.com>, 2018
+%% Copyright (c) Youssef Cherem <ycherem(at)gmail.com>, 2019
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -14,7 +14,7 @@
% The Current Maintainer of this work is Youssef Cherem.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{abnt}[2018/11/19]
+\ProvidesPackage{abnt}[2019/12/14]
\RequirePackage[left=3cm,top=3cm,right=2cm,bottom=2cm]{geometry}
\RequirePackage{setspace}
\RequirePackage[automark,markcase=used]{scrlayer-scrpage}
@@ -27,7 +27,7 @@
\lehead*{\pagemark}
}
-\RequirePackage{emptypage}
+
\RequirePackage{etoolbox}%\ifdefempty{def}{true}{false}
@@ -129,17 +129,39 @@
\newcommand{\@tipotrabalho}{}
\newcommand{\tipotrabalho}[1]{\gdef\@tipotrabalho{#1}}
+
+%titlefont, @authorfont and @datefont defined by koma classes
+
+\@ifundefined{KOMAClassName}{%
+ \typeout{Usando uma classe padrão}
+% if not koma
+\RequirePackage{emptypage}
\newcommand*{\@titlefont}{\bfseries}
\newcommand*{\titlefont}[1]{\gdef\@titlefont{#1}}
-
\newcommand*{\@authorfont}{\normalfont}
\newcommand*{\authorfont}[1]{\gdef\@authorfont{#1}}
+\newcommand*{\@datefont}{\normalfont}
+\newcommand*{\datefont}[1]{\gdef\@datefont{#1}}
+}
+{% if koma
+\typeout{Usando KOMA-Sript.}
+%\KOMAoptions{cleardoublepage=empty} not needed in koma version 3.0 and later
+\newcommand*{\@titlefont}{\bfseries}
+\renewcommand*{\titlefont}[1]{\gdef\@titlefont{#1}}
+\renewcommand*{\@authorfont}{\normalfont}
+\newcommand*{\authorfont}[1]{\gdef\@authorfont{#1}}
+\renewcommand*{\@datefont}{\normalfont}
+\newcommand*{\datefont}[1]{\gdef\@datefont{#1}}
+}
+
+
+\@ifclassloaded{scrbook}{%
+\typeout{Usando a classe scrbook}
+}{}
\newcommand*{\@localfont}{\normalfont}
\newcommand*{\localfont}[1]{\gdef\@localfont{#1}}
-\newcommand*{\@datefont}{\normalfont}
-\newcommand*{\datefont}[1]{\gdef\@datefont{#1}}
\newcommand*{\@instituicaofont}{\normalfont}
\newcommand*{\instituicaofont}[1]{\gdef\@instituicaofont{#1}}
@@ -197,7 +219,4 @@
-\onehalfspacing
-
-
\endinput
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/abnt.tlpobj new/tlpkg/tlpobj/abnt.tlpobj
--- old/tlpkg/tlpobj/abnt.tlpobj 2019-02-28 03:13:42.000000000 +0100
+++ new/tlpkg/tlpobj/abnt.tlpobj 2019-12-15 01:53:40.000000000 +0100
@@ -1,6 +1,6 @@
name abnt
category Package
-revision 49188
+revision 53128
shortdesc Typesetting academic works according to ABNT rules
relocated 1
longdesc The ABNT package provides a clean and practical implementation
@@ -10,6 +10,5 @@
RELOC/tex/latex/abnt/abnt.sty
catalogue-also biblatex-abnt abntex2
catalogue-ctan /macros/latex/contrib/abnt
-catalogue-date 2018-11-18 17:03:00 +0100
catalogue-license lppl1.3c
catalogue-topics portuguese-br
++++++ academicons.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/academicons.doc.tlpobj new/tlpkg/tlpobj/academicons.doc.tlpobj
--- old/tlpkg/tlpobj/academicons.doc.tlpobj 2019-02-28 03:13:45.000000000 +0100
+++ new/tlpkg/tlpobj/academicons.doc.tlpobj 2020-03-24 01:55:53.000000000 +0100
@@ -1,6 +1,6 @@
name academicons.doc
category Package
-revision 48100
+revision 54512
shortdesc doc files of academicons
relocated 1
docfiles size=28
++++++ academicons.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/academicons.tlpobj new/tlpkg/tlpobj/academicons.tlpobj
--- old/tlpkg/tlpobj/academicons.tlpobj 2019-02-28 03:13:45.000000000 +0100
+++ new/tlpkg/tlpobj/academicons.tlpobj 2020-03-24 01:55:53.000000000 +0100
@@ -1,6 +1,6 @@
name academicons
category Package
-revision 48100
+revision 54512
shortdesc Font containing high quality icons of online academic profiles
relocated 1
longdesc The academicons package provides access in (La)TeX to 76 high
@@ -30,7 +30,6 @@
RELOC/tex/latex/academicons/tuacademicons.fd
catalogue-contact-repository https://github.com/diogo-fernan/academicons
catalogue-ctan /fonts/academicons
-catalogue-date 2018-06-27 11:07:10 +0200
-catalogue-license lppl1.3cofl
+catalogue-license lppl1.3c ofl
catalogue-topics font font-supp-symbol font-symbol font-ttf
catalogue-version 1.8.6-2
++++++ acmart.doc.tar.xz ++++++
++++ 9612 lines of diff (skipped)
++++++ acmart.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/acmart/ACM-Reference-Format.bst new/bibtex/bst/acmart/ACM-Reference-Format.bst
--- old/bibtex/bst/acmart/ACM-Reference-Format.bst 2018-11-12 23:10:14.000000000 +0100
+++ new/bibtex/bst/acmart/ACM-Reference-Format.bst 2020-02-25 02:19:42.000000000 +0100
@@ -34,6 +34,7 @@
institution
journal
key
+ location
month
note
number
@@ -425,6 +426,44 @@
if$
}
+%
+% Sometimes articleno starts with the word 'Article' or 'Paper.
+% (this is a bug of acmdl, sigh)
+% We strip them. We assume eid or articleno is already on stack
+%
+
+FUNCTION { strip.articleno.or.eid }
+{
+ 't :=
+ t #1 #7 substring$ "Article" =
+ {t #8 t text.length$ substring$ 't :=}
+ { }
+ if$
+ t #1 #7 substring$ "article" =
+ {t #8 t text.length$ substring$ 't :=}
+ { }
+ if$
+ t #1 #5 substring$ "Paper" =
+ {t #6 t text.length$ substring$ 't :=}
+ { }
+ if$
+ t #1 #5 substring$ "paper" =
+ {t #6 t text.length$ substring$ 't :=}
+ { }
+ if$
+ % Strip any left trailing space or ~
+ t #1 #1 substring$ " " =
+ {t #2 t text.length$ substring$ 't :=}
+ { }
+ if$
+ t #1 #1 substring$ "~" =
+ {t #2 t text.length$ substring$ 't :=}
+ { }
+ if$
+ t
+}
+
+
FUNCTION { format.articleno }
{
articleno empty.or.unknown not eid empty.or.unknown not and
@@ -440,20 +479,20 @@
{ }
if$
eid empty.or.unknown
- { "Article \bibinfo{articleno}{" articleno * "}" * }
- { "Article \bibinfo{articleno}{" eid * "}" * }
+ { "Article \bibinfo{articleno}{" articleno strip.articleno.or.eid * "}" * }
+ { "Article \bibinfo{articleno}{" eid strip.articleno.or.eid * "}" * }
if$
}
if$
}
FUNCTION { format.year }
-{ % push year string or "[n. d.]" onto output stack
+{ % push year string or "[n.\,d.]" onto output stack
%% Because year is a mandatory field, we always force SOMETHING
%% to be output
"\bibinfo{year}{"
year empty.or.unknown
- { "[n. d.]" }
+ { "[n.\,d.]" }
{ year }
if$
* "}" *
@@ -678,16 +717,15 @@
}
{ "[" archiveprefix "l" change.case$ "]" * * * }
if$
- "{" *
+ "{" eprint "}" * * *
primaryclass empty.or.unknown
{ eprintclass empty.or.unknown
{ }
- { eprintclass "/" * * }
+ { "~[" eprintclass "]" * * * }
if$
}
- { primaryclass "/" * * }
+ { "~[" primaryclass "]" * * * }
if$
- eprint "}" * *
writeln
}
if$
@@ -732,7 +770,7 @@
year empty.or.unknown
{ "empty year in " cite$ * warning$
write$
- " \bibinfo{year}{[n. d.]}"
+ " \bibinfo{year}{[n.d.]}"
"\natexlab{" extra.label * "}" * *
mid.sentence 'output.state :=
}
@@ -1232,6 +1270,8 @@
FUNCTION { format.emphasize.booktitle }
{ booktitle format.a.title.with.edition }
+
+
FUNCTION { format.city }
{
% jtb: if the preceding string (the title of the conference) is non-empty,
@@ -1241,7 +1281,7 @@
duplicate$ empty.or.unknown
{ }
{
- city empty.or.unknown
+ city empty.or.unknown location empty.or.unknown and
{
date empty.or.unknown
{ }
@@ -1249,9 +1289,19 @@
if$
}
{
- date empty.or.unknown
- { " (" * city * ")" * }
- { " (" * city * ", " * date * ")" * }
+ location empty.or.unknown
+ {
+ date empty.or.unknown
+ { " (" * city * ")" * }
+ { " (" * city * ", " * date * ")" * }
+ if$
+ }
+ {
+ date empty.or.unknown
+ { " (" * location * ")" * }
+ { " (" * location * ", " * date * ")" * }
+ if$
+ }
if$
}
if$
@@ -1922,7 +1972,7 @@
if$
duplicate$
year empty.or.unknown
- { "[n. d.]" }
+ { "[n.d.]" }
{ year field.or.null purify$ #-1 #4 substring$}
if$
*
@@ -1970,7 +2020,7 @@
% save the year for sort processing afterwards (adding a, b, c, etc.)
%
year empty.or.unknown
- { "[n. d.]" }
+ { "[n.d.]" }
{ year field.or.null purify$ #-1 #4 substring$}
if$
'label.year :=
@@ -2338,10 +2388,17 @@
fin.entry
}
-FUNCTION { online } { misc }
+FUNCTION { online } { manual }
+
+FUNCTION { game } { manual }
+
+FUNCTION { artifactsoftware } { manual }
+
+FUNCTION { artifactdataset } { manual }
-FUNCTION { game } { misc }
+FUNCTION { software } { manual }
+FUNCTION { dataset } { manual }
FUNCTION { phdthesis }
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/acmart/acmart.cls new/tex/latex/acmart/acmart.cls
--- old/tex/latex/acmart/acmart.cls 2019-03-30 22:25:18.000000000 +0100
+++ new/tex/latex/acmart/acmart.cls 2020-02-25 02:19:42.000000000 +0100
@@ -37,8 +37,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{acmart}
-[2019/03/29 v1.59 Typesetting articles for the Association for
-Computing Machinery]
+[2020/02/22 v1.70 Typesetting articles for the Association for Computing Machinery]
\def\@classname{acmart}
\InputIfFileExists{acmart-preload-hook.tex}{%
\ClassWarning{\@classname}{%
@@ -71,6 +70,14 @@
\fi}{\PackageError{\@classname}{The option screen can be either true or
false}}
\ExecuteOptionsX{screen=false}
+\define@boolkey+{acmart.cls}[@ACM@]{urlbreakonhyphens}[true]{%
+ \if@ACM@urlbreakonhyphens
+ \PackageInfo{\@classname}{Using breaking urls on hyphens}%
+ \else
+ \PackageInfo{\@classname}{Not breaking urls on hyphens}%
+ \fi}{\PackageError{\@classname}{The option urlbreakonhyphens can be either true or
+ false}}
+\ExecuteOptionsX{urlbreakonhyphens=true}
\define@boolkey+{acmart.cls}[@ACM@]{acmthm}[true]{%
\if@ACM@acmthm
\PackageInfo{\@classname}{Requiring acmthm}%
@@ -157,6 +164,7 @@
\ClassInfo{\@classname}{Using format \ACM@format, number \ACM@format@nr}
\newif\if@ACM@manuscript
\newif\if@ACM@journal
+\newif\if@ACM@journal@bibstrip
\newif\if@ACM@sigchiamode
\ifnum\ACM@format@nr=5\relax % siggraph
\ClassWarning{\@classname}{The format siggraph is now obsolete.
@@ -190,6 +198,11 @@
\@ACM@journalfalse
\@ACM@sigchiamodetrue
\fi
+\if@ACM@journal
+ \@ACM@journal@bibstriptrue
+\else
+ \@ACM@journal@bibstripfalse
+\fi
\ifx\ACM@fontsize\@empty
\ifcase\ACM@format@nr
\relax % manuscript
@@ -478,6 +491,9 @@
\urlstyle{sf}
\fi
\AtEndPreamble{%
+ \if@ACM@urlbreakonhyphens
+ \def\do@url@hyp{\do\-}%
+ \fi
\if@ACM@screen
\hypersetup{colorlinks,
linkcolor=ACMPurple,
@@ -714,6 +730,15 @@
\let\@vspacer\@vspacer@orig}
\AtBeginEnvironment{table*}{\let\@vspace\@vspace@orig
\let\@vspacer\@vspacer@orig}
+\AtBeginEnvironment{algorithm}{\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+\AtBeginEnvironment{algorithm*}{\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+\AtBeginEnvironment{lstlisting}{\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+\AtBeginEnvironment{lstlisting*}{\let\@vspace\@vspace@orig
+ \let\@vspacer\@vspacer@orig}
+
\RequirePackage{caption, float}
\captionsetup[table]{position=top}
\if@ACM@journal
@@ -853,9 +878,12 @@
\endlist
}
\let\enddescription=\endlist % for efficiency
+\newif\if@ACM@maketitle@typeset
+\@ACM@maketitle@typesetfalse
\define@choicekey*+{ACM}{acmJournal}[\@journalCode\@journalCode@nr]{%
CIE,%
CSUR,%
+ DGOV,%
DTRAP,%
HEALTH,%
IMWUT,%
@@ -879,6 +907,7 @@
TDS,%
TEAC,%
TECS,%
+ TELO,%
THRI,%
TIIS,%
TIOT,%
@@ -906,11 +935,13 @@
TOS,%
TOSEM,%
TOSN,%
+ TQC,%
TRETS,%
TSAS,%
TSC,%
TSLP,%
- TWEB%
+ TWEB,%
+ FACMP%
}{%
\ifcase\@journalCode@nr
\relax % CIE
@@ -921,6 +952,10 @@
\def\@journalName{ACM Computing Surveys}%
\def\@journalNameShort{ACM Comput. Surv.}%
\def\@permissionCodeOne{0360-0300}%
+\or % DGOV
+ \def\@journalName{Digital Government: Research and Practice}%
+ \def\@journalNameShort{Digit. Gov. Res. Pract.}%
+ \def\@permissionCodeOne{2639-0175}%
\or % DTRAP
\def\@journalName{Digital Threats: Research and Practice}%
\def\@journalNameShort{Digit. Threat. Res. Pract.}%
@@ -1007,8 +1042,8 @@
\or % TCPS
\def\@journalName{ACM Transactions on Cyber-Physical Systems}%
\or % TDS
- \def\@journalName{ACM Transactions on Data Science}%
- \def\@journalNameShort{ACM Trans. Data Sci.}%
+ \def\@journalName{ACM/IMS Transactions on Data Science}%
+ \def\@journalNameShort{ACM/IMS Trans. Data Sci.}%
\def\@permissionCodeOne{2577-3224}%
\or % TEAC
\def\@journalName{ACM Transactions on Economics and Computation}%
@@ -1016,6 +1051,10 @@
\def\@journalName{ACM Transactions on Embedded Computing Systems}%
\def\@journalNameShort{ACM Trans. Embedd. Comput. Syst.}%
\def\@permissionCodeOne{1539-9087}%
+\or % TELO
+ \def\@journalName{ACM Transactions on Evolutionary Learning}%
+ \def\@journalNameShort{ACM Trans. Evol. Learn.}%
+ \def\@permissionCodeOne{2688-3007}%
\or % THRI
\def\@journalName{ACM Transactions on Human-Robot Interaction}%
\def\@journalNameShort{ACM Trans. Hum.-Robot Interact.}%
@@ -1123,6 +1162,10 @@
\def\@journalName{ACM Transactions on Sensor Networks}%
\def\@journalNameShort{ACM Trans. Sensor Netw.}%
\def\@permissionCodeOne{1550-4859}%
+\or % TQC
+ \def\@journalName{ACM Transactions on Quantum Computing}%
+ \def\@journalNameShort{ACM Trans. Quantum Comput.}%
+ \def\@permissionCodeOne{2643-6817}%
\or % TRETS
\def\@journalName{ACM Transactions on Reconfigurable Technology and Systems}%
\def\@journalNameShort{ACM Trans. Reconfig. Technol. Syst.}%
@@ -1143,12 +1186,17 @@
\def\@journalName{ACM Transactions on the Web}%
\def\@journalNameShort{ACM Trans. Web}%
\def\@permissionCodeOne{1559-1131}%
+\else % FACMP, a dummy journal
+ \def\@journalName{Forthcoming ACM Publication}%
+ \def\@journalNameShort{ACM Forthcoming}%
+ \def\@permissionCodeOne{XXXX-XXXX}%
\fi
\ClassInfo{\@classname}{Using journal code \@journalCode}%
}{%
\ClassError{\@classname}{Incorrect journal #1}%
}%
-\def\acmJournal#1{\setkeys{ACM}{acmJournal=#1}}
+\def\acmJournal#1{\setkeys{ACM}{acmJournal=#1}%
+ \global\@ACM@journal@bibstriptrue}
\def\@journalCode@nr{0}
\def\@journalName{}%
\def\@journalNameShort{\@journalName}%
@@ -1161,9 +1209,13 @@
\gdef\acmConference@venue{#4}%
\ifx\acmConference@shortname\@empty
\gdef\acmConference@shortname{#2}%
- \fi}
+ \fi
+ \global\@ACM@journal@bibstripfalse
+}
+\if@ACM@journal\else
\acmConference[Conference'17]{ACM Conference}{July 2017}{Washington,
- DC, USA}
+ DC, USA}%
+\fi
\def\acmBooktitle#1{\gdef\@acmBooktitle{#1}}
\acmBooktitle{Proceedings of \acmConference@name
\ifx\acmConference@name\acmConference@shortname\else
@@ -1336,9 +1388,17 @@
\def\terms#1{\ClassWarning{\@classname}{The command \string\terms{} is
obsolete. I am going to ignore it}}
\def\keywords#1{\def\@keywords{#1}}
-\keywords{}
+\let\@keywords\@empty
+\AtEndDocument{\if@ACM@nonacm\else\ifx\@keywords\@empty
+ \ifnum\getrefnumber{TotPages}>2\relax
+ \ClassWarningNoLine{\@classname}{ACM keywords are mandatory
+ for papers over two pages}%
+ \fi\fi\fi}
\renewenvironment{abstract}{\Collect@Body\@saveabstract}{}
-\long\def\@saveabstract#1{\long\gdef\@abstract{#1}}
+\long\def\@saveabstract#1{\if@ACM@maketitle@typeset
+ \ClassError{\@classname}{Abstract must be defined before maketitle
+ command. Please move it!}\fi
+ \long\gdef\@abstract{#1}}
\@saveabstract{}
\long\def\@lempty{}
\define@boolkey+{@ACM@topmatter@}[@ACM@]{printccs}[true]{%
@@ -1353,6 +1413,11 @@
\else
\ClassInfo{\@classname}{Suppressing bibformat}%
\fi}{\ClassError{\@classname}{The option printacmref can be either true or false}}
+\AtEndDocument{\if@ACM@nonacm\else\if@ACM@printacmref\else
+ \ifnum\getrefnumber{TotPages}>1\relax
+ \ClassWarningNoLine{\@classname}{ACM reference format is mandatory
+ for papers over one page}%
+ \fi\fi\fi}
\define@boolkey+{@ACM@topmatter@}[@ACM@]{printfolios}[true]{%
\if@ACM@printfolios
\ClassInfo{\@classname}{Printing folios}%
@@ -1400,7 +1465,7 @@
\newcounter{@concepts}
\newcommand\ccsdesc[2][100]{%
\ccsdesc@parse#1~#2~~\ccsdesc@parse@end}
-\RequirePackage{textcomp}
+\def\textrightarrow{$\rightarrow$}
\def\ccsdesc@parse#1~#2~#3~{%
\stepcounter{@concepts}%
\expandafter\ifx\csname CCS@General@#2\endcsname\relax
@@ -1422,6 +1487,11 @@
#3\fi\fi\ifnum\value{(a)concepts}=0.\else; \fi}%
\fi
\ccsdesc@parse@finish}
+\AtEndDocument{\if@ACM@nonacm\else\ifx\@concepts\@empty\relax
+ \ifnum\getrefnumber{TotPages}>2\relax
+ \ClassWarningNoLine{\@classname}{CCS concepts are mandatory
+ for papers over two pages}%
+ \fi\fi\fi}
\def\ccsdesc@parse@finish#1\ccsdesc@parse@end{}
\newif\if@printcopyright
\@printcopyrighttrue
@@ -1562,10 +1632,10 @@
source.
\or % usgovmixed
ACM acknowledges that this contribution was authored or co-authored
- by an employee, contractor, or affiliate of the United States government. As such,
- the United States government retains a nonexclusive, royalty-free right to
- publish or reproduce this article, or to allow others to do so, for
- government purposes only.
+ by an employee, contractor, or affiliate of the United States
+ government. As such, the United States government retains a
+ nonexclusive, royalty-free right to publish or reproduce this
+ article, or to allow others to do so, for government purposes only.
\or % cagov
This article was authored by employees of the Government of Canada.
As such, the Canadian government retains all interest in the
@@ -1659,6 +1729,7 @@
\fi}}
\newbox\mktitle@bx
\def\maketitle{%
+ \@ACM@maketitle@typesettrue
\if@ACM@anonymous
% Anonymize omission of \author-s
\ifnum\num@authorgroups=0\author{}\fi
@@ -1688,7 +1759,7 @@
\fi
\ifx\@empty\@authorsaddresses\else
\if@ACM@anonymous\else
- \if@ACM@journal
+ \if@ACM@journal@bibstrip
\footnotetextauthorsaddresses{%
\def\par{\let\par\@par}\parindent\z@\@setauthorsaddresses}%
\fi
@@ -1705,7 +1776,7 @@
\if@printpermission\@copyrightpermission\par\fi
\fi
\if@ACM@manuscript\else
- \if@ACM@journal\else % Print the conference information
+ \if@ACM@journal@bibstrip\else % Print the conference information
{\itshape \acmConference@shortname, \acmConference@date, \acmConference@venue}\par
\fi
\fi
@@ -1721,7 +1792,7 @@
This is the author's version of the work. It is posted here for
your personal use. Not for redistribution. The definitive Version
of Record was published in
- \if@ACM@journal
+ \if@ACM@journal@bibstrip
\emph{\@journalName}%
\else
\emph{\@acmBooktitle}%
@@ -1733,7 +1804,7 @@
\fi\\
\else
\if@ACM@nonacm\else
- \if@ACM@journal
+ \if@ACM@journal@bibstrip
\@permissionCodeOne/\@acmYear/\@acmMonth-ART\@acmArticle
\ifx\@acmPrice\@empty\else\ \$\@acmPrice\fi\\
\@formatdoi{\@acmDOI}%
@@ -1752,7 +1823,7 @@
\if@ACM@printccs
\ifx\@concepts\@empty\else\bgroup
{\@specialsection{CCS Concepts}%
- \@concepts\par}\egroup
+ \noindent\@concepts\par}\egroup
\fi
\fi
\ifx\@keywords\@empty\else\bgroup
@@ -1761,7 +1832,7 @@
\else
\@specialsection{Keywords}%
\fi
- \@keywords}\par\egroup
+ \noindent\@keywords}\par\egroup
\fi
\andify\authors
\andify\shortauthors
@@ -1801,12 +1872,13 @@
\or % siggraph
\section*{#1}%
\or % sigplan
- \paragraph*{#1}%
+ \noindentparagraph*{#1:~}%
\or % sigchi
\section*{#1}%
\or % sigchi-a
\section*{#1}%
- \fi}
+ \fi
+}
\def\@printtopmatter{%
\ifx\@startPage\@empty
\gdef\@startPage{1}%
@@ -2095,7 +2167,8 @@
\newdimen\author@bx@wd
\newskip\author@bx@sep
\author@bx@sep=1pc\relax
-\def\@typeset@author@bx{\bgroup\hsize=\author@bx@wd\def\and{\par}%
+\def\@typeset@author@bx{\bgroup\hsize=\author@bx@wd
+ \def\and{\par}\normalbaselines
\global\setbox\author@bx=\vtop{\if@ACM@sigchiamode\else\centering\fi
\@authorfont\@currentauthors\par\@affiliationfont
\@currentaffiliation}\egroup
@@ -2200,19 +2273,24 @@
\ifnum\num@authorgroups>1\relax
addresses: \else address: \fi
\bgroup
- \def\streetaddress##1{\unskip\@addpunct, ##1}%
- \def\postcode##1{\unskip\@addpunct, ##1}%
+ \def\streetaddress##1{\unskip, ##1}%
+ \def\postcode##1{\unskip, ##1}%
\def\position##1{\unskip\ignorespaces}%
- \def\institution##1{\unskip\@addpunct, ##1}%
- \def\city##1{\unskip\@addpunct, ##1}%
- \def\state##1{\unskip\@addpunct, ##1}%
+ \def\institution##1{\unskip, ##1}%
+ \def\city##1{\unskip, ##1}%
+ \def\state##1{\unskip, ##1}%
\renewcommand\department[2][0]{\unskip\@addpunct, ##2}%
- \def\country##1{\unskip\@addpunct, ##1}%
- \def\and{\unskip\@addpunct; }%
+ \def\country##1{\unskip, ##1}%
+ \def\and{\unskip; }%
\def\@author##1{##1}%
- \def\email##1##2{\unskip\@addpunct, \nolinkurl{##2}}%
+ \def\email##1##2{\unskip, \nolinkurl{##2}}%
\addresses
\egroup}
+\AtEndDocument{\if@ACM@nonacm\else\if@ACM@journal
+ \ifx\@authorsaddresses\@empty
+ \ClassWarningNoLine{\@classname}{Authors'
+ addresses are mandatory for ACM journals}%
+ \fi\fi\fi}
\def\@setaddresses{}
\def\@authornotemark{\g@addto@macro\@currentauthors{\footnotemark\relax}}
\def\@@authornotemark#1{\g@addto@macro\@currentauthors{\footnotemark[#1]}}
@@ -2258,7 +2336,7 @@
% and the present \@mkbibcitation definition is never used
% in this case. The conditional remains useful if the user
% explicitly sets \settopmatter{printacmref=true}.
- \if@ACM@journal
+ \if@ACM@journal@bibstrip
\textit{\@journalNameShort}
\@acmVolume, \@acmNumber \@article@string (\@acmPubDate),
\ref{TotPages}~\@pages@word.
@@ -2273,21 +2351,32 @@
\fi
\ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi
\par\egroup}
-\def\@printendtopmatter{\bgroup
+\def\@printendtopmatter{%
\let\@vspace\@vspace@orig
\let\@vspacer\@vspacer@orig
\par\bigskip
- \egroup}
+ \let\@vspace\@vspace@acm
+ \let\@vspacer\@vspacer@acm
+ }
\def\@setthanks{\long\def\thanks##1{\par##1\@addpunct.}\thankses}
\def\@setauthorsaddresses{\@authorsaddresses\unskip\@addpunct.}
\RequirePackage{fancyhdr}
+\let\ACM@ps@plain\ps@plain
+\let\ACM@ps@myheadings\ps@myheadings
+\let\ACM@ps@headings\ps@headings
+\def\ACM@restore@pagestyle{%
+ \let\ps@plain\ACM@ps@plain
+ \let\ps@myheadings\ACM@ps@myheadings
+ \let\ps@headings\ACM@ps@headings}
+\AtBeginDocument{\ACM@restore@pagestyle}
\if@ACM@review
\newsavebox{\ACM@linecount@bx}
\newlength\ACM@linecount@bxht
\newcount\ACM@linecount
\ACM@linecount\@ne\relax
\def\ACM@mk@linecount{%
- \savebox{\ACM@linecount@bx}[4em][t]{\parbox[t]{4em}{%
+ \savebox{\ACM@linecount@bx}[4em][t]{\parbox[t]{4em}{\normalfont
+ \normalsize
\setlength{\ACM@linecount@bxht}{0pt}%
\loop{\color{red}\scriptsize\the\ACM@linecount}\\
\global\advance\ACM@linecount by \@ne
@@ -2305,10 +2394,29 @@
\fi}
\def\ACM@linecountR{%
\if@ACM@review
- \ACM@mk@linecount
- \begin{picture}(0,0)%
- \put(20,-22){\usebox{\ACM@linecount@bx}}%
- \end{picture}%
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \relax
+ \or % acmsmall
+ \relax
+ \or % acmlarge
+ \relax
+ \or % acmtog
+ \ACM@mk@linecount
+ \or % sigconf
+ \ACM@mk@linecount
+ \or % siggraph
+ \ACM@mk@linecount
+ \or % sigplan
+ \ACM@mk@linecount
+ \or % sigchi
+ \ACM@mk@linecount
+ \or % sigchi-a
+ \ACM@mk@linecount
+ \fi
+ \begin{picture}(0,0)%
+ \put(20,-22){\usebox{\ACM@linecount@bx}}%
+ \end{picture}%
\fi}
\if@ACM@timestamp
% Subtracting 30 from \time gives us the effect of rounding down despite
@@ -2332,7 +2440,8 @@
Anon.
\ifx\@acmSubmissionID\@empty\else Submission Id: \@acmSubmissionID\fi
\else\shortauthors\fi}
-\def\@headfootfont{\sffamily}
+\def\@headfootfont{\sffamily\footnotesize}
+\AtBeginDocument{%
\fancypagestyle{standardpagestyle}{%
\fancyhf{}%
\renewcommand{\headrulewidth}{\z@}%
@@ -2343,56 +2452,72 @@
\else%
\@acmArticle\if@ACM@printfolios:\thepage\fi%
\fi%
- }
- \ifcase\ACM@format@nr
- \relax % manuscript
- \fancyhead[LE]{\ACM@linecountL\if@ACM@printfolios\thepage\fi}%
- \fancyhead[RO]{\if@ACM@printfolios\thepage\fi}%
- \fancyhead[RE]{\@shortauthors}%
- \fancyhead[LO]{\ACM@linecountL\shorttitle}%
- \if@ACM@nonacm\else%
- \fancyfoot[RO,LE]{\footnotesize Manuscript submitted to ACM}
- \fi%
- \or % acmsmall
- \fancyhead[LE]{\ACM@linecountL\@headfootfont\@acmArticlePage}%
- \fancyhead[RO]{\@headfootfont\@acmArticlePage}%
- \fancyhead[RE]{\@headfootfont\@shortauthors}%
- \fancyhead[LO]{\ACM@linecountL\@headfootfont\shorttitle}%
- \if@ACM@nonacm\else%
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date: \(a)acmPubDate.}%
- \fi%
- \or % acmlarge
- \fancyhead[LE]{\ACM@linecountL\@headfootfont
- \@acmArticlePage\quad\textbullet\quad\@shortauthors}%
- \fancyhead[LO]{\ACM@linecountL}%
- \fancyhead[RO]{\@headfootfont
- \shorttitle\quad\textbullet\quad\@acmArticlePage}%
- \if@ACM@nonacm\else%
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date: \(a)acmPubDate.}%
- \fi%
- \or % acmtog
- \fancyhead[LE]{\ACM@linecountL\@headfootfont
+ }%
+ \if@ACM@journal@bibstrip
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \fancyhead[LE]{\ACM@linecountL\if@ACM@printfolios\thepage\fi}%
+ \fancyhead[RO]{\if@ACM@printfolios\thepage\fi}%
+ \fancyhead[RE]{\@shortauthors}%
+ \fancyhead[LO]{\ACM@linecountL\shorttitle}%
+ \if@ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize Manuscript submitted to ACM}
+ \fi%
+ \or % acmsmall
+ \fancyhead[LE]{\ACM@linecountL\@headfootfont\@acmArticlePage}%
+ \fancyhead[RO]{\@headfootfont\@acmArticlePage}%
+ \fancyhead[RE]{\@headfootfont\@shortauthors}%
+ \fancyhead[LO]{\ACM@linecountL\@headfootfont\shorttitle}%
+ \if@ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date: \(a)acmPubDate.}%
+ \fi
+ \or % acmlarge
+ \fancyhead[LE]{\ACM@linecountL\@headfootfont
\@acmArticlePage\quad\textbullet\quad\@shortauthors}%
- \fancyhead[LO]{\ACM@linecountL}%
- \fancyhead[RE]{\ACM@linecountR}%
- \fancyhead[RO]{\@headfootfont
- \shorttitle\quad\textbullet\quad\@acmArticlePage\ACM@linecountR}%
- \if@ACM@nonacm\else%
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date: \(a)acmPubDate.}%
- \fi%
+ \fancyhead[LO]{\ACM@linecountL}%
+ \fancyhead[RO]{\@headfootfont
+ \shorttitle\quad\textbullet\quad\@acmArticlePage}%
+ \if@ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date: \(a)acmPubDate.}%
+ \fi
+ \or % acmtog
+ \fancyhead[LE]{\ACM@linecountL\@headfootfont
+ \@acmArticlePage\quad\textbullet\quad\@shortauthors}%
+ \fancyhead[LO]{\ACM@linecountL}%
+ \fancyhead[RE]{\ACM@linecountR}%
+ \fancyhead[RO]{\@headfootfont
+ \shorttitle\quad\textbullet\quad\@acmArticlePage\ACM@linecountR}%
+ \if@ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date: \(a)acmPubDate.}%
+ \fi
+ \else % Proceedings
+ \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}%
+ \fancyhead[LO]{\ACM@linecountL\@headfootfont\shorttitle}%
+ \fancyhead[RE]{\@headfootfont\@shortauthors\ACM@linecountR}%
+ \if@ACM@nonacm\else%
+ \fancyhead[LE]{\ACM@linecountL\@headfootfont\footnotesize
+ \acmConference@shortname,
+ \acmConference@date, \acmConference@venue}%
+ \fancyhead[RO]{\@headfootfont
+ \acmConference@shortname,
+ \acmConference@date, \acmConference@venue\ACM@linecountR}%
+ \fi
+ \fi
\else % Proceedings
\fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}%
\fancyhead[LO]{\ACM@linecountL\@headfootfont\shorttitle}%
\fancyhead[RE]{\@headfootfont\@shortauthors\ACM@linecountR}%
\if@ACM@nonacm\else%
- \fancyhead[LE]{\ACM@linecountL\@headfootfont\acmConference@shortname,
+ \fancyhead[LE]{\ACM@linecountL\@headfootfont
+ \acmConference@shortname,
\acmConference@date, \acmConference@venue}%
- \fancyhead[RO]{\@headfootfont\acmConference@shortname,
+ \fancyhead[RO]{\@headfootfont
+ \acmConference@shortname,
\acmConference@date, \acmConference@venue\ACM@linecountR}%
- \fi%
+ \fi
\fi
\if@ACM@sigchiamode
\fancyheadoffset[L]{\dimexpr(\marginparsep+\marginparwidth)}%
@@ -2400,8 +2525,9 @@
\if@ACM@timestamp
\fancyfoot[LO,RE]{\ACM@timestamp}
\fi
-}
+}%
\pagestyle{standardpagestyle}
+}
\newdimen\@folio@wd
\@folio@wd=\z@
\newdimen\@folio@ht
@@ -2442,46 +2568,53 @@
\textcolor{white}{\LARGE\sffamily\bfseries\@acmArticle}}}}
\end{picture}\fi}
+\AtBeginDocument{%
\fancypagestyle{firstpagestyle}{%
\fancyhf{}%
\renewcommand{\headrulewidth}{\z@}%
\renewcommand{\footrulewidth}{\z@}%
- \ifcase\ACM@format@nr
- \relax % manuscript
- \fancyhead[L]{\ACM@linecountL}%
- \fancyfoot[RO,LE]{\if@ACM@printfolios\small\thepage\fi}%
- \if@ACM@nonacm\else%
- \fancyfoot[RE,LO]{\footnotesize Manuscript submitted to ACM}%
- \fi%
- \or % acmsmall
- \if@ACM@nonacm\else%
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date:
- \(a)acmPubDate.}%
- \fi%
- \fancyhead[LE]{\ACM@linecountL\@folioblob}%
- \fancyhead[LO]{\ACM@linecountL}%
- \fancyhead[RO]{\@folioblob}%
- \fancyheadoffset[RO,LE]{0.6\@folio@wd}%
- \or % acmlarge
- \if@ACM@nonacm\else%
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date:
- \(a)acmPubDate.}%
- \fi%
- \fancyhead[RO]{\@folioblob}%
- \fancyhead[LE]{\ACM@linecountL\@folioblob}%
- \fancyhead[LO]{\ACM@linecountL}%
- \fancyheadoffset[RO,LE]{1.4\@folio@wd}%
- \or % acmtog
- \if@ACM@nonacm\else%
- \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
- \@acmNumber, Article \@acmArticle. Publication date:
- \(a)acmPubDate.}%
- \fi%
- \fancyhead[L]{\ACM@linecountL}%
- \fancyhead[R]{\ACM@linecountR}%
- \else % Conference proceedings
+ \if@ACM@journal@bibstrip
+ \ifcase\ACM@format@nr
+ \relax % manuscript
+ \fancyhead[L]{\ACM@linecountL}%
+ \fancyfoot[RO,LE]{\if@ACM@printfolios\small\thepage\fi}%
+ \if@ACM@nonacm\else%
+ \fancyfoot[RE,LO]{\footnotesize Manuscript submitted to ACM}%
+ \fi%
+ \or % acmsmall
+ \if@ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date:
+ \(a)acmPubDate.}%
+ \fi%
+ \fancyhead[LE]{\ACM@linecountL\@folioblob}%
+ \fancyhead[LO]{\ACM@linecountL}%
+ \fancyhead[RO]{\@folioblob}%
+ \fancyheadoffset[RO,LE]{0.6\@folio@wd}%
+ \or % acmlarge
+ \if@ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date:
+ \(a)acmPubDate.}%
+ \fi%
+ \fancyhead[RO]{\@folioblob}%
+ \fancyhead[LE]{\ACM@linecountL\@folioblob}%
+ \fancyhead[LO]{\ACM@linecountL}%
+ \fancyheadoffset[RO,LE]{1.4\@folio@wd}%
+ \or % acmtog
+ \if@ACM@nonacm\else%
+ \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No.
+ \@acmNumber, Article \@acmArticle. Publication date:
+ \(a)acmPubDate.}%
+ \fi%
+ \fancyhead[L]{\ACM@linecountL}%
+ \fancyhead[R]{\ACM@linecountR}%
+ \else % Conference proceedings
+ \fancyhead[L]{\ACM@linecountL}%
+ \fancyhead[R]{\ACM@linecountR}%
+ \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}%
+ \fi
+ \else
\fancyhead[L]{\ACM@linecountL}%
\fancyhead[R]{\ACM@linecountR}%
\fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}%
@@ -2496,15 +2629,7 @@
\fancyfoot[LO,RE]{\ACM@timestamp}
\fi
\fi
-}
-\let\ACM@ps@plain\ps@plain
-\let\ACM@ps@myheadings\ps@myheadings
-\let\ACM@ps@headings\ps@headings
-\def\ACM@restore@pagestyle{%
- \let\ps@plain\ACM@ps@plain
- \let\ps@myheadings\ACM@ps@myheadings
- \let\ps@headings\ACM@ps@headings}
-\AtBeginDocument{\ACM@restore@pagestyle}
+}}
\def\ACM@NRadjust#1{%
\begingroup
\expandafter\ifx\csname Sectionformat\endcsname\relax
@@ -2551,6 +2676,11 @@
{-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
{-3.5\p@}%
{\ACM@NRadjust{\@parfont\@adddotafter}}}
+\newcommand\noindentparagraph{\@startsection{paragraph}{4}{\z@}%
+ {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
+ {-3.5\p@}%
+ {\ACM@NRadjust{\@parfont}}}
+
\renewcommand\part{\@startsection{part}{9}{\z@}%
{-10\p@ \@plus -4\p@ \@minus -2\p@}%
{4\p@}%
@@ -2582,20 +2712,8 @@
\or % sigplan
\def\@secfont{\bfseries\Large\section@raggedright}
\def\@subsecfont{\bfseries\section@raggedright}
- \renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
- {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}%
- {.25\baselineskip}%
- {\@subsubsecfont}}
\def\@subsubsecfont{\bfseries\section@raggedright}
- \renewcommand\paragraph{\@startsection{paragraph}{4}{\z@}%
- {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
- {-3.5\p@}%
- {\@parfont\@addspaceafter}}
\def\@parfont{\bfseries\itshape}
- \renewcommand\subparagraph{\@startsection{subparagraph}{5}{\z@}%
- {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}%
- {-3.5\p@}%
- {\@subparfont\@addspaceafter}}
\def\@subparfont{\itshape}
\or % sigchi
\setcounter{secnumdepth}{1}
@@ -2781,7 +2899,7 @@
\ifx\@tempa\@empty\def\@tempa{arxiv}\fi
\def\@tempb{arxiv}%
\ifx\@tempa\@tempb
- arXiv:\href{http://arxiv.org/abs/#2}{#2}\else arXiv:#2%
+ arXiv:\href{https://arxiv.org/abs/#2}{#2}\else arXiv:#2%
\fi}
\let\@vspace@orig=\@vspace
\let\@vspacer@orig=\@vspacer
@@ -2791,6 +2909,8 @@
\apptocmd{\@vspacer}{\ClassWarning{\@classname}{\string\vspace\space should
only be used to provide space above/below surrounding
objects}}{}{}
+\let\@vspace@acm=\@vspace
+\let\@vspacer@acm=\@vspacer
\let\ACM@origbaselinestretch\baselinestretch
\AtEndDocument{\ifx\baselinestretch\ACM@origbaselinestretch\else
\ClassError{\@classname}{An attempt to redefine
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/acmart.tlpobj new/tlpkg/tlpobj/acmart.tlpobj
--- old/tlpkg/tlpobj/acmart.tlpobj 2019-04-01 02:24:49.000000000 +0200
+++ new/tlpkg/tlpobj/acmart.tlpobj 2020-02-26 01:54:37.000000000 +0100
@@ -1,11 +1,11 @@
name acmart
category Package
-revision 50662
+revision 53899
shortdesc Class for typesetting publications of ACM
relocated 1
longdesc This package provides a class for typesetting publications of
-longdesc the Association for Computing Machinery.
-runfiles size=51
+longdesc the Association for Computing Machinery (ACM).
+runfiles size=52
RELOC/bibtex/bst/acmart/ACM-Reference-Format.bst
RELOC/tex/latex/acmart/ACM-Reference-Format.bbx
RELOC/tex/latex/acmart/ACM-Reference-Format.cbx
@@ -15,7 +15,6 @@
catalogue-contact-development https://github.com/borisveytsman/acmart/pulls
catalogue-contact-repository https://github.com/borisveytsman/acmart/
catalogue-ctan /macros/latex/contrib/acmart
-catalogue-date 2019-03-30 12:39:31 +0100
catalogue-license lppl1.3
catalogue-topics class comp-sci comp-theory engineering journalpub
-catalogue-version 1.58
+catalogue-version 1.70
++++++ acro.doc.tar.xz ++++++
++++ 4660 lines of diff (skipped)
++++++ acro.tar.xz ++++++
++++ 4427 lines of diff (skipped)
++++++ acronym.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/acronym/CHANGES new/doc/latex/acronym/CHANGES
--- old/doc/latex/acronym/CHANGES 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/acronym/CHANGES 2020-04-12 00:20:38.000000000 +0200
@@ -0,0 +1,239 @@
+Version 1.47 (Apr 2020)
+
+- Fixed \Iac macro expansion bug
+-- Tobias Oetiker
+- Fixed regression in commands for capitalisation
+-- Marcus Meeßen
+- Fixed bug were output depends on the position of the list of acronyms
+-- Marcus Meeßen
+- Fixed \Iac hyperlink nesting
+-- Marcus Meeßen
+
+Version 1.46 (Mar 2020)
+
+- Fix merge error
+
+Version 1.45 (Mar 2020)
+
+- Fixed hyperref regression and the longstanding "missing aux" bug.
+-- Marcus Meeßen
+
+Version 1.44 (Feb 2020)
+
+- added the |printonlyreused| option, which allows to automatically exclude acronyms from the list of acronyms if they are used only once
+-- Marcus Meeßen
+
+Version 1.43 (Feb 2020)
+
+fixed unconventional dots spacing in list of acronyms
+-- Marcus Meeßen
+
+enhanced list of acronyms with hyperrefs
+-- Marcus Meeßen
+
+fixed collisions between acronyms and package commands, can be turned of with
+the |noacroprefix| option
+-- Marcus Meeßen
+
+Version 1.42 (Nov 2019)
+
+fix the carriage return with long lines (line 234/235) -- Philippe Chauvat
+
+fix page number display for acfi Acfi -- Tobi Oetiker
+
+fix double space and missing used flag with acfi -- Horst Schirmeier
+
+two features were added -- Oz Davidi
+ * Now it is possible to forbid a line break between the full name and the short name (when they are printed together). It is possible to control it individually (for each command), and also globally (with the |nolinebreak| option).
+ * Added the \Ac{p,f,fp,l,lp,lu} commands. They work exactly the same way as the \ac commands, but prints the full name, starting with an upper case letter (in case it was defined with a lower case letter).
+
+correting issue with long lines due to carriage return misplaced -- Philippe Chauvat
+
+Version 1.41 (Mar 2015)
+
+change names of internal macros to avoid nameing conflics with pageslts
+package -- Tobi Oetiker and Jason Mills
+
+Version 1.40 (Sept 2014)
+
+remove \hskip\z@ instances, since they cause bad formating
+since space at the end of a line can not be collapsed anymore
+-- Hartmut Henkel
+
+Version 1.39 (Aug 2014)
+
+make the appearance of labels consistent whether or not the acronym environment
+has its optional argument provided
+-- Yann Leprince
+
+Version 1.38 (Oct 2012)
+
+add support for dynamic indefinite articles depending on the acronym form used
+-- Ash Hughes
+
+fix for non hyphenation of first word in long form
+-- Martin Rüßler
+
+fix description of acrodefplural
+-- Joel Johnson
+
+\ac* should NOT set the used flag ... now it does not
+-- Martin Falk
+
+Version 1.36 (Sept 2010) Uwe Bieling disable hyperlinks in nolist mode.
+Tobi added mbox to prevent hyphenation of short form of acronyms.
+
+Version 1.35 (Oct 2009) Added support for nonstandard plural forms.
+Changed management of default short form in acronym definition.
+Now, one can safely use \newacro in the preamble to define acronyms.
+-- Sergio Callegari
+
+Version 1.34 (Jan 2009) Make sure the s in acp gets smaller as well when the
+smaller package option is used.
+-- Tobi Oetiker
+
+Version 1.33 (Dec 2008) Make the alternate acronym environment
+representation work. The test for the presence of optional argument was
+rather broken. When it worked, it did so for all the wrong reasons
+-- Enrico Gregorio
+
+Version 1.32 (May 2008) Altered code to redefine labels in
+order to cope with unreproducable bug-reports. Warnings turned into infos.
+-- Ulrich Diez
+
+Version 1.31 (April 2008) Renamed clearlist to AC@clearlist to fix
+name conflict with jurabib
+-- Philipp Lehman
+
+Version 1.30 (April 2008) Corrected code to redefine labels and
+adjusted behavior with \cmd{\AC@used}.
+-- Ulrich Diez
+
+Version 1.29 (April 2008) let withpage option show the 'corect' page number
+and not just the first one.
+-- Domagoj Babic (babic in cs.ubc.ca) (with help from Ulrich Diaz)
+
+Version 1.28 (April 2008) fixed layout of addpage list
+-- Tobias Oetiker (tobi with oetiker.ch)
+
+Version 1.27 (April 2008) add option 'addpage' to add pagenumber of first
+occurenace to list of acronyms.
+-- Tobias Oetiker (tobi with oetiker.ch)
+
+Version 1.26 (June 2006) supress lone item when nolist is in effect
+-- Immo Köster <Immo.Koester there rwth-aachen.de>
+
+Version 1.25 (November 2005) properly handle acronyms in pdfbookmarks
+-- Heiko Oberdiek <oberdiek there uni-freiburg.de>
+
+Version 1.24 (October 2005) ac* commands are now not fragile anymore ...
+-- José Emilio Vila Forcén jose.vila there cui.unige.ch
+
+Version 1.23 (October 2005) fixed typo in nolist option. added comment about fragility of ac commands.
+-- Tobias Oetiker (tobi with oetiker.ch)
+
+Version 1.22 (October 2005) added starred versions of ac(p), acf(p), acs(p),
+acl(p), acfi, acsu & aclu
+-- Stefan Pinnow (Mo-Gul here gmx.net)
+
+Version 1.21 (September 2005): fixed the \acused command again ... broke it
+in 1.20 (this time I amended the docs, so that the intention becomes clear).
+Set acronyms as used in the first run, not only in the second one.
+-- Tobi Oetiker tobi at oetiker.ch
+
+added new option nolist to suppress printing the acronym list all together
+-- José Emilio Vila Forcén jose.vila there cui.unige.ch
+
+Version 1.20 (August 2005): make the acused command actually work
+-- Richard Walker Richard.Walker there cs.anu.edu.au
+
+Version 1.19 (April 2005): three new commands acused (set-used), acsu (adds to used), aclu (adds to used)
+-- Lee Netherton ltn100 there ohm.york.ac.uk
+
+Version 1.18 (April 2005): added additional format option for Full Name (acfi)
+-- Manuel G"ortz mgoertz there kom.tu-darmstadt.de
+
+Version 1.17 (November 2004): added don't use acronyms (dua) option
+-- Oliver Creighton
+
+Version 1.16 (November 2004): fix version number
+-- Oliver Creighton <creighto there in.tum.de>
+new option to suppress all acronym printing -- don't use acronyms (dua)
+
+Version 1.16 (November 2004): fix version number
+-- tobi there oetiker.ch
+
+Version 1.15 (November 2004): fix for acresetall to work when ac is called
+in grouped material.
+-- Hendri Adriaens <Hendri there uvt.nl>
+
+Version 1.14 (October 2004): fix acsp and acfp for footnote mode
+-- Markus Ortner <m.ortner there icie.jku.at>
+
+Version 1.13 (July 2004): deflist renamed to AC there deflist to
+avoid unnecessary naming conflict.
+-- Peter May <peter.may there philips.com>
+
+Version 1.13 (July 2004): printonlyused was not working anymore
+-- Tobi Oetiker <tobi at oetiker.ch>
+
+Version 1.13 (July 2004): if the footnote option was on, footnotes were
+printed for ALL acronyms ALL the time, this looked rather odd if the same
+acronym was used more than once on the same page. Changed it so that
+footnote printing follows the same rules as normal acronym printing (only
+print footnote first time). One might think about changing this, so that
+either footnotes get printed 'once' per page. Or that the footnote marks are
+issued once per acronym and page, so that all instances of the same acronym
+on a page get the same footnote mark. Feel free to contribute patches.
+-- Tobi Oetiker <tobi at oetiker.ch>
+
+Version 1.12 (June 2004): Make acronyms robust and compatible
+with pdf bookmarks.
+-- Danie Els <dnjels there sun.ac.za>
+
+Version 1.11 (June 2004): Make hyperlinks work inside optional
+item text by replacing hypertarget with raisedhypertarget
+-- Martin Salois <Martin.Salois there drdc-rddc.gc.ca>
+
+Version 1.10 (May 2004): Fix for the bug of a \cs{}\cs{} following an
+acronym. Add footnote optional out for \cmd{\acs}. Fix for list of acronyms
+in front matter and addition of \cmd{\acroextra} command.
+-- Danie Els <dnjels there sun.ac.za>
+
+Version 1.9 (October 2003): Fix hyperref processing to work regardles
+of calling order. 'printused' now prints every acronym used not only
+the ones called through \ac.
+-- Danie Els <dnjels there sun.ac.za> and Tobi Oetiker
+
+Version 1.8 (October 2003): When the hyperref package is loaded before the
+acronym package, all acronyms will become a hyperlink to their own
+definition.
+-- Martin Salois <Martin.Salois there drdc-rddc.gc.ca>
+
+Version 1.7 (September 2003): Added \acresetall for resetting the 'used'-tag
+of \ac. With the new option 'printonlyused', the acronym-list will consist of
+the used acronyms only and not of all defined acronyms; Optional in a special
+deflist - environment.
+-- Sebastian Max <smx there comnets.rwth-aachen.de>
+
+Version 1.6 (May 2000): Added the smaller option and the macros \acsfont,
+\acffont, and \acfsfont used to control the appearance of \acs and \acf.
+-- Ingo Lepper <lepper there math.uni-muenster.de>
+
+Version 1.5 (May 2000): Added support for english plural forms and the
+footnote option.
+-- David Sterratt <David.C.Sterratt there ed.ac.uk>
+
+Version 1.4 (February 2000): A formatted acronym string, which is allowed
+to contain indices, for example, is now possible. For this purpose
+the syntax of \acro and \acrodef now permits an optional argument:
+ \acro{<acronym>}{<full name>} (without opt. arg.)
+ \acro{<acronym>}[<short name>]{<full name>} (with opt. arg.)
+The user macros \ac, \acs, \acl, and \acf print now <short name>
+instead of <acronym>, if available.
+-- Heiko Oberdiek <oberdiek there ruf.uni-freiburg.de>
+
+Version 1.2 (August 1996) features a new command: \acl to print the
+expanded acronym with out even mentioning that there is an acronym for
+this word.
+-- Tobias Oetiker <tobi at oetiker.ch>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/acronym/README new/doc/latex/acronym/README
--- old/doc/latex/acronym/README 2009-12-12 01:36:11.000000000 +0100
+++ new/doc/latex/acronym/README 2020-04-12 00:20:38.000000000 +0200
@@ -1,27 +1,30 @@
-I'd like to announce the availability of
-my LaTeX2e acronym Package from CTAN.
+An Acronym Environment for LaTeX
INSTALLATION:
- call 'latex acronym.ins' and copy the acronym.sty - file into
a path searched by LaTeX.
- to re-generate the documentation, call latex acronym.dtx
-When writing a paper on cellular mobile radio I started to used a lot
-of acronyms. This can be very disturbing for the reader, as he might
-not know all the used acronyms. To help the reader I kept a list of
-all the acronyms at the end of my paper.
-
-This package makes sure, that all acronyms used in the text are
-spelled out in full at least once. And it provides an environment to
-keep a list of used acronyms.
+While writing a paper on cellular mobile radio I had to used a lot of
+acronyms. Acronyms can be quite disturbing for the novice reader ...
+
+The Acronym package provides tooling to make sure that all acronyms used in
+the text are spelled out in full at least once and it provides an
+environment to keep a list of used acronyms.
Note that acronym requires the 'suffix' package. You can find it on
CTAN:macros/latex/contrib/bigfoot/
Files of the `acronym' package:
- README This file
- acronym.dtx Sourcecode, example file & documentation
- acronym.ins Installation script generating the source and an example
- acronym.pdf PDF Version of the Docs
- CHANGES list of changes
+ README This file
+ acronym.dtx Sourcecode, example file & documentation
+ acronym.ins Installation script generating the source and an example
+ acronym.pdf PDF Version of the Docs
+ CHANGES list of changes
+
+If you run into trouble or would like to contribute, please use
+
+https://github.com/oetiker/acronym/
+cheers
+tobi
Binary files old/doc/latex/acronym/acronym.pdf and new/doc/latex/acronym/acronym.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/acronym/acrotest.tex new/doc/latex/acronym/acrotest.tex
--- old/doc/latex/acronym/acrotest.tex 2010-09-12 01:01:37.000000000 +0200
+++ new/doc/latex/acronym/acrotest.tex 2020-04-12 00:20:38.000000000 +0200
@@ -64,10 +64,15 @@
\acl{lox}/\acl{lh2} (\acsu{lox}/\acsu{lh2})
+\Acp{LFVP} are processes in which the lepton number of the initial
+and final states are different. An example for \iac{LFVP} is
+neutrinoless double beta decay.
+
\subsection{Some testing fundamentals}
When testing \acp{IC}, one typically wants to identify functional
blocks to be tested separately. The latter are commonly indicated as
-\acp{BUT}. To test a \ac{BUT} requires defining a testing strategy\dots
+\acp{BUT}. To test a \ac{BUT} requires defining a testing strategy\dots{}
+\Iac{IC} popped up unexpectedly.
\section{Acronyms}
\begin{acronym}[TDMA]
@@ -76,6 +81,8 @@
\acro{NA}[\ensuremath{N_{\mathrm A}}]
{Number of Avogadro\acroextra{ (see \S\ref{Chem})}}
\acro{NAD+}[NAD\textsuperscript{+}]{Nicotinamide Adenine Dinucleotide}
+ \acro{LFVP}{lepton flavor violating process}
+ \acroindefinite{LFVP}{an}{a}
\acro{NUA}{Not Used Acronym}
\acro{TDMA}{Time Division Multiple Access}
\acro{UA}{Used Acronym}
@@ -84,6 +91,7 @@
\acro{IC}{Integrated Circuit}%
\acro{BUT}{Block Under Test}%
\acrodefplural{BUT}{Blocks Under Test}%
+ \acroindefinite{IC}{an}{an}
\end{acronym}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/acronym.doc.tlpobj new/tlpkg/tlpobj/acronym.doc.tlpobj
--- old/tlpkg/tlpobj/acronym.doc.tlpobj 2019-02-28 03:13:49.000000000 +0100
+++ new/tlpkg/tlpobj/acronym.doc.tlpobj 2020-04-16 01:56:52.000000000 +0200
@@ -1,9 +1,10 @@
name acronym.doc
category Package
-revision 36582
+revision 54758
shortdesc doc files of acronym
relocated 1
-docfiles size=68
+docfiles size=73
+ RELOC/doc/latex/acronym/CHANGES
RELOC/doc/latex/acronym/README
RELOC/doc/latex/acronym/acronym.pdf
RELOC/doc/latex/acronym/acrotest.tex
++++++ acronym.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/acronym/acronym.sty new/tex/latex/acronym/acronym.sty
--- old/tex/latex/acronym/acronym.sty 2015-03-21 22:59:45.000000000 +0100
+++ new/tex/latex/acronym/acronym.sty 2020-04-12 00:20:38.000000000 +0200
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% acronym.dtx (with options: `acronym')
-%% Copyright 1995--2009 by Tobias Oetiker (tobi(a)oetiker.ch)
+%% Copyright 1995--2020 by Tobias Oetiker (tobi(a)oetiker.ch)
%% and individual authors listed elsewhere.
%% All rights reserved.
%%
@@ -40,8 +40,8 @@
%%
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{acronym}[2015/03/21
- v1.41
+\ProvidesPackage{acronym}[2020/04/17
+ v1.47
Support for acronyms (Tobias Oetiker)]
\RequirePackage{suffix,xstring}
\newif\ifAC@footnote
@@ -50,9 +50,15 @@
\newif\ifAC@nohyperlinks
\AC@nohyperlinksfalse
\DeclareOption{nohyperlinks}{\AC@nohyperlinkstrue}
+\newif\ifAC@noacroprefix
+\AC@noacroprefixfalse
+\DeclareOption{noacroprefix}{\AC@noacroprefixtrue}
\newif\ifAC@printonlyused
\AC@printonlyusedfalse
\DeclareOption{printonlyused}{\AC@printonlyusedtrue}
+\newif\ifAC@printonlyreused
+\AC@printonlyreusedfalse
+\DeclareOption{printonlyreused}{\AC@printonlyreusedtrue}
\newif\ifAC@withpage
\AC@withpagefalse
\DeclareOption{withpage}{\AC@withpagetrue}
@@ -65,6 +71,9 @@
\newif\ifAC@nolist
\AC@nolistfalse
\DeclareOption{nolist}{\AC@nolisttrue\AC@nohyperlinkstrue}
+\newif\ifAC@nolinebreak
+\AC@nolinebreakfalse
+\DeclareOption{nolinebreak}{\AC@nolinebreaktrue}
\ProcessOptions\relax
\ifAC@smaller
\RequirePackage{relsize}
@@ -74,7 +83,13 @@
\fi
\newcommand*{\acffont}[1]{#1}
\newcommand*{\acfsfont}[1]{#1}
+\ifAC@nolinebreak
+ \def\AC@linebreakpenalty{4}
+\else
+ \def\AC@linebreakpenalty{3}
+\fi
\def\AC@hyperlink#1#2{#2}
+\def\AC@hyperref[#1]#2{#2}
\def\AC@hypertarget#1#2{#2}
\def\AC@phantomsection{}
\ifAC@nohyperlinks
@@ -82,6 +97,7 @@
\AtBeginDocument{%
\@ifpackageloaded{hyperref}
{\let\AC@hyperlink=\hyperlink
+ \let\AC@hyperref=\hyperref
\newcommand*\AC@raisedhypertarget[2]{%
\Hy@raisedlink{\hypertarget{#1}{}}#2}%
\let\AC@hypertarget=\AC@raisedhypertarget
@@ -95,6 +111,13 @@
}{}}%
\fi
\AtBeginDocument{%
+ \@ifpackageloaded{hyperref}{%
+ \let\AC@pageref=\@pagerefstar%
+ }{%
+ \let\AC@pageref=\pageref%
+ }%
+}
+\AtBeginDocument{%
\providecommand\texorpdfstring[2]{#1}%
\providecommand\pdfstringdefDisableCommands[1]{}%
\pdfstringdefDisableCommands{%
@@ -115,17 +138,27 @@
}%
\def\acs#1{\AChy@call{#1}\AC@acs}%
\def\acl#1{\AChy@call{#1}\@acl}%
+ \def\Acl#1{\AChy@call{#1}\@Acl}%
\def\acf#1{\AChy@call{#1}\AChy@acf}%
+ \def\Acf#1{\AChy@call{#1}\AChy@Acf}%
\def\ac#1{\AChy@call{#1}\@ac}%
+ \def\Ac#1{\AChy@call{#1}\@Ac}%
\def\acsp#1{\AChy@call{#1}\@acsp}%
\def\aclp#1{\AChy@call{#1}\@aclp}%
+ \def\Aclp#1{\AChy@call{#1}\@Aclp}%
\def\acfp#1{\AChy@call{#1}\AChy@acfp}%
+ \def\Acfp#1{\AChy@call{#1}\AChy@Acfp}%
\def\acp#1{\AChy@call{#1}\@acp}%
+ \def\Acp#1{\AChy@call{#1}\@Acp}%
\def\acfi#1{\AChy@call{#1}\AChy@acf}%
+ \def\Acfi#1{\AChy@call{#1}\AChy@Acf}%
\let\acsu\acs
\let\aclu\acl
+ \let\Aclu\Acl
\def\AChy@acf#1{\AC@acl{#1} (\AC@acs{#1})}%
+ \def\AChy@Acf#1{\AC@Acl{#1} (\AC@acs{#1})}%
\def\AChy@acfp#1{\AC@aclp{#1} (\AC@acsp{#1})}%
+ \def\AChy@Acfp#1{\AC@Aclp{#1} (\AC@acsp{#1})}%
}%
}
\newtoks\AC@clearlist
@@ -134,12 +167,11 @@
}
\newcommand*\acresetall{\the\AC@clearlist\AC@clearlist={}}
\def\AC@reset#1{%
- \global\expandafter\let\csname AC@#1\endcsname\relax
+ \global\expandafter\let\csname AC@\AC@prefix#1\endcsname\relax
}
\newcommand*\AC@used{@<>@<>@}
\newcommand{\AC@populated}{}
\newcommand*{\AC@logged}[1]{%
- \acronymused{#1}% mark it as used in the current run too
\@bsphack
\protected@write\@auxout{}{\string\acronymused{#1}}%
\@esphack}
@@ -149,12 +181,31 @@
}%
}
\newcommand*{\acronymused}[1]{%
- \expandafter\ifx\csname acused@#1\endcsname\AC@used
- \relax
- \else
- \global\expandafter\let\csname acused@#1\endcsname\AC@used
- \global\let\AC@populated\AC@used
- \fi}
+ \expandafter\ifx\csname acused@#1@once\endcsname\AC@used%
+ \expandafter\ifx\csname acused@#1@twice\endcsname\AC@used%
+ \relax%
+ \else%
+ \global\expandafter\let\csname acused@#1@twice\endcsname\AC@used%
+ \global\let\AC@populated\AC@used%
+ \fi%
+ \else%
+ \global\expandafter\let\csname acused@#1@once\endcsname\AC@used%
+ \ifAC@printonlyreused%
+ \relax%
+ \else%
+ \global\let\AC@populated\AC@used%
+ \fi%
+ \fi%
+}
+\newcommand{\@firstupper}[1]{%
+ \StrSplit{#1}{1}{\head}{\tail}%
+ \MakeUppercase\head\tail%
+}
+\ifAC@noacroprefix
+ \newcommand*\AC@prefix{}
+\else
+ \newcommand*\AC@prefix{acronyms@}
+\fi
\newcommand*\newacro[1]{%
\@ifnextchar[{\AC@newacro{#1}}{\AC@newacro{#1}[#1]}}
\newcommand\AC@newacro{}
@@ -216,35 +267,69 @@
\end{AC@deflist}%
\fi}%
\newcommand*\AC@acro[1]{%
- \@ifnextchar[{\AC@@acro{#1}}{\AC@@acro{#1}[#1]}}
-\newcommand\AC@@acro{}
-\def\AC@@acro#1[#2]#3{%
+ \@ifnextchar[{%
+ \csname AC@\AC@prefix{}@acro\endcsname{#1}%
+ }{%
+ \csname AC@\AC@prefix{}@acro\endcsname{#1}[#1]%
+ }%
+}
+\expandafter\newcommand\csname AC@\AC@prefix{}@acro\endcsname{}
+\expandafter\def\csname AC@\AC@prefix{}@acro\endcsname#1[#2]#3{%
\ifAC@nolist%
\else%
- \ifAC@printonlyused%
- \expandafter\ifx\csname acused@#1\endcsname\AC@used%
- \item[\protect\AC@hypertarget{#1}{\aclabelfont{#2}}] #3%
+ \ifnum%
+ \ifAC@printonlyused 1%
+ \else\ifAC@printonlyreused 1%
+ \else 0\fi\fi%
+ =1\relax%
+ \ifnum%
+ \ifAC@printonlyused%
+ \expandafter\ifx\csname acused@#1@once\endcsname\AC@used 1 \else 0 \fi%
+ \else\ifAC@printonlyreused%
+ \expandafter\ifx\csname acused@#1@twice\endcsname\AC@used 1 \else 0 \fi%
+ \else 0 \fi\fi%
+ =1\relax%
+ \item[\protect\AC@hypertarget{#1}{%
+ \AC@hyperref[acro:#1]{\aclabelfont{#2}\hfill}%
+ }]\AC@hyperref[acro:#1]{#3}%
\ifAC@withpage%
\expandafter\ifx\csname r@acro:#1\endcsname\relax%
\PackageInfo{acronym}{%
Acronym #1 used in text but not spelled out in
full in text}%
\else%
- \dotfill\pageref{acro:#1}%
- \fi\\%
- \fi%
+ \nobreak\leaders\hbox{$\m@th\mkern\@dotsep mu\hbox{.}\mkern\@dotsep mu$}\hfill%
+ \nobreak\hb@xt@\@pnumwidth{%
+ \hfil\normalfont\normalcolor\AC@pageref{acro:#1}%
+ }%
+ \fi%
+ \fi\\%
\fi%
- \else%
- \item[\protect\AC@hypertarget{#1}{\aclabelfont{#2}}] #3%
- \fi%
- \fi%
- \begingroup
+ \else%
+ \item[\protect\AC@hypertarget{#1}{\AC@hyperref[acro:#1]{\aclabelfont{#2}\hfill}}]\AC@hyperref[acro:#1]{#3}%
+ \fi%
+ \fi%
+ \begingroup
\def\acroextra##1{}%
\@bsphack
- \protected@write\@auxout{}%
- {\string\newacro{#1}[\string\AC@hyperlink{#1}{#2}]{#3}}%
+ \ifAC@printonlyreused%
+ \protected@write\@auxout{}{%
+ \string\newacro{#1}[%
+ \expandafter\ifx\csname acused@#1@twice\endcsname\AC@used%
+ \string\AC@hyperlink{#1}{#2}%
+ \else%
+ {#2}%
+ \fi%
+ ]{#3}%
+ }%
+ \else%
+ \protected@write\@auxout{}{%
+ \string\newacro{#1}[\string\AC@hyperlink{#1}{#2}]{#3}%
+ }%
+ \fi%
\@esphack
- \endgroup}
+ \endgroup
+ \ignorespaces}
\newcommand*\newacroindefinite[3]{%
\expandafter\gdef\csname fn@#1@IS\endcsname{#2}%
\expandafter\gdef\csname fn@#1@IL\endcsname{#3}%
@@ -257,7 +342,7 @@
\newcommand\AC@acroindefinite[3]{
\@bsphack
\protected@write\@auxout{}%
- {\string\newacroindefinite{#1}{\string\AC@hyperlink{#1}{#2}}{#3}}%
+ {\string\newacroindefinite{#1}{#2}{#3}}%
\@esphack
}
\newcommand*\newacroplural[1]{%
@@ -311,6 +396,11 @@
\AC@acl{#1}s%
\fi
}
+\newcommand*\AC@Aclp[1]{%
+ \AC@uppertrue%
+ \AC@aclp{#1}%
+ \AC@upperfalse%
+}
\newcommand*\AC@acsp[1]{%
\ifcsname fn@#1@PS\endcsname
\csname fn@#1@PS\endcsname
@@ -318,19 +408,29 @@
\AC@acs{#1}s%
\fi
}
-
\newif\ifAC@starred
+\newif\ifAC@upper
\newcommand*\AC@get[3]{%
- \ifx#1\relax
- \PackageWarning{acronym}{Acronym `#3' is not defined}%
- \textbf{#3!}%
+ \ifx#1\relax
+ \PackageWarning{acronym}{Acronym `#3' is not defined}%
+ \textbf{#3!}%
+ \else
+ \ifAC@upper
+ \@firstupper{\expandafter#2#1}%
\else
- \expandafter#2#1%
- \fi}
+ \expandafter#2#1%
+ \fi
+ \fi
+}
\newcommand*\AC@acs[1]{%
\mbox{\expandafter\AC@get\csname fn@#1\endcsname\@firstoftwo{#1}}}
\newcommand*\AC@acl[1]{%
\expandafter\AC@get\csname fn@#1\endcsname\@secondoftwo{#1}}
+\newcommand*\AC@Acl[1]{%
+ \AC@uppertrue%
+ \AC@acl{#1}%
+ \AC@upperfalse%
+}
\newcommand*{\acs}{\AC@starredfalse\protect\acsa}%
\WithSuffix\newcommand\acs*{\AC@starredtrue\protect\acsa}%
\newcommand*{\acsa}[1]{%
@@ -344,9 +444,14 @@
\ifAC@starred\else\AC@logged{#1}\fi}
\newcommand*{\acl}{\AC@starredfalse\protect\@acl}%
\WithSuffix\newcommand\acl*{\AC@starredtrue\protect\@acl}%
+\newcommand*{\Acl}{\AC@starredfalse\protect\@Acl}%
+\WithSuffix\newcommand\Acl*{\AC@starredtrue\protect\@Acl}%
\newcommand*{\@acl}[1]{%
\AC@acl{#1}%
\ifAC@starred\else\AC@logged{#1}\fi}
+\newcommand*{\@Acl}[1]{%
+ \AC@Acl{#1}%
+ \ifAC@starred\else\AC@logged{#1}\fi}
\newcommand*\@verridelabel[1]{%
\@bsphack
\protected@write\@auxout{}{\string\AC@undonewlabel{#1}}%
@@ -414,72 +519,96 @@
\fi
}%
\newcommand*\AC@placelabel[1]{%
- \expandafter\ifx\csname AC@#1\endcsname\AC@used
+ \expandafter\ifx\csname AC@\AC@prefix#1\endcsname\AC@used
\else
{\AC@phantomsection\@verridelabel{acro:#1}}%
\ifAC@starred\else%
- \global\expandafter\let\csname AC@#1\endcsname\AC@used
+ \global\expandafter\let\csname AC@\AC@prefix#1\endcsname\AC@used
\fi%
\AC@addtoAC@clearlist{#1}%
\fi
}%
\newcommand*{\acf}{\AC@starredfalse\protect\acfa}%
\WithSuffix\newcommand\acf*{\AC@starredtrue\protect\acfa}%
-\newcommand*{\acfa}[1]{%
- \texorpdfstring{\protect\@acf{#1}}{\AC@acl{#1} (#1)}}
-\newcommand*{\@acf}[1]{%
+\newcommand*{\Acf}{\AC@starredfalse\protect\Acfa}%
+\WithSuffix\newcommand\Acf*{\AC@starredtrue\protect\Acfa}%
+\newcommand*{\acfa}[2][\AC@linebreakpenalty]{%
+ \texorpdfstring{\protect\@acf[#1]{#2}}{\AC@acl{#2} (#2)}}
+\newcommand*{\Acfa}[2][\AC@linebreakpenalty]{%
+ \texorpdfstring{\protect\@Acf[#1]{#2}}{\AC@Acl{#2} (#2)}}
+\newcommand*{\@acf}[2][\AC@linebreakpenalty]{%
\ifAC@footnote
- \acsfont{\AC@acs{#1}}%
- \footnote{\AC@placelabel{#1}\AC@acl{#1}{}}%
+ \acsfont{\AC@acs{#2}}%
+ \footnote{\AC@placelabel{#2}\AC@acl{#2}{}}%
\else
\acffont{%
- \AC@placelabel{#1}\AC@acl{#1}%
- \nolinebreak[3] %
- \acfsfont{(\acsfont{\AC@acs{#1}})}%
+ \AC@placelabel{#2}\AC@acl{#2}%
+ \nolinebreak[#1] %
+ \acfsfont{(\acsfont{\AC@acs{#2}})}%
}%
\fi
- \ifAC@starred\else\AC@logged{#1}\fi}
+ \ifAC@starred\else\AC@logged{#2}\fi}
+\newcommand*{\@Acf}[2][\AC@linebreakpenalty]{%
+ \ifAC@footnote
+ \acsfont{\AC@acs{#2}}%
+ \footnote{\AC@placelabel{#2}\AC@Acl{#2}{}}%
+ \else
+ \acffont{%
+ \AC@placelabel{#2}\AC@Acl{#2}%
+ \nolinebreak[#1] %
+ \acfsfont{(\acsfont{\AC@acs{#2}})}%
+ }%
+ \fi
+ \ifAC@starred\else\AC@logged{#2}\fi}
\newcommand*{\ac}{\AC@starredfalse\protect\@ac}%
\WithSuffix\newcommand\ac*{\AC@starredtrue\protect\@ac}%
-\newcommand{\@ac}[1]{%
+\newcommand*{\Ac}{\AC@starredfalse\protect\@Ac}%
+\WithSuffix\newcommand\Ac*{\AC@starredtrue\protect\@Ac}%
+\newcommand{\@ac}[2][\AC@linebreakpenalty]{%
\ifAC@dua
- \ifAC@starred\acl*{#1}\else\acl{#1}\fi%
+ \ifAC@starred\acl*{#2}\else\acl{#2}\fi%
\else
- \expandafter\ifx\csname AC@#1\endcsname\AC@used%
- \ifAC@starred\acs*{#1}\else\acs{#1}\fi%
+ \expandafter\ifx\csname AC@\AC@prefix#2\endcsname\AC@used%
+ \ifAC@starred\acs*{#2}\else\acs{#2}\fi%
\else
- \ifAC@starred\acf*{#1}\else\acf{#1}\fi%
+ \ifAC@starred\acf*[#1]{#2}\else\acf[#1]{#2}\fi%
+ \fi
+ \fi}
+\newcommand{\@Ac}[2][\AC@linebreakpenalty]{%
+ \ifAC@dua
+ \ifAC@starred\Acl*{#2}\else\Acl{#2}\fi%
+ \else
+ \expandafter\ifx\csname AC@\AC@prefix#2\endcsname\AC@used%
+ \ifAC@starred\acs*{#2}\else\acs{#2}\fi%
+ \else
+ \ifAC@starred\Acf*[#1]{#2}\else\Acf[#1]{#2}\fi%
\fi
\fi}
-\newcommand{\@firstupper}[1]{%
- \StrLeft{#1}{1}[\firstletter]%
- \StrGobbleLeft{#1}{1}[\remainder]%
- \MakeUppercase\firstletter\remainder
-}
\newcommand*{\iac}{\AC@starredfalse\protect\@iac}%
\WithSuffix\newcommand\iac*{\AC@starredtrue\protect\@iac}%
\newcommand*{\Iac}{\AC@starredfalse\protect\@Iac}%
\WithSuffix\newcommand\Iac*{\AC@starredtrue\protect\@Iac}%
\newcommand*{\@iaci}[1]{%
- \ifcsname fn@#1@IL\endcsname
- \ifAC@dua
- \csname fn@#1@IL\endcsname%
- \else
- \expandafter\ifx\csname AC@#1\endcsname\AC@used%
+ \ifcsname fn@#1@IL\endcsname
+ \ifAC@dua
+ \csname fn@#1@IL\endcsname%
+ \else
+ \expandafter\ifx\csname AC@\AC@prefix#1\endcsname\AC@used%
\csname fn@#1@IS\endcsname%
\else
\csname fn@#1@IL\endcsname%
\fi
- \fi
- \else
- a%
- \fi
+ \fi
+ \else
+ a%
+ \fi
}
-\newcommand*{\@iac}[1]{%
- \@iaci{#1} \ifAC@starred\ac*{#1}\else\ac{#1}\fi%
+\newcommand*{\@iac}[2][\AC@linebreakpenalty]{%
+ \@iaci{#2} \ifAC@starred\ac*[#1]{#2}\else\ac[#1]{#2}\fi%
}
-\newcommand*{\@Iac}[1]{%
- \@firstupper{\@iaci{#1}} \ifAC@starred\ac*{#1}\else\ac{#1}\fi%
+\newcommand*{\@Iac}[2][\AC@linebreakpenalty]{%
+ \@firstupper{\@iaci{#2}}\space%
+ \ifAC@starred\ac*[#1]{#2}\else\ac[#1]{#2}\fi%
}
\newcommand*{\acsp}{\AC@starredfalse\protect\acspa}%
\WithSuffix\newcommand\acsp*{\AC@starredtrue\protect\acspa}%
@@ -490,43 +619,94 @@
\ifAC@starred\else\AC@logged{#1}\fi}
\newcommand*{\aclp}{\AC@starredfalse\protect\@aclp}%
\WithSuffix\newcommand\aclp*{\AC@starredtrue\protect\@aclp}%
+\newcommand*{\Aclp}{\AC@starredfalse\protect\@Aclp}%
+\WithSuffix\newcommand\Aclp*{\AC@starredtrue\protect\@Aclp}%
\newcommand*{\@aclp}[1]{%
\AC@aclp{#1}%
\ifAC@starred\else\AC@logged{#1}\fi}
+\newcommand*{\@Aclp}[1]{%
+ \AC@Aclp{#1}%
+ \ifAC@starred\else\AC@logged{#1}\fi}
\newcommand*{\acfp}{\AC@starredfalse\protect\acfpa}%
\WithSuffix\newcommand\acfp*{\AC@starredtrue\protect\acfpa}%
-\newcommand*{\acfpa}[1]{%
- \texorpdfstring{\protect\@acfp{#1}}{\AC@aclp{#1} (\AC@acsp{#1})}}
-\newcommand*{\@acfp}[1]{%
+\newcommand*{\Acfp}{\AC@starredfalse\protect\Acfpa}%
+\WithSuffix\newcommand\Acfp*{\AC@starredtrue\protect\Acfpa}%
+\newcommand*{\acfpa}[2][\AC@linebreakpenalty]{%
+ \texorpdfstring{\protect\@acfp[#1]{#2}}{\AC@aclp{#2} (\AC@acsp{#2})}}
+\newcommand*{\Acfpa}[2][\AC@linebreakpenalty]{%
+ \texorpdfstring{\protect\@Acfp[#1]{#2}}{\AC@Aclp{#2} (\AC@acsp{#2})}}
+\newcommand*{\@acfp}[2][\AC@linebreakpenalty]{%
\ifAC@footnote
- \acsfont{\AC@acsp{#1}}%
- \footnote{\AC@placelabel{#1}\AC@aclp{#1}{}}%
+ \acsfont{\AC@acsp{#2}}%
+ \footnote{\AC@placelabel{#2}\AC@aclp{#2}{}}%
\else
\acffont{%
- \AC@placelabel{#1}\AC@aclp{#1}%
- \nolinebreak[3] %
- \acfsfont{(\acsfont{\AC@acsp{#1}})}%
+ \AC@placelabel{#2}\AC@aclp{#2}%
+ \nolinebreak[#1] %
+ \acfsfont{(\acsfont{\AC@acsp{#2}})}%
}%
\fi
- \ifAC@starred\else\AC@logged{#1}\fi}
+ \ifAC@starred\else\AC@logged{#2}\fi}
+\newcommand*{\@Acfp}[2][\AC@linebreakpenalty]{%
+ \ifAC@footnote
+ \acsfont{\AC@acsp{#2}}%
+ \footnote{\AC@placelabel{#2}\AC@Aclp{#2}{}}%
+ \else
+ \acffont{%
+ \AC@placelabel{#2}\AC@Aclp{#2}%
+ \nolinebreak[#1] %
+ \acfsfont{(\acsfont{\AC@acsp{#2}})}%
+ }%
+ \fi
+ \ifAC@starred\else\AC@logged{#2}\fi}
\newcommand*{\acp}{\AC@starredfalse\protect\@acp}%
\WithSuffix\newcommand\acp*{\AC@starredtrue\protect\@acp}%
-\newcommand{\@acp}[1]{%
+\newcommand*{\Acp}{\AC@starredfalse\protect\@Acp}%
+\WithSuffix\newcommand\Acp*{\AC@starredtrue\protect\@Acp}%
+\newcommand{\@acp}[2][\AC@linebreakpenalty]{%
+ \ifAC@dua
+ \ifAC@starred\aclp*{#2}\else\aclp{#2}\fi%
+ \else
+ \expandafter\ifx\csname AC@\AC@prefix#2\endcsname\AC@used
+ \ifAC@starred\acsp*{#2}\else\acsp{#2}\fi%
+ \else
+ \ifAC@starred\acfp*[#1]{#2}\else\acfp[#1]{#2}\fi%
+ \fi
+ \fi}
+\newcommand{\@Acp}[2][\AC@linebreakpenalty]{%
\ifAC@dua
- \ifAC@starred\aclp*{#1}\else\aclp{#1}\fi%
+ \ifAC@starred\Aclp*{#2}\else\Aclp{#2}\fi%
\else
- \expandafter\ifx\csname AC@#1\endcsname\AC@used
- \ifAC@starred\acsp*{#1}\else\acsp{#1}\fi%
+ \expandafter\ifx\csname AC@\AC@prefix#2\endcsname\AC@used
+ \ifAC@starred\acsp*{#2}\else\acsp{#2}\fi%
\else
- \ifAC@starred\acfp*{#1}\else\acfp{#1}\fi%
+ \ifAC@starred\Acfp*[#1]{#2}\else\Acfp[#1]{#2}\fi%
\fi
\fi}
\newcommand*{\acfi}{\AC@starredfalse\protect\acfia}%
\WithSuffix\newcommand\acfi*{\AC@starredtrue\protect\acfia}%
-\newcommand{\acfia}[1]{%
- {\itshape \AC@acl{#1} \nolinebreak[3]} (\ifAC@starred\acs*{#1}\else\acs{#1}\fi)}
+\newcommand*{\Acfi}{\AC@starredfalse\protect\Acfia}%
+\WithSuffix\newcommand\Acfi*{\AC@starredtrue\protect\Acfia}%
+\newcommand{\acfia}[2][\AC@linebreakpenalty]{%
+ \texorpdfstring{\protect\@acfi[#1]{#2}}{{\AC@acl{#2}} (#2)}}
+\newcommand{\Acfia}[2][\AC@linebreakpenalty]{%
+ \texorpdfstring{\protect\@Acfi[#1]{#2}}{{\AC@Acl{#2}} (#2)}}
+\newcommand*{\@acfi}[2][\AC@linebreakpenalty]{%
+ \acffont{%
+ \AC@placelabel{#2}{\itshape\AC@acl{#2}}%
+ \nolinebreak[#1] %
+ \acfsfont{(\acsfont{\AC@acs{#2}})}%
+ }%
+ \ifAC@starred\else\AC@logged{#2}\fi}
+\newcommand*{\@Acfi}[2][\AC@linebreakpenalty]{%
+ \acffont{%
+ \AC@placelabel{#2}{\itshape\AC@Acl{#2}}%
+ \nolinebreak[#1] %
+ \acfsfont{(\acsfont{\AC@acs{#2}})}%
+ }%
+ \ifAC@starred\else\AC@logged{#2}\fi}
\newcommand{\acused}[1]{%
-\global\expandafter\let\csname AC@#1\endcsname\AC@used%
+\global\expandafter\let\csname AC@\AC@prefix#1\endcsname\AC@used%
\AC@addtoAC@clearlist{#1}}
\newcommand*{\acsu}{\AC@starredfalse\protect\acsua}%
\WithSuffix\newcommand\acsu*{\AC@starredtrue\protect\acsua}%
@@ -534,8 +714,12 @@
\ifAC@starred\acs*{#1}\else\acs{#1}\fi\acused{#1}}
\newcommand*{\aclu}{\AC@starredfalse\protect\aclua}%
\WithSuffix\newcommand\aclu*{\AC@starredtrue\protect\aclua}%
+\newcommand*{\Aclu}{\AC@starredfalse\protect\Aclua}%
+\WithSuffix\newcommand\Aclu*{\AC@starredtrue\protect\Aclua}%
\newcommand{\aclua}[1]{%
\ifAC@starred\acl*{#1}\else\acl{#1}\fi\acused{#1}}
+\newcommand{\Aclua}[1]{%
+ \ifAC@starred\Acl*{#1}\else\Acl{#1}\fi\acused{#1}}
\endinput
%%
%% End of file `acronym.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/acronym.tlpobj new/tlpkg/tlpobj/acronym.tlpobj
--- old/tlpkg/tlpobj/acronym.tlpobj 2019-02-28 03:13:49.000000000 +0100
+++ new/tlpkg/tlpobj/acronym.tlpobj 2020-04-16 01:56:52.000000000 +0200
@@ -1,6 +1,6 @@
name acronym
category Package
-revision 36582
+revision 54758
shortdesc Expand acronyms at least once
relocated 1
longdesc This package ensures that all acronyms used in the text are
@@ -8,11 +8,10 @@
longdesc environment to build a list of acronyms used. The package is
longdesc compatible with pdf bookmarks. The package requires the suffix
longdesc package, which in turn requires that it runs under e-TeX.
-runfiles size=5
+runfiles size=6
RELOC/tex/latex/acronym/acronym.sty
catalogue-also glossaries
catalogue-ctan /macros/latex/contrib/acronym
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics acronym
-catalogue-version 1.41
+catalogue-version 1.47
++++++ actuarialangle.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/actuarialangle/README.md new/doc/latex/actuarialangle/README.md
--- old/doc/latex/actuarialangle/README.md 2017-04-11 23:13:38.000000000 +0200
+++ new/doc/latex/actuarialangle/README.md 2019-06-14 23:06:16.000000000 +0200
@@ -1,19 +1,19 @@
# actuarialangle
-Package `actuarialangle` provides commands to typeset the "angle"
+Package **actuarialangle** provides commands to typeset the "angle"
symbol denoting a duration in actuarial notation, such as in symbols
-for the present value of certain or life annuities and an overhead
-square bracket used to emphasize joint status in symbols of life
+for the present value of certain or life annuities, and an over
+angle bracket used to emphasize joint status in symbols of life
contingencies.
-## Licence
+## License
LaTeX Project Public License, version 1.3c or (at your option) any
later version.
## Version
-2.0 (2017-04-10)
+2.1 (2019-06-13)
## Author
Binary files old/doc/latex/actuarialangle/actuarialangle.pdf and new/doc/latex/actuarialangle/actuarialangle.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/actuarialangle.doc.tlpobj new/tlpkg/tlpobj/actuarialangle.doc.tlpobj
--- old/tlpkg/tlpobj/actuarialangle.doc.tlpobj 2019-02-28 03:13:50.000000000 +0100
+++ new/tlpkg/tlpobj/actuarialangle.doc.tlpobj 2019-06-15 01:39:28.000000000 +0200
@@ -1,8 +1,8 @@
name actuarialangle.doc
category Package
-revision 43751
+revision 51376
shortdesc doc files of actuarialangle
relocated 1
-docfiles size=27
+docfiles size=31
RELOC/doc/latex/actuarialangle/README.md
RELOC/doc/latex/actuarialangle/actuarialangle.pdf
++++++ actuarialangle.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/actuarialangle/actuarialangle.sty new/tex/latex/actuarialangle/actuarialangle.sty
--- old/tex/latex/actuarialangle/actuarialangle.sty 2017-04-11 23:13:38.000000000 +0200
+++ new/tex/latex/actuarialangle/actuarialangle.sty 2019-06-14 23:06:16.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2017 Vincent Goulet
+%% Copyright (C) 2019 Vincent Goulet
%%
%% This file may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c of this
@@ -29,64 +29,162 @@
%% actuarialangle.ins and the derived files listed in the README.md file.
%%
\NeedsTeXFormat{LaTeX2e}[2009/09/24]
-\ProvidesPackage{actuarialangle}[2017/04/10 v2.0 Actuarial angle]
+\ProvidesPackage{actuarialangle}[2019/06/13 v2.1 Actuarial angle]
\newif\ifacta@thinspace \acta@thinspacetrue
\newif\ifacta@bracket \acta@brackettrue
\DeclareOption{thinspace}{\acta@thinspacetrue}
\DeclareOption{thickspace}{\acta@thinspacefalse}
\DeclareOption{nobracket}{\acta@bracketfalse}
\ProcessOptions
+\def\acta@overbarkern@fontdimen{8}
+\def\acta@overbarkern@family{\thr@@}
+\def\acta@overbarrule@fontdimen{8}
+\def\acta@overbarrule@family{\thr@@}
+\def\acta@overbarvgap@fontdimen{8}
+\def\acta@overbarvgap@family{\thr@@}
+\def\acta@overbarkern#1{%
+ \fontdimen\acta@overbarkern@fontdimen
+ \ifx#1\displaystyle
+ \textfont
+ \else
+ \ifx#1\textstyle
+ \textfont
+ \else
+ \ifx#1\scriptstyle
+ \scriptfont
+ \else
+ \scriptscriptfont
+ \fi
+ \fi
+ \fi
+ \acta@overbarkern@family
+}
+\def\acta@overbarrule#1{%
+ \fontdimen\acta@overbarrule@fontdimen
+ \ifx#1\displaystyle
+ \textfont
+ \else
+ \ifx#1\textstyle
+ \textfont
+ \else
+ \ifx#1\scriptstyle
+ \scriptfont
+ \else
+ \scriptscriptfont
+ \fi
+ \fi
+ \fi
+ \acta@overbarrule@family
+}
+\def\acta@overbarvgap#1{%
+ \ifx\acta@overbarrule@fontdimen\acta@overbarvgap@fontdimen
+ \thr@@
+ \fi
+ \fontdimen\acta@overbarvgap@fontdimen
+ \ifx#1\displaystyle
+ \textfont
+ \else
+ \ifx#1\textstyle
+ \textfont
+ \else
+ \ifx#1\scriptstyle
+ \scriptfont
+ \else
+ \scriptscriptfont
+ \fi
+ \fi
+ \fi
+ \acta@overbarvgap@family
+}
\DeclareRobustCommand{\actuarialangle}{\mathpalette\acta@angle}
\def\acta@angle#1#2{%
\mathord{%
- \mkern1mu
- \vbox{\hrule \hbox{%
+ \mkern1mu%
+ \vbox{%
+ \kern\acta@overbarkern#1%
+ \hrule \@height\acta@overbarrule#1%
+ \hbox{%
\vbox{%
- \kern3\fontdimen8\scriptfont\thr@@
- \hbox{$#1#2\m@th$}}%
- \setbox\z@\hbox{$#1()$}\vrule depth\dp\z@}}%
- \mkern1mu}}
+ \kern\acta@overbarvgap#1%
+ \hbox{$\m@th#1#2$}%
+ }%
+ \setbox\z@\hbox{$#1\mathstrut$}%
+ \vrule \@width\acta@overbarrule#1\@depth\dp\z@
+ }%
+ }%
+ \mkern1mu%
+ }%
+}
\ifacta@thinspace
- \def\angl#1{{\actuarialangle{{#1}\mkern1mu}}}
+ \newcommand*\angl[1]{{\actuarialangle{#1\mkern1mu}}}
\else
- \def\angl#1{{\actuarialangle{{#1}\mkern2mu}}}
+ \newcommand*\angl[1]{{\actuarialangle{#1\mkern2mu}}}
\fi
-\def\angln{{\angl n}}
-\def\anglr{{\angl r}}
-\def\anglk{{\angl k}}
+\newcommand*\angln{{\angl n}}
+\newcommand*\anglr{{\angl r}}
+\newcommand*\anglk{{\angl k}}
\ifacta@bracket
\RequirePackage{pict2e}
\DeclareRobustCommand{\overanglebracket}{%
\mathpalette\acta@anglebracket}
\def\acta@anglebracket#1#2{%
- \setbox\z@\hbox{$\m@th#1#2$}
- \dimen0\wd\z@ \dimen1\ht\z@
- \setbox\tw@\hbox{%
- \setlength{\unitlength}{\dimen1}%
- \begin{picture}(0.4,0)
- \polyline(0.4001,0)(0.4,0)(0,-0.8)
- \end{picture}%
- \setlength{\unitlength}{\dimen0}%
- \begin{picture}(1,0)
- \put(0,0){\line(1,0){1}}
- \end{picture}%
- \setlength{\unitlength}{\dimen1}%
- \begin{picture}(0.4,0)
- \polyline(-0.0001,0)(0,0)(0.4,-0.8)
- \end{picture}}
- \dimen@\wd\tw@
- \vbox to\dimen1{%
- \baselineskip\z@
- \lineskip3\fontdimen8\scriptfont\thr@@
- \advance\lineskip by 0.2pt
- \lineskiplimit\lineskip
- \vss
- \box\tw@%
- \hbox to\dimen@{\hss\unhbox\z@\hss}
- }
+ \mathord{%
+ \mkern1mu%
+ \linethickness{\acta@overbarrule#1}%
+ \setbox\z@\hbox{$\m@th#1#2$}%
+ \dimen\z@\wd\z@ \dimen\tw@\ht\z@
+ \setbox\tw@\hbox{%
+ \unitlength\dimen\tw@
+ \begin{picture}(0.4,0)
+ \polyline(0.4001,0)(0.4,0)(0,-0.8)
+ \end{picture}%
+ \unitlength\dimen\z@
+ \begin{picture}(1,0)
+ \put(0,0){\line(1,0){1}}
+ \end{picture}%
+ \unitlength\dimen\tw@
+ \begin{picture}(0.4,0)
+ \polyline(-0.0001,0)(0,0)(0.4,-0.8)
+ \end{picture}%
+ }%
+ \dimen@\wd\tw@
+ \vbox{%
+ \baselineskip\z@
+ \lineskip\acta@overbarvgap#1%
+ \advance\lineskip\@halfwidth
+ \lineskiplimit\lineskip
+ \kern\acta@overbarkern#1%
+ \kern\@halfwidth
+ \box\tw@
+ \hbox to\dimen@{\hss\unhbox\z@\hss}%
+ }%
+ \mkern1mu%
+ }%
}
\let\group\overanglebracket
\fi
+\AtBeginDocument{%
+ \@ifpackageloaded{unicode-math}{%
+ \ifx\XeTeXcharclass\@undefined
+ \global\let\acta@overbarkern\Umathoverbarkern
+ \global\let\acta@overbarrule\Umathoverbarrule
+ \global\let\acta@overbarvgap\Umathoverbarvgap
+ \global\let\acta@overbarkern@fontdimen\@undefined
+ \global\let\acta@overbarkern@family\@undefined
+ \global\let\acta@overbarrule@fontdimen\@undefined
+ \global\let\acta@overbarrule@family\@undefined
+ \global\let\acta@overbarvgap@fontdimen\@undefined
+ \global\let\acta@overbarvgap@family\@undefined
+ \else
+ \gdef\acta@overbarkern@fontdimen{54}% XeTeX mistake? Use 55?
+ \gdef\acta@overbarkern@family{\tw@}%
+ \gdef\acta@overbarrule@fontdimen{54}%
+ \gdef\acta@overbarrule@family{\tw@}%
+ \gdef\acta@overbarvgap@fontdimen{54}% XeTeX mistake? Use 53?
+ \gdef\acta@overbarvgap@family{\tw@}%
+ \fi
+ }{}%
+}
\endinput
%%
%% End of file `actuarialangle.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/actuarialangle.tlpobj new/tlpkg/tlpobj/actuarialangle.tlpobj
--- old/tlpkg/tlpobj/actuarialangle.tlpobj 2019-02-28 03:13:50.000000000 +0100
+++ new/tlpkg/tlpobj/actuarialangle.tlpobj 2019-06-15 01:39:28.000000000 +0200
@@ -1,6 +1,6 @@
name actuarialangle
category Package
-revision 43751
+revision 51376
shortdesc Angle symbol denoting a duration in actuarial and financial notation
relocated 1
longdesc This package provides commands to typeset the "angle" symbol
@@ -8,10 +8,12 @@
longdesc for the present value of certain or life annuities, and an over
longdesc angle square bracket used to emphasize joint status in symbols
longdesc of life contingencies.
-runfiles size=1
+runfiles size=2
RELOC/tex/latex/actuarialangle/actuarialangle.sty
+catalogue-contact-bugs https://gitlab.com/vigou3/actuarialangle/issues
+catalogue-contact-repository https://gitlab.com/vigou3/actuarialangle
catalogue-ctan /macros/latex/contrib/actuarialangle
-catalogue-date 2017-04-12 09:07:39 +0200
+catalogue-date 2019-06-13 21:35:31 +0200
catalogue-license lppl1.3c
catalogue-topics graphics-symb
-catalogue-version 2.0
+catalogue-version 2.1
++++++ actuarialsymbol.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/actuarialsymbol/README.md new/doc/latex/actuarialsymbol/README.md
--- old/doc/latex/actuarialsymbol/README.md 2017-06-15 23:47:10.000000000 +0200
+++ new/doc/latex/actuarialsymbol/README.md 2019-06-13 21:54:34.000000000 +0200
@@ -19,7 +19,7 @@
## Version
-1.0a (2017-06-14)
+1.1 (2019-06-13)
## Authors
Binary files old/doc/latex/actuarialsymbol/actuarialsymbol.pdf and new/doc/latex/actuarialsymbol/actuarialsymbol.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/actuarialsymbol.doc.tlpobj new/tlpkg/tlpobj/actuarialsymbol.doc.tlpobj
--- old/tlpkg/tlpobj/actuarialsymbol.doc.tlpobj 2019-02-28 03:13:50.000000000 +0100
+++ new/tlpkg/tlpobj/actuarialsymbol.doc.tlpobj 2020-03-04 23:48:57.000000000 +0100
@@ -1,9 +1,9 @@
name actuarialsymbol.doc
category Package
-revision 44607
+revision 54080
shortdesc doc files of actuarialsymbol
relocated 1
-docfiles size=88
+docfiles size=89
RELOC/doc/latex/actuarialsymbol/README.md
RELOC/doc/latex/actuarialsymbol/actuarialsymbol.pdf
RELOC/doc/latex/actuarialsymbol/mosaic.jpg
++++++ actuarialsymbol.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/actuarialsymbol/actuarialsymbol.sty new/tex/latex/actuarialsymbol/actuarialsymbol.sty
--- old/tex/latex/actuarialsymbol/actuarialsymbol.sty 2017-06-15 23:47:10.000000000 +0200
+++ new/tex/latex/actuarialsymbol/actuarialsymbol.sty 2019-06-13 21:54:34.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2017 David Beauchemin, Vincent Goulet
+%% Copyright (C) 2019 David Beauchemin, Vincent Goulet
%%
%% This file may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License, either version 1.3c of this
@@ -28,7 +28,7 @@
%% This work consists of actuarialsymbol.dtx and the derived files.
%%
\NeedsTeXFormat{LaTeX2e}[2009/09/24]
-\ProvidesPackage{actuarialsymbol}[2017/06/14 v1.0a Actuarial symbols]
+\ProvidesPackage{actuarialsymbol}[2019/06/13 v1.1 Actuarial symbols]
\RequirePackage{amsmath}
\RequirePackage{actuarialangle}
\newif\ifacts@alignpreced \acts@alignprecedfalse
@@ -37,77 +37,79 @@
\DeclareOption{compactpreced}{\acts@compactprecedtrue}
\ProcessOptions
\DeclareRobustCommand{\actsymb}{\acts@actsymb}
-\newcommand\acts@actsymb{%
- \@ifnextchar[{\acts@@actsymb}%
- {\acts@@actsymb[]}}
-\newcommand\acts@@actsymb{}
+\newcommand*\acts@actsymb{%
+ \new@ifnextchar[{\acts@@actsymb}%
+ {\acts@@actsymb[]}}
+\newcommand*\acts@@actsymb{}
\def\acts@@actsymb[#1]{%
- \@ifnextchar[{\acts@@@actsymb[#1]}%
- {\acts@@@actsymb[#1][]}}
-\newcommand\acts@@@actsymb{}
+ \new@ifnextchar[{\acts@@@actsymb[#1]}%
+ {\acts@@@actsymb[#1][]}}
+\newcommand*\acts@@@actsymb{}
\def\acts@@@actsymb[#1][#2]{%
- \@ifnextchar[{\acts@@@@actsymb[#1][#2]}%
- {\acts@@@@actsymb[#1][#2][]}}
-\newcommand\acts@@@@actsymb{}
+ \new@ifnextchar[{\acts@@@@actsymb[#1][#2]}%
+ {\acts@@@@actsymb[#1][#2][]}}
+\newcommand*\acts@@@@actsymb{}
\def\acts@@@@actsymb[#1][#2][#3]#4#5{%
- \@ifnextchar[{\@actsymbol[#1][#2][#3]{#4}{#5}}%
- {\@actsymbol[#1][#2][#3]{#4}{#5}[]}}
-\def\@actsymbol[#1][#2][#3]#4#5[#6]{
- \@mathmeasure\z@\displaystyle{#3}
- \@mathmeasure\@ne\scriptstyle{#1}
- \@mathmeasure\tw@\scriptstyle{#2}
- \@mathmeasure\thr@@\scriptstyle{#5}
- \@mathmeasure4\scriptstyle{#6}
- \mathord{}
- \ifdim \wd\tw@>\z@ \ifdim \wd\tw@>\wd\@ne
- \setbox\@ne\hbox to\wd\tw@{\hfil\unhbox\@ne}
+ \new@ifnextchar[{\@actsymbol[#1][#2][#3]{#4}{#5}}%
+ {\@actsymbol[#1][#2][#3]{#4}{#5}[]}}
+\newcommand*\@actsymbol{}
+\def\@actsymbol[#1][#2][#3]#4#5[#6]{%
+ \@mathmeasure\z@\displaystyle{#3}%
+ \@mathmeasure\tw@\scriptstyle{#1}%
+ \@mathmeasure4\scriptstyle{#2}%
+ \@mathmeasure6\scriptstyle{#5}%
+ \@mathmeasure8\scriptstyle{#6}%
+ \mathord{}%
+ \ifdim \wd4>\z@ \ifdim \wd4>\wd\tw@
+ \setbox\tw@\hbox to\wd4{\hfil\unhbox\tw@}%
\else
- \setbox\tw@\hbox to\wd\@ne{\hfil\unhbox\tw@}
+ \setbox4\hbox to\wd\tw@{\hfil\unhbox4}%
\fi\fi
- \ifdim \ht\@ne>\ht\thr@@
- \ht\thr@@=\ht\@ne
+ \ifdim \ht\tw@>\ht6
+ \ht6=\ht\tw@
\else
- \ht\@ne=\ht\thr@@
+ \ht\tw@=\ht6%
\fi
- \ifnum\ifdim \wd\tw@>\z@ 1\else\ifdim \wd4>\z@ 1\else 0\fi\fi
- =1
- \ifdim \dp\tw@>\dp4 \dp4=\dp\tw@\else \dp\tw@=\dp4\fi
- \mathopen{\vphantom{\textstyle #4}^{\box\tw@}\sb{\box\@ne}}%
+ \ifnum\ifdim \wd4>\z@ 1\else\ifdim \wd8>\z@ 1\else 0\fi\fi
+ =1 %
+ \ifdim \dp4>\dp8 \dp8=\dp4\else \dp4=\dp8\fi
+ \mathopen{\vphantom{\textstyle #4}\sp{\box4}\sb{\box\tw@}}%
\ifdim\wd\z@=\z@
- #4^{\box4}\sb{\box\thr@@}%
+ #4\sp{\box8}\sb{\box6}%
\else
- #3^{\box4}\sb{\vphantom{\copy\thr@@}}(#4\sb{\box\thr@@})%
+ #3\sp{\box8}\sb{\vphantom{\copy6}}(#4\sb{\box6})%
\fi
\else
- \mathopen{\vphantom{\textstyle #4}\sb{\box\@ne}}%
+ \mathopen{\vphantom{\textstyle #4}\sb{\box\tw@}}%
\ifdim\wd\z@=\z@
- #4\sb{\box\thr@@}%
+ #4\sb{\box6}%
\else
- #3(#4\sb{\box\thr@@})%
+ #3(#4\sb{\box6})%
\fi
\fi
}
-\newcommand\@actinssc[1]{%
+\newcommand*\@actinssc[1]{%
\@ifstar{\acts@actsc{\bar{#1}}}%
{\acts@actsc{#1}}}
-\newcommand\@actannsc[1]{%
+\newcommand*\@actannsc[1]{%
\@ifstar{\@ifstar{\acts@actsc{\ddot{#1}}}%
- {\acts@actsc{\bar{#1}}}}
+ {\acts@actsc{\bar{#1}}}}%
{\acts@actsc{#1}}}
-\newcommand\acts@actsc[1]{%
- \@ifnextchar[{\acts@@actsc{#1}}%
- {\acts@@actsc{#1}[]}}
+\newcommand*\acts@actsc[1]{%
+ \new@ifnextchar[{\acts@@actsc{#1}}%
+ {\acts@@actsc{#1}[]}}
+\newcommand*\@actothersc{}
\let\@actothersc\acts@actsc
-\newcommand\acts@@actsc{}
+\newcommand*\acts@@actsc{}
\def\acts@@actsc#1[#2]{%
- \@ifnextchar[{\acts@@@actsc{#1}[#2]}%
- {\acts@@@actsc{#1}[#2][]}}
-\newcommand\acts@@@actsc{}
+ \new@ifnextchar[{\acts@@@actsc{#1}[#2]}%
+ {\acts@@@actsc{#1}[#2][]}}
+\newcommand*\acts@@@actsc{}
\def\acts@@@actsc#1[#2][#3]#4{%
- \@ifnextchar[{\@actsymbol[#2][#3][]{#1}{#4}}%
- {\@actsymbol[#2][#3][]{#1}{#4}[]}}
-\DeclareRobustCommand{\lx}{\@actothersc {\ell}}
-\DeclareRobustCommand{\Lx}{\@actothersc {\mathcal{L}}}
+ \new@ifnextchar[{\@actsymbol[#2][#3][]{#1}{#4}}%
+ {\@actsymbol[#2][#3][]{#1}{#4}[]}}
+\DeclareRobustCommand{\lx}{\@actothersc\ell}
+\DeclareRobustCommand{\Lx}{\@actothersc{\mathcal{L}}}
\DeclareRobustCommand{\dx}{\@actothersc d}
\DeclareRobustCommand{\Dx}{\@actothersc{\mathcal{D}}}
\DeclareRobustCommand{\px}{\@actothersc p}
@@ -118,91 +120,91 @@
\DeclareRobustCommand{\sx}{\@actannsc s}
\DeclareRobustCommand{\aringx}{\@actothersc{\mathring{a}}}
\DeclareRobustCommand{\eringx}{\@actothersc{\mathring{e}}}
-\newcommand\@actpremres[1]{%
+\newcommand*\@actpremres[1]{%
\@ifstar{\acts@actpremres{\bar{#1}}}%
{\acts@actpremres{#1}}}
-\newcommand\acts@actpremres[1]{%
- \@ifnextchar[{\acts@@actpremres{#1}}%
- {\acts@@actpremres{#1}[]}}
-\newcommand\acts@@actpremres{}
+\newcommand*\acts@actpremres[1]{%
+ \new@ifnextchar[{\acts@@actpremres{#1}}%
+ {\acts@@actpremres{#1}[]}}
+\newcommand*\acts@@actpremres{}
\def\acts@@actpremres#1[#2]{%
- \@ifnextchar[{\acts@@@actpremres{#1}[#2]}%
- {\acts@@@actpremres{#1}[#2][]}}
-\newcommand\acts@@@actpremres{}
+ \new@ifnextchar[{\acts@@@actpremres{#1}[#2]}%
+ {\acts@@@actpremres{#1}[#2][]}}
+\newcommand*\acts@@@actpremres{}
\def\acts@@@actpremres#1[#2][#3]#4{%
- \@ifnextchar[{\@actsymbol[#2][#3][#1]{{#4}}{}}%
- {\@actsymbol[#2][#3][#1]{{#4}}{}[]}}
+ \new@ifnextchar[{\@actsymbol[#2][#3][#1]{{#4}}{}}%
+ {\@actsymbol[#2][#3][#1]{{#4}}{}[]}}
\DeclareRobustCommand{\Px}{\@actothersc P}
\DeclareRobustCommand{\Vx}{\@actothersc V}
\DeclareRobustCommand{\Wx}{\@actothersc W}
\DeclareRobustCommand{\premium}{\@actpremres P}
\DeclareRobustCommand{\reserve}{\@actpremres V}
\DeclareRobustCommand{\paidup}{\@actpremres W}
-\DeclareRobustCommand{\term}[2]{\itop{#1}:\angl{#2}}
-\DeclareRobustCommand{\termxn}{{\itop{x}:\angln}}
-\DeclareRobustCommand{\pureendow}[2]{#1:\itop{\angl{#2}}}
-\DeclareRobustCommand{\pureendowxn}{{x:\itop{\angln}}}
-\DeclareRobustCommand{\endow}[2]{#1:\angl{#2}}
-\DeclareRobustCommand{\endowxn}{{x:\angln}}
+\DeclareRobustCommand{\term}[2]{\itop{#1}{:}\angl{#2}}
+\DeclareRobustCommand{\termxn}{{\itop{x}{:}\angln}}
+\DeclareRobustCommand{\pureendow}[2]{#1{:}\itop{\angl{#2}}}
+\DeclareRobustCommand{\pureendowxn}{{x{:}\itop{\angln}}}
+\DeclareRobustCommand{\endow}[2]{#1{:}\angl{#2}}
+\DeclareRobustCommand{\endowxn}{{x{:}\angln}}
\let\joint\overline
\newlength{\twoletkern}
-\setlength{\twoletkern}{1.2pt}
+\setlength{\twoletkern}{0.1em}
\DeclareRobustCommand{\twoletsymb}[3][\twoletkern]{(#2\kern-#1#3)}
-\newcommand\@twoletinssc[3][\twoletkern]{%
+\newcommand*\@twoletinssc[3][\twoletkern]{%
\@ifstar{\twoletsymb[#1]{#2}{\bar{#3}}}%
{\twoletsymb[#1]{#2}{#3}}}
-\newcommand\@twoletannsc[3][\twoletkern]{%
+\newcommand*\@twoletannsc[3][\twoletkern]{%
\@ifstar{\@ifstar{\twoletsymb[#1]{#2}{\ddot{#3}}}%
{\twoletsymb[#1]{#2}{\bar{#3}}}}%
{\twoletsymb[#1]{#2}{#3}}}
-\newcommand{\IA}{\@twoletinssc IA}
-\newcommand{\IbA}{\@twoletinssc{\bar{I}}A}
-\newcommand{\ImA}{\@twoletinssc{I^{(m)}}A}
-\newcommand{\DA}{\@twoletinssc DA}
-\newcommand{\DbA}{\@twoletinssc{\bar{D}}A}
-\newcommand{\DmA}{\@twoletinssc{D^{(m)}}A}
-\newcommand{\Ia}{\(a)twoletannsc[0.5\twoletkern]Ia}
-\newcommand{\Is}{\(a)twoletannsc[0.5\twoletkern]Is}
-\newcommand{\Da}{\(a)twoletannsc[0.5\twoletkern]Da}
-\newcommand{\Ds}{\(a)twoletannsc[0.5\twoletkern]Ds}
+\newcommand*{\IA}{\@twoletinssc IA}
+\newcommand*{\IbA}{\@twoletinssc{\bar{I}}A}
+\newcommand*{\ImA}{\@twoletinssc{I^{(m)}}A}
+\newcommand*{\DA}{\@twoletinssc DA}
+\newcommand*{\DbA}{\@twoletinssc{\bar{D}}A}
+\newcommand*{\DmA}{\@twoletinssc{D^{(m)}}A}
+\newcommand*{\Ia}{\(a)twoletannsc[0.5\twoletkern]Ia}
+\newcommand*{\Is}{\(a)twoletannsc[0.5\twoletkern]Is}
+\newcommand*{\Da}{\(a)twoletannsc[0.5\twoletkern]Da}
+\newcommand*{\Ds}{\(a)twoletannsc[0.5\twoletkern]Ds}
\newlength{\nthtopsep}
-\setlength{\nthtopsep}{2\p@}
+\setlength{\nthtopsep}{0.18em}
\newlength{\nthtopskip}
-\setlength{\nthtopskip}{7\p@}
+\setlength{\nthtopskip}{0.64em}
\newlength{\nthbottomsep}
-\setlength{\nthbottomsep}{2\p@}
+\setlength{\nthbottomsep}{0.18em}
\newlength{\nthbottomskip}
-\setlength{\nthbottomskip}{9\p@}
+\setlength{\nthbottomskip}{0.82em}
\DeclareRobustCommand{\nthtop}{\@ifstar\@varnthtop\@nthtop}
\DeclareRobustCommand{\nthbottom}{\@ifstar\@varnthbottom\@nthbottom}
-\newcommand{\@nthtop}[3][\nthtopsep]{%
+\newcommand*{\@nthtop}[3][\nthtopsep]{%
\mathpalette{\@precedence t\z@{#1}{#2}}{#3}}
-\newcommand{\@varnthtop}[3][\nthtopskip]{%
+\newcommand*{\@varnthtop}[3][\nthtopskip]{%
\mathpalette{\@precedence t{#1}\z@{#2}}{#3}}
-\newcommand{\@nthbottom}[3][\nthbottomsep]{%
+\newcommand*{\@nthbottom}[3][\nthbottomsep]{%
\mathpalette{\@precedence b\z@{#1}{#2}}{#3}}
-\newcommand{\@varnthbottom}[3][\nthbottomskip]{%
+\newcommand*{\@varnthbottom}[3][\nthbottomskip]{%
\mathpalette{\@precedence b{#1}\z@{#2}}{#3}}
\ifacts@alignpreced
\let\@nthtop\@varnthtop
\let\@nthbottom\@varnthbottom
\fi
\ifacts@compactpreced
- \let\@varnthtop\nthtop
- \let\@varnthbottom\nthbottom
+ \let\@varnthtop\@nthtop
+ \let\@varnthbottom\@nthbottom
\fi
-\def\@precedence#1#2#3#4#5#6{%
+\newcommand*\@precedence[6]{%
\setbox\tw@\hbox{$\m@th#5#4$}%
- \setbox\z@\hbox{$\m@th#5#6$}
+ \setbox\z@\hbox{$\m@th#5#6$}%
\dimen@\wd\z@
\vbox to\ht\z@{%
- \baselineskip=#2
- \lineskip=#3
+ \baselineskip=#2%
+ \lineskip=#3%
\lineskiplimit\lineskip
\if b#1\relax\box\z@\else\vss\fi
\hbox to\dimen@{\hss\unhbox\tw@\hss}%
\if t#1\relax\box\z@\else\vss\fi
- }
+ }%
}
\DeclareRobustCommand{\firsttop}{%
\@ifstar{\@varnthtop{1}}{\@nthtop{1}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/actuarialsymbol.tlpobj new/tlpkg/tlpobj/actuarialsymbol.tlpobj
--- old/tlpkg/tlpobj/actuarialsymbol.tlpobj 2019-02-28 03:13:50.000000000 +0100
+++ new/tlpkg/tlpobj/actuarialsymbol.tlpobj 2020-03-04 23:48:57.000000000 +0100
@@ -1,6 +1,6 @@
name actuarialsymbol
category Package
-revision 44607
+revision 54080
shortdesc Actuarial symbols of life contingencies and financial mathematics
relocated 1
longdesc This package provides commands to compose actuarial symbols of
@@ -16,11 +16,10 @@
longdesc contingencies. This package requires actuarialangle.
runfiles size=2
RELOC/tex/latex/actuarialsymbol/actuarialsymbol.sty
-catalogue-contact-bugs https://github.com/vigou3/actuarialsymbol/issues
-catalogue-contact-home https://vigou3.github.io/actuarialsymbol
-catalogue-contact-repository https://github.com/vigou3/actuarialsymbol
+catalogue-contact-bugs https://gitlab.com/vigou3/actuarialsymbol/issues
+catalogue-contact-home https://vigou3.gitlab.io/actuarialsymbol
+catalogue-contact-repository https://gitlab.com/vigou3/actuarialsymbol
catalogue-ctan /macros/latex/contrib/actuarialsymbol
-catalogue-date 2017-06-14 22:39:00 +0200
catalogue-license lppl1.3c
catalogue-topics graphics-symb
-catalogue-version 1.0a
+catalogue-version 1.1
++++++ adforn.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/adforn/COPYING new/doc/fonts/adforn/COPYING
--- old/doc/fonts/adforn/COPYING 2010-09-24 18:24:36.000000000 +0200
+++ new/doc/fonts/adforn/COPYING 2019-10-03 23:05:46.000000000 +0200
@@ -1,340 +1,340 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/adforn/NOTICE new/doc/fonts/adforn/NOTICE
--- old/doc/fonts/adforn/NOTICE 2010-09-24 18:24:36.000000000 +0200
+++ new/doc/fonts/adforn/NOTICE 2019-10-03 23:05:46.000000000 +0200
@@ -1,35 +1,35 @@
- The OrnementsADF fonts consists of fonts made by Arkandis Digital
- Foundry (ADF), collectively known as the "Program"
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or any later
- version, with font exception.
-
- As a special exception, if you create a document which uses ornementsADF
- font, and embed this font or unaltered portions of this font into the
- document, this font does not by itself cause the resulting document to
- be covered by the GNU General Public License. This exception does not
- however invalidate any other reasons why the document might be covered
- by the GNU General Public License. If you modify this font, you may
- extend this exception to your version of the font, but you are not
- obligated to do so. If you do not wish to do so, delete this exception
- statement from your version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-_____________________________________________________________________________________
- RELEASE -
- 1.001 - Minor corrections
-______________________________________________________________________________________
-
-
-
-
+ The OrnementsADF fonts consists of fonts made by Arkandis Digital
+ Foundry (ADF), collectively known as the "Program"
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or any later
+ version, with font exception.
+
+ As a special exception, if you create a document which uses ornementsADF
+ font, and embed this font or unaltered portions of this font into the
+ document, this font does not by itself cause the resulting document to
+ be covered by the GNU General Public License. This exception does not
+ however invalidate any other reasons why the document might be covered
+ by the GNU General Public License. If you modify this font, you may
+ extend this exception to your version of the font, but you are not
+ obligated to do so. If you do not wish to do so, delete this exception
+ statement from your version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+_____________________________________________________________________________________
+ RELEASE -
+ 1.001 - Minor corrections
+______________________________________________________________________________________
+
+
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/adforn/README new/doc/fonts/adforn/README
--- old/doc/fonts/adforn/README 2010-09-24 18:24:36.000000000 +0200
+++ new/doc/fonts/adforn/README 2019-10-13 23:38:26.000000000 +0200
@@ -28,5 +28,16 @@
If you have comments about the font itself, please contact Hirwen Harendal
(harendalh <at> hotmail <dot> com).
-Clea F. Rees (cfrees <at> imapmail <dot> org)
-2010/07/30
+Clea F. Rees (ReesC21 <at> cardiff <dot> ac <dot> uk)
+
+Versioning
+----------
+
+Version 1.1a corrects a bug **if** I've understood the problem correctly, which
+I'm far from convinced of. (All it does is add a pair of curly brackets in the
+.sty.)
+
+Version 1.1b includes the PDF documentation *and* the TFM. Apologies for the
+inconvenience.
+
+2019/10/13
Binary files old/doc/fonts/adforn/adforn.pdf and new/doc/fonts/adforn/adforn.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/adforn/adforn.tex new/doc/fonts/adforn/adforn.tex
--- old/doc/fonts/adforn/adforn.tex 2010-09-24 18:24:36.000000000 +0200
+++ new/doc/fonts/adforn/adforn.tex 2019-10-03 23:05:46.000000000 +0200
@@ -1,7 +1,7 @@
% !TEX TS-program = pdflatex
% !TEX encoding = UTF-8 Unicode
%% adforn.tex
-%% Copyright 2010 Clea F. Rees
+%% Copyright 2019 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -31,9 +31,9 @@
\usepackage[a4paper,headheight=13pt]{geometry}
\usepackage{microtype}
-\title{adforn}
-\author{Clea F.\ Rees\footnote{cfrees <at> imapmail <dot> org}}
-\newcommand*{\dyddiad}{1\textsuperscript{st} August, 2010}
+\title{adforn\thanks{Version 1.1}}
+\author{Clea F.\ Rees\footnote{ReesC21 <at> cardiff <dot> ac <dot> uk}}
+\newcommand*{\dyddiad}{24\textsuperscript{th} September, 2019}
\date{\dyddiad}
\pagestyle{fancy}
@@ -42,11 +42,11 @@
\fancyhf[ch]{}
\fancyhf[lf]{}
\fancyhf[rf]{}
-% \fancyhf[cf]{\itshape --- \thepage~\ofname~\pageref{LastPage} ---}
+% \fancyhf[cf]{\itshape --- \thepage~of~\pageref{LastPage} ---}
\fancyhf[lh]{}
\fancyhf[rh]{}
\fancyhf[ch]{\itshape adforn\hspace*{1.5em}\adforn{37}\hspace*{1.5em}\dyddiad}
- \fancyhf[cf]{\itshape \adforn{18} \thepage~\ofname~\pageref{LastPage} \adforn{46}}
+ \fancyhf[cf]{\itshape \adforn{18} \thepage~of~\pageref{LastPage} \adforn{46}}
\renewcommand{\headrulewidth}{0pt}
\makeatletter
@@ -309,4 +309,4 @@
\adfflourishleftdouble\quad\adfast9\quad\adfflourishrightdouble
\end{center}
-\end{document}
\ No newline at end of file
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/adforn/manifest.txt new/doc/fonts/adforn/manifest.txt
--- old/doc/fonts/adforn/manifest.txt 2010-09-24 18:24:36.000000000 +0200
+++ new/doc/fonts/adforn/manifest.txt 2019-10-13 23:38:26.000000000 +0200
@@ -1,4 +1,4 @@
-Copyright 2010 Clea F. Rees
+Copyright 2019 Clea F. Rees
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.
@@ -13,9 +13,10 @@
adforn.sty
OrnementsADF.enc
OrnementsADF.map
-uOrnementsADF.fd
+uornementsadf.fd
adforn.tex
manifest.txt
+README
Derived files:
OrnementsADF.tfm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adforn.doc.tlpobj new/tlpkg/tlpobj/adforn.doc.tlpobj
--- old/tlpkg/tlpobj/adforn.doc.tlpobj 2019-02-28 03:13:50.000000000 +0100
+++ new/tlpkg/tlpobj/adforn.doc.tlpobj 2020-03-24 01:55:53.000000000 +0100
@@ -1,9 +1,9 @@
name adforn.doc
category Package
-revision 20019
+revision 54512
shortdesc doc files of adforn
relocated 1
-docfiles size=100
+docfiles size=98
RELOC/doc/fonts/adforn/COPYING
RELOC/doc/fonts/adforn/NOTICE
RELOC/doc/fonts/adforn/README
++++++ adforn.tar.xz ++++++
Binary files old/fonts/type1/arkandis/adforn/OrnementsADF.pfm and new/fonts/type1/arkandis/adforn/OrnementsADF.pfm differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/adforn/adforn.sty new/tex/latex/adforn/adforn.sty
--- old/tex/latex/adforn/adforn.sty 2010-09-24 18:24:36.000000000 +0200
+++ new/tex/latex/adforn/adforn.sty 2019-10-13 23:38:26.000000000 +0200
@@ -1,7 +1,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{adforn}[2010/07/25 v1.0 adforn CFR]
+\ProvidesPackage{adforn}[2019/10/13 v1.1b adforn CFR]
\RequirePackage{pifont}
-\Pifont{OrnementsADF}
+{\Pifont{OrnementsADF}}
\newcommand*{\adforn}[1]{%
\Pisymbol{OrnementsADF}{#1}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adforn.tlpobj new/tlpkg/tlpobj/adforn.tlpobj
--- old/tlpkg/tlpobj/adforn.tlpobj 2019-02-28 03:13:50.000000000 +0100
+++ new/tlpkg/tlpobj/adforn.tlpobj 2020-03-24 01:55:53.000000000 +0100
@@ -1,6 +1,6 @@
name adforn
category Package
-revision 20019
+revision 54512
shortdesc OrnementsADF font with TeX/LaTeX support
relocated 1
longdesc The bundle provides the Ornements ADF font in PostScript type 1
@@ -9,17 +9,15 @@
longdesc README.) The TeX/LaTeX support is licensed under LPPL. (See
longdesc README, manifest.txt.)
execute addMap OrnementsADF.map
-runfiles size=18
+runfiles size=17
RELOC/fonts/afm/arkandis/adforn/OrnementsADF.afm
RELOC/fonts/enc/dvips/adforn/OrnementsADF.enc
RELOC/fonts/map/dvips/adforn/OrnementsADF.map
RELOC/fonts/tfm/arkandis/adforn/OrnementsADF.tfm
RELOC/fonts/type1/arkandis/adforn/OrnementsADF.pfb
- RELOC/fonts/type1/arkandis/adforn/OrnementsADF.pfm
RELOC/tex/latex/adforn/adforn.sty
RELOC/tex/latex/adforn/uornementsadf.fd
catalogue-ctan /fonts/adforn
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl
+catalogue-license lppl gpl2
catalogue-topics font font-ornmnt font-type1
-catalogue-version 1.001-b-2
+catalogue-version 1.1b
++++++ adfsymbols.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/adfsymbols/COPYING new/doc/fonts/adfsymbols/COPYING
--- old/doc/fonts/adfsymbols/COPYING 2010-09-12 19:54:53.000000000 +0200
+++ new/doc/fonts/adfsymbols/COPYING 2019-10-03 23:05:00.000000000 +0200
@@ -1,340 +1,340 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) year name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/adfsymbols/NOTICE new/doc/fonts/adfsymbols/NOTICE
--- old/doc/fonts/adfsymbols/NOTICE 2010-09-12 19:54:53.000000000 +0200
+++ new/doc/fonts/adfsymbols/NOTICE 2019-10-03 23:05:00.000000000 +0200
@@ -1,35 +1,35 @@
- The symbolsADF fonts consists of fonts made by Arkandis Digital
- Foundry (ADF), collectively known as the "Program"
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or any later
- version, with font exception.
-
- As a special exception, if you create a document which uses BulletsADF or arrowsADF
- font, and embed this font or unaltered portions of this font into the
- document, this font does not by itself cause the resulting document to
- be covered by the GNU General Public License. This exception does not
- however invalidate any other reasons why the document might be covered
- by the GNU General Public License. If you modify this font, you may
- extend this exception to your version of the font, but you are not
- obligated to do so. If you do not wish to do so, delete this exception
- statement from your version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-_____________________________________________________________________________________
- RELEASE -
- 1.001 - Minor corrections
-______________________________________________________________________________________
-
-
-
-
+ The symbolsADF fonts consists of fonts made by Arkandis Digital
+ Foundry (ADF), collectively known as the "Program"
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or any later
+ version, with font exception.
+
+ As a special exception, if you create a document which uses BulletsADF or arrowsADF
+ font, and embed this font or unaltered portions of this font into the
+ document, this font does not by itself cause the resulting document to
+ be covered by the GNU General Public License. This exception does not
+ however invalidate any other reasons why the document might be covered
+ by the GNU General Public License. If you modify this font, you may
+ extend this exception to your version of the font, but you are not
+ obligated to do so. If you do not wish to do so, delete this exception
+ statement from your version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+_____________________________________________________________________________________
+ RELEASE -
+ 1.001 - Minor corrections
+______________________________________________________________________________________
+
+
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/adfsymbols/README new/doc/fonts/adfsymbols/README
--- old/doc/fonts/adfsymbols/README 2010-09-12 19:54:53.000000000 +0200
+++ new/doc/fonts/adfsymbols/README 2019-10-13 23:38:49.000000000 +0200
@@ -28,5 +28,14 @@
If you have comments about the fonts themselves, please contact Hirwen Harendal
(harendalh <at> hotmail <dot> com).
-Clea F. Rees (cfrees <at> imapmail <dot> org)
-2010/08/03
+Clea F. Rees (ReesC21 <at> cardiff <dot> ac <dot> uk)
+
+Changes
+-------
+
+Version 1.2a fixes a bug **if** I've understood the problem correctly, which I'm
+far from sure about. (All it does is add a pair of curly brackets in the .sty.)
+
+Version 1.2b hopefully includes both the PDF *and* the TFM.
+
+2019/10/13
Binary files old/doc/fonts/adfsymbols/adfsymbols.pdf and new/doc/fonts/adfsymbols/adfsymbols.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/adfsymbols/adfsymbols.tex new/doc/fonts/adfsymbols/adfsymbols.tex
--- old/doc/fonts/adfsymbols/adfsymbols.tex 2010-09-12 19:54:53.000000000 +0200
+++ new/doc/fonts/adfsymbols/adfsymbols.tex 2019-10-03 23:05:00.000000000 +0200
@@ -1,7 +1,7 @@
% !TEX TS-program = pdflatex
% !TEX encoding = UTF-8 Unicode
%% adfsymbols.tex
-%% Copyright 2010 Clea F. Rees
+%% Copyright 2019 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -32,9 +32,9 @@
\usepackage[a4paper,headheight=13pt]{geometry}
\usepackage{microtype}
-\title{adfsymbols}
-\author{Clea F.\ Rees\footnote{cfrees <at> imapmail <dot> org}}
-\newcommand*{\dyddiad}{3\textsuperscript{rd} August, 2010}
+\title{adfsymbols\thanks{Version 1.2.}}
+\author{Clea F.\ Rees\footnote{ReesC21 <at> cardiff <dot> ac <dot> uk}}
+\newcommand*{\dyddiad}{24\textsuperscript{th} September, 2019}
\date{\dyddiad}
\pagestyle{fancy}
\fancyhf[ch]{}
@@ -250,4 +250,4 @@
\end{verbatim}
was used to customise this document's headers and footers with \lpack{fancyhdr}. (\verb|\dyddiad| is an uninteresting command which simply holds the date used for the document.)
-\end{document}
\ No newline at end of file
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/adfsymbols/manifest.txt new/doc/fonts/adfsymbols/manifest.txt
--- old/doc/fonts/adfsymbols/manifest.txt 2010-09-12 19:54:53.000000000 +0200
+++ new/doc/fonts/adfsymbols/manifest.txt 2019-10-03 23:05:00.000000000 +0200
@@ -1,4 +1,4 @@
-Copyright 2010 Clea F. Rees
+Copyright 2019 Clea F. Rees
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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adfsymbols.doc.tlpobj new/tlpkg/tlpobj/adfsymbols.doc.tlpobj
--- old/tlpkg/tlpobj/adfsymbols.doc.tlpobj 2019-02-28 03:13:50.000000000 +0100
+++ new/tlpkg/tlpobj/adfsymbols.doc.tlpobj 2020-03-24 01:55:53.000000000 +0100
@@ -1,9 +1,9 @@
name adfsymbols.doc
category Package
-revision 19766
+revision 54512
shortdesc doc files of adfsymbols
relocated 1
-docfiles size=106
+docfiles size=104
RELOC/doc/fonts/adfsymbols/COPYING
RELOC/doc/fonts/adfsymbols/NOTICE
RELOC/doc/fonts/adfsymbols/README
++++++ adfsymbols.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/adfsymbols/adfarrows.sty new/tex/latex/adfsymbols/adfarrows.sty
--- old/tex/latex/adfsymbols/adfarrows.sty 2010-09-12 19:54:53.000000000 +0200
+++ new/tex/latex/adfsymbols/adfarrows.sty 2019-10-13 23:38:49.000000000 +0200
@@ -1,4 +1,4 @@
-%% Copyright 2010 Clea F. Rees
+%% Copyright 2019 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -14,9 +14,9 @@
%
% This work consists of all files listed in manifest.txt.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{adfarrows}[2010/08/03 v1.0 adfarrows CFR]
+\ProvidesPackage{adfarrows}[2019/10/13 v1.2b adfarrows CFR]
\RequirePackage{pifont,fp}
-\Pifont{ArrowsADF}
+{\Pifont{ArrowsADF}}
\def\adfarrows@ot{opentail}%
\def\adfarrows@p{plain}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/adfsymbols/adfbullets.sty new/tex/latex/adfsymbols/adfbullets.sty
--- old/tex/latex/adfsymbols/adfbullets.sty 2010-09-12 19:54:53.000000000 +0200
+++ new/tex/latex/adfsymbols/adfbullets.sty 2019-10-13 23:38:49.000000000 +0200
@@ -1,4 +1,4 @@
-%% Copyright 2010 Clea F. Rees
+%% Copyright 2019 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -14,9 +14,9 @@
%
% This work consists of all files listed in manifest.txt.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{adfbullets}[2010/07/25 v1.0 adfbullets CFR]
+\ProvidesPackage{adfbullets}[2019/10/13 v1.2b adfbullets CFR]
\RequirePackage{pifont}
-\Pifont{BulletsADF}
+{\Pifont{BulletsADF}}
\newcommand*{\adfbullet}[1]{%
\Pisymbol{BulletsADF}{#1}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adfsymbols.tlpobj new/tlpkg/tlpobj/adfsymbols.tlpobj
--- old/tlpkg/tlpobj/adfsymbols.tlpobj 2019-02-28 03:13:51.000000000 +0100
+++ new/tlpkg/tlpobj/adfsymbols.tlpobj 2020-03-24 01:55:53.000000000 +0100
@@ -1,14 +1,11 @@
name adfsymbols
category Package
-revision 19766
+revision 54512
shortdesc SymbolsADF with TeX/LaTeX support
relocated 1
longdesc The package provides Arkandis foundry's ArrowsADF and
longdesc BulletsADF fonts in Adobe Type 1 format, together with
-longdesc TeX/LaTeX support files. The fonts are licensed under GPL v2 or
-longdesc later with font exception. (See NOTICE, COPYING, README.) The
-longdesc TeX/LaTeX support is licensed under LPPL. (See README,
-longdesc manifest.txt.)
+longdesc TeX/LaTeX support files.
execute addMap ArrowsADF.map
execute addMap BulletsADF.map
runfiles size=19
@@ -26,7 +23,6 @@
RELOC/tex/latex/adfsymbols/uarrowsadf.fd
RELOC/tex/latex/adfsymbols/ubulletsadf.fd
catalogue-ctan /fonts/adfsymbols
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl
-catalogue-topics font font-symbol font-type1
-catalogue-version 1.001
+catalogue-license lppl gpl2
+catalogue-topics font font-symbol font-type1 font-supp
+catalogue-version 1.2b
++++++ adjmulticol.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/adjmulticol/Makefile new/doc/latex/adjmulticol/Makefile
--- old/doc/latex/adjmulticol/Makefile 2011-02-25 00:37:42.000000000 +0100
+++ new/doc/latex/adjmulticol/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,63 +0,0 @@
-#
-# Makefile for adjmulticol package
-#
-# This file is in public domain
-#
-# $Id: Makefile,v 2.3 2011-02-22 22:46:46 boris Exp $
-#
-
-PACKAGE=adjmulticol
-SAMPLES = sample.tex
-
-all: $(PACKAGE).pdf ${SAMPLES:%.tex=%.pdf}
-
-
-%.pdf: %.dtx $(PACKAGE).sty
- pdflatex $<
- - bibtex $*
- pdflatex $<
- - makeindex -s gind.ist -o $*.ind $*.idx
- - makeindex -s gglo.ist -o $*.gls $*.glo
- pdflatex $<
- while ( grep -q '^LaTeX Warning: Label(s) may have changed' $*.log) \
- do pdflatex $<; done
-
-
-%.pdf: %.tex $(PACKAGE).sty
- pdflatex $<
- - bibtex $*
- pdflatex $<
- while ( grep -q '^LaTeX Warning: Label(s) may have changed' $*.log) \
- do pdflatex $<; done
-
-
-%.sty: %.ins %.dtx
- pdflatex $<
-
-
-
-.PRECIOUS: $(PACKAGE).cfg $(PACKAGE).sty
-
-
-clean:
- $(RM) $(PACKAGE).sty *.log *.aux \
- *.cfg *.glo *.idx *.toc \
- *.ilg *.ind *.out *.lof \
- *.lot *.bbl *.blg *.gls \
- *.dvi *.ps *.tgz *.zip
-
-veryclean: clean
- $(RM) *.pdf
-
-distclean: veryclean
-
-#
-# Archive for the distribution. Includes typeset documentation
-#
-archive: all clean
- tar -czvf $(PACKAGE).tgz --exclude '*~' --exclude '*.tgz' --exclude CVS .
-
-zip: all clean
- ${MAKE} $(PACKAGE).sty
- $(RM) *.log
- zip -r $(PACKAGE).zip * -x '*~' -x '*.tgz' -x '*.zip' -x "*.ins" -x CVS -x 'CVS/*'
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/adjmulticol/README new/doc/latex/adjmulticol/README
--- old/doc/latex/adjmulticol/README 2013-01-25 00:22:29.000000000 +0100
+++ new/doc/latex/adjmulticol/README 2020-03-07 22:39:53.000000000 +0100
@@ -1,5 +1,4 @@
Adjusting Margins for Multicolumn and Unicolumn Output
- Version 1.1
This package provides an extension of the multicol package with the
option to change the margins for multicolumn and unicolumn layout.
@@ -12,3 +11,4 @@
v1.1 Changed calculations for unicolumn layout
which might previously lead to loss of text
+ v1.2 Bug fix: now adjmulticols works inside a box too.
\ No newline at end of file
Binary files old/doc/latex/adjmulticol/adjmulticol.pdf and new/doc/latex/adjmulticol/adjmulticol.pdf differ
Binary files old/doc/latex/adjmulticol/sample.pdf and new/doc/latex/adjmulticol/sample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adjmulticol.doc.tlpobj new/tlpkg/tlpobj/adjmulticol.doc.tlpobj
--- old/tlpkg/tlpobj/adjmulticol.doc.tlpobj 2019-02-28 03:13:51.000000000 +0100
+++ new/tlpkg/tlpobj/adjmulticol.doc.tlpobj 2020-03-08 01:33:20.000000000 +0100
@@ -1,10 +1,9 @@
name adjmulticol.doc
category Package
-revision 28936
+revision 54157
shortdesc doc files of adjmulticol
relocated 1
-docfiles size=79
- RELOC/doc/latex/adjmulticol/Makefile
+docfiles size=77
RELOC/doc/latex/adjmulticol/README
RELOC/doc/latex/adjmulticol/adjmulticol.bib
RELOC/doc/latex/adjmulticol/adjmulticol.pdf
++++++ adjmulticol.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/adjmulticol/adjmulticol.sty new/tex/latex/adjmulticol/adjmulticol.sty
--- old/tex/latex/adjmulticol/adjmulticol.sty 2013-01-25 00:22:29.000000000 +0100
+++ new/tex/latex/adjmulticol/adjmulticol.sty 2020-03-07 22:39:53.000000000 +0100
@@ -20,7 +20,7 @@
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
-%% Copyright 2011, Boris Veytsman <borisv(a)lk.net>
+%% Copyright 2020, Boris Veytsman <borisv(a)lk.net>
%% 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
@@ -107,7 +107,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{adjmulticol}
-[2012/01/20 v1.1 Adjusted margins for multicolumn layout]
+[2020/03/06 v1.2 Adjusted margins for multicolumn layout]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{multicol}}
\ProcessOptions\relax
\RequirePackage{multicol}
@@ -161,8 +161,10 @@
#1\advance\vsize
\c@collectmore\baselineskip}
\def\endadjmulticols{%
- \def\@currenvir{multicols}%
- \endmulticols}
+ \global\let\@ADJMC@checkend\@checkend
+ \gdef\@checkend##1{}%
+ \endmulticols
+ \global\let\@checkend\@ADJMC@checkend}
\let\adjmc@page@sofar@orig=\page@sofar
\def\adjmc@page@sofar{%
\ifnum\col@number=\@ne
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adjmulticol.tlpobj new/tlpkg/tlpobj/adjmulticol.tlpobj
--- old/tlpkg/tlpobj/adjmulticol.tlpobj 2019-02-28 03:13:52.000000000 +0100
+++ new/tlpkg/tlpobj/adjmulticol.tlpobj 2020-03-08 01:33:20.000000000 +0100
@@ -1,6 +1,6 @@
name adjmulticol
category Package
-revision 28936
+revision 54157
shortdesc Adjusting margins for multicolumn and single column output
relocated 1
longdesc The package adds, to the multicol package, the option to change
@@ -9,8 +9,9 @@
longdesc two side printing.
runfiles size=2
RELOC/tex/latex/adjmulticol/adjmulticol.sty
+catalogue-contact-bugs https://github.com/borisveytsman/adjmulticol/issues
+catalogue-contact-repository https://github.com/borisveytsman/adjmulticol
catalogue-ctan /macros/latex/contrib/adjmulticol
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics multicol layout
-catalogue-version 1.1
+catalogue-version 1.2
++++++ adobemapping.tar.xz ++++++
++++ 20594 lines of diff (skipped)
++++++ adtrees.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/adtrees/README new/doc/latex/adtrees/README
--- old/doc/latex/adtrees/README 2016-01-20 23:46:59.000000000 +0100
+++ new/doc/latex/adtrees/README 2019-07-11 23:04:12.000000000 +0200
@@ -2,8 +2,8 @@
formalism devoted to represent natural language expressions.
The package is composed by the filed
-- adtree.sty: containing the LaTeX engine to adpositional trees;
-- adtreedoc.pdf: the human readable documentation for the package;
-- adtreedoc.tex: the source code for the documentation.
+- adtrees.sty: containing the LaTeX engine to adpositional trees;
+- adtreesdoc.pdf: the human readable documentation for the package;
+- adtreesdoc.tex: the source code for the documentation.
The package is distributed under the GNU General Public License.
Binary files old/doc/latex/adtrees/adtreesdoc.pdf and new/doc/latex/adtrees/adtreesdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/adtrees/adtreesdoc.tex new/doc/latex/adtrees/adtreesdoc.tex
--- old/doc/latex/adtrees/adtreesdoc.tex 2016-01-20 23:46:59.000000000 +0100
+++ new/doc/latex/adtrees/adtreesdoc.tex 2019-07-11 23:04:12.000000000 +0200
@@ -4,6 +4,7 @@
\usepackage{graphics}
\usepackage{adtrees}
\usepackage{url}
+\usepackage{microtype}
\begin{document}
\title{Adpositional Trees in \LaTeX}
@@ -17,7 +18,7 @@
\author[Federico Gobbo]{Federico Gobbo}
\address[Federico Gobbo]{Faculty of Humanities\\
University of Amsterdam\\
- Spuistraat 210,NL-1012VT Amsterdam, The Netherlands}
+ Spuistraat 134,NL-1012VT Amsterdam, The Netherlands}
\email{F.Gobbo(a)uva.nl}
\urladdr{http://federicogobbo.name}
\maketitle
@@ -31,16 +32,9 @@
Scholar Press (2011). Since then, they have been used without
theoretical modifications in a number of applications.
-This document describes the \LaTeX\/ package to draw adtrees. This
-package is an improvement over the original one used to typeset all
-the examples in the previously cited book. The present package
-maintains the same graphical presentation with a number of
-improvements, and an incompatible syntax. Also, the original package,
-although never distributed, is no longer maintained.
-
-This document describes all the features of the package. It is written
-so that a user may start typesetting adtrees as soon as possible: all
-the fundamental commands and macros are presented in
+This document describes the \LaTeX\/ package to draw adtrees. It is
+written so that a user may start typesetting adtrees as soon as
+possible: all the fundamental commands and macros are presented in
Section~\ref{sec:simple}. At the first reading, the subsequent
sections may be freely skipped.
@@ -56,20 +50,28 @@
affect the construction of the various pieces composing
adtrees. Changing these definitions is intended for advanced users,
who want to modify the standard appearance of
-adtrees. Section~\ref{sec:hints} concludes the description of the
+adtrees. Section~\ref{sec:hints} concludes the description of the main
graphical package, showing some special techniques to deal with
adtrees, and a couple of very low-level primitives of the package.
+Sections~\ref{sec:pathlike} and~\ref{sec:tabular} describe two
+alternatives way to compose adtrees. the former shows a
+\emph{path-like} format which is useful when keeping the order of
+morphemes in the original sentence is important; the latter is a
+textual rendering of an adtree as a piece of indented text.
+
The final Section~\ref{sec:linear} describes the way to render adtrees
in a linear format. This is a minor feature which we discourage to
use, except for very special purposes.
% --------------------------
+\clearpage
\section{Simple Adtrees}\label{sec:simple}
The installation of the package is standard: see the documentation on
-your particular \TeX\/ system for the details. Using the package in a
-document requires it to be invoked with
-\verb|\usepackage{adtrees}|.\vspace{1.5ex}
+your particular \TeX\/ system for the details. It reduces to put the
+\verb|.sty| file in a sensible place. Using the package in a document
+requires it to be invoked with
+\verb|\usepackage{adtrees}| in the preamble.\vspace{1.5ex}
The simplest adtree is composed by a single morpheme:
\begin{equation*}
@@ -112,7 +114,7 @@
\emph{trajectory}. The trajectory is an arrow, and it can be
$\leftarrow$, $\rightarrow$, or $\leftrightarrow$. The following three
examples are very similar to the ones in Figure 2.11 of Gobbo and
-Benini (2011:24):
+Benini (2011):
\begin{equation*}
\ATr{to}{I_2^2}
{\ATm{Kim}{O_2}}
@@ -222,7 +224,7 @@
\verb|r| for \emph{left} and \emph{right}, respectively. They both
take a single argument which is the adtree being appended at the end
of the extended branch. For example, the following adtree, similar to
-the one in Figure~2.16 (Gobbo and Benini 2011:29):
+the one in Figure~2.16 (Gobbo and Benini 2011):
\begin{equation*}
\unitlength.23ex
\ATl{with}{I^3_3}[phrase]
@@ -264,7 +266,7 @@
Sometimes, for the sake of clarity, morphological relations should be
stated explicitly. For example, the following adtree:
\begin{equation*}
- \unitlength.2ex
+% \unitlength.3ex
\ATr{-ly}{E>I^3_2}
{\ATm{quick-}{A}}
{\ATre{I^3_2}
@@ -307,9 +309,11 @@
typesetting of adtrees using the $\mu$ adposition.
% --------------------------
+\clearpage
\section{Alignments and Centring}\label{sec:centring}
Drawing an adtree in a display is the simplest and most common way:
\begin{equation*}
+ \unitlength.18ex
\ATl{with}{I^3_3}
{\ATs{the key}{O_3}}
{\ATre{I^3_2}
@@ -319,6 +323,7 @@
is generated by the following code
\begin{verbatim}
\begin{equation*}
+ \unitlength.18ex
\ATl{with}{I^3_3}
{\ATs{the key}{O_3}}
{\ATre{I^3_2}
@@ -334,13 +339,13 @@
In general, we strongly encourages the user to use a robust display
environment, like \verb|equation*| or \verb|displaymath|, and to avoid
the \verb|center| environment. Advanced displays to align mathematical
-material, as in AMS-\TeX\/, are another good and reliable option to
-place adtrees in a page.\vspace{1.5ex}
+material, as in the \AmS\ suite, are another good and reliable option
+to place adtrees in a page.\vspace{1.5ex}
An adtree fits exactly its enclosing box, that is
\begin{equation*}
\fboxsep0pt
- \unitlength.3ex
+ \unitlength.18ex
\fbox{\ATl{with}{I^3_3}
{\ATs{the key}{O_3}}
{\ATre{I^3_2}
@@ -352,11 +357,11 @@
on purpose, to make easier to collate together adtrees.\vspace{1.5ex}
Writing a morpheme or a summary directly inside the text, like
-\ATm{Gargoyle}{O}, produces a box whose baseline is exactly the
+\fbox{\ATm{Gargoyle}{O}}, produces a box whose baseline is exactly the
baseline of the morpheme. This makes the behaviour predictable, even
if the graphical appearance is quite terrible (like in this
-paragraph). An adtree, like \ATre{I_2^2} {\ATm{the box}{O_2}}
-{\ATbe{I_1^2}{\ATm{Kim}{O_1}}{\ATs{owns}{I^2}}}, behaves similarly,
+paragraph). An adtree, like \fbox{\ATre{I_2^2} {\ATm{the box}{O_2}}
+ {\ATbe{I_1^2}{\ATm{Kim}{O_1}}{\ATs{owns}{I^2}}}}, behaves similarly,
because the baseline of the box is the baseline of the lowest morpheme
or summary in the whole tree, the one corresponding to the \emph{owns}
morpheme in the example.
@@ -401,6 +406,7 @@
in Section~\ref{sec:hints}.
% --------------------------
+\clearpage
\section{Dealing with Complex Adtrees}\label{sec:complex}
Simple adtrees are easily typeset using the previously described
commands. But, sooner or later, one has to typeset a complex adtree,
@@ -411,61 +417,63 @@
The simplest and crudest one is to change the length of branches. In
this respect, branches are drawn using the \LaTeX\/ \verb|picture|
-environment, so the length of each branch is
-$25\verb|\unitlength|$. The value of \verb|\unitlength| may be changed
-globally, affecting the way all subsequent adtrees in a document are
-typeset. Also, the value may be changed inside a surrounding group,
-which affects only the adtree to be typeset, but not the rest of the
-document. Finally, the value of \verb|\unitlength| can be changed
-within the adtree, to affect the point where the change appears and
-all the subtrees. Notice how there is no way to directly change the
-value of \verb|\unitlength| in a single node: we will return on this
-point later.
+environment, so the length of each branch is $25\verb|\unitlength|$.
+
+The value of \verb|\unitlength| may be changed globally, affecting the
+way all subsequent adtrees in a document are typeset. Also, the value
+may be changed inside a surrounding group, which affects only the
+adtree to be typeset, but not the rest of the document.
+
+Finally, the value of \verb|\unitlength| can be changed within the
+adtree, to affect the point where the change appears and all the
+subtrees. Notice how there is no way to directly change the value of
+\verb|\unitlength| in a single node: we will return on this point
+later.
For example,
\begin{equation*}
- {\unitlength.3ex
+ {\unitlength.28ex
\ATl{with}{I^3_3}
{\ATs{the key}{O_3}}
{\ATre{I^3_2}
{\ATs{the door}{O_2}}
{\ATs{will be opened}{I^3}}} }
\end{equation*}
-has been typeset by
+has been typeset adopting the strategy to affect all the branches in
+the adtree:
\begin{verbatim}
- {\unitlength.3ex
- \ATl{with}{I^3_3}
- {\ATs{the key}{O_3}}
- {\ATre{I^3_2}
- {\ATs{the door}{O_2}}
- {\ATs{will be opened}{I^3}}} }
+ {\unitlength.3ex
+ \ATl{with}{I^3_3}{\ATs{the key}{O_3}}
+ {\ATre{I^3_2}
+ {\ATs{the door}{O_2}}
+ {\ATs{will be opened}{I^3}}} }
\end{verbatim}
-adopting the strategy to affect all the branches in the adtree. Notice
-how the outermost braces limit the scope of the change to the value of
-\verb|\unitlength|.
On the contrary,
-\begin{equation*}
- \ATl{with}{I^3_3}
- {\unitlength.12ex\ATxl{\ATbe{O_3}
- {\ATm{the}{A}}
- {\ATm{key}{O}}}}
- {\unitlength.33ex\ATre{I^3_2}
- {\ATs{the door}{O_2}}
- {\ATs{will be opened}{I^3}}}
-\end{equation*}
-modifies the length of all the branches in the left subtree to
-\verb|3ex| (since $3 = 25 \cdot 0.12$), and to \verb|8.25ex| in the
-right subtree
\begin{verbatim}
+ \unitlength.31ex
\ATl{with}{I^3_3}
{\unitlength.12ex\ATxl{\ATbe{O_3}
{\ATm{the}{A}}
{\ATm{key}{O}}}}
- {\unitlength.33ex\ATre{I^3_2}
+ {\unitlength.28ex\ATre{I^3_2}
{\ATs{the door}{O_2}}
{\ATs{will be opened}{I^3}}}
\end{verbatim}
+modifies the length of all the branches in the left subtree to
+\verb|3ex| (since $3 = 25 \cdot 0.12$), and to \verb|7ex| in the
+right subtree, while the outer branches have a length of
+\verb|7.75ex|, obtaining
+\begin{equation*}
+ \unitlength.31ex
+ \ATl{with}{I^3_3}
+ {\unitlength.12ex\ATxl{\ATbe{O_3}
+ {\ATm{the}{A}}
+ {\ATm{key}{O}}}}
+ {\unitlength.28ex\ATre{I^3_2}
+ {\ATs{the door}{O_2}}
+ {\ATs{will be opened}{I^3}}}
+\end{equation*}
The adposition, and the related arrow and grammar character are moved
accordingly, which is not pleasant in this example, although it is
@@ -486,9 +494,9 @@
latest example. This can be achieved using the length variant of the
adtree drawing commands. There are also an angle variant, and a
variant affecting both the length and the angle.
-
The complete list of complex adtree drawing commands, with all the
-variants is:
+variants is in Table~\ref{tab:1}
+\begin{table}
\begin{center}
\begin{tabular}{cccc}\renewcommand{\arraystretch}{1.3}
\textbf{base command} & \textbf{length variant} & \textbf{angle
@@ -517,6 +525,9 @@
\hline
\end{tabular}
\end{center}
+\caption{Complex adtrees drawing command.}\label{tab:1}
+\end{table}
+
The names of these commands are easy to remember: the length variant
has a trailing \verb|L|, the angle variant a trailing \verb|A|, and
the combined variant a trailing \verb|LA|.
@@ -539,7 +550,7 @@
any other values resorts to the default.
The combined variant requires two additional arguments, the length and
-the angle, in this order, before any other parameter.
+the angle, in this order, before any other parameter.\vspace*{1.5ex}
A hidden, very technical, feature of the package is that, whatever
follows the length in the \verb|L| argument gets evaluated inside the
@@ -609,7 +620,7 @@
$120$ degrees. These values are the only possible ones, also in the
angle variant of the commands, as said before. Moreover, the value
$60$, $90$, or $120$ passed to the angle variant of a command (or to
-the combined variant) affect the node locally, as in the length
+the combined variant) affects the node locally, as in the length
variants' case.
For example
@@ -663,6 +674,7 @@
fall beyond the base of the branches.
% --------------------------
+\clearpage
\section{Internal Constructions}\label{sec:internal}
All the major parts of an adtree can be customised. This section
describes a number of definitions which are used to control the
@@ -729,9 +741,9 @@
{\ATs{The box belongs}{I^2_1}}}
\end{verbatim}
-The \verb|L| hidden feature of the package, already introduces, allows
-to redefine these commands within the scope of a single node, as in
-the root of
+The \verb|L| hidden feature of the package, already introduced, which
+injects code into the macro expansion, allows to redefine these
+commands within the scope of a single node, as in the root of
\begin{equation*}
\ATrL{\unitlength\def\ATpreadpositionskip{\vskip-2ex}}
{to}{I_2^2}{\ATm{Kim}{O}}
@@ -944,6 +956,7 @@
be taken in account when changing the definition.
% --------------------------
+\clearpage
\section{Hints and Tricks}\label{sec:hints}
There are a few last features which can be exploited in the
\verb|adtrees| package. These are the low-level commands to draw the
@@ -963,12 +976,11 @@
For example,
\begin{equation*}
- \unitlength.2ex
+ \unitlength.26ex
{\def\ATrightbranch#1#2{\color{red}\line(#1,#2)}
\ATlL{\unitlength
\def\ATleftbranch##1##2{\color{green}\line(##1,##2)}}
- {with}{I^3_3}
- {\ATs{the key}{O_3}}
+ {with}{I^3_3}{\ATs{the key}{O_3}}
{\ATre{I^3_2}
{\ATxl{\ATs{the door}{O_2}}}
{\ATs{will be opened}{I^3}}} }
@@ -1095,9 +1107,420 @@
\end{verbatim}
Changing \verb|\small| in the above code, modifies the size of the
components of the adposition block. We suggest to avoid such a change,
-except in a local group which contains a complete adtree.
+except in a local group which contains a complete adtree.\vfill
% --------------------------
+\clearpage
+\section{Path-like Adtrees}\label{sec:pathlike}
+Adtrees are abstract representation of pieces of text. When the
+relation with an effective piece of text is relevant, a different
+representation is preferred: path-like adtrees. For example, the
+expression ``the girl for whom the man bought the book'' is rendered as
+\begin{displaymath}
+ \begin{pathlikeadtree}
+ the [A] ( 1,1)[\overleftarrow{O}] &
+ girl [O] &
+ for [U] ( 5,4)[\overleftarrow{I^4_3}] &
+ wh- [U] (-2,6)[\overleftarrow{O}] &
+ om [O_2] (-2,1)[\overleftarrow{O_2}] &
+ the [A] ( 1,1)[\overleftarrow{O_1}] &
+ man [O_1] ( 1,2)[\overleftarrow{I^4_1}] &
+ bought [I^4_{\mathsf{dep}}] (-4,5)[\overrightarrow{A}] &
+ the [A] ( 1,1)[\overleftarrow{O_2}] &
+ book [O_2] (-2,3)[\overleftarrow{I^4_2}]
+ \end{pathlikeadtree}
+\end{displaymath}
+from the code
+\begin{verbatim}
+ \begin{pathlikeadtree}
+ the [A] ( 1,1)[\overleftarrow{O}] &
+ girl [O] &
+ for [U] ( 5,4)[\overleftarrow{I^4_3}] &
+ wh- [U] (-2,6)[\overleftarrow{O}] &
+ om [O_2] (-2,1)[\overleftarrow{O_2}] &
+ the [A] ( 1,1)[\overleftarrow{O_1}] &
+ man [O_1] ( 1,2)[\overleftarrow{I^4_1}] &
+ bought [I^4_{\mathsf{dep}}] (-4,5)[\overrightarrow{A}] &
+ the [A] ( 1,1)[\overleftarrow{O_2}] &
+ book [O_2] (-2,3)[\overleftarrow{I^4_2}]
+ \end{pathlikeadtree}
+\end{verbatim}
+
+To write a path-like adtree one encloses it into a
+\verb!pathlikeadtree! environment. Then, each \emph{cell} is written.
+Cells are separated by \verb|&|. A cell is composed by a
+\emph{morpheme}, a \emph{grammar character}, and one or more
+\emph{arcs}. The morpheme $m$ comes first with his grammar character
+following in square brackets:
+\begin{verbatim}
+ \begin{pathlikeadtree}
+ morhpeme [G]
+ \end{pathlikeadtree}
+\end{verbatim}
+produces
+\begin{displaymath}
+ \begin{pathlikeadtree}
+ morhpeme [G]
+ \end{pathlikeadtree}
+\end{displaymath}
+
+An arc is specified as \verb|(|$t$\verb|,|$h$\verb|)[|$g$\verb|]|
+where $t$ is the \emph{target}, i.e., the node to which the arc is
+directed, $h$ is the \emph{height} of the arc, which \textbf{must} be
+a positive integer, and $g$ is the \emph{grammar character} of the
+composition of expressions which the arc intend to represent. It
+should be remarked that there \textbf{must} be no space between
+\verb|)| and \verb|[|. For example,
+\begin{displaymath}
+ \begin{pathlikeadtree}
+ the[A](1,1)[\overleftarrow{O}] &
+ girl[O]&for[U]&wh-[U]&om[O_2]&the[A]&man[O_1]&
+ bought[I^4_{\mathsf{dep}}]&the[A]&book[O_2]
+ \end{pathlikeadtree}
+\end{displaymath}
+has been typeset by
+\begin{verbatim}
+ \begin{pathlikeadtree}
+ the[A](1,1)[\overleftarrow{O}] &
+ girl[O]&for[U]&wh-[U]&om[O_2]&the[A]&man[O_1]&
+ bought[I^4_{\mathsf{dep}}]&the[A]&book[O_2]
+ \end{pathlikeadtree}
+\end{verbatim}
+
+The target uses a \emph{relative} specification: in the example, it is
+one step forward with respect to the node it has been written into. Of
+course, going backwards is possible, by using a negative value for the
+target:
+\begin{displaymath}
+ \begin{pathlikeadtree}
+ the[A]&girl[O]&for[U]&
+ wh-[U] (-2,2)[\overleftarrow{O}] &
+ om[O_2]&the[A]&man[O_1]&bought[I^4_{\mathsf{dep}}]&
+ the[A]&book[O_2]
+ \end{pathlikeadtree}
+\end{displaymath}
+\begin{verbatim}
+ \begin{pathlikeadtree}
+ the[A]&girl[O]&for[U]&
+ wh-[U] (-2,2)[\overleftarrow{O}] &
+ om[O_2]&the[A]&man[O_1]&bought[I^4_{\mathsf{dep}}]&
+ the[A]&book[O_2]
+ \end{pathlikeadtree}
+\end{verbatim}
+However, it is possible to specify an \emph{absolute} position
+prepending a \verb|!| to the target:
+\begin{verbatim}
+ \begin{pathlikeadtree}
+ the[A]&girl[O]&
+ for[U] (!8,1)[\overleftarrow{I^4_3}] &
+ wh-[U]&om[O_2]&the[A]&man[O_1]&
+ bought[I^4_{\mathsf{dep}}]&the[A]&book[O_2]
+ \end{pathlikeadtree}
+\end{verbatim}
+\begin{displaymath}
+ \begin{pathlikeadtree}
+ the[A]&girl[O]&
+ for[U] (!8,1)[\overleftarrow{I^4_3}] &
+ wh-[U]&om[O_2]&the[A]&man[O_1]&
+ bought[I^4_{\mathsf{dep}}]&the[A]&book[O_2]
+ \end{pathlikeadtree}
+\end{displaymath}
+
+The appearance of a path-like adtree is controlled by a number of
+parameters which the user may customise:
+\begin{itemize}
+\item \verb|\ATpathinterskip| (default: \verb|.5em|) is the distance
+ between two cells;
+\item \verb|\ATpathunitlength| (default: \verb|4ex|) corresponds to
+ the length of a line of height $1$;
+\item \verb|\ATpicskip| (default: \verb|.2ex|) is the distance between
+ the upper text and the arcs below;
+\item \verb|\ATpathlinethickness| (default: \verb|.1em|) specifies the
+ thickness of the arcs;
+\item \verb|\ATpathlabelhspace| (default: \verb|.3em|) defines the
+ horizontal space between the grammar character in an arc and the
+ vertical line of the arc to which it is closer;
+\item \verb|\ATpathlabelvspace| (default: \verb|1ex|) defines the
+ vertical space between the baseline of the grammar character in an
+ arc and the horizontal line of the arc.
+\end{itemize}
+Finally, the way in which the grammar characters are written is
+customisable by changing their default boxes. They are defined as
+\begin{verbatim}
+ \def\ATnGCBox#1{\@ATsmall$\mathrm{#1}$}
+ \def\ATlGCBox#1{\@ATsmall$\mathrm{#1}$}
+\end{verbatim}
+with \verb|\ATnGCBox| controlling the rendering of the part below each
+morpheme, and \verb|\ATlGCBox| controlling the labels of the arcs.
+
+As an example,
+\begin{displaymath}
+ \ATpathinterskip1.2em
+ \ATpathunitlength4.5ex
+ \ATpicskip1ex
+ \ATpathlinethickness.2pt
+ \ATpathlabelhspace1em
+ \ATpathlabelvspace2ex
+ \begin{pathlikeadtree}
+ the [A] ( 1,1)[\overleftarrow{O}] &
+ girl [O] &
+ for [U] ( 5,4)[\overleftarrow{I^4_3}] &
+ wh- [U] (-2,6)[\overleftarrow{O}] &
+ om [O_2] (-2,1)[\overleftarrow{O_2}] &
+ the [A] ( 1,1)[\overleftarrow{O_1}] &
+ man [O_1] ( 1,2)[\overleftarrow{I^4_1}] &
+ bought [I^4_{\mathsf{dep}}] (-4,5)[\overrightarrow{A}] &
+ the [A] ( 1,1)[\overleftarrow{O_2}] &
+ book [O_2] (-2,3)[\overleftarrow{I^4_2}]
+ \end{pathlikeadtree}
+\end{displaymath}
+has been typeset by
+\begin{verbatim}
+ \ATpathinterskip1.2em
+ \ATpathunitlength4.5ex
+ \ATpicskip1ex
+ \ATpathlinethickness.2pt
+ \ATpathlabelhspace1em
+ \ATpathlabelvspace2ex
+ \begin{pathlikeadtree}
+ the [A] ( 1,1)[\overleftarrow{O}] &
+ girl [O] &
+ for [U] ( 5,4)[\overleftarrow{I^4_3}] &
+ wh- [U] (-2,6)[\overleftarrow{O}] &
+ om [O_2] (-2,1)[\overleftarrow{O_2}] &
+ the [A] ( 1,1)[\overleftarrow{O_1}] &
+ man [O_1] ( 1,2)[\overleftarrow{I^4_1}] &
+ bought [I^4_{\mathsf{dep}}] (-4,5)[\overrightarrow{A}] &
+ the [A] ( 1,1)[\overleftarrow{O_2}] &
+ book [O_2] (-2,3)[\overleftarrow{I^4_2}]
+ \end{pathlikeadtree}
+\end{verbatim}
+
+Path-like adtrees as explained so far are useful to represent adtrees
+having $\epsilon$-only adpositions. Since every adtree, up to a
+syntactical transformation, can be represented in this way, although
+losing some pieces of structural content, path-like adtrees drawn
+using the previously explained features are completely general.
+
+However, there is less elegant way of writing general adtrees in the
+path-like form, in which adpositions are directly referred to in the
+arcs.
+
+In short, the arc syntax is generalised to
+\verb|(|$t$\verb|,|$h$\verb|)[|$g$\verb|]|\verb|<|$a$\verb|>| where
+the $a$ specifies the adposition, either using the relative or the
+absolute \verb|!| syntax. Of course, when there is no explicit
+adpostion to refer, i.e., the adposition is $\epsilon$, the previous
+syntax, without the parameter in angle brackets, is used.
+
+As an illustration,
+\begin{displaymath}
+ \ATpathinterskip1.2em
+ \begin{pathlikeadtree}
+ the [A] ( 1,1)[\overleftarrow{O}] &
+ girl [O] &
+ for [U] &
+ wh- [U] &
+ om [O_2] ( 3,4)[\overleftarrow{I^4_3}]<!3> &
+ the [A] ( 1,1)[\overleftarrow{O_1}] &
+ man [O_1] ( 1,2)[\overleftarrow{I^4_1}] &
+ bought [I^4_{\mathsf{dep}}] (-6,6)[\overrightarrow{A}]<-4> &
+ the [A] ( 1,1)[\overleftarrow{O_2}] &
+ book [O_2] (-2,3)[\overleftarrow{I^4_2}]
+ \end{pathlikeadtree}
+\end{displaymath}
+has been typeset by
+\begin{verbatim}
+\begin{displaymath}
+ \ATpathinterskip1.2em
+ \begin{pathlikeadtree}
+ the [A] ( 1,1)[\overleftarrow{O}] &
+ girl [O] &
+ for [U] &
+ wh- [U] &
+ om [O_2] ( 3,4)[\overleftarrow{I^4_3}]<!3> &
+ the [A] ( 1,1)[\overleftarrow{O_1}] &
+ man [O_1] ( 1,2)[\overleftarrow{I^4_1}] &
+ bought [I^4_{\mathsf{dep}}] (-6,6)[\overrightarrow{A}]<-4> &
+ the [A] ( 1,1)[\overleftarrow{O_2}] &
+ book [O_2] (-2,3)[\overleftarrow{I^4_2}]
+ \end{pathlikeadtree}
+\end{displaymath}
+\end{verbatim}\vspace{1.5ex}
+
+There are a few hints and tricks about path-like adtrees: first, as in
+the case of adtrees, the \verb|pathlikeadtree| environment produces a
+\TeX{} box, thus it can be manipulated by, e.g., rotating, scaling,
+etc.
+
+Second, while the syntax inside the \verb|pathlikeadtree| is quite
+rigid, it is possible to locally use commands by putting them in the
+morpheme of a cell. The effects of this commands influence the cell
+from the point they are issued, but also all the subsequent
+cells. Beware that using commands with side effects inside a
+\verb|pathlikeadtree| environment is an hack, which requires a deep
+understanding of how the code of the package operates.
+
+The third way to radically affect the appearance of a path-like adtree
+is to redefine \verb|\ATpathpichook|, which is \verb|\def|ined to be
+empty by default. This command is issued just before each arc is
+drawn. To code sophisticated manipulations of the drawing process
+requires to understand how the drawing engine works. However, for
+simple manipulations, it suffices to know that \verb|\@ATpa| contains
+the index of the source cell of an arc, \verb|\@ATpb| the index of the
+target cell, \verb|\@ATpc| the height, \verb|\@ATsa| is a box register
+containing the already formatted grammar character of an arc, and
+\verb|\@ATpe| is either $0$ or the index of the adposition cell.
+Needless to say, using this feature is for advanced users only.
+
+% --------------------------
+\clearpage
+\section{Tabular Adtrees}\label{sec:tabular}
+Sometimes it is useful to have a purely textual representation of an
+adtree, which is more compact and fits, e.g., in a double column
+format. For example
+\begin{equation*}
+ \ATrLA{2\unitlength}{120}{wh-}{O}
+ {\ATr{for}{I}
+ {\ATs{the girl}{O}}
+ {\ATle{I^4_2}
+ {\ATs{the book}{Y}}
+ {\ATre{I^4_1}
+ {\ATm{-o}{X}}
+ {\ATs{bought}{I^4_{\mathrm{dep}}}}}}}
+ {\ATle{O}
+ {\ATm{the}{A}}
+ {\ATm{man}{O}}}
+\end{equation*}
+can be rendered as
+\begin{ATtabulardisplay}
+ \ATrLA{2\unitlength}{120}{wh-}{O}
+ {\ATr{for}{I}
+ {\ATs{the girl}{O}}
+ {\ATle{I^4_2}
+ {\ATs{the book}{Y}}
+ {\ATre{I^4_1}
+ {\ATm{-o}{X}}
+ {\ATs{bought}{I^4_{\mathrm{dep}}}}}}}
+ {\ATle{O}
+ {\ATm{the}{A}}
+ {\ATm{man}{O}}}
+\end{ATtabulardisplay}
+
+Obtaining this effect is as simple as enclosing the adtree into a
+\verb!ATtabulardisplay! environment. The previous example has been
+typeset by
+\begin{verbatim}
+ \begin{ATtabulardisplay}
+ \ATrA{120}{wh-}{O}
+ {\ATr{for}{I}
+ {\ATs{the girl}{O}}
+ {\ATle{I^4_2}
+ {\ATs{the book}{Y}}
+ {\ATre{I^4_1}
+ {\ATm{-o}{X}}
+ {\ATs{bought}{I^4_{\mathrm{dep}}}}}}}
+ {\ATle{O}{\ATm{the}{A}}{\ATm{man}{O}}}
+ \end{ATtabulardisplay}
+\end{verbatim}
+
+The environment uses the \verb|\ATtabskip| command to declare the
+amount of space to use for indenting the sub-trees. The default is
+\verb|\def\ATtabskip{\hspace*{1em}}|. In addition, the whole
+environment is moved on the right by \verb|\ATtabindent|, with default
+value \verb|\def\ATtabindent{\hspace*{2em}}|.
+
+Alternatively, the environment \verb|ATtabular| allows to typeset the
+adtree in the same way but inside a box, which can then be manipulated
+as one pleases:
+\begin{displaymath}
+ \fbox{$\vcenter{\begin{ATtabular}
+ \ATrLA{2\unitlength}{120}{wh-}{O}
+ {\ATr{for}{I}
+ {\ATs{the girl}{O}}
+ {\ATle{I^4_2}
+ {\ATs{the book}{Y}}
+ {\ATre{I^4_1}
+ {\ATm{-o}{X}}
+ {\ATs{bought}{I^4_{\mathrm{dep}}}}}}}
+ {\ATle{O}
+ {\ATm{the}{A}}
+ {\ATm{man}{O}}}
+ \end{ATtabular}}$} =
+ \fbox{$\vcenter{\begin{ATtabular}
+ \ATrLA{2\unitlength}{120}{wh-}{O}
+ {\ATr{for}{I}
+ {\ATs{the girl}{O}}
+ {\ATle{I^4_2}
+ {\ATs{the book}{Y}}
+ {\ATre{I^4_1}
+ {\ATm{-o}{X}}
+ {\ATs{bought}{I^4_{\mathrm{dep}}}}}}}
+ {\ATle{O}
+ {\ATm{the}{A}}
+ {\ATm{man}{O}}}
+ \end{ATtabular}}$}
+\end{displaymath}
+\begin{verbatim}
+ \fbox{$\vcenter{
+ \begin{ATtabular}
+ \ATrLA{2\unitlength}{120}{wh-}{O}
+ {\ATr{for}{I}
+ {\ATs{the girl}{O}}
+ {\ATle{I^4_2}
+ {\ATs{the book}{Y}}
+ {\ATre{I^4_1}
+ {\ATm{-o}{X}}
+ {\ATs{bought}{I^4_{\mathrm{dep}}}}}}}
+ {\ATle{O}
+ {\ATm{the}{A}}
+ {\ATm{man}{O}}}
+ \end{ATtabular}}$} =
+ \fbox{$\vcenter{
+ \begin{ATtabular}
+ \ATrLA{2\unitlength}{120}{wh-}{O}
+ {\ATr{for}{I}
+ {\ATs{the girl}{O}}
+ {\ATle{I^4_2}
+ {\ATs{the book}{Y}}
+ {\ATre{I^4_1}
+ {\ATm{-o}{X}}
+ {\ATs{bought}{I^4_{\mathrm{dep}}}}}}}
+ {\ATle{O}
+ {\ATm{the}{A}}
+ {\ATm{man}{O}}}
+ \end{ATtabular}}$}
+\end{verbatim}
+
+The various pieces of the adtree are rendered according to the
+following definitions, which could be modified on need, see also the
+next section, keeping in mind that they are not for the casual user.
+\begin{verbatim}
+ \def\ATtabularadpositionblock#1#2#3{%
+ \hbox{\ATtabindent\AT@loop@tab%
+ {#2}\textsuperscript{#1}\textsubscript{#3}}}
+ \def\ATtabularmorphemeblock#1#2{
+ \hbox{\ATtabindent\AT@loop@tab%
+ {#1}\textsubscript{#2}}}
+ \def\ATtabularsummaryblock#1#2{
+ \hbox{\ATtabindent\AT@loop@tab%
+ \mbox{$\triangle($}%
+ \mbox{#1}\mbox{$)$}\textsubscript{#2}}}
+ \def\ATtabularfirstattribute{\ATlinearfirstattribute}
+ \def\ATtabularnextattribute{\ATlinearnextattribute}
+ \def\ATtabularsubtrees#1#2{%
+ \advance\@AT@tabcount1%
+ \vbox{#1\relax#2}%
+ \advance\@AT@tabcount-1}
+\end{verbatim}
+
+Finally the \verb|\ATTabular| command can be used to switch from the
+normal graphical rendering of adtrees to the tabular one. This is a
+low-level command which has been left accessible to end-users willing
+to write their own environments when \verb|ATtabular| is not enough.
+
+% --------------------------
+\clearpage
\section{Linear Adtrees}\label{sec:linear}
Adtrees can be rendered in a linear format. This is not graphically
pleasant, so we discourage users to adopt it.\vspace{1.5ex}
@@ -1105,11 +1528,11 @@
Nevertheless, it may be useful to have a very compact representation
of adtrees. This can be automatically obtained by prepending the
\verb|\ATlinearise| command to an adtree. For example
-\begin{equation*}
+\begin{center}
\ATlinearise{\ATlcL{.3ex}{I_2^2}[phrase]
{\ATm{\cancel{something}}{O}[object][fruit]}
{\ATs{Kim eats}{I_1^2}}}
-\end{equation*}
+\end{center}
is the same as
\begin{equation*}
\ATlcL{.3ex}{I_2^2}[phrase]
@@ -1135,13 +1558,14 @@
Linear adtrees are composed using the following commands
\begin{verbatim}
- \def\ATlinearadpositionblock#1#2#3{%
- {#2}${}^{\hbox{#1}}_{\hbox{#3}}$}
- \def\ATlinearfirstattribute#1#2{{#1}:{#2}}
- \def\ATlinearnextattribute#1#2{{#1};{#2}}
- \def\ATlinearsubtrees#1#2{(#1,\linebreak[0] #2)}
- \def\ATlinearmorphemeblock#1#2{{#1}${}_{\hbox{#2}}$}
- \def\ATlinearsummaryblock#1#2{({#1})${}_{\hbox{#2}}$}
+ \def\ATlinearadpositionblock#1#2#3%
+ {{#2}\textsuperscript{#1}\textsubscript{#3}}
+ \def\ATlinearfirstattribute#1{{#1}:}
+ \def\ATlinearnextattribute#1{{#1};}
+ \def\ATlinearsubtrees#1#2{(#1,\linebreak[0] #2)}
+ \def\ATlinearmorphemeblock#1#2{{#1}\textsubscript{#2}}
+ \def\ATlinearsummaryblock#1#2{\mbox{$\triangle($}%
+ \mbox{#1}\mbox{$)$}\textsubscript{#2}}
\end{verbatim}
Their meaning should be intuitive after the explanations in
Section~\ref{sec:internal}.
@@ -1170,35 +1594,41 @@
\end{equation*}
we can execute
\begin{verbatim}
- {\def\ATlinearadpositionblock#1#2#3{\relax}
- \def\ATlinearfirstattribute#1#2{#2}
- \def\ATlinearnextattribute#1#2{[{#2}]}
- \def\ATlinearsubtrees{\relax}
- \def\ATlinearmorphemeblock#1{\relax}
- \def\ATlinearsummaryblock#1{\relax}
- \ATlinearise{\ATl{with}{I^2_2}[phrase]
+ { \def\ATlinearadpositionblock#1#2#3{\relax}
+ \def\ATlinearfirstattribute#1#2{#2}
+ \def\ATlinearnextattribute#1#2{[{#2}]}
+ \def\ATlinearsubtrees{\relax}
+ \def\ATlinearmorphemeblock#1{\relax}
+ \def\ATlinearsummaryblock#1{\relax}
+ \ATlinearise{
+ \ATl{with}{I^2_2}[phrase]
{\ATs{the key}{O}[third actant]}
{\ATre{I^2_1}
{\ATxl{\ATs{the door}{O}[second actant]}}
{\ATs{will be opened}{I^2}[governor]}}} }
\end{verbatim}
which produces
-\begin{equation*}
- {\def\ATlinearadpositionblock#1#2#3{\relax}
+\begin{center}
+ { \def\ATlinearadpositionblock#1#2#3{\relax}
\def\ATlinearfirstattribute#1#2{#2}
\def\ATlinearnextattribute#1#2{[{#2}]}
\def\ATlinearsubtrees{\relax}
\def\ATlinearmorphemeblock#1{\relax}
\def\ATlinearsummaryblock#1{\relax}
- \ATlinearise{\ATl{with}{I^2_2}[phrase]
- {\ATs{the key}{O}[third actant]}
- {\ATre{I^2_1}
- {\ATxl{\ATs{the door}{O}[second actant]}}
- {\ATs{will be opened}{I^2}[governor]}}} }
-\end{equation*}
-It is needless to say that such computations require a real \TeX\/
-magician, who is able to understand (and, hopefully, improve) the code
-of the package! Nevertheless, this opens the door to \LaTeX\/ macros
-that operate on adtrees, treating them like data structures.\vfill
-
-\end{document}
\ No newline at end of file
+ \ATlinearise{
+ \ATl{with}{I^2_2}[phrase]
+ {\ATs{the key}{O}[third actant]}
+ {\ATre{I^2_1}
+ {\ATxl{\ATs{the door}{O}[second actant]}}
+ {\ATs{will be opened}{I^2}[governor]}}} }
+\end{center}
+Needless to say, such computations require a real \TeX\/ magician, who
+is able to fully understand the code of the package! Nevertheless,
+this opens the door to \LaTeX\/ macros that operate on adtrees,
+treating them like data structures.\vfill
+\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% TeX-master: t
+%%% End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adtrees.doc.tlpobj new/tlpkg/tlpobj/adtrees.doc.tlpobj
--- old/tlpkg/tlpobj/adtrees.doc.tlpobj 2019-02-28 03:14:04.000000000 +0100
+++ new/tlpkg/tlpobj/adtrees.doc.tlpobj 2019-07-12 01:55:13.000000000 +0200
@@ -1,9 +1,9 @@
name adtrees.doc
category Package
-revision 39438
+revision 51618
shortdesc doc files of adtrees
relocated 1
-docfiles size=87
+docfiles size=100
RELOC/doc/latex/adtrees/README
RELOC/doc/latex/adtrees/adtreesdoc.pdf
RELOC/doc/latex/adtrees/adtreesdoc.tex
++++++ adtrees.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/adtrees/adtrees.sty new/tex/latex/adtrees/adtrees.sty
--- old/tex/latex/adtrees/adtrees.sty 2016-01-20 23:46:59.000000000 +0100
+++ new/tex/latex/adtrees/adtrees.sty 2019-07-11 23:04:12.000000000 +0200
@@ -1,14 +1,15 @@
-%%-------------------------------------------------------
+%-------------------------------------------------------
%% This package is deputed to draw AdTrees as defined by
%% F. Gobbo and M. Benini in "Constructive Adpositional
%% Grammars: Foundations of Constructive Linguistics",
%% Cambrdige Scholar Publishing
%%
-%% Version 1.0 - 2016/01/20
+%% Version 1.1 - 2019/07/11
%%-------------------------------------------------------
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{adtrees}[2016/01/20 v1.0 Adtrees package]
+\ProvidesPackage{adtrees}[2019/07/11 v1.1 Adtrees package]
\RequirePackage{cancel}
+\RequirePackage{epic}
%%-------------------------------------------------------
%% We assume that \smaller is a command that reduces the
@@ -18,8 +19,8 @@
%% the right size when dealing with \normalsize trees.
%%-------------------------------------------------------
\@ifundefined{smaller}%
-{\gdef\@ATsmall{\small}}%
-{\gdef\@ATsmall{\smaller}}
+ {\gdef\@ATsmall{\small}}%
+ {\gdef\@ATsmall{\smaller}}
%%-------------------------------------------------------
%% Usually, the angle in adtrees is 60 degrees
@@ -36,7 +37,7 @@
\ATnormalangle
%%-------------------------------------------------------
-%% Firstly, we declare the internal variables
+%% First, we declare the internal variables
%%-------------------------------------------------------
\newskip\@ATlen % a temporay length
\newskip\@ATbp % the base point of a block
@@ -63,6 +64,8 @@
\newif\if@ATlinear % switch for linear vs tree format
\@ATlinearfalse % (usually false)
+\newif\if@ATtabul % switch for linear vs tree format
+\@ATtabulfalse % (usually false)
%%-------------------------------------------------------
%% The variable stack implementation
@@ -73,17 +76,20 @@
%% In this case, we know that the saved values are, in
%% fact, dimensions. We store them as numbers.
%%-------------------------------------------------------
+\newcount\@ATstackheight \@ATstackheight0
\def\@ATeos{X}
\edef\@ATstack{\@ATeos}
\def\@ATpush#1{%
-\def\@ATcons{\noexpand\@ATcons}%
-\expandafter\edef\expandafter\@ATstack\expandafter{%
-\@ATcons{#1}\@ATstack}}
+ \global\advance\@ATstackheight1%
+ \def\@ATcons{\noexpand\@ATcons}%
+ \expandafter\edef\expandafter\@ATstack\expandafter{%
+ \@ATcons{#1}\@ATstack}}
\def\@AT@top#1#2#3X{#2}
\def\@ATtop{\expandafter\@AT@top\@ATstack}
\def\@AT@pop#1#2#3X{%
-\def\@ATcons{\noexpand\@ATcons}%
-\expandafter\edef\expandafter\@ATstack\expandafter{#3\@ATeos}}
+ \global\advance\@ATstackheight-1%
+ \def\@ATcons{\noexpand\@ATcons}%
+ \expandafter\edef\expandafter\@ATstack\expandafter{#3\@ATeos}}
\def\@ATpop{\expandafter\@AT@pop\@ATstack}
%%-------------------------------------------------------
@@ -98,7 +104,9 @@
%%-------------------------------------------------------
\def\@ATadposition#1#2#3{%
\if@ATlinear%
- \ATlinearadpositionblock{#1}{#2}{#3}\else%%
+ \@ATlinearadpositionblock{#1}{#2}{#3}\else%
+ \if@ATtabul%
+ \@ATtabularadpositionblock{#1}{#2}{#3}\else%
\setbox\@ATsa\hbox{#1}\setbox\@ATsb\hbox{#2}%
\setbox\@ATsc\hbox{#3}%
\setbox\@ATu\vbox{\copy\@ATsa\copy\@ATsb\copy\@ATsc}%
@@ -112,7 +120,7 @@
\hbox to\@ATlen{\hfil\box\@ATsc\hfil}\nointerlineskip%
\ATpostadpositionskip}%
\@ATwt\dp\@ATu%
- \hbox{\raise\@ATwt\hbox{\box\@ATu}}\fi}
+ \hbox{\raise\@ATwt\hbox{\box\@ATu}}\fi\fi}
\def\@ATtree#1#2#3#4#5{%
\@ifnextchar[{\@ATadposb{#1}{#2}{#3}{#4}{#5}}%
{\@ATadposa{#1}{#2}{#3}{#4}{#5}}}
@@ -120,29 +128,33 @@
\@ATtreeparsed{#1}{#2}{#3}{#4}{\hbox{#5}}}
\def\@ATadposb#1#2#3#4#5[#6]{%
\@ATadposc{#1}{#2}{#3}{#4}{%
- \@ATadposd{#5}{\@ATsmall\ATAttributeBox{#6}}}}
+ \@ATadposd{#5}{\ATAttributeBox{#6}}}}
\def\@ATadposc#1#2#3#4#5{%
\@ifnextchar[{\@ATadposf{#1}{#2}{#3}{#4}{#5}}%
{\@ATadposa{#1}{#2}{#3}{#4}{#5}}}
\def\@ATadposd#1#2{\if@ATlinear%
- \ATlinearfirstattribute{#1}{#2}\else%
+ \@ATlinearfirstattribute{#1}{#2}\else%
+ \if@ATtabul%
+ \@ATtabularfirstattribute{#1}{#2}\else%
\setbox\@ATsa\hbox{#1}\setbox\@ATsb\hbox{#2}%
\setbox\@ATu\vbox{\copy\@ATsa\copy\@ATsb}\@ATlen\wd\@ATu%
\vbox{%
\hbox to\@ATlen{\hfil\box\@ATsa\hfil}\nointerlineskip%
\ATfirstattrskip%
- \hbox to\@ATlen{\hfil\box\@ATsb\hfil}}\fi}%
+ \hbox to\@ATlen{\hfil\box\@ATsb\hfil}}\fi\fi}
\def\@ATadpose#1#2{\if@ATlinear%
- \ATlinearnextattribute{#1}{#2}\else%
+ \@ATlinearnextattribute{#1}{#2}\else%
+ \if@ATtabul%
+ \@ATtabularnextattribute{#1}{#2}\else%
\setbox\@ATsa\hbox{#1}\setbox\@ATsb\hbox{#2}%
\setbox\@ATu\vbox{\copy\@ATsa\copy\@ATsb}\@ATlen\wd\@ATu%
\vbox{%
\hbox to\@ATlen{\hfil\box\@ATsa\hfil}\nointerlineskip%
\ATinterattrskip%
- \hbox to\@ATlen{\hfil\box\@ATsb\hfil}}\fi}%
+ \hbox to\@ATlen{\hfil\box\@ATsb\hfil}}\fi\fi}%
\def\@ATadposf#1#2#3#4#5[#6]{%
\@ATadposc{#1}{#2}{#3}{#4}{%
- \@ATadpose{#5}{\@ATsmall\ATAttributeBox{#6}}}}
+ \@ATadpose{#5}{\ATAttributeBox{#6}}}}
%%-------------------------------------------------------
%% The internal drawing procedure for binary adtrees.
@@ -184,62 +196,66 @@
%% and to limit register/memory usage.
%%-------------------------------------------------------
\def\@ATtreeparsed#1#2#3#4#5#6#7{%
-\if@ATlinear%
-\@ATadposition{#3}{#4}{#5}\ATlinearsubtrees{#6}{#7}\else%
-\sbox{\@ATta}{\ignorespaces#6\@killglue}%
-\@ATpush{\the\@ATbp}\@ATpush{\the\@ATwt}%
-\sbox{\@ATtb}{\ignorespaces#7\@killglue}%
-\setbox\@ATu\hbox{\usebox{\@ATta}\usebox{\@ATtb}}\@ATh\ht\@ATu%
-\setbox\@ATu\hbox{\usebox{\@ATta}}\@ATlen\ht\@ATu\advance\@ATlen -\@ATh%
-\edef\@ATtok{\@ATtop}\@ATpop\@ATwl\@ATtok%
-\edef\@ATtok{\@ATtop}\@ATpop\@ATbl\@ATtok%
-\@ATrl\@ATwl\advance\@ATrl -\@ATbl%
-\sbox{\@ATta}{\raisebox{-\@ATlen}{\usebox{\@ATta}}}%
-\setbox\@ATu\hbox{\usebox{\@ATtb}}\@ATwr\@ATwt\@ATlen\ht\@ATu%
-\advance\@ATlen -\@ATh\@ATbr\@ATbp\@ATrr\@ATwr\advance\@ATrr -\@ATbr%
-\sbox{\@ATtb}{\raisebox{-\@ATlen}{\usebox{\@ATtb}}}%
-\@ATskip\z@\@ATpiks\z@%
-\@ATunit\unitlength%
-\unitlength#1%
-\@ATlen\@ATbl\advance\@ATlen\@ATrr\advance\@ATlen 50\unitlength\relax%
-\ifdim\@ATlen<\@ATwl%
-\ifdim\@ATwr<\@ATwl\@ATpiks\@ATrl\advance\@ATpiks -\@ATrr%
-\advance\@ATpiks -50\unitlength\fi%
-\@ATlen\@ATwl\fi\relax%
-\ifdim\@ATlen<\@ATwr\@ATlen\@ATwr%
-\@ATskip\@ATbr\advance\@ATskip -\@ATbl%
-\advance\@ATskip -50\unitlength\fi\relax%
-\global\@ATbp\@ATbl\global\advance\@ATbp 25\unitlength%
-\global\advance\@ATbp \@ATskip\global\@ATwt\@ATlen%
-\setbox\@ATu\box\voidb@x%
-\unitlength\@ATunit%
-\hbox{\hspace*{\@ATskip}\usebox{\@ATta}\hspace*{-\@ATrl}%
-\@ATunit\unitlength%
-\unitlength#1%
-\edef\@AT@angle{#2}%
-{\ifnum\@AT@angle=120%
-\raisebox{\(a)ATh}{\begin{picture}(50,12.5)%
-\thicklines\put(25,12.5){\ATleftbranch{-2}{-1}{25}}%
-\put(25,12.5){\ATcircle{2}}%
-\put(25,9.5){\makebox(0,0)[t]{\@ATadposition{#3}{#4}{#5}}}%
-\thicklines\put(25,12.5){\ATrightbranch{2}{-1}{25}}%
-\end{picture}}%
-\else\ifnum\@AT@angle=90%
-\raisebox{\@ATh}{\begin{picture}(50,25)%
-\thicklines\put(25,25){\ATleftbranch{-1}{-1}{25}}%
-\put(25,25){\ATcircle{2}}%
-\put(25,19){\makebox(0,0)[t]{\@ATadposition{#3}{#4}{#5}}}%
-\thicklines\put(25,25){\ATrightbranch{1}{-1}{25}}%
-\end{picture}}%
-\else%
-\raisebox{\@ATh}{\begin{picture}(50,50)%
-\thicklines\put(25,50){\ATleftbranch{-1}{-2}{25}}%
-\put(25,50){\ATcircle{2}}%
-\put(25,35){\makebox(0,0)[t]{\@ATadposition{#3}{#4}{#5}}}%
-\thicklines\put(25,50){\ATrightbranch{1}{-2}{25}}%
-\end{picture}}\fi\fi}%
-\unitlength\@ATunit%
-\hspace*{-\@ATbr}\usebox{\@ATtb}\hspace*{\@ATpiks}}\fi}
+ \if@ATlinear%
+ \@ATlinearadpositionblock{#3}{#4}{#5}%
+ \@ATlinearsubtrees{#6}{#7}\else%
+ \if@ATtabul%
+ \vbox{\@ATtabularadpositionblock{#3}{#4}{#5}%
+ \@ATtabularsubtrees{#6}{#7}}\else%
+ \sbox{\@ATta}{\ignorespaces#6\@killglue}%
+ \@ATpush{\the\@ATbp}\@ATpush{\the\@ATwt}%
+ \sbox{\@ATtb}{\ignorespaces#7\@killglue}%
+ \setbox\@ATu\hbox{\usebox{\@ATta}\usebox{\@ATtb}}\@ATh\ht\@ATu%
+ \setbox\@ATu\hbox{\usebox{\@ATta}}\@ATlen\ht\@ATu\advance\@ATlen -\@ATh%
+ \edef\@ATtok{\@ATtop}\@ATpop\@ATwl\@ATtok%
+ \edef\@ATtok{\@ATtop}\@ATpop\@ATbl\@ATtok%
+ \@ATrl\@ATwl\advance\@ATrl -\@ATbl%
+ \sbox{\@ATta}{\raisebox{-\@ATlen}{\usebox{\@ATta}}}%
+ \setbox\@ATu\hbox{\usebox{\@ATtb}}\@ATwr\@ATwt\@ATlen\ht\@ATu%
+ \advance\@ATlen -\@ATh\@ATbr\@ATbp\@ATrr\@ATwr\advance\@ATrr -\@ATbr%
+ \sbox{\@ATtb}{\raisebox{-\@ATlen}{\usebox{\@ATtb}}}%
+ \@ATskip\z@\@ATpiks\z@%
+ \@ATunit\unitlength%
+ \unitlength#1%
+ \@ATlen\@ATbl\advance\@ATlen\@ATrr\advance\@ATlen 50\unitlength\relax%
+ \ifdim\@ATlen<\@ATwl%
+ \ifdim\@ATwr<\@ATwl\@ATpiks\@ATrl\advance\@ATpiks -\@ATrr%
+ \advance\@ATpiks -50\unitlength\fi%
+ \@ATlen\@ATwl\fi\relax%
+ \ifdim\@ATlen<\@ATwr\@ATlen\@ATwr%
+ \@ATskip\@ATbr\advance\@ATskip -\@ATbl%
+ \advance\@ATskip -50\unitlength\fi\relax%
+ \global\@ATbp\@ATbl\global\advance\@ATbp 25\unitlength%
+ \global\advance\@ATbp \@ATskip\global\@ATwt\@ATlen%
+ \setbox\@ATu\box\voidb@x%
+ \unitlength\@ATunit%
+ \hbox{\hspace*{\@ATskip}\usebox{\@ATta}\hspace*{-\@ATrl}%
+ \@ATunit\unitlength%
+ \unitlength#1%
+ \edef\@AT@angle{#2}%
+ {\ifnum\@AT@angle=120%
+ \raisebox{\(a)ATh}{\begin{picture}(50,12.5)%
+ \thicklines\put(25,12.5){\ATleftbranch{-2}{-1}{25}}%
+ \put(25,12.5){\ATcircle{2}}%
+ \put(25,9.5){\makebox(0,0)[t]{\@ATadposition{#3}{#4}{#5}}}%
+ \thicklines\put(25,12.5){\ATrightbranch{2}{-1}{25}}%
+ \end{picture}}%
+ \else\ifnum\@AT@angle=90%
+ \raisebox{\@ATh}{\begin{picture}(50,25)%
+ \thicklines\put(25,25){\ATleftbranch{-1}{-1}{25}}%
+ \put(25,25){\ATcircle{2}}%
+ \put(25,19){\makebox(0,0)[t]{\@ATadposition{#3}{#4}{#5}}}%
+ \thicklines\put(25,25){\ATrightbranch{1}{-1}{25}}%
+ \end{picture}}%
+ \else%
+ \raisebox{\@ATh}{\begin{picture}(50,50)%
+ \thicklines\put(25,50){\ATleftbranch{-1}{-2}{25}}%
+ \put(25,50){\ATcircle{2}}%
+ \put(25,35){\makebox(0,0)[t]{\@ATadposition{#3}{#4}{#5}}}%
+ \thicklines\put(25,50){\ATrightbranch{1}{-2}{25}}%
+ \end{picture}}\fi\fi}%
+ \unitlength\@ATunit%
+ \hspace*{-\@ATbr}\usebox{\@ATtb}\hspace*{\@ATpiks}}\fi\fi}
%%-------------------------------------------------------
%% The internal drawing procedure for right extensions
@@ -248,32 +264,34 @@
%% been truncated.
%%-------------------------------------------------------
\def\@ATright#1#2#3{%
-\if@ATlinear%
-#3\else%
-\sbox{\@ATtb}{\ignorespaces#3\@killglue}%
-\setbox\@ATu\hbox{\usebox{\@ATtb}}\@ATh\ht\@ATu\@ATwr\@ATwt%
-\@ATbr\@ATbp\@ATrr\@ATwr\advance\@ATrr -\@ATbr%
-\global\advance\@ATbp\ifdim\@ATbr<25pt -\@ATbp\else -25\unitlength\fi%
-\@ATwt\@ATrr\advance\@ATwt 25\unitlength\global\advance\@ATwt\@ATbp%
-\setbox\@ATu\box\voidb@x%
-\hbox{\hspace*{\@ATbp}%
-\@ATlen\unitlength%
-\unitlength#1%
-\edef\@AT@angle{#2}%
-\ifnum\@AT@angle=120%
-\raisebox{\(a)ATh}{\begin{picture}(25,12.5)%
-\thicklines\put(0,12.5){\ATrightbranch{2}{-1}{25}}%
-\end{picture}}%
-\else\ifnum\@AT@angle=90%
-\raisebox{\@ATh}{\begin{picture}(25,25)%
-\thicklines\put(0,25){\ATrightbranch{1}{-1}{25}}%
-\end{picture}}%
-\else%
-\raisebox{\@ATh}{\begin{picture}(25,50)%
-\thicklines\put(0,50){\ATrightbranch{1}{-2}{25}}%
-\end{picture}}\fi\fi%
-\unitlength\@ATlen%
-\hspace*{-\@ATbr}\usebox{\@ATtb}}\fi}
+ \if@ATlinear%
+ #3\else%
+ \if@ATtabul%
+ #3\else%
+ \sbox{\@ATtb}{\ignorespaces#3\@killglue}%
+ \setbox\@ATu\hbox{\usebox{\@ATtb}}\@ATh\ht\@ATu\@ATwr\@ATwt%
+ \@ATbr\@ATbp\@ATrr\@ATwr\advance\@ATrr -\@ATbr%
+ \global\advance\@ATbp\ifdim\@ATbr<25pt -\@ATbp\else -25\unitlength\fi%
+ \@ATwt\@ATrr\advance\@ATwt 25\unitlength\global\advance\@ATwt\@ATbp%
+ \setbox\@ATu\box\voidb@x%
+ \hbox{\hspace*{\@ATbp}%
+ \@ATlen\unitlength%
+ \unitlength#1%
+ \edef\@AT@angle{#2}%
+ \ifnum\@AT@angle=120%
+ \raisebox{\(a)ATh}{\begin{picture}(25,12.5)%
+ \thicklines\put(0,12.5){\ATrightbranch{2}{-1}{25}}%
+ \end{picture}}%
+ \else\ifnum\@AT@angle=90%
+ \raisebox{\@ATh}{\begin{picture}(25,25)%
+ \thicklines\put(0,25){\ATrightbranch{1}{-1}{25}}%
+ \end{picture}}%
+ \else%
+ \raisebox{\@ATh}{\begin{picture}(25,50)%
+ \thicklines\put(0,50){\ATrightbranch{1}{-2}{25}}%
+ \end{picture}}\fi\fi%
+ \unitlength\@ATlen%
+ \hspace*{-\@ATbr}\usebox{\@ATtb}}\fi\fi}
%%-------------------------------------------------------
%% The internal drawing procedure for left extensions
@@ -282,31 +300,33 @@
%% has been truncated.
%%-------------------------------------------------------
\def\@ATleft#1#2#3{%
-\if@ATlinear%
-#3\else%
-\sbox{\@ATta}{\ignorespaces#3\@killglue}%
-\setbox\@ATu\hbox{\usebox{\@ATta}}\@ATh\ht\@ATu\@ATwl\@ATwt%
-\@ATrl\@ATwl\advance\@ATrl -\@ATbp\global\advance\@ATbp 25\unitlength\relax%
-\global\@ATwt\ifdim\@ATbp<\@ATwl\@ATwl\else\@ATbp\fi\relax%
-\setbox\@ATu\box\voidb@x%
-\hbox{\usebox{\@ATta}\hspace*{-\@ATrl}%
-\@ATlen\unitlength%
-\unitlength#1%
-\edef\@AT@angle{#2}%
-\ifnum\@AT@angle=120%
-\raisebox{\(a)ATh}{\begin{picture}(25,12.5)%
-\thicklines\put(25,12.5){\ATleftbranch{-2}{-1}{25}}%
-\end{picture}}%
-\else\ifnum\@AT@angle=90%
-\raisebox{\@ATh}{\begin{picture}(25,25)%
-\thicklines\put(25,25){\ATleftbranch{-1}{-1}{25}}%
-\end{picture}}%
-\else%
-\raisebox{\@ATh}{\begin{picture}(25,50)%
-\thicklines\put(25,50){\ATleftbranch{-1}{-2}{25}}%
-\end{picture}}\fi\fi%
-\unitlength\@ATlen%
-\hspace*{-\@ATbp}\hspace*{\@ATwt}}\fi}%
+ \if@ATlinear%
+ #3\else%
+ \if@ATtabul%
+ #3\else%
+ \sbox{\@ATta}{\ignorespaces#3\@killglue}%
+ \setbox\@ATu\hbox{\usebox{\@ATta}}\@ATh\ht\@ATu\@ATwl\@ATwt%
+ \@ATrl\@ATwl\advance\@ATrl -\@ATbp\global\advance\@ATbp 25\unitlength\relax%
+ \global\@ATwt\ifdim\@ATbp<\@ATwl\@ATwl\else\@ATbp\fi\relax%
+ \setbox\@ATu\box\voidb@x%
+ \hbox{\usebox{\@ATta}\hspace*{-\@ATrl}%
+ \@ATlen\unitlength%
+ \unitlength#1%
+ \edef\@AT@angle{#2}%
+ \ifnum\@AT@angle=120%
+ \raisebox{\(a)ATh}{\begin{picture}(25,12.5)%
+ \thicklines\put(25,12.5){\ATleftbranch{-2}{-1}{25}}%
+ \end{picture}}%
+ \else\ifnum\@AT@angle=90%
+ \raisebox{\@ATh}{\begin{picture}(25,25)%
+ \thicklines\put(25,25){\ATleftbranch{-1}{-1}{25}}%
+ \end{picture}}%
+ \else%
+ \raisebox{\@ATh}{\begin{picture}(25,50)%
+ \thicklines\put(25,50){\ATleftbranch{-1}{-2}{25}}%
+ \end{picture}}\fi\fi%
+ \unitlength\@ATlen%
+ \hspace*{-\@ATbp}\hspace*{\@ATwt}}\fi\fi}%
%%-------------------------------------------------------
%% The internal procedure to draw a leaf.
@@ -320,7 +340,10 @@
{\@ATadlb{#1}{#2}}%
{\@ATadla{#1}{#2}}}
\def\@ATadla#1#2{%
- \if@ATlinear\ATlinearmorphemeblock{#1}{#2}\else%
+ \if@ATlinear\relax%
+ \@ATlinearmorphemeblock{#1}{#2}\else%
+ \if@ATtabul%
+ \@ATtabularmorphemeblock{#1}{#2}\else%
\setbox\@ATsa\hbox{#1}\setbox\@ATsb\hbox{#2}%
\setbox\@ATu\vbox{\copy\@ATsa\copy\@ATsb}\@ATlen\wd\@ATu%
\setbox\@ATu\vbox{%
@@ -334,28 +357,32 @@
\@ATwt\ht\@ATu\advance\@ATwt-\ht\@ATsa%
\setbox\@ATu\hbox{\lower\@ATwt\hbox{\box\@ATu}}%
\global\@ATwt\wd\@ATu\global\@ATbp .5\@ATwt%
- \hbox{\box\@ATu}\fi}
+ \hbox{\box\@ATu}\fi\fi}
\def\@ATadlb#1#2[#3]{%
\@ATadlc{#1}{\@ATadld{#2}{\ATAttributeBox{#3}}}}
\def\@ATadlc#1#2{\@ifnextchar[%
{\@ATadlf{#1}{#2}}%
{\@ATadla{#1}{#2}}}
\def\@ATadld#1#2{\if@ATlinear%
- \ATlinearfirstattribute{#1}{#2}\else%
+ \@ATlinearfirstattribute{#1}{#2}\else%
+ \if@ATtabul%
+ \@ATtabularfirstattribute{#1}{#2}\else%
\setbox\@ATsa\hbox{#1}\setbox\@ATsb\hbox{#2}%
\setbox\@ATu\vbox{\copy\@ATsa\copy\@ATsb}\@ATlen\wd\@ATu%
\vbox{%
\hbox to\@ATlen{\hfil\box\@ATsa\hfil}\nointerlineskip%
\ATfirstattrskip%
- \hbox to\@ATlen{\hfil\box\@ATsb\hfil}}\fi}%
+ \hbox to\@ATlen{\hfil\box\@ATsb\hfil}}\fi\fi}%
\def\@ATadle#1#2{\if@ATlinear%
- \ATlinearnextattribute{#1}{#2}\else%
+ \@ATlinearnextattribute{#1}{#2}\else%
+ \if@ATtabul%
+ \@ATtabularnextattribute{#1}{#2}\else%
\setbox\@ATsa\hbox{#1}\setbox\@ATsb\hbox{#2}%
\setbox\@ATu\vbox{\copy\@ATsa\copy\@ATsb}\@ATlen\wd\@ATu%
\vbox{%
\hbox to\@ATlen{\hfil\box\@ATsa\hfil}\nointerlineskip%
\ATinterattrskip%
- \hbox to\@ATlen{\hfil\box\@ATsb\hfil}}\fi}%
+ \hbox to\@ATlen{\hfil\box\@ATsb\hfil}}\fi\fi}%
\def\@ATadlf#1#2[#3]{%
\@ATadlc{#1}{\@ATadle{#2}{\ATAttributeBox{#3}}}}
@@ -371,7 +398,10 @@
{\@ATadsb{#1}{#2}}%
{\@ATadsa{#1}{#2}}}
\def\@ATadsa#1#2{%
- \if@ATlinear\ATlinearsummaryblock{#1}{#2}\else%
+ \if@ATlinear\relax%
+ \@ATlinearsummaryblock{#1}{#2}\else%
+ \if@ATtabul\relax%
+ \@ATtabularsummaryblock{#1}{#2}\else%
\setbox\@ATsa\hbox{#1}\setbox\@ATsb\hbox{#2}%
\setbox\@ATsc\hbox{\ATSummarySymbol}%
\setbox\@ATu\vbox{\copy\@ATsc\copy\@ATsa\copy\@ATsb}%
@@ -390,28 +420,32 @@
\@ATwt\ht\@ATu\advance\@ATwt-\ht\@ATsa%
\setbox\@ATu\hbox{\lower\@ATwt\hbox{\box\@ATu}}%
\global\@ATwt\wd\@ATu\global\@ATbp .5\@ATwt%
- \hbox{\box\@ATu}\fi}
+ \hbox{\box\@ATu}\fi\fi}
\def\@ATadsb#1#2[#3]{%
\@ATadsc{#1}{\@ATadsd{#2}{\ATAttributeBox{#3}}}}
\def\@ATadsc#1#2{\@ifnextchar[%
{\@ATadsf{#1}{#2}}%
{\@ATadsa{#1}{#2}}}
\def\@ATadsd#1#2{\if@ATlinear%
- \ATlinearfirstattribute{#1}{#2}\else%
+ \@ATlinearfirstattribute{#1}{#2}\else%
+ \if@ATtabul%
+ \@ATtabularfirstattribute{#1}{#2}\else%
\setbox\@ATsa\hbox{#1}\setbox\@ATsb\hbox{#2}%
\setbox\@ATu\vbox{\copy\@ATsa\copy\@ATsb}\@ATlen\wd\@ATu%
\vbox{%
\hbox to\@ATlen{\hfil\box\@ATsa\hfil}\nointerlineskip%
\ATfirstattrskip%
- \hbox to\@ATlen{\hfil\box\@ATsb\hfil}}\fi}%
+ \hbox to\@ATlen{\hfil\box\@ATsb\hfil}}\fi\fi}%
\def\@ATadse#1#2{\if@ATlinear%
- \ATlinearnextattribute{#1}{#2}\else%
+ \@ATlinearnextattribute{#1}{#2}\else%
+ \if@ATtabul%
+ \@ATtabularnextattribute{#1}{#2}\else%
\setbox\@ATsa\hbox{#1}\setbox\@ATsb\hbox{#2}%
\setbox\@ATu\vbox{\copy\@ATsa\copy\@ATsb}\@ATlen\wd\@ATu%
\vbox{%
\hbox to\@ATlen{\hfil\box\@ATsa\hfil}\nointerlineskip%
\ATinterattrskip%
- \hbox to\@ATlen{\hfil\box\@ATsb\hfil}}\fi}%
+ \hbox to\@ATlen{\hfil\box\@ATsb\hfil}}\fi\fi}%
\def\@ATadsf#1#2[#3]{%
\@ATadsc{#1}{\@ATadse{#2}{\ATAttributeBox{#3}}}}
@@ -455,9 +489,9 @@
%%
%% \ATSummarySymbol defines the symbol used for the summary
%%-------------------------------------------------------
-\def\ATMorphemeBox#1{#1\strut}
-\def\ATGrammarCharacterBox#1{$\mathrm{#1}$}
-\def\ATAttributeBox#1{\textsf{[#1]}}
+\def\ATMorphemeBox#1{\mbox{#1\strut}}
+\def\ATGrammarCharacterBox#1{\mbox{\@ATsmall$\mathrm{#1}$}}
+\def\ATAttributeBox#1{\mbox{\@ATsmall\textsf{[#1]}}}
\def\ATfirstattrskip{\vskip.7ex}
\def\ATinterattrskip{\vskip.5ex}
@@ -546,36 +580,24 @@
\def\@ATmu{\mu}
\def\@AT@shorttree#1#2#3#4#5{%
\@ATtree{#1}{#2}{\hbox{$#3$}}%
- {\@ATsmall\ATMorphemeBox{#4}}%
- {\@ATsmall\ATGrammarCharacterBox{#5}}}
-\def\ATl{\@AT@shorttree{\unitlength}{\@ATangle}%
- {\scriptstyle\leftarrow}}
-\def\ATlL#1{\@AT@shorttree{#1}{\@ATangle}%
- {\scriptstyle\leftarrow}}
-\def\ATlA#1{\@AT@shorttree{\unitlength}{#1}%
- {\scriptstyle\leftarrow}}
-\def\ATlLA#1#2{\@AT@shorttree{#1}{#2}%
- {\scriptstyle\leftarrow}}
-\def\ATr{\@AT@shorttree{\unitlength}{\@ATangle}%
- {\scriptstyle\rightarrow}}
-\def\ATrL#1{\@AT@shorttree{#1}{\@ATangle}%
- {\scriptstyle\rightarrow}}
-\def\ATrA#1{\@AT@shorttree{\unitlength}{#1}%
- {\scriptstyle\rightarrow}}
-\def\ATrLA#1#2{\@AT@shorttree{#1}{#2}%
- {\scriptstyle\rightarrow}}
-\def\ATb{\@AT@shorttree{\unitlength}{\@ATangle}%
- {\scriptstyle\leftrightarrow}}
-\def\ATbL#1{\@AT@shorttree{#1}{\@ATangle}%
- {\scriptstyle\leftrightarrow}}
-\def\ATbA#1{\@AT@shorttree{\unitlength}{#1}%
- {\scriptstyle\leftrightarrow}}
-\def\ATbLA#1#2{\@AT@shorttree{#1}{#2}%
- {\scriptstyle\leftrightarrow}}
+ {\ATMorphemeBox{#4}}%
+ {\ATGrammarCharacterBox{#5}}}
+\def\ATlLA#1#2{\@AT@shorttree{#1}{#2}{\scriptstyle\leftarrow}}
+\def\ATl{\ATlLA{\unitlength}{\@ATangle}}
+\def\ATlL#1{\ATlLA{#1}{\@ATangle}}
+\def\ATlA{\ATlLA{\unitlength}}
+\def\ATrLA#1#2{\@AT@shorttree{#1}{#2}{\scriptstyle\rightarrow}}
+\def\ATr{\ATrLA{\unitlength}{\@ATangle}}
+\def\ATrL#1{\ATrLA{#1}{\@ATangle}}
+\def\ATrA{\ATrLA{\unitlength}}
+\def\ATbLA#1#2{\@AT@shorttree{#1}{#2}{\scriptstyle\leftrightarrow}}
+\def\ATb{\ATbLA{\unitlength}{\@ATangle}}
+\def\ATbL#1{\ATbLA{#1}{\@ATangle}}
+\def\ATbA{\ATbLA{\unitlength}}
+\def\ATleLA#1#2{\ATlLA{#1}{#2}{$\@ATeps$}}
\def\ATle{\ATl{$\@ATeps$}}
\def\ATleL#1{\ATlL{#1}{$\@ATeps$}}
\def\ATleA#1{\ATlA{#1}{$\@ATeps$}}
-\def\ATleLA#1#2{\ATlLA{#1}{#2}{$\@ATeps$}}
\def\ATlc{\ATl{$\@ATepsc$}}
\def\ATlcL#1{\ATlL{#1}{$\@ATepsc$}}
\def\ATlcA#1{\ATlA{#1}{$\@ATepsc$}}
@@ -608,18 +630,16 @@
\def\ATbmuL#1{\ATbL{#1}{$\@ATmu$}}
\def\ATbmuA#1{\ATbA{#1}{$\@ATmu$}}
\def\ATbmuLA#1#2{\ATbLA{#1}{#2}{$\@ATmu$}}
-\def\ATxl{\@ATleft{\unitlength}{\@ATangle}}
-\def\ATxlL#1{\@ATleft{#1}{\@ATangle}}
-\def\ATxlA#1{\@ATleft{\unitlength}{#1}}
\def\ATxlLA#1#2{\@ATleft{#1}{#2}}
-\def\ATxr{\@ATright{\unitlength}{\@ATangle}}
-\def\ATxrL#1{\@ATright{#1}{\@ATangle}}
-\def\ATxrA#1{\@ATright{\unitlength}{#1}}
+\def\ATxl{\ATxlLA{\unitlength}{\@ATangle}}
+\def\ATxlL#1{\ATxlLA{#1}{\@ATangle}}
+\def\ATxlA{\ATxlLA{\unitlength}}
\def\ATxrLA#1#2{\@ATright{#1}{#2}}
-\def\ATs#1#2{\@ATads{\ATMorphemeBox{#1}}%
- {\ATGrammarCharacterBox{#2}}}
-\def\ATm#1#2{\@ATadl{\ATMorphemeBox{#1}}%
- {\ATGrammarCharacterBox{#2}}}
+\def\ATxr{\ATxrLA{\unitlength}{\@ATangle}}
+\def\ATxrL#1{\ATxrLA{#1}{\@ATangle}}
+\def\ATxrA{\ATxrLA{\unitlength}}
+\def\ATs#1#2{\@ATads{\ATMorphemeBox{#1}}{\ATGrammarCharacterBox{#2}}}
+\def\ATm#1#2{\@ATadl{\ATMorphemeBox{#1}}{\ATGrammarCharacterBox{#2}}}
%%-------------------------------------------------------
%% Public commands to write adtrees in linear format.
@@ -632,17 +652,95 @@
%% where t is the text. All these renderings are coded via
%% suitable blocks
%%-------------------------------------------------------
-\def\ATlinearise#1{\@ATlineartrue\hbox{#1}\@ATlinearfalse}
-\def\ATLinear{\@ATlineartrue}
-\def\ATNormal{\@ATlinearfalse}
-
-\def\ATlinearadpositionblock#1#2#3{%
- {#2}${}^{\hbox{#1}}_{\hbox{#3}}$}
-\def\ATlinearfirstattribute#1#2{{#1}:{#2}}
-\def\ATlinearnextattribute#1#2{{#1};{#2}}
+\def\ATLinear{\global\@ATlineartrue\global\@ATtabulfalse%
+ \gdef\@ATlinearadpositionblock{\ATlinearadpositionblock}%
+ \gdef\@ATlinearfirstattribute{\ATlinearfirstattribute}%
+ \gdef\@ATlinearnextattribute{\ATlinearnextattribute}%
+ \gdef\@ATlinearsubtrees{\ATlinearsubtrees}%
+ \gdef\@ATlinearmorphemeblock{\ATlinearmorphemeblock}%
+ \gdef\@ATlinearsummaryblock{\ATlinearsummaryblock}}
+\def\ATNormal{\global\@ATlinearfalse\global\@ATtabulfalse}
+\def\ATlinearise#1{\ATLinear\ensuremath{#1}\ATNormal}
+
+\def\ATlinearadpositionblock#1#2#3%
+ {{#2}\textsuperscript{#1}\textsubscript{#3}}
+\def\ATlinearfirstattribute#1{{#1}:}
+\def\ATlinearnextattribute#1{{#1};}
\def\ATlinearsubtrees#1#2{(#1,\linebreak[0] #2)}
-\def\ATlinearmorphemeblock#1#2{{#1}${}_{\hbox{#2}}$}
-\def\ATlinearsummaryblock#1#2{({#1})${}_{\hbox{#2}}$}
+\def\ATlinearmorphemeblock#1#2{{#1}\textsubscript{#2}}
+\def\ATlinearsummaryblock#1#2{\mbox{$\triangle($}%
+ \mbox{#1}\mbox{$)$}\textsubscript{#2}}
+\def\@ATlinearadpositionblock{\ATlinearadpositionblock}%
+\def\@ATlinearfirstattribute{\ATlinearfirstattribute}%
+\def\@ATlinearnextattribute{\ATlinearnextattribute}%
+\def\@ATlinearsubtrees{\ATlinearsubtrees}%
+\def\@ATlinearmorphemeblock{\ATlinearmorphemeblock}%
+\def\@ATlinearsummaryblock{\ATlinearsummaryblock}
+
+%%-------------------------------------------------------
+%% Public commands to write adtrees in tabular format.
+%%
+%% Essentially, an adtree is written as
+%% Ad^dir_GC(
+%% L,
+%% R)
+%% where Ad is the adposition, dir is the direction, GC
+%% is the grammar character, and L and R are the left and
+%% right subtrees respectively. Leaves are written as
+%% m_GC, where m is the morpheme, and summaries as (t)_GC
+%% where t is the text. All these renderings are coded via
+%% suitable blocks
+%%-------------------------------------------------------
+\def\ATTabular{\global\@ATtabultrue\global\@ATlinearfalse%
+ \gdef\@ATtabularadpositionblock{\ATtabularadpositionblock}%
+ \gdef\@ATtabularfirstattribute{\ATtabularfirstattribute}%
+ \gdef\@ATtabularnextattribute{\ATtabularnextattribute}%
+ \gdef\@ATtabularsubtrees{\ATtabularsubtrees}%
+ \gdef\@ATtabularmorphemeblock{\ATtabularmorphemeblock}%
+ \gdef\@ATtabularsummaryblock{\ATtabularsummaryblock}%
+ \@AT@tabcountreset}
+
+\newenvironment{ATtabulardisplay}
+{\ATTabular\unskip\hfill\break}
+{\ATNormal}
+
+\newenvironment{ATtabular}
+{\hbox\bgroup\ATTabular}
+{\egroup\ATNormal}
+
+\def\ATtabskip{\hspace*{.7em}}
+\def\ATtabindent{\hspace*{1em}}
+
+\newcount\@AT@tabcount
+\newcount\@AT@@tabcount
+\def\@AT@tabcountreset{\global\@AT@tabcount0}
+\def\AT@loop@tab{\@AT@@tabcount\@AT@tabcount%
+ \ifnum\@AT@@tabcount>0%
+ \loop\ATtabskip\advance\@AT@@tabcount-1%
+ \ifnum\@AT@@tabcount>0\repeat\else\relax\fi}
+
+\def\ATtabularadpositionblock#1#2#3{%
+ \hbox{\ATtabindent\AT@loop@tab%
+ {#2}\textsuperscript{#1}\textsubscript{#3}}}
+\def\ATtabularmorphemeblock#1#2{
+ \hbox{\ATtabindent\AT@loop@tab%
+ {#1}\textsubscript{#2}}}
+\def\ATtabularsummaryblock#1#2{
+ \hbox{\ATtabindent\AT@loop@tab%
+ \mbox{$\triangle($}%
+ \mbox{#1}\mbox{$)$}\textsubscript{#2}}}
+\def\ATtabularfirstattribute{\ATlinearfirstattribute}
+\def\ATtabularnextattribute{\ATlinearnextattribute}
+\def\ATtabularsubtrees#1#2{%
+ \advance\@AT@tabcount1%
+ \vbox{#1\relax#2}%
+ \advance\@AT@tabcount-1}
+\def\@ATtabularadpositionblock{\ATtabularadpositionblock}%
+\def\@ATtabularfirstattribute{\ATtabularfirstattribute}%
+\def\@ATtabularnextattribute{\ATtabularnextattribute}%
+\def\@ATtabularsubtrees{\ATtabularsubtrees}%
+\def\@ATtabularmorphemeblock{\ATtabularmorphemeblock}%
+\def\@ATtabularsummaryblock{\ATtabularsummaryblock}%
%%-------------------------------------------------------
%% Centring adtrees.
@@ -659,12 +757,191 @@
%%-------------------------------------------------------
\def\ATvcentre#1{%
\setbox\@ATsc\hbox{#1}%
- \@ATlen\dp\@ATsc\setbox\@ATsc\hbox{\raise\@ATlen\box\@ATsc}
+ \@ATlen\dp\@ATsc\setbox\@ATsc\hbox{\raise\@ATlen\box\@ATsc}%
\@ATlen.5\ht\@ATsc\hbox{\lower\@ATlen\box\@ATsc}}%
\def\AThcentre#1{%
\setbox\@ATsc\hbox{#1}%
- \@ATlen-.5\wd\@ATsc%
- \hbox{\kern\@ATlen\box\@ATsc}}
+ \@ATlen-.5\wd\@ATsc\hbox{\kern\@ATlen\box\@ATsc}}
\def\ATcentre#1{\AThcentre{\ATvcentre{#1}}}
%%-------------------------------------------------------
+%% Pathlike adtrees.
+%%
+%% A pathlike adtree is rendered by enclosing it into the
+%% pathlikeadtree environment.
+%%-------------------------------------------------------
+
+% the pieces the user may use and change
+\newskip\ATpathinterskip \ATpathinterskip.5em
+\newskip\ATpathunitlength \ATpathunitlength4ex
+\newskip\ATpicskip \ATpicskip.2ex
+\newskip\ATpathlinethickness \ATpathlinethickness.1em
+\def\ATnGCBox#1{\@ATsmall$\mathrm{#1}$}
+\def\ATlGCBox#1{\@ATsmall$\mathrm{#1}$}
+\newskip\ATpathlabelhspace \ATpathlabelhspace.3em
+\newskip\ATpathlabelvspace \ATpathlabelvspace1ex
+\def\ATpathpichook{}
+
+%\newenvironment{pathlikeadtree}
+\def\pathlikeadtree{\@ATpathlistinit}
+\def\endpathlikeadtree{\@ATpathlistend}
+
+% some internal declarations
+\newif\if@ATpathfirstnode
+\newbox\@ATpathbox \newbox\@ATpathlinebox
+\newcount\@ATanchor \newcount\@ATcells \newcount\@ATadppars
+\newcount\@ATpa \newcount\@ATpb \newcount\@ATpc
+\newcount\@ATpd \newcount\@ATpe \newcount\@ATtmp
+\newcount\@ATtmpa \newcount\@AThmax
+
+% A pathlike adtree starts with parsing a node after cleaning up what
+% has to be done, and temporarily redefining &
+\def\@ATpathlistinit{%
+ \begingroup%
+ \linethickness{\ATpathlinethickness}%
+ \global\@ATpathfirstnodetrue\global\@ATanchor0\global\@ATcells0%
+ \global\@ATadppars0\global\@AThmax0\def\@ATpathdrawlines{\relax}%
+ \setbox\@ATpathbox\null\setbox\@ATpathlinebox\null\AT@n}
+
+% A pathlike adtree ends by drawing the two boxes which contain the
+% list of marked morphemes and the connecting lines, respectively
+\def\@ATpathlistend{%
+ \def\@ATca##1{\@ATpa ##1\relax}\def\@ATcb##1{\@ATpb ##1\relax}%
+ \def\@ATcc##1{\@ATpc ##1\relax}\def\@ATcd##1{\@ATpd ##1\relax}%
+ \def\@ATce##1{\@ATpe ##1\@ATto}\@ATpathdrawlines%
+ \global\setbox\@ATpathbox\hbox{%
+ \vbox{\box\@ATpathbox\nointerlineskip%
+ \vskip\ATpicskip\box\@ATpathlinebox}}%
+ \box\@ATpathbox\endgroup}
+
+% Parsing a node: it has the form
+% - morpheme[gc]
+% possibly followed by one or more arrow specs
+\def\AT@n#1[#2]{\@ifnextchar(%
+ {\@ATn{#1}{#2}\AT@to}
+ {\@ATn{#1}{#2}}}
+\def\AT@np{\@ifnextchar&{\@AT@n}{}}
+\def\@AT@n[#2]{\AT@n#1[#2]}
+
+% when morpheme[gc] has been extracted, its cell is constructed as a
+% box and accumulated in the pathbox, correctly spaced
+% At the end, we pass on the next cell, if any
+\def\@ATn#1#2{%
+ \global\advance\@ATanchor1%
+ \setbox\@ATsa\hbox{\ignorespaces#1}\@ATlen\wd\@ATsa%
+ \setbox\@ATsb\hbox{\ATnGCBox{#2}}\@ATwt\wd\@ATsb\relax%
+ \ifdim\@ATlen<\@ATwt\relax\@ATlen\@ATwt\fi%
+ \setbox\@ATsa\vbox{\hbox to\@ATlen{\hfil\box\@ATsa\hfil}%
+ \hbox to\@ATlen{\hfil\box\@ATsb\hfil}}%
+ \@ATwt\wd\@ATpathbox\advance\@ATwt.5\@ATlen%
+ \if@ATpathfirstnode\else\advance\@ATwt\ATpathinterskip\fi%
+ \expandafter\edef\csname @ATcell\the\@ATanchor\endcsname{\the\@ATwt}%
+ \setbox\@ATpathbox\hbox{\box\@ATpathbox%
+ \if@ATpathfirstnode\global\@ATpathfirstnodefalse\else%
+ \hskip\ATpathinterskip\fi\box\@ATsa}%
+ \@ifnextchar&{\AT@np}{}}
+
+% parsing an arrow spec: it has the form
+% (t,h)[gc]<a>
+% where the "a" part is optional
+% moreover, if "t" or "a" are specified by absolute positions, they
+% are preceded by "!".
+% parsing calculates the absolute values of the relative positions,
+% and send everything to \@ATtoa
+\def\AT@to(#1){\AT@@to#1)}
+\def\AT@@to{\@ifnextchar!{\AT@to@a}{\AT@tor(}}
+\def\AT@to@a!#1){\AT@toa(#1)}
+\def\AT@tor(#1,#2){%
+ \@ATtmp#1\advance\@ATtmp\@ATanchor\relax%
+ \AT@toa(\the\@ATtmp,#2)}
+\def\AT@toa(#1,#2)[#3]{\@ifnextchar<%
+ {\@AT@toa{#1}{#2}{\ATlGCBox{#3}}}%
+ {\@ATtoa{#1}{#2}{\ATlGCBox{#3}}{0}}}
+\def\@AT@toa#1#2#3<{\@ifnextchar!%
+ {\@AT@@toa{#1}{#2}{#3}}%
+ {\@ATtoar{#1}{#2}{#3}}}
+\def\@AT@@toa#1#2#3!#4>{\@ATtoa{#1}{#2}{#3}{#4}}
+\def\@ATtoar#1#2#3#4>{%
+ \@ATtmpa#4\relax\ifnum#4=\z@\relax\@ATtmpa\z@%
+ \else\advance\@ATtmpa\@ATanchor\fi%
+ \@ATtoa{#1}{#2}{#3}{\the\@ATtmpa}}
+
+% when an arrow has been parsed, we must accumulate it into the
+% command \@ATpathdrawlines which will construct the arrows at the
+% right moment, i.e., after the whole pathlike adtree has been
+% scanned. Notice how the command checks whether an arrow is followed
+% by another one, eventually restarting the parsing process for the
+% new arrow. If not, let's move to the next cell, if any
+\def\@ATtoa#1#2#3#4{%
+ \ifnum\@AThmax<#2\relax\@AThmax#2\fi%
+ \def\@ATca{\noexpand\@ATca}\def\@ATcb{\noexpand\@ATcb}%
+ \def\@ATcc{\noexpand\@ATcc}\def\@ATcd{\noexpand\@ATcd}%
+ \def\@ATce{\noexpand\@ATce}%
+ \expandafter\def\csname @ATadppar\the\@ATadppars\endcsname{#3}%
+ \expandafter\edef\expandafter\@ATpathdrawlines\expandafter{%
+ \@ATca{\the\@ATanchor}\@ATcb{#1}\@ATcc{#2}%
+ \@ATcd{\the\@ATadppars}\@ATce{#4}\@ATpathdrawlines}%
+ \global\advance\@ATadppars1\relax
+ \@ifnextchar({\AT@to}{\AT@np}}
+
+% at the end, an arrow is effectively drawn.
+\def\@ATto{%
+ \edef\@AText{\csname @ATcell\the\@ATpa\endcsname}\@ATbl\@AText%
+ \edef\@AText{\csname @ATcell\the\@ATpb\endcsname}\@ATbr\@AText%
+ \setbox\@ATsa\hbox{\csname @ATadppar\the\@ATpd\endcsname}%
+ \setbox\@ATsa\hbox{%
+ \hskip\ATpathlabelhspace\box\@ATsa\hskip\ATpathlabelhspace}%
+ \@ATbp\ht\@ATsa\advance\@ATbp\dp\@ATsa%
+ \advance\@ATbp\ATpathlabelvspace\relax%
+ \@ATskip\wd\@ATsa\relax\unitlength1pt\relax%
+ \@ATh\@ATpc\ATpathunitlength\relax%
+ \@ATunit\@AThmax\ATpathunitlength\relax%
+ \@ATlen\@ATbr\advance\@ATlen\@ATbl\relax%
+ \@ATwr\@ATbr\advance\@ATwr-\@ATbl\relax%
+ \@ATrr\@ATunit\advance\@ATrr-\@ATh\relax%
+ \ifnum\@ATpe=\z@\else%
+ \edef\@AText{\csname @ATcell\the\@ATpe\endcsname}\@ATrl\@AText\fi%
+ \ATpathpichook\relax%
+ \setbox\@ATu\hbox{%
+ \begin{picture}(\strip@pt\@ATlen,\strip@pt\@ATunit)
+ \put(\strip@pt\@ATbl,\strip@pt\@ATunit)%
+ {\line(0,-1){\strip@pt\@ATh}}%
+ \put(\strip@pt\@ATbr,\strip@pt\@ATunit)%
+ {\line(0,-1){\strip@pt\@ATh}}%
+ \ifdim\@ATwr<\z@\relax%
+ \put(\strip@pt\@ATbl,\strip@pt\@ATrr)%
+ {\vector(-1,0){-\strip@pt\@ATwr}}%
+ \put(\strip@pt\@ATbr,\strip@pt\@ATrr)%
+ {\makebox(0,\strip@pt\@ATbp)[l]{\box\@ATsa}}\else%
+ \put(\strip@pt\@ATbl,\strip@pt\@ATrr)%
+ {\vector(1,0){\strip@pt\@ATwr}}%
+ \put(\strip@pt\@ATbr,\strip@pt\@ATrr)%
+ {\makebox(0,\strip@pt\@ATbp)[r]{\box\@ATsa}}\fi%
+ \ifnum\@ATpe=\z@\else\ifdim\@ATrl<\@ATbl%
+ \(a)ATwt.5\ATpathunitlength%
+ \@ATwl\@ATbl\advance\@ATwl-\@ATwt%
+ \@ATwr\@ATrr\advance\@ATwr2\@ATwt%
+ \dottedline{3}(\strip@pt\@ATbl,\strip@pt\@ATrr)%
+ (\strip@pt\@ATwl,\strip@pt\@ATwr)%
+ \advance\@ATbl-\@ATwt\advance\@ATrr2\@ATwt%
+ \@ATlen\@ATbl\advance\@ATlen-\@ATrl%
+ \@ATwl\@ATbl\advance\@ATwl-\@ATlen%
+ \dottedline{3}(\strip@pt\@ATbl,\strip@pt\@ATrr)%
+ (\strip@pt\@ATwl,\strip@pt\@ATrr)%
+ \dottedline{3}(\strip@pt\@ATrl,\strip@pt\@ATunit)%
+ (\strip@pt\@ATrl,\strip@pt\@ATrr)\else%
+ \(a)ATwt.5\ATpathunitlength%
+ \@ATwl\@ATbl\advance\@ATwl\@ATwt%
+ \@ATwr\@ATrr\advance\@ATwr2\@ATwt%
+ \dottedline{3}(\strip@pt\@ATbl,\strip@pt\@ATrr)%
+ (\strip@pt\@ATwl,\strip@pt\@ATwr)%
+ \advance\@ATbl\@ATwt\advance\@ATrr2\@ATwt%
+ \@ATlen\@ATbl\advance\@ATlen-\@ATrl%
+ \@ATwl\@ATbl\advance\@ATwl-\@ATlen%
+ \dottedline{3}(\strip@pt\@ATbl,\strip@pt\@ATrr)%
+ (\strip@pt\@ATwl,\strip@pt\@ATrr)%
+ \dottedline{3}(\strip@pt\@ATrl,\strip@pt\@ATunit)%
+ (\strip@pt\@ATrl,\strip@pt\@ATrr)\fi\fi%
+ \end{picture}}%
+ \setbox\@ATpathlinebox\hbox{%
+ \box\@ATu\kern-\@ATlen\box\@ATpathlinebox}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/adtrees.tlpobj new/tlpkg/tlpobj/adtrees.tlpobj
--- old/tlpkg/tlpobj/adtrees.tlpobj 2019-02-28 03:14:04.000000000 +0100
+++ new/tlpkg/tlpobj/adtrees.tlpobj 2019-07-12 01:55:13.000000000 +0200
@@ -1,18 +1,15 @@
name adtrees
category Package
-revision 39438
+revision 51618
shortdesc Macros for drawing adpositional trees
relocated 1
-longdesc The adtrees package provides a package to write adpositional
-longdesc trees, a formalism devoted to represent natural language
-longdesc expressions. The package is composed by the files adtree.sty:
-longdesc containing the LaTeX engine to adpositional trees
-longdesc adtreedoc.pdf: the human readable documentation for the package
-longdesc adtreedoc.tex: the source code for the documentation.
-runfiles size=7
+longdesc This package provides a means to write adpositional trees, a
+longdesc formalism devoted to representing natural language expressions.
+longdesc The package relies on epic and cancel.
+runfiles size=10
RELOC/tex/latex/adtrees/adtrees.sty
catalogue-ctan /macros/latex/contrib/adtrees
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-07-11 19:30:04 +0200
catalogue-license gpl
catalogue-topics tree linguistic
-catalogue-version 1.0
+catalogue-version 1.1
++++++ afm2pl.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/afm2pl.man1.pdf and new/texmf-dist/doc/man/man1/afm2pl.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/afm2pl.doc.tlpobj new/tlpkg/tlpobj/afm2pl.doc.tlpobj
--- old/tlpkg/tlpobj/afm2pl.doc.tlpobj 2019-03-27 02:23:57.000000000 +0100
+++ new/tlpkg/tlpobj/afm2pl.doc.tlpobj 2020-03-04 23:48:58.000000000 +0100
@@ -1,6 +1,6 @@
name afm2pl.doc
category TLCore
-revision 50602
+revision 54074
shortdesc doc files of afm2pl
docfiles size=15
texmf-dist/doc/man/man1/afm2pl.1
++++++ afm2pl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/afm2pl.tlpobj new/tlpkg/tlpobj/afm2pl.tlpobj
--- old/tlpkg/tlpobj/afm2pl.tlpobj 2019-03-27 02:23:57.000000000 +0100
+++ new/tlpkg/tlpobj/afm2pl.tlpobj 2020-03-04 23:48:58.000000000 +0100
@@ -1,6 +1,6 @@
name afm2pl
category TLCore
-revision 50602
+revision 54074
shortdesc convert AFM to TeX property list (.pl) metrics
longdesc Program home page: http://tex.aanhet.net/afm2pl/
depend afm2pl.ARCH
++++++ alegreya.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/alegreya/README new/doc/fonts/alegreya/README
--- old/doc/fonts/alegreya/README 2019-03-07 23:25:21.000000000 +0100
+++ new/doc/fonts/alegreya/README 2019-10-14 22:41:24.000000000 +0200
@@ -1,4 +1,4 @@
-This is the README for the alegreya package, version 2019-03-07.
+This is the README for the alegreya package, version 2019-10-12.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support
for the Alegreya and AlegreyaSans families of fonts, designed by
@@ -46,10 +46,10 @@
Options thin, light and extrabold are
similarly available but for the Sans family only.
-Commands \Alegreya, \AlegreyaBlack, \AlegreyaMedium,
-\AlegreyaSans, \AlegreyaSansThin, \AlegreyaSansLight,
-\AlegreyaSansMedium, \AlegreyaSansExtraBold, and
-\AlegreyaSansBlack select the specified family.
+Commands \Alegreya, \AlegreyaExtraBold, \AlegreyaBlack,
+\AlegreyaMedium, \AlegreyaSans, \AlegreyaSansThin,
+\AlegreyaSansLight, \AlegreyaSansMedium, \AlegreyaSansExtraBold,
+and \AlegreyaSansBlack select the specified family.
Commands \AlegreyaLF, \AlegreyaOsF, \AlegreyaTLF, and
\AlegreyaTOsF allow for localized use of non-default
Binary files old/doc/fonts/alegreya/alegreya-samples.pdf and new/doc/fonts/alegreya/alegreya-samples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/alegreya/alegreya-samples.tex new/doc/fonts/alegreya/alegreya-samples.tex
--- old/doc/fonts/alegreya/alegreya-samples.tex 2018-08-03 23:13:21.000000000 +0200
+++ new/doc/fonts/alegreya/alegreya-samples.tex 2019-10-14 22:41:24.000000000 +0200
@@ -1,5 +1,4 @@
\documentclass[12pt]{article}
-\usepackage[T1]{fontenc}
\usepackage{Alegreya,AlegreyaSans}
\usepackage{lipsum}
\begin{document}
@@ -10,6 +9,8 @@
\subsection*{Regular}
\lipsum[1]
+%L'Astolfo
+
\subsection*{Italic}
\textit{\lipsum[2]}
@@ -20,6 +21,24 @@
\textbf{\textit{\lipsum[4]}}
+\subsection*{Medium}
+
+{\AlegreyaMedium\lipsum[8]}
+
+\subsection*{Medium Italic}
+
+{\AlegreyaMedium\textit{\lipsum[8]}}
+
+
+\subsection*{Extra Bold}
+
+{\AlegreyaExtraBold\lipsum[9]}
+
+
+\subsection*{Extra Bold Italic}
+
+{\AlegreyaExtraBold\textit{\lipsum[9]}}
+
\subsection*{Black}
{\AlegreyaBlack\lipsum[5]}
@@ -56,10 +75,16 @@
\subsection*{Ligatures}
+\begin{huge}
Often we officially find offers floating in far offt offline fjords.
+
+\end{huge}
+
+
\section{Alegreya Sans}\sf
+
\subsection*{Regular}
\lipsum[1]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/alegreya.doc.tlpobj new/tlpkg/tlpobj/alegreya.doc.tlpobj
--- old/tlpkg/tlpobj/alegreya.doc.tlpobj 2019-03-08 02:23:59.000000000 +0100
+++ new/tlpkg/tlpobj/alegreya.doc.tlpobj 2020-03-24 01:55:54.000000000 +0100
@@ -1,9 +1,9 @@
name alegreya.doc
category Package
-revision 50277
+revision 54512
shortdesc doc files of alegreya
relocated 1
-docfiles size=33
+docfiles size=274
RELOC/doc/fonts/alegreya/OFL.txt
RELOC/doc/fonts/alegreya/README
RELOC/doc/fonts/alegreya/alegreya-samples.pdf
++++++ alegreya.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-a/alegreya.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-a.new.3606/alegreya.tar.xz differ: char 25, line 1
++++++ aleph.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/aleph.1 new/texmf-dist/doc/man/man1/aleph.1
--- old/texmf-dist/doc/man/man1/aleph.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/aleph.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH ALEPH 1 "27 May 2018" "Web2C 2019"
+.TH ALEPH 1 "6 August 2019" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
@@ -56,6 +56,13 @@
Run aleph --help to see the complete list of options; this is not
exhaustive.
.TP
+.BI -cnf-line \ string
+Parse
+.I string
+as a
+.I texmf.cnf
+configuration line. See the Kpathsea manual.
+.TP
.BI --fmt \ format
Use
.I format
Binary files old/texmf-dist/doc/man/man1/aleph.man1.pdf and new/texmf-dist/doc/man/man1/aleph.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/lamed.man1.pdf and new/texmf-dist/doc/man/man1/lamed.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/aleph.doc.tlpobj new/tlpkg/tlpobj/aleph.doc.tlpobj
--- old/tlpkg/tlpobj/aleph.doc.tlpobj 2019-03-27 02:23:57.000000000 +0100
+++ new/tlpkg/tlpobj/aleph.doc.tlpobj 2020-03-14 01:41:44.000000000 +0100
@@ -1,6 +1,6 @@
name aleph.doc
category Package
-revision 50602
+revision 54276
shortdesc doc files of aleph
docfiles size=21
texmf-dist/doc/aleph/base/News
++++++ algobox.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/algobox/LICENSE new/doc/latex/algobox/LICENSE
--- old/doc/latex/algobox/LICENSE 2017-09-05 23:56:47.000000000 +0200
+++ new/doc/latex/algobox/LICENSE 2019-09-29 23:12:31.000000000 +0200
@@ -632,7 +632,7 @@
the "copyright" line and a pointer to where the full notice is found.
algobox
- Copyright (C) 2016-2017 Julien RIVAUD
+ Copyright (C) 2016-2019 Julien RIVAUD
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
- algobox Copyright (C) 2016-2017 Julien RIVAUD
+ algobox Copyright (C) 2016-2019 Julien RIVAUD
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
Binary files old/doc/latex/algobox/algobox.pdf and new/doc/latex/algobox/algobox.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/algobox.doc.tlpobj new/tlpkg/tlpobj/algobox.doc.tlpobj
--- old/tlpkg/tlpobj/algobox.doc.tlpobj 2019-02-28 03:14:29.000000000 +0100
+++ new/tlpkg/tlpobj/algobox.doc.tlpobj 2019-09-30 01:54:35.000000000 +0200
@@ -1,9 +1,9 @@
name algobox.doc
category Package
-revision 45223
+revision 52204
shortdesc doc files of algobox
relocated 1
-docfiles size=43
+docfiles size=39
RELOC/doc/latex/algobox/LICENSE
RELOC/doc/latex/algobox/README.md
RELOC/doc/latex/algobox/algobox.pdf
++++++ algobox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/algobox/algobox.sty new/tex/latex/algobox/algobox.sty
--- old/tex/latex/algobox/algobox.sty 2017-09-05 23:56:47.000000000 +0200
+++ new/tex/latex/algobox/algobox.sty 2019-09-29 23:12:31.000000000 +0200
@@ -6,17 +6,17 @@
%%
%% algobox.dtx (with options: `package')
%%
-%% File: algobox.dtx (C) Copyright 2016-2017 RIVAUD Julien
+%% File: algobox.dtx (C) Copyright 2016-2019 RIVAUD Julien
%%
%% It may be distributed and/or modified under the conditions of the
%% General Public License (GPL), either version 3 of this
%% license or (at your option) any later version.
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\RequirePackage{expl3}[2016/01/19]
+\RequirePackage{expl3}[2018/06/19]
\def\ExplFileName{algobox}
\def\ExplFileDescription{Typeset Algobox programs}
-\def\ExplFileDate{2017/09/04}
-\def\ExplFileVersion{1.2a}
+\def\ExplFileDate{2019/09/29}
+\def\ExplFileVersion{1.3}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\RequirePackage{xparse}
@@ -207,7 +207,7 @@
}
\NewDocumentCommand \__algobox_FINALGORITHME:w {} {
- \int_while_do:nNnn \l__algobox_level_int > \c_zero {
+ \int_while_do:nNnn \l__algobox_level_int > \c_zero_int {
\__algobox_unindent:
}
\__algobox_block:nn {structure} {FIN_ALGORITHME}
@@ -273,7 +273,7 @@
}
\NewDocumentCommand \__algobox_FONCTION:w { +u{\;} } {
- \int_while_do:nNnn \l__algobox_level_int > \c_one {
+ \int_while_do:nNnn \l__algobox_level_int > \c_one_int {
\__algobox_unindent:
}
\__algobox_indent:nn {fonctions} {FONCTION}
@@ -312,7 +312,7 @@
}
\cs_new_protected_nopar:Nn \__algobox_topstructure:nn {
- \int_while_do:nNnn \l__algobox_level_int > \c_zero {
+ \int_while_do:nNnn \l__algobox_level_int > \c_zero_int {
\__algobox_unindent:
}
\__algobox_indent:nn {#1} {#2}
@@ -325,7 +325,7 @@
}
\cs_new_protected_nopar:Nn \__algobox_funcstructure:nn {
- \int_while_do:nNnn \l__algobox_level_int > \c_two {
+ \int_while_do:nNnn \l__algobox_level_int > { 2 } {
\__algobox_unindent:
}
\bool_if:nTF {#2}{\__algobox_indent:nn}{\__algobox_block:nn} {fonctions} {#1}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/algobox.tlpobj new/tlpkg/tlpobj/algobox.tlpobj
--- old/tlpkg/tlpobj/algobox.tlpobj 2019-02-28 03:14:29.000000000 +0100
+++ new/tlpkg/tlpobj/algobox.tlpobj 2019-09-30 01:54:36.000000000 +0200
@@ -1,6 +1,6 @@
name algobox
category Package
-revision 45223
+revision 52204
shortdesc Typeset Algobox programs
relocated 1
longdesc This LaTeX package can typeset Algobox programs almost exactly
@@ -18,7 +18,7 @@
catalogue-contact-home https://gitlab.com/frnchfrgg-latex/algobox/wikis/home
catalogue-contact-repository https://gitlab.com/frnchfrgg-latex/algobox
catalogue-ctan /macros/latex/contrib/algobox
-catalogue-date 2017-09-07 05:54:52 +0200
+catalogue-date 2019-09-29 19:21:54 +0200
catalogue-license gpl3+
catalogue-topics listing program-doc
-catalogue-version 1.2a
+catalogue-version 1.3
++++++ algolrevived.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/algolrevived/OFL-FAQ.txt new/doc/fonts/algolrevived/OFL-FAQ.txt
--- old/doc/fonts/algolrevived/OFL-FAQ.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/algolrevived/OFL-FAQ.txt 2019-05-13 23:13:37.000000000 +0200
@@ -0,0 +1,435 @@
+OFL FAQ - Frequently Asked Questions about the SIL Open Font License (OFL)
+Version 1.1-update5 - April 2017
+The OFL FAQ is copyright (c) 2005-2017 SIL International.
+(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 WEB FONT 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, to create logos or other graphics or even to manufacture objects based on their outlines?
+Yes. You are very welcome to do so. Authors of fonts released under the OFL allow you to use their font software as such for any kind of design work. No additional license or permission is required, unlike with some other licenses. Some examples of these uses are: logos, posters, business cards, stationery, video titling, signage, t-shirts, personalised fabric, 3D-printed/laser-cut shapes, sculptures, rubber stamps, cookie cutters and lead type.
+
+1.1.1 Does that restrict the license or distribution of that artwork?
+No. You remain the author and copyright holder of that newly derived graphic or object. You are simply using an open font in the design process. It is only when you redistribute, bundle or modify the font itself that other conditions of the license have to be respected (see below for more details).
+
+1.1.2 Is any kind of acknowledgement required?
+No. Font authors may appreciate being mentioned in your artwork's acknowledgements alongside the name of the font, possibly with a link to their website, 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 and repositories?
+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 (or other similar package formats or installers) 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 web fonts 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: 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 may consist 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). Even if the font travels inside the document as one of its assets, it should not lose its authorship information and licensing.
+
+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 (see section 6 for more details and examples) 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 of the OFL's permissions and conditions? 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.
+
+1.20 I'm writing a small app for mobile platforms, do I need to include the whole package?
+If you bundle a font under the OFL with your mobile app you must comply with the terms of the license. At a minimum you must include the copyright statement, the license notice and the license text. A mention of this information in your About box or Changelog, with a link to where the font package is from, is good practice, and the extra space needed to carry these items is very small. You do not, however, need to include the full contents of the font package - only the fonts you use and the copyright and license that apply to them. For example, if you only use the regular weight in your app, you do not need to include the italic and bold versions.
+
+1.21 What about including OFL fonts by default in my firmware or dedicated operating system?
+Many such systems are restricted and turned into appliances so that users cannot study or modify them. Using open fonts to increase quality and language coverage is a great idea, but you need to be aware that if there is a way for users to extract fonts you cannot legally prevent them from doing that. The fonts themselves, including any changes you make to them, must be distributed under the OFL even if your firmware has a more restrictive license. If you do transform the fonts and change their formats when you include them in your firmware you must respect any names reserved by the font authors via the RFN mechanism and pick your own font name. Alternatively if you directly add a font under the OFL to the font folder of your firmware without modifying or optimizing it you are simply bundling the font like with any other software collection, and do not need to make any further changes.
+
+1.22 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. Remember 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).
+
+1.23 Can OFL fonts be included in services that deliver fonts to the desktop from remote repositories? Even if they contain both OFL and non-OFL fonts?
+Yes. Some foundries have set up services to deliver fonts to subscribers directly to desktops from their online repositories; similarly, plugins are available to preview and use fonts directly in your design tool or publishing suite. These services may mix open and restricted fonts in the same channel, however they should make a clear distinction between them to users. These services should also not hinder users (such as through DRM or obfuscation mechanisms) from extracting and using the OFL fonts in other environments, or continuing to use OFL fonts after subscription terms have ended, as those uses are specifically allowed by the OFL.
+
+1.24 Can services that provide or distribute OFL fonts restrict my use of them?
+No. The terms of use of such services cannot replace or restrict the terms of the OFL, as that would be the same as distributing the fonts under a different license, which is not allowed. You are still entitled to use, modify and redistribute them as the original authors have intended outside of the sole control of that particular distribution channel. Note, however, that the fonts provided by these services may differ from the Original Versions.
+
+
+2 USING OFL FONTS FOR WEBPAGES AND ONLINE WEB FONT SERVICES
+
+NOTE: This section often refers to a separate paper on 'Web Fonts & RFNs'. This is available at http://scripts.sil.org/OFL_web_fonts_and_RFNs
+
+2.1 Can I make webpages using these fonts?
+Yes! Go ahead! Using CSS (Cascading Style Sheets) is recommended. Your three best options are:
+- 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 web fonts are often tuned for a web environment and not intended for installation and use outside a browser. The reasons in favour of using web fonts 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 web font 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. However, there may be certain formats or usage scenarios that may allow the use of RFNs. See http://scripts.sil.org/OFL_web_fonts_and_RFNs
+
+2.4 Can I make OFL fonts available through web font online services?
+Yes, you are welcome to include OFL fonts in online web font 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 Some web font formats and services provide ways of "optimizing" the font for a particular website or web application; is that allowed?
+Yes, it is permitted, but remember that these optimized 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 optimization 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 that your users expect. It may also introduce degradation of quality in the rendering or specific bugs on the various target platforms compared to the original font from upstream. In other words, remember that one person's optimized font may be another person's missing feature. Various advanced typographic features (OpenType, Graphite or AAT) are also available through CSS and may provide the desired effects without the need to modify the font.
+
+2.6 Is subsetting a web font considered modification?
+Yes. Removing any parts of the font when delivering a web font to a browser, including unused glyphs and smart font code, is considered modification. This is permitted by the OFL but would not normally allow the use of RFNs. Some newer subsetting technologies may be able to subset in a way that allows users to effectively have access to the complete font, including smart font behaviour. See 2.8 and http://scripts.sil.org/OFL_web_fonts_and_RFNs
+
+2.7 Are there any situations in which a modified web font could use RFNs?
+Yes. If a web font is optimized only in ways that preserve Functional Equivalence (see 2.8), then it may use RFNs, as it reasonably represents the Original Version and respects the intentions of the author(s) and the main purposes of the RFN mechanism (avoids collisions, protects authors, minimizes support, encourages derivatives). However this is technically very difficult and often impractical, so a much better scenario is for the web font service or provider to sign a separate agreement with the author(s) that allows the use of RFNs for Modified Versions.
+
+2.8 How do you know if an optimization to a web font preserves Functional Equivalence?
+Functional Equivalence is described in full in the 'Web fonts and RFNs' paper at http://scripts.sil.org/OFL_web_fonts_and_RFNs, in general, an optimized font is deemed to be Functionally Equivalent (FE) to the Original Version if it:
+
+- Supports the same full character inventory. If a character can be properly displayed using the Original Version, then that same character, encoded correctly on a web page, will display properly.
+- Provides the same smart font behavior. Any dynamic shaping behavior that works with the Original Version should work when optimized, unless the browser or environment does not support it. There does not need to be guaranteed support in the client, but there should be no forced degradation of smart font or shaping behavior, such as the removal or obfuscation of OpenType, Graphite or AAT tables.
+- Presents text with no obvious degradation in visual quality. The lettershapes should be equally (or more) readable, within limits of the rendering platform.
+- Preserves original author, project and license metadata. At a minimum, this should include: Copyright and authorship; The license as stated in the Original Version, whether that is the full text of the OFL or a link to the web version; Any RFN declarations; Information already present in the font or documentation that points back to the Original Version, such as a link to the project or the author's website.
+
+If an optimized font meets these requirements, and so is considered to be FE, then it's very likely that the original author would feel that the optimized font is a good and reasonable equivalent. If it falls short of any of these requirements, the optimized font does not reasonably represent the Original Version, and so should be considered to be a Modified Version. Like other Modified Versions, it would not be allowed to use any RFNs and you simply need to pick your own font name.
+
+2.9 Isn't use of web fonts another form of embedding?
+No. Unlike embedded fonts in a PDF, web fonts are not an integrated part of the document itself. They are not specific to a single document and are often applied to thousands of documents around the world. The font data is not stored alongside the document data and often originates from a different location. The ease by which the web fonts used by a document may be identified and downloaded for desktop use demonstrates that they are philosophically and technically separate from the web pages that specify them. See http://scripts.sil.org/OFL_web_fonts_and_RFNs
+
+2.10 So would it be better to not use RFNs at all if you want your font to be distributed by a web fonts service?
+No. Although the OFL does not require authors to use RFNs, the RFN mechanism is an important part of the OFL model and completely compatible with web font services. If that web font service modifies the fonts, then the best solution is to sign a separate agreement for the use of any RFNs. It is perfectly valid for an author to not declare any RFNs, but before they do so they need to fully understand the benefits they are giving up, and the overall negative effect of allowing many different versions bearing the same name to be widely distributed. As a result, we don't generally recommend it.
+
+2.11 What should an agreement for the use of RFNs say? Are there any examples?
+There is no prescribed format for this agreement, as legal systems vary, and no recommended examples. Authors may wish to add specific clauses to further restrict use, require author review of Modified Versions, establish user support mechanisms or provide terms for ending the agreement. Such agreements are usually not public, and apply only to the main parties. However, it would be very beneficial for web font services to clearly state when they have established such agreements, so that the public understands clearly that their service is operating appropriately.
+
+See the separate paper on 'Web Fonts & RFNs' for in-depth discussion of issues related to the use of RFNs for web fonts. This is available at http://scripts.sil.org/OFL_web_fonts_and_RFNs
+
+
+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. See the placeholders in the OFL header template for recommendations on where to add your own statements. (Remember that, when authors have reserved names via the RFN mechanism, you need to change the internal names of the font to your own font name when making your modified version even if it is just a small change.)
+
+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 or OpenType/Graphite/AAT 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. The OFL does not grant any rights under trademark law. Bear in mind that trademark law varies from country to country and that there are no international trademark conventions as there are for copyright. You may need to significantly invest in registering and defending a trademark for it to remain valid in the countries you are interested in. This may be costly for an individual independent designer.
+
+3.8 If I commit changes to a font (or publish a branch in a DVCS) as part of a public open source software project, do I have to change the internal font names?
+Only if there are declared RFNs. Making a public commit or publishing a public branch is effectively redistributing your modifications, so any change to the font will require that you do not use the RFNs. Even if there are no RFNs, it may be useful to change the name or add a suffix indicating that a particular version of the font is still in development and not released yet. This will clearly indicate to users and fellow designers that this particular font is not ready for release yet. See section 5 for more details.
+
+
+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 (marked with the <> characters). Include this file in your release package.
+
+4.2.2 Put your copyright and the OFL text with your chosen Reserved Font Name(s) 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). Accurate metadata in your font files is beneficial to you as an increasing number of applications are exposing this information to the user. For example, clickable links can bring users back to your website and let them know about other work you have done or services you provide. Depending on the format of your fonts and sources, you can use template human-readable headers or machine-readable metadata. You should also double-check that there is no conflicting metadata in the font itself contradicting the license, such as the fstype bits in the os2 table or fields in the name table.
+
+4.2.3 Write an initial FONTLOG.txt for your font and include it in the release package (see Section 6 and Appendix A for details including a template).
+
+4.2.4 Include the relevant practical documentation on the license by adding the current OFL-FAQ.txt file in your package.
+
+4.2.5 If you wish you can use the OFL graphics (http://scripts.sil.org/OFL_logo) on your website.
+
+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. We recommend you turn to designers, foundries or consulting companies with experience in doing open font design to provide this service to you.
+
+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) 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 and if it treats authors with fairness.
+
+4.5 Why should I use the OFL for my fonts?
+- to meet needs for fonts that can be modified to support lesser-known 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, Graphite or AAT 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 web font online services
+- to attract attention for your commercial fonts
+- to make money through web font 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 for simplicity and legibility. 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. RFNs are optional and not required, but we encourage you to use them. This is primarily to avoid confusion between your work and Modified Versions. As an author you can release a font under the OFL and not declare any Reserved Font Names. There may be situations where you find that using no RFNs and letting your font be changed and modified - including any kind of modification - without having to change the original name is desirable. However you need to be fully aware of the consequences. There will be no direct way for end-users and other designers to distinguish your Original Version from many Modified Versions that may be created. You have to trust whoever is making the changes and the optimizations to not introduce problematic changes. The RFNs you choose for your own creation have value to you as an author because they allow you to maintain artistic integrity and keep some control over the distribution channel to your end-users. For discussion of RFNs and web fonts see section 2.
+
+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. The existence of such an agreement should be made as clear as possible to downstream users and designers in the distribution package and the relevant documentation. They need to know if they are a party to the agreement or not and what they are practically allowed to do or not even if all the details of the agreement are not public.
+
+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 own 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 existing RFNs but only add your own. RFN statements should be placed next to the copyright statement of the relevant author as indicated in the OFL.txt template to make them visible to designers wishing to make their separate version.
+
+
+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 designers and 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, 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 under a different license. They may also choose to release the same font under both the OFL and some other license. Only the Copyright Holder(s) can do this, and doing so does not change the terms of the OFL as it applies to that font.
+
+8.3 Is the OFL a contract or a license?
+The OFL is a worldwide license based on international copyright agreements and conventions. It is 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-2017 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 quote from the OFL FAQ?
+Yes, SIL gives permission to quote from the OFL FAQ (OFL-FAQ.txt), in whole or in part, provided that the quoted text is:
+
+- unmodified,
+- used to help explain the intent of the OFL, rather than cause misunderstanding, and
+- accompanied with the following attribution: "From the OFL FAQ (OFL-FAQ.txt), copyright (c) 2005-2017 SIL International. Used by permission. http://scripts.sil.org/OFL-FAQ_web".
+
+8.6 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 <language_name>. 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.
+
+8.7 Does the OFL have an explicit expiration term?
+No, the implicit intent of the OFL is that the permissions granted are perpetual and irrevocable.
+
+
+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
+
+10 December 2010 (Fred Foobar) GlobalFontFamily-devel version 1.4
+- fix new build and testing system (bug #123456)
+
+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(a)university.edu
+W: http://art.university.edu/projects/fonts
+D: Contributor - Armenian glyphs and code
+
+N: Fred Foobar
+E: fred(a)foobar.org
+W: http://foobar.org
+D: Contributor - misc Graphite fixes
+
+N: Pat Johnson
+E: pat(a)fontstudio.org
+W: http://pat.fontstudio.org
+D: Designer - Greek & Cyrillic glyphs based on Roman design
+
+N: Tom Parker
+E: tom(a)company.com
+W: http://www.company.com/tom/projects/fonts
+D: Engineer - original smart font code
+
+N: Joe Smith
+E: joe(a)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 renowned educational institution with a strong design department...
+-----
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/algolrevived/README new/doc/fonts/algolrevived/README
--- old/doc/fonts/algolrevived/README 2017-07-14 01:08:29.000000000 +0200
+++ new/doc/fonts/algolrevived/README 2019-11-13 22:43:43.000000000 +0100
@@ -12,13 +12,27 @@
license is in http://www.latex-project.org/lppl.txt and version 1.3 or later is
part of all distributions of LaTeX version 2003/12/01 or later. All files in that archive are
- Copyright (c) 2017 Michael Sharpe
+ Copyright (c) 2017--2019 Michael Sharpe
Files provided "as is", with no warranties.
The support files are provided in encodings OT1, T1, TS1 and LY1 for users of Western scripts.
-Current version: 1.01 2017-07-11
+Current version: 1.041 2019-11-12
+
+Changes in version 1.041
+Corrections to the fd files.
+
+Changes in version 1.04
+1. Added missing zalts1.enc so that textcomp works as expected.
+2. Changed mb to sb in all fd files, so that medium weight is mapped to a valid NFSS code.
+
+Changes in version 1.03
+Changed \let\zal@typewriter\@empty to \global\let\zal@typewriter\@empty in all fd files to prevent later problems if the fd file is called from within a group. (Thanks to Frank Mittelbach.)
+
+Changes in version 1.02
+1. Documentation correction.
+2. Corrected fd files. (Thanks to Frank Mittelbach for spotting the problem.)
Changes in version 1.01
1. Added overlooked typewriter support (.sty and .fd files) for LaTeX.
Binary files old/doc/fonts/algolrevived/algolrevived-doc.pdf and new/doc/fonts/algolrevived/algolrevived-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/algolrevived/algolrevived-doc.tex new/doc/fonts/algolrevived/algolrevived-doc.tex
--- old/doc/fonts/algolrevived/algolrevived-doc.tex 2017-07-14 01:08:29.000000000 +0200
+++ new/doc/fonts/algolrevived/algolrevived-doc.tex 2019-11-10 23:04:20.000000000 +0100
@@ -1,13 +1,14 @@
-% !TEX TS-program = pdflatexmk
+% !TEX TS-program = pdflatexmk
% Template file for TeXShop by Michael Sharpe, LPPL
\documentclass[11pt]{article}
\usepackage[margin=1in]{geometry}
\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
\usepackage{graphicx}
-\pdfmapfile{+algolrevived.map}
+%\pdfmapfile{=algolrevived.map}
%\pdfmapline{+AlgolRevived-tlf-ts1 AlgolRevived " zalts1Enc ReEncodeFont " <zalts1.enc <AlgolRevived.pfb}
%SetFonts
% algolrevived
+\usepackage{trace}
\usepackage{algolrevived} % use sb in place of bold
\usepackage[T1]{fontenc}
\usepackage{textcomp}
@@ -175,5 +176,5 @@
246 \textdiv
247 \textsqcup
\end{verbatim}
-For example, typing in \verb|A\coloneq B| results in A\textcoloneq B.
+For example, typing in \verb|A\textcoloneq B| results in A\textcoloneq B.
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/algolrevived.doc.tlpobj new/tlpkg/tlpobj/algolrevived.doc.tlpobj
--- old/tlpkg/tlpobj/algolrevived.doc.tlpobj 2019-02-28 03:14:29.000000000 +0100
+++ new/tlpkg/tlpobj/algolrevived.doc.tlpobj 2020-03-24 01:56:29.000000000 +0100
@@ -1,9 +1,10 @@
name algolrevived.doc
category Package
-revision 44784
+revision 54512
shortdesc doc files of algolrevived
relocated 1
-docfiles size=34
+docfiles size=47
+ RELOC/doc/fonts/algolrevived/OFL-FAQ.txt
RELOC/doc/fonts/algolrevived/OFL.txt
RELOC/doc/fonts/algolrevived/README
RELOC/doc/fonts/algolrevived/algolrevived-doc.pdf
++++++ algolrevived.tar.xz ++++++
++++ 4003 lines of diff (skipped)
++++++ amiri.doc.tar.xz ++++++
Binary files old/doc/fonts/amiri/Documentation-Arabic.pdf and new/doc/fonts/amiri/Documentation-Arabic.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/amiri/NEWS new/doc/fonts/amiri/NEWS
--- old/doc/fonts/amiri/NEWS 2017-12-21 00:14:59.000000000 +0100
+++ new/doc/fonts/amiri/NEWS 2019-09-30 23:40:28.000000000 +0200
@@ -1,3 +1,53 @@
+Amiri 0.112 (2019-09-29)
+------------------------
+
+* Fix dot below (U+065C) and make it rounded not rectangular.
+* Add an Amiri.fontspec file for use with LaTeX fontspec package (#139).
+* Make the build reproducible.
+* Fix some misplaced Latin accents.
+* Add alternate comma and semicolon for Sindhi and Malay, and can be enabled
+ with “ss08” feature as well (#145).
+* Fix Rohingya tones positioning a bit (#155).
+* Don’t make rounded guillemots the default as they are meant to be only for
+ Arabic.
+* Make narrow no break space as wide as thin space (#177).
+* Fix handling of several Quranic small letters to follow latest Unicode
+ recommendations.
+
+Amiri 0.111 (2017-12-30)
+------------------------
+
+* Drop TTF files from the web fonts archive, WOFF and WOFF2 should be all one
+ needs now.
+* Cosmetic changes to the CSS snippet.
+* Fix kerning of the new Kaf glyphs introduced in the previous release.
+* Add a font table document for the Quran font since it has different character
+ coverage.
+* Removed the `ccmp` feature composing decomposed Latin base/accent
+ combinations supported by the font. HarfBuzz does this in a bit smarter way,
+ users of other engines can apply Unicode normalization to the input text if
+ this is needed.
+* Fix wrong glyph class for U+0674 ARABIC LETTER HIGH HAMZA, causing it to be
+ incorrectly treated as a zero width mark:
+ https://github.com/alif-type/amiri/issues/138.
+* Drop localized Arabic names from the font (like style names), their support
+ in application is spotty, also it is a bit Ugly to have the font presented
+ with mixed language name, e.g. “Amiri عادي”, in some applications under
+ Arabic locales.
+* Allow Kashida around floating Hamza:
+ https://github.com/alif-type/amiri/issues/137
+* Colorize Hamza above mark in colored Quran font:
+ https://github.com/alif-type/amiri/issues/136
+* Change the shape of Damma used in U+06C7 & U+0677:
+ https://github.com/alif-type/amiri/issues/123
+* Other smaller fixes.
+* OpenType layout tables are now compiled with FontTool’s feaLib instead of my
+ FontForge fork. This is an attempt to make building the fonts from source
+ simpler for others and more predictable.
+* The font can now be built with Python 3, by calling `make PY2=python3`.
+* The font can be also built with upstream FontForge now, though the result
+ might be slightly different from the pre-built fonts.
+
Amiri 0.110 (2017-12-20)
------------------------
* New Glyphs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/amiri/NEWS-Arabic new/doc/fonts/amiri/NEWS-Arabic
--- old/doc/fonts/amiri/NEWS-Arabic 2017-12-21 00:14:59.000000000 +0100
+++ new/doc/fonts/amiri/NEWS-Arabic 2019-09-30 23:40:28.000000000 +0200
@@ -1,3 +1,28 @@
+أميري ٠٫١١٢ (٢٠١٩-٠٩-٢٩)
+------------------------
+* إصلاح علامة النقطة التحتية لتكون مستديرة لا مربعة.
+* إضافة ملف Amiri.fontspec ليستحدم مع حزمة fontspec للاتخ (#139).
+* إضافة فاصلة وفاصلة منقوطة بديلة للسندية والجاوية، ويمكنتفعيلها أيضا بخاصية
+ “ss08” (#145).
+* إصلاح تموضع بعض علامات تشكيل الروهينجا (#155).
+* جعل المسافة الضيقة غير الفاصلة مساوية في العرض للمسافة الرفيعة (#177).
+* إصلاح الحروف القرآنية الصغيرة لتوافق معايير يونيكود الحديثة.
+
+أميري ٠٫١١١ (٢٠١٧-١٢-٣٠)
+------------------------
+* تحسين اقتران الكافات التي أضيفت في الإصدارة السابقة.
+* إصلاح خطأ يجعل جرف الهمزة العالية (U+0674) يقترن بالهرف السابق عليه:
+ https://github.com/alif-type/amiri/issues/138.
+* إزالة الأسماء العربية الداخلية للخط، لتفادي ازدواجية اللغة في اسم الخط في بعض
+ التطبيقات عندما يكون النظام باللغة العربية، مثل ”Amiri عادي“.
+* السماح بأن تسبق أو تلحق همزة وسط الكلمة بالكشيدة:
+ https://github.com/alif-type/amiri/issues/137
+* تلوين علامة الهمزة المنفصلة في الخط القرآني الملون:
+ https://github.com/alif-type/amiri/issues/136
+* تغيير شكل الضمة في حرفي U+06C7 و U+0677:
+ https://github.com/alif-type/amiri/issues/123
+* تغييرات شغيرة أخرى، و تغييرات على نظام بناء الخط من المصدر.
+
أميري ٠٫١١٠ (٢٠١٧-١٢-٢٠)
-----------------------
* محارف جديدة:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/amiri/README new/doc/fonts/amiri/README
--- old/doc/fonts/amiri/README 2017-12-21 00:14:59.000000000 +0100
+++ new/doc/fonts/amiri/README 2019-09-30 23:40:28.000000000 +0200
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/alif-type/amiri.svg?branch=master)](https://t…
+
Amiri Font
==========
@@ -26,5 +28,64 @@
> http://amirifont.org
+Contributing
+------------
+
+To edit the font sources, you will need FontForge, preferably the latest
+version. To install FontForge on Debian and Ubuntu:
+
+ $ sudo apt-get install fontforge
+
+You can then open the source files in FontForge and start editing, either from
+GUI or from the command line:
+
+ $ fontforge sources/Amiri-Regular.sfdir
+
+To build the fonts you need FontForge Python module, gpp and FontTools:
+
+ $ sudo apt-get install python-fontforge gpp
+ $ python -m venv amiri --system-site-packages
+ $ . amiri/bin/activate
+ $ pip install fonttools brotli
+
+To build the font files run:
+
+ $ make ttf
+
+To build the font files along with the web files; run:
+
+ $ make web
+
+Ubuntu 16.04 Contributors
+-------------------------
+
+You might face an error with importing fontforge
+
+ File "tools/build.py", line 18, in <module>
+ import fontforge
+ ImportError: No module named fontforge
+
+This is because fontforge does not work properly with Python 3 on Ubuntu 16.04.
+To build the fonts with Python version 2.7 ; install FontForge Python
+module by following the instructions from the [official documentation][3]. But
+make sure to enable python extension and scripting for Python 2. Use the following
+commands instead of the original in the last step of the installation:
+
+ $ cd fontforge
+ $ ./bootstrap
+ $ ./configure --enable-python-extension --enable-python-scripting=2
+ $ make
+ $ sudo make install
+ $ sudo ldconfig
+
+After that, return back to the directory of the amiri repository and continue
+with python-fontforge, gpp, and the virtual environment
+
+ $ sudo apt-get install python-fontforge gpp
+ $ virtualenv amiri --system-site-packages
+ $ . amiri/bin/activate
+ $ pip install fonttools brotli
+
[1]: http://www.bibalex.org/bulaqpress/en/bulaq.htm "The Bulaq Press"
[2]: http://scripts.sil.org/OFL "The Open Font License"
+[3]: https://github.com/fontforge/fontforge/blob/master/INSTALL-git.md "FontForge official documentation"
\ No newline at end of file
Binary files old/doc/fonts/amiri/amiri-table.pdf and new/doc/fonts/amiri/amiri-table.pdf differ
Binary files old/doc/fonts/amiri/documentation-arabic.pdf and new/doc/fonts/amiri/documentation-arabic.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amiri.doc.tlpobj new/tlpkg/tlpobj/amiri.doc.tlpobj
--- old/tlpkg/tlpobj/amiri.doc.tlpobj 2019-02-28 03:14:36.000000000 +0100
+++ new/tlpkg/tlpobj/amiri.doc.tlpobj 2019-10-01 02:21:32.000000000 +0200
@@ -1,13 +1,12 @@
name amiri.doc
category Package
-revision 46104
+revision 52218
shortdesc doc files of amiri
relocated 1
-docfiles size=81
+docfiles size=39
+ RELOC/doc/fonts/amiri/Documentation-Arabic.pdf
RELOC/doc/fonts/amiri/NEWS
RELOC/doc/fonts/amiri/NEWS-Arabic
RELOC/doc/fonts/amiri/OFL.txt
RELOC/doc/fonts/amiri/README
RELOC/doc/fonts/amiri/README-Arabic
- RELOC/doc/fonts/amiri/amiri-table.pdf
- RELOC/doc/fonts/amiri/documentation-arabic.pdf
++++++ amiri.tar.xz ++++++
Binary files old/fonts/truetype/public/amiri/Amiri-Bold.ttf and new/fonts/truetype/public/amiri/Amiri-Bold.ttf differ
Binary files old/fonts/truetype/public/amiri/Amiri-BoldSlanted.ttf and new/fonts/truetype/public/amiri/Amiri-BoldSlanted.ttf differ
Binary files old/fonts/truetype/public/amiri/Amiri-Regular.ttf and new/fonts/truetype/public/amiri/Amiri-Regular.ttf differ
Binary files old/fonts/truetype/public/amiri/Amiri-Slanted.ttf and new/fonts/truetype/public/amiri/Amiri-Slanted.ttf differ
Binary files old/fonts/truetype/public/amiri/AmiriQuran.ttf and new/fonts/truetype/public/amiri/AmiriQuran.ttf differ
Binary files old/fonts/truetype/public/amiri/AmiriQuranColored.ttf and new/fonts/truetype/public/amiri/AmiriQuranColored.ttf differ
Binary files old/fonts/truetype/public/amiri/amiri-bold.ttf and new/fonts/truetype/public/amiri/amiri-bold.ttf differ
Binary files old/fonts/truetype/public/amiri/amiri-boldslanted.ttf and new/fonts/truetype/public/amiri/amiri-boldslanted.ttf differ
Binary files old/fonts/truetype/public/amiri/amiri-quran-colored.ttf and new/fonts/truetype/public/amiri/amiri-quran-colored.ttf differ
Binary files old/fonts/truetype/public/amiri/amiri-quran.ttf and new/fonts/truetype/public/amiri/amiri-quran.ttf differ
Binary files old/fonts/truetype/public/amiri/amiri-regular.ttf and new/fonts/truetype/public/amiri/amiri-regular.ttf differ
Binary files old/fonts/truetype/public/amiri/amiri-slanted.ttf and new/fonts/truetype/public/amiri/amiri-slanted.ttf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/amiri/Amiri.fontspec new/tex/latex/amiri/Amiri.fontspec
--- old/tex/latex/amiri/Amiri.fontspec 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/amiri/Amiri.fontspec 2019-09-30 23:40:28.000000000 +0200
@@ -0,0 +1,7 @@
+\defaultfontfeatures[Amiri]{
+ Extension=.ttf,
+ UprightFont=*-Regular,
+ ItalicFont=*-Slanted,
+ BoldFont=*-Bold,
+ BoldItalicFont=*-BoldSlanted,
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amiri.tlpobj new/tlpkg/tlpobj/amiri.tlpobj
--- old/tlpkg/tlpobj/amiri.tlpobj 2019-02-28 03:14:36.000000000 +0100
+++ new/tlpkg/tlpobj/amiri.tlpobj 2019-10-01 02:21:33.000000000 +0200
@@ -1,6 +1,6 @@
name amiri
category Package
-revision 46104
+revision 52218
shortdesc A classical Arabic typeface, Naskh style
relocated 1
longdesc Amiri is a classical Arabic typeface in Naskh style for
@@ -11,19 +11,20 @@
longdesc aesthetics and traditions of Arabic typesetting, and adapting
longdesc it to the era of digital typesetting, in a publicly available
longdesc form.
-runfiles size=716
- RELOC/fonts/truetype/public/amiri/amiri-bold.ttf
- RELOC/fonts/truetype/public/amiri/amiri-boldslanted.ttf
- RELOC/fonts/truetype/public/amiri/amiri-quran-colored.ttf
- RELOC/fonts/truetype/public/amiri/amiri-quran.ttf
- RELOC/fonts/truetype/public/amiri/amiri-regular.ttf
- RELOC/fonts/truetype/public/amiri/amiri-slanted.ttf
+runfiles size=604
+ RELOC/fonts/truetype/public/amiri/Amiri-Bold.ttf
+ RELOC/fonts/truetype/public/amiri/Amiri-BoldSlanted.ttf
+ RELOC/fonts/truetype/public/amiri/Amiri-Regular.ttf
+ RELOC/fonts/truetype/public/amiri/Amiri-Slanted.ttf
+ RELOC/fonts/truetype/public/amiri/AmiriQuran.ttf
+ RELOC/fonts/truetype/public/amiri/AmiriQuranColored.ttf
+ RELOC/tex/latex/amiri/Amiri.fontspec
catalogue-contact-bugs https://github.com/alif-type/amiri/issues
catalogue-contact-home http://amirifont.org
catalogue-contact-repository https://github.com/alif-type/amiri
catalogue-contact-support https://github.com/alif-type/amiri/issues
catalogue-ctan /fonts/amiri
-catalogue-date 2017-12-20 14:05:09 +0100
+catalogue-date 2019-09-29 23:15:18 +0200
catalogue-license ofl
catalogue-topics font font-ttf arabic
-catalogue-version 0.110
+catalogue-version 0.112
++++++ amsmath.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/amsmath/README.md new/doc/latex/amsmath/README.md
--- old/doc/latex/amsmath/README.md 2018-12-11 23:32:49.000000000 +0100
+++ new/doc/latex/amsmath/README.md 2020-02-02 23:42:01.000000000 +0100
@@ -1,71 +1,61 @@
-## README for latex-amsmath bundle
+The amsmath bundle for LaTeX
+============================
+Release 2020-02-02
-### OVERVIEW
+Overview
+--------
-The amsmath package is an extension package for LaTeX that provides
+The `amsmath` package is an extension package for LaTeX that provides
additional features to facilitate mathematical typesetting. It has been
-developed by the American Mathematical Society and released for general
+developed by the American Mathematical Society (AMS) and released for general
use as a service to the mathematical community. A number of smaller
-auxiliary packages are also distributed with the amsmath package.
+auxiliary packages are also distributed with the `amsmath` package.
-Effective in 2016, maintenance of amsmath was transferred from AMS to
-the LaTeX3 Project; as amsmath is considered a "required" package, this
+Effective in 2016, maintenance of `amsmath was transferred from AMS to
+the LaTeX Project; as `amsmath` is considered a "required" package, this
centralizes control over the core LaTeX components.
+Installation
+------------
-### INSTALLATION AND GETTING STARTED
+We no longer distribute installation instructions for the various TeX
+implementations. All modern TeX systems include `amsmath` as-standard, and end
+users should in general use the release versions supplied in this way.
-In order to use amsmath you need to have TeX installed first.
-For information on getting TeX see one of the following:
+Release distribution is carried out only through the CTAN archives.
- - [LaTeX Project Website](https://www.latex-project.org/)
- - [TeX User Group](https://www.tug.org/)
- - [TeX resources (AMS infos for authors)](https://www.ams.org/tex/tex-resources)
+Documentation
+-------------
-It is recommended to install a comprehensive distribution, such as
-TeX Live, MiKTeX for Windows, or MacTeX for Macintosh.
-As part of the "required" LaTeX package subset, amsmath
-will already be available if one of these distributions is chosen.
-
-If you are installing amsmath manually, the most recent version
-will be available from the CTAN archives
-https://www.ctan.org/pkg/amsmath
-
-
-The primary documentation for amsmath is in
-
- - amsldoc.pdf
+The primary documentation for `amsmath` is in provided as `amsldoc.pdf`.
Additional documentation files include:
- - diffs-m.txt
- - subeqn.pdf
- - technote.pdf
- - testmath.pdf
+ - `diffs-m.txt`
+ - `subeqn.pdf`
+ - `technote.pdf`
+ - `testmath.pdf`
which are included in the collection. All of these can be accessed
easily with most distributions by entering `texdoc` *filename* at the
command line, or via [TeXdoc Online](http://texdoc.net).
-
-
-
-### CHANGE LOG
+Change logs
+-----------
The file `changes.txt` lists recent changes in reverse chronological order.
The file `diffs-m.txt` contains information on development and changes
prior to 2000.
+Reporting Bugs
+--------------
-### Reporting Bugs
-
-If you wish to report a problem or bug in any of these packages
-please use the
-[Issue Tracker for LaTeX2e on GitHub](https://github.com/latex3/latex2e/issues)
-and follow the guidelines that pop up if you press the `New issue` button.
-
+If you wish to report a problem or bug in the `amsmath` bundle
+please use the [Issue Tracker for LaTeX2e on
+GitHub](https://github.com/latex3/latex2e/issues)
+and follow the guidelines that pop up if you press the "New issue" button.
In particular, to check that you are really seeing a bug, please write
a short, self-contained document that shows the problem. This should
@@ -77,22 +67,15 @@
If the bug turns out to be with third-party software then please
contact the developer, and not us!
+License
+-------
-### Copyright
-
-Copyright 2001-2004, 2007, 2008, 2010, 2011, 2013 American Mathematical Society.
-Copyright 2016-2018 LaTeX3 Project and American Mathematical Society.
-
-This work may be distributed and/or modified under the
-conditions of the LaTeX Project Public License, either version 1.3c
-of this license or (at your option) any later version.
-The latest version of this license is in
- https://www.latex-project.org/lppl.txt
-and version 1.3c or later is part of all distributions of LaTeX
-version 2005/12/01 or later.
+The contents of this bundle are distributed under the [LaTeX Project
+Public License](https://www.latex-project.org/lppl/lppl-1-3c/),
+version 1.3c or later.
-This work has the LPPL maintenance status `maintained'.
+-----
-The Current Maintainer of this work is the LaTeX3 Project.
+<p>Copyright (C) 2001-2004, 2007, 2008, 2010, 2011, 2013 American Mathematical Society. <br />
+<p>Copyright (C) 2016-2020 The LaTeX Project and American Mathematical Society. <br />
-This README file is copyright 2016-2018 The LaTeX3 Project.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/amsmath/ams-external.txt new/doc/latex/amsmath/ams-external.txt
--- old/doc/latex/amsmath/ams-external.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/amsmath/ams-external.txt 2019-10-04 22:57:14.000000000 +0200
@@ -0,0 +1,547 @@
+%%% list of external commands used by amsmath (not totally correct)
+
+\!
+\"
+\(
+\*
+\,
+\-
+\.
+\/
+\:
+\;
+\=
+\Acute
+\AmS
+\AmSfont
+\And
+\AtBeginDocument
+\Bar
+\Big
+\Bigg
+\Biggr
+\Bigr
+\Breve
+\Check
+\DOTS
+\DOTSB
+\DOTSI
+\DOTSX
+\Ddot
+\DeclareFontEncoding
+\DeclareFontShape
+\DeclareMathAccent
+\DeclareMathDelimiter
+\DeclareMathOperator
+\DeclareMathSymbol
+\DeclareOption
+\DeclareRobustCommand
+\Dot
+\ExecuteOptions
+\GenericError
+\GenericInfo
+\GenericWarning
+\Grave
+\Hat
+\Leftarrow
+\Longleftarrow
+\Longleftrightarrow
+\Longrightarrow
+\MessageBreak
+\MultiIntegral
+\PackageError
+\PackageWarning
+\PackageWarningNoLine
+\PassOptionsToPackage
+\Pr
+\ProcessOptions
+\Relbar
+\RequirePackage
+\Rightarrow
+\Tilde
+\Umathaccent
+\Umathcar
+\Umathchar
+\Umathcharnumdef
+\Umathcode
+\Umathcodenum
+\Umathfractiondelsize
+\Vec
+\Vert
+\XeTeXcharclass
+\[
+\]
+\above
+\abovedisplayskip
+\abovewithdelims
+\accentedsymbol
+\acute
+\addtocounter
+\advance
+\aftergroup
+\allowbreak
+\allowdisplaybreaks
+\alph
+\arabic
+\arccos
+\arcsin
+\arctan
+\arg
+\array
+\arraycolsep
+\arraystretch
+\atop
+\atopwithdelims
+\badness<
+\bar
+\baselineskip
+\baselineskip6
+\begin
+\begingroup
+\belowdisplayskip
+\bgroup
+\big
+\bigcap
+\bigcup
+\bigg
+\biggr
+\bigodot
+\bigoplus
+\bigotimes
+\bigr
+\bigsqcup
+\biguplus
+\bigvee
+\bigwedge
+\binom
+\bmod
+\boldsymbol
+\box
+\boxed
+\breve
+\cases
+\cdotp
+\cdots
+\cfrac
+\char
+\chardef
+\check
+\cleaders
+\colon
+\columnwidth
+\coprod
+\copy
+\cos
+\cosh
+\cot
+\coth
+\cr
+\crcr
+\csc
+\csname
+\csnamen
+\csnamethe
+\dbinom
+\ddddot
+\dddot
+\ddot
+\def
+\deg
+\delimiter
+\delimiterfactor
+\delimitershortfall
+\det
+\dfrac
+\dim
+\displaybreak
+\displayindent
+\displaylimits
+\displaystyle
+\displaywidth
+\divide
+\do
+\dot
+\doteq
+\dots
+\dotsb
+\dotsc
+\dotsi
+\dotsm
+\dotso
+\dp
+\edef
+\egroup
+\else
+\end
+\endalign
+\endaligned
+\endarray
+\endcsname
+\endgather
+\endgroup
+\endmathdisplay
+\endmatrix
+\endmultline
+\endsplit
+\endsubarray
+\eqno
+\eqref
+\everycr
+\everydisplay
+\everymath
+\exp
+\expandafter
+\fbox
+\fi
+\fontchardp
+\fontcharht
+\fontdimen
+\fontencoding
+\fontfamily
+\frac
+\fracwithdelims
+\futurelet
+\gcd
+\gdef
+\genfrac
+\global
+\grave
+\halign
+\halignto
+\hat
+\hbox
+\hdots
+\hdotsfor
+\hfil
+\hfill
+\hfilneg
+\hfuzz
+\hom
+\hookleftarrow
+\hookrightarrow
+\hrule
+\hskip
+\ht
+\ialign
+\idotsint
+\if
+\ifDOTS
+\ifcase
+\ifdim
+\iff
+\iffalse
+\iffalse%initialvalue
+\ifhbox
+\ifinner
+\ifm
+\ifmacrostarts
+\ifmmode
+\ifnum
+\ifnum`
+\ifodd
+\iftrue
+\ifvmode
+\ifx
+\ignorespaces
+\ignorespacesafterend
+\iiiint
+\iiint
+\iint
+\impliedby
+\implies
+\inf
+\injlim
+\int
+\interdisplaylinepenalty
+\intertext
+\intop
+\joinrel
+\jot
+\ker
+\kern
+\l%
+\lVert
+\label
+\lastbox
+\lastkern
+\lastskip
+\lbrace
+\ldots
+\leavevmode
+\left
+\leftarrow
+\leftmargini
+\leftmarginiminus
+\leftroot
+\leqno
+\let
+\lg
+\lhook
+\lim
+\liminf
+\limits
+\lineskip
+\lineskiplimit
+\linewidth
+\llap
+\ln
+\log
+\long
+\longleftarrow
+\longleftrightarrow
+\longmapsto
+\longrightarrow
+\loop
+\lq
+\lvert
+\mapsto
+\mapstochar
+\mathaccent
+\mathaccentV
+\mathalpha
+\mathbin
+\mathchar
+\mathchardef
+\mathchoice
+\mathclose
+\mathcode
+\mathdisplay
+\mathellipsis
+\mathgroup
+\mathhexbox
+\mathinner
+\mathop
+\mathopen
+\mathord
+\mathpalette
+\mathpunct
+\mathrel
+\mathring
+\mathsurround
+\mathxxx
+\mathxxxtest
+\mathxxxx
+\matrix
+\max
+\maxdimen
+\mbox
+\meaning
+\medmuskip
+\medspace
+\min
+\minalignsep
+\mintagsep
+\mkern
+\mod
+\moveleft
+\mskip
+\mspace
+\multicolumn
+\multiply
+\multlinegap
+\multlinegap10pt
+\multlinetaggap
+\multlinetaggap10pt
+\negmedspace
+\negthickspace
+\negthinspace
+\newbox
+\newcommand
+\newcount
+\newcounter
+\newdimen
+\newenvironment
+\newhelp
+\newif
+\newmuskip
+\newskip
+\newtoks
+\noalign
+\nobreak
+\nobreakdash
+\nobreakspace
+\noexpand
+\noindent
+\nointerlineskip
+\nolimits
+\nonscript
+\nonumber
+\normalbaselines
+\normalcolor
+\normalfont
+\normallineskiplimit
+\not
+\notag
+\nottest
+\null
+\nulldelimiterspace
+\number
+\numberwithin
+\of
+\oint
+\ointop
+\omit
+\openup
+\operatorfont
+\operatorname
+\operatornamewithlimits
+\or
+\over
+\overleftarrow
+\overleftrightarrow
+\overline
+\overrightarrow
+\overset
+\overwithdelims
+\par
+\parshape
+\penalty
+\pmatrix
+\pmod
+\pod
+\postdisplaypenalty
+\predisplaypenalty
+\prevdepth
+\primfrac
+\prod
+\projlim
+\protect
+\providecommand
+\qopname
+\quad
+\rVert
+\raise
+\raisetag
+\rangle
+\rbrace
+\rbrack
+\rceil
+\ref
+\refstepcounter
+\relax
+\relaxo
+\relbar
+\renewcommand
+\renewenvironment
+\repeat
+\rfloor
+\rgroup
+\rhook
+\right
+\rightarrow
+\rlap
+\rmoustache
+\romannumeral
+\root
+\rootbox
+\rq
+\rvert
+\scriptfont
+\scriptscriptfont
+\scriptscriptstyle
+\scriptstyle
+\sec
+\selectfont
+\setbox
+\setcounter
+\shoveleft
+\shoveright
+\sideset
+\sim
+\sin
+\sinh
+\skewchar
+\smash
+\space
+\spaceor
+\span
+\spbreve
+\spcheck
+\spdddot
+\spddot
+\spdot
+\sphat
+\split
+\sptilde
+\sqrtsign
+\stepcounter
+\string
+\strut
+\strutbox
+\subarray
+\substack
+\sum
+\sup
+\symoperators
+\tabskip
+\tag
+\taghere
+\tan
+\tanh
+\tbinom
+\text
+\textellipsis
+\textfont
+\textstyle
+\textup
+\tfrac
+\the
+\theequation
+\theparentequation
+\thetag
+\thickmuskip
+\thickmuskip0mu
+\thickspace
+\thinmuskip
+\thinspace
+\tilde
+\tmspace
+\toks
+\typeout
+\u
+\underleftarrow
+\underleftrightarrow
+\underrightarrow
+\underset
+\unhbox
+\unhcopy
+\unpenalty
+\unskip
+\unvbox
+\unvcopy
+\uppercase
+\uproot
+\usefont
+\value
+\varDelta
+\varGamma
+\varLambda
+\varOmega
+\varPhi
+\varPi
+\varPsi
+\varSigma
+\varTheta
+\varUpsilon
+\varXi
+\varinjlim
+\varliminf
+\varlimsup
+\varprojlim
+\vbox
+\vcenter
+\vec
+\vee
+\veqno
+\vert
+\vrule
+\vskip
+\vss
+\vtop
+\wd
+\widehat
+\widetilde
+\xdef
+\xleaders
+\xleftarrow
+\xrightarrow
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/amsmath/ams-internal.txt new/doc/latex/amsmath/ams-internal.txt
--- old/doc/latex/amsmath/ams-internal.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/amsmath/ams-internal.txt 2019-10-04 22:57:14.000000000 +0200
@@ -0,0 +1,482 @@
+%%%% list of internal commands used by amsmath (not totally correct)
+
+\@@above
+\@@abovewithdelims
+\@@atop
+\@@atopwithdelims
+\@@eqno
+\@@italiccorr
+\@@leqno
+\@@over
+\@@overline
+\@@overwithdelims
+\@@sqrt
+\@@undefined
+\@@underline
+\@M
+\@addtoreset
+\@amsmath@err
+\@arrayboxrestore
+\@arrayparboxrestore
+\@backslashchar
+\@badmath
+\@car
+\@cdots
+\@centering
+\@checkend
+\@currentlabel
+\@currenvir
+\@declmathop
+\@depth
+\@display@init
+\@displaytrue
+\@eha
+\@ehc
+\@ehd
+\@elt
+\@empty
+\@emptytoks
+\@envbody
+\@eqnnum
+\@eqnswfalse
+\@eqnswtrue
+\@eqpen
+\@fleqntrue
+\@for
+\@genfrac
+\@getpen
+\@gobble
+\@gobblefour
+\@gobblethree
+\@gobbletwo
+\@gtempa
+\@height
+\@iden
+\@ifdefinable
+\@ifnextchar
+\@ifnotempty
+\@ifpackageloaded
+\@ifpackagewith
+\@ifstar
+\@ifundefined
+\@ignoretrue
+\@ldots
+\@let@token
+\@lign
+\@m
+\@mathmargin
+\@mathmeasure
+\@mathstyle
+\@namedef
+\@ne
+\@nil
+\@nocnterr
+\@nocounterr
+\@nx
+\@onlypreamble
+\@saveprimitive
+\@sptoken
+\@stpelt
+\@tempa
+\@tempb
+\@tempc
+\@tempcnta
+\@tempcntb
+\@tempd
+\@tempdima
+\@tempdimb
+\@tempdimc
+\@temptokena
+\@testopt
+\@totalleftmargin
+\@undefined
+\@width
+\@xp
+\@xp#1
+\DN@
+\DOTS@
+\DOTSCASE@
+\FN@
+\Invalid@@
+\Leftarrowfill@
+\Leftrightarrowfill@
+\Let@
+\Mathstrut@
+\Mathstrutbox@
+\RIfM@
+\Rightarrowfill@
+\SK@@label
+\SK@equationtrue
+\SK@tagform@
+\Umathch@
+\acc@check
+\acc@error
+\accentclass@
+\add@amp
+\add@amps
+\addto@envbody
+\addto@hook
+\align@
+\align@preamble
+\align@recover
+\aligned@a
+\alignedat@a
+\alignedspace@left
+\alignsafe@testopt
+\alignsep@
+\alignsep@-
+\alignsep@<
+\alt@tag
+\ams@DeclareRobustCommand
+\ams@def
+\ams@newcommand
+\ams@renewcommand
+\andhelp@
+\arrowfill@
+\bBigg@
+\begin@stack
+\big@size
+\bigcap@
+\bigcup@
+\bigodot@
+\bigoplus@
+\bigotimes@
+\bigsqcup@
+\biguplus@
+\bigvee@
+\bigwedge@
+\binrel@
+\binrel@@
+\black@
+\bold@false
+\bold@true
+\boldsymboldots@
+\boxz@
+\c@MaxMatrixCols
+\c@MaxMatrixColsc
+\calc@shift@align
+\calc@shift@gather
+\check@mathfonts
+\checkat@false
+\checkat@true
+\cl@@ckpt
+\classnum@
+\cmex@opt
+\collect@@body
+\collect@body
+\column@
+\column@plus
+\coprod@
+\count@
+\csname@@
+\csnamec@
+\csnamecl@
+\csnameemdf@
+\csnamem@gobble
+\csnamemb@
+\ctagsplit@false
+\ctagsplit@true
+\default@tag
+\delayed@
+\df@label
+\df@tag
+\dft@tag
+\dimen@
+\displ@y
+\displ@y@
+\displaywidth@
+\dotsb@
+\dotso@
+\dotsspace@
+\dspbrk@
+\dspbrk@context
+\dspbrk@lvl
+\dt@pfalse
+\dt@ptrue
+\emdf@L
+\emdf@La
+\emdf@R
+\emdf@Ra
+\emdf@U
+\emdf@Ua
+\endmathdisplay@a
+\endmathdisplay@fleqn
+\endmultline@math
+\env@cases
+\env@matrix
+\eqnshift@
+\every@math@size
+\ex@
+\ext@arrow
+\extra@
+\extrap@
+\f@series
+\f@size
+\field@lengths
+\fieldlengths@
+\finsm@sh
+\firstchoice@false
+\firstchoice@true
+\fracwithdelims@
+\frozen@everymath
+\gather@
+\gather@split
+\gdisplaywidth@
+\genfrac@choice
+\genfrac@rule
+\getdsp@pen
+\getmathch@
+\getmathcode@
+\gmeasure@
+\gobble@tag
+\gtest@false
+\gtest@true
+\hdots@for
+\hexnumber@
+\if@display
+\if@eqnsw
+\if@fleqn
+\ifbold@
+\ifcheckat@
+\ifctagsplit@
+\ifdt@p
+\iffirstchoice@
+\ifgtest@
+\ifinalign@
+\ifingather@
+\ifmeasuring@
+\ifshifttag@
+\ifst@rred
+\iftag@
+\iftagsleft@
+\iftagsleft@L
+\ifxxat@
+\ilimits@
+\inalign@false
+\inalign@true
+\incr@eqnum
+\inf@bad
+\ingather@false
+\ingather@true
+\insplit@
+\intdots@
+\intertext@
+\intkern@
+\ints@a
+\ints@b
+\ints@c
+\invalid@tag
+\keybin@
+\keybin@test
+\label@in@display
+\leavevmode@ifvmode
+\leftarrowfill@
+\leftrightarrowfill@
+\leftroot@
+\leftroot@mu
+\lendmultline@
+\lendsplit@
+\lineht@
+\ltx@label
+\m@gobble
+\m@ne
+\m@th
+\m@th$
+\macc@a
+\macc@adjust
+\macc@code
+\macc@depth
+\macc@group
+\macc@kerna
+\macc@kernb
+\macc@nested
+\macc@nested@a
+\macc@nucleus
+\macc@palette
+\macc@set@skewchar
+\macc@skewchar
+\macc@style
+\macc@test
+\macc@tmp
+\macro@
+\macro@@
+\make@df@tag
+\make@df@tag@@
+\make@df@tag@@@
+\make@display@tag
+\makesm@sh
+\maketag@@
+\maketag@@@
+\math@
+\math@bgroup
+\math@cr
+\math@cr@
+\math@cr@@
+\math@cr@@@
+\math@cr@@@align
+\math@cr@@@align@measure
+\math@cr@@@aligned
+\math@cr@@@alignedat
+\math@cr@@@gather
+\math@cr@@[
+\math@egroup
+\mathbin@
+\mathch@
+\mathdisplay@@pop
+\mathdisplay@@push
+\mathdisplay@pop
+\mathdisplay@push
+\mathdisplay@stack
+\mathrel@
+\mathsm@sh
+\matrix@check
+\matrix@error
+\maxcol@width
+\maxcolumn@widths
+\maxfields@
+\mb@b
+\mb@t
+\mb@tb
+\mdots@
+\mdots@@
+\meaning@
+\meaning@@
+\measure@
+\measuring@false
+\measuring@true
+\mmeasure@
+\multline@
+\multline@indent
+\new@ifnextchar
+\newmcodes@
+\newmcodes@m
+\newmcodes@o
+\next@
+\nextii@
+\nextiii@
+\nextiv@
+\nextix@
+\nextv@
+\nextvi@
+\nextvii@
+\nextviii@
+\nfss@text
+\nmlimits@
+\noaccents@
+\nogood@displaybreak
+\nolimits@
+\nomath@env
+\nonmatherr@
+\not@
+\operator@font
+\operator@fontlim$
+\operator@fontmod
+\overarrow@
+\p@
+\p@equation
+\place@tag
+\place@tag@gather
+\plainroot@
+\print@eqnum
+\process@envbody
+\prod@
+\protected@edef
+\push@begins
+\r@@t
+\raise@tag
+\relaxnext@
+\rendmultline@
+\rendsplit@
+\reset@equation
+\reset@strutbox@
+\resetMathstrut@
+\restore@hfuzz
+\restore@math@cr
+\restorealignstate@
+\restorecolumn@
+\restorecounters@
+\rightarrowfill@
+\rightdelim@
+\row@
+\savealignstate@
+\savecolumn@
+\savecounters@
+\savefieldlength@
+\saveshift@
+\savetaglength@
+\select@group
+\set@field
+\set@gather@field
+\set@mathaccent
+\setboxz@h
+\sf@size
+\shdots@for
+\shift@tag
+\shifttag@false
+\shifttag@true
+\sixt@@n
+\skip@
+\slimits@
+\split@
+\split@al@a
+\split@al@tagcheck
+\split@aligned
+\split@err
+\split@tag
+\split@warning
+\spread@equation
+\ssf@size
+\st@rredfalse
+\st@rredtrue
+\start@align
+\start@aligned
+\start@gather
+\start@multline
+\std@equal
+\std@minus
+\striplong@
+\strut@
+\strut@$
+\strutbox@
+\sum@
+\tag@false
+\tag@help
+\tag@in@align
+\tag@in@display
+\tag@in@display@a
+\tag@lengths
+\tag@shifts
+\tag@true
+\tag@width
+\tagform@
+\tagshift@
+\tagsleft@false
+\tagsleft@true
+\tagwidth@
+\tdots@
+\text@
+\textdef@
+\thecharacter@
+\thedots@
+\thr@@
+\toks@
+\too@wide
+\totwidth@
+\try@load@fontshape
+\tw@
+\underarrow@
+\uproot@
+\use@mathgroup
+\varlim@
+\varliminf@
+\varlimsup@
+\wdz@
+\x@calc@shift@lc
+\x@calc@shift@lf
+\x@calc@shift@rc
+\x@calc@shift@rf
+\x@lcalc@width
+\x@rcalc@width
+\xatlevel@
+\xxat@true
+\z@
Binary files old/doc/latex/amsmath/amsbsy.pdf and new/doc/latex/amsmath/amsbsy.pdf differ
Binary files old/doc/latex/amsmath/amscd.pdf and new/doc/latex/amsmath/amscd.pdf differ
Binary files old/doc/latex/amsmath/amsgen.pdf and new/doc/latex/amsmath/amsgen.pdf differ
Binary files old/doc/latex/amsmath/amsldoc-1.pdf and new/doc/latex/amsmath/amsldoc-1.pdf differ
Binary files old/doc/latex/amsmath/amsldoc-bb.pdf and new/doc/latex/amsmath/amsldoc-bb.pdf differ
Binary files old/doc/latex/amsmath/amsldoc.pdf and new/doc/latex/amsmath/amsldoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/amsmath/amsldoc.tex new/doc/latex/amsmath/amsldoc.tex
--- old/doc/latex/amsmath/amsldoc.tex 2018-04-07 22:51:30.000000000 +0200
+++ new/doc/latex/amsmath/amsldoc.tex 2020-02-02 23:42:01.000000000 +0100
@@ -1,6 +1,6 @@
%
-% Copyright 1995, 2000, 2013 American Mathematical Society.
-% Copyright 2016-2018 LaTeX3 Project and American Mathematical Society.
+% Copyright (C) 1995, 2000, 2013 American Mathematical Society.
+% Copyright (C) 2016-2020 LaTeX3 Project and American Mathematical Society.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -9,9 +9,9 @@
% https://www.latex-project.org/lppl.txt
% and version 1.3c 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 the LaTeX3 Project.
%
\documentclass[leqno,titlepage,openany]{amsldoc}[1999/12/13]
@@ -64,7 +64,7 @@
\title{User's Guide for the \nipkg{amsmath} Package (Version~2.1)}
\author{American Mathematical Society, \LaTeX3 Project}
-\date{1999-12-13 (revised 2002-02-25, 2016-11-14, 2018-04-05)}
+\date{1999-12-13\\(revised 2002-02-25, 2016-11-14, 2018-04-05, 2019-10-14)}
\makeatletter
\def\@thanks{\bigskip\MaintainedByLaTeXTeam{amslatex}}
\makeatother
@@ -1032,7 +1032,7 @@
This works pretty well, except that the equation counter won't be reset
to zero at the beginning of a new section or chapter, unless you do it
yourself using \cn{setcounter}. To make this a little more convenient,
-the \nipkg{amsmath} package provides a
+the \nipkg{amsmath} package provides a
command\index{equationn@equation numbers!hierarchy} \cn{numberwithin}.
To have equation numbering tied to section numbering, with automatic
reset of the equation counter, write
@@ -1372,9 +1372,12 @@
In the \nipkg{amsmath} package there are somewhat more general commands,
\cn{overset} and \cn{underset}, that can be used to place one symbol
above or below another symbol, whether it's a relation or something
-else. The input |\overset{*}{X}| will place a superscript-size $*$ above
-the $X$: $\overset{*}{X}$; \cn{underset} is the analog for adding a
-symbol underneath.
+else. The input |\overset{*}{X}| will place a superscript-size {\small$*$} above
+the {\small$X$}: {\small$\smash{\overset{*}{X}}$};
+\cn{underset} is the analog for adding a
+symbol underneath. The command \cn{overunderset} is a combination of
+these, taking three arguments to place superscript sized expressions
+above and below the same base.
See also the description of \cn{sideset} in \secref{sideset}.
Binary files old/doc/latex/amsmath/amsmath.pdf and new/doc/latex/amsmath/amsmath.pdf differ
Binary files old/doc/latex/amsmath/amsopn.pdf and new/doc/latex/amsmath/amsopn.pdf differ
Binary files old/doc/latex/amsmath/amstext.pdf and new/doc/latex/amsmath/amstext.pdf differ
Binary files old/doc/latex/amsmath/amsxtra.pdf and new/doc/latex/amsmath/amsxtra.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/amsmath/changes.txt new/doc/latex/amsmath/changes.txt
--- old/doc/latex/amsmath/changes.txt 2018-12-11 23:32:49.000000000 +0100
+++ new/doc/latex/amsmath/changes.txt 2020-02-02 23:42:01.000000000 +0100
@@ -1,3 +1,43 @@
+#########################
+# 2020-02-02 Release
+#########################
+
+2020-01-20 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * amsmath.dtx (subsection{Vertical bar symbols}):
+ Make \lvert, \rvert, \lVert and \rVert robust to match kernel
+ correction (gh/251)
+
+2019-12-01 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * amsmath.dtx: docu update for gh/200 no code change.
+
+#########################
+# 2019-11-17 Release
+#########################
+
+2019-11-16 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * amsmath.dtx (section{Math accents}):
+ Added \MakeRobust inside \DeclareMathAccent to match kernel
+ change (gh/216)
+
+#########################
+# 2019-10-01b Release
+#########################
+
+2019-10-11 David Carlisle <David.Carlisle(a)latex-project.org>
+
+ * build.lua: package amsmath-2018-12-01.sty (only ctan build script no source changes)
+
+#########################
+# 2019-10-01 Release
+#########################
+
+2019-02-06 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * amsmath.dtx (section{Mods, continued fractions, etc.}):
+ Command \overunderset added
#########################
# 2018-12-01 Release
Binary files old/doc/latex/amsmath/subeqn.pdf and new/doc/latex/amsmath/subeqn.pdf differ
Binary files old/doc/latex/amsmath/technote.pdf and new/doc/latex/amsmath/technote.pdf differ
Binary files old/doc/latex/amsmath/testmath.pdf and new/doc/latex/amsmath/testmath.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amsmath.doc.tlpobj new/tlpkg/tlpobj/amsmath.doc.tlpobj
--- old/tlpkg/tlpobj/amsmath.doc.tlpobj 2019-02-28 03:14:43.000000000 +0100
+++ new/tlpkg/tlpobj/amsmath.doc.tlpobj 2020-02-03 01:54:43.000000000 +0100
@@ -1,15 +1,15 @@
name amsmath.doc
category Package
-revision 49390
+revision 53640
shortdesc doc files of amsmath
relocated 1
-docfiles size=776
+docfiles size=671
RELOC/doc/latex/amsmath/README.md
+ RELOC/doc/latex/amsmath/ams-external.txt
+ RELOC/doc/latex/amsmath/ams-internal.txt
RELOC/doc/latex/amsmath/amsbsy.pdf
RELOC/doc/latex/amsmath/amscd.pdf
RELOC/doc/latex/amsmath/amsgen.pdf
- RELOC/doc/latex/amsmath/amsldoc-1.pdf
- RELOC/doc/latex/amsmath/amsldoc-bb.pdf
RELOC/doc/latex/amsmath/amsldoc.pdf
RELOC/doc/latex/amsmath/amsldoc.tex
RELOC/doc/latex/amsmath/amsmath.pdf
++++++ amsmath.tar.xz ++++++
++++ 2985 lines of diff (skipped)
++++++ amstex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/amstex.1 new/texmf-dist/doc/man/man1/amstex.1
--- old/texmf-dist/doc/man/man1/amstex.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/amstex.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH AMSTEX 1 "16 June 2015" "Web2C 2019"
+.TH AMSTEX 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if t .ds TX \fRT\\h'-0.1667m'\\v'0.20v'E\\v'-0.20v'\\h'-0.125m'X\fP
.if n .ds TX TeX
Binary files old/texmf-dist/doc/man/man1/amstex.man1.pdf and new/texmf-dist/doc/man/man1/amstex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amstex.doc.tlpobj new/tlpkg/tlpobj/amstex.doc.tlpobj
--- old/tlpkg/tlpobj/amstex.doc.tlpobj 2019-03-27 02:24:01.000000000 +0100
+++ new/tlpkg/tlpobj/amstex.doc.tlpobj 2020-03-04 23:48:59.000000000 +0100
@@ -1,6 +1,6 @@
name amstex.doc
category Package
-revision 50602
+revision 54070
shortdesc doc files of amstex
docfiles size=203
texmf-dist/doc/amstex/base/README
++++++ amstex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/amstex.tlpobj new/tlpkg/tlpobj/amstex.tlpobj
--- old/tlpkg/tlpobj/amstex.tlpobj 2019-03-27 02:24:02.000000000 +0100
+++ new/tlpkg/tlpobj/amstex.tlpobj 2020-03-04 23:48:59.000000000 +0100
@@ -1,6 +1,6 @@
name amstex
category Package
-revision 50602
+revision 54070
shortdesc American Mathematical Society plain TeX macros
longdesc AMS-TeX is a TeX macro package, originally written by Michael
longdesc Spivak for the American Mathematical Society (AMS) during
@@ -38,6 +38,5 @@
catalogue-also joy-of-tex
catalogue-contact-home http://www.ams.org/tex/amstex.html
catalogue-ctan /macros/amstex
-catalogue-date 2019-01-29 20:02:48 +0100
catalogue-license lppl
catalogue-topics maths
++++++ animate.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/animate/ChangeLog new/doc/latex/animate/ChangeLog
--- old/doc/latex/animate/ChangeLog 2019-03-07 23:25:34.000000000 +0100
+++ new/doc/latex/animate/ChangeLog 2020-03-25 22:10:11.000000000 +0100
@@ -1,38 +1,69 @@
+2020-03-25
+ * fix: using `controlsaligned' as package option
+
+2020-03-24
+ * new: option `controlsaligned' extended for refined adjustment of
+ horizontal position
+
+2020-03-23
+ * new: option `controlsaligned' for changing horizontal position of
+ animation controls
+
+2019-12-03
+ * fix: another occurrence of quotes issue, now fixed at a central place
+
+2019-11-27
+ * fix: quotes around \@filef@und added by \IfFileExists removed for luatex
+ compatibility (fix provided by U Fischer); using JS API dirtifies PDF
+
+2019-11-05
+ * fix: old engine testing pkgs replaced by `iftex'
+
+2019-08-20
+ * fix: now, on PageClosePageInvisible event, seeking to poster frame only if
+ currently not on display.
+
+2019-07-22
+ * new: option `alttext' for setting description text
+
+2019-04-09
+ * fix: improved patching of `dvisvgm.def'
+
2019-03-06
- * change : jbig2 format support removed; dvisvgm-related code moved to
+ * change: jbig2 format support removed; dvisvgm-related code moved to
pdfbase.sty (media9)
2019-01-23
- * new : support for embedding PDF with `dvisvgm', multipage PDF support with
+ * new: support for embedding PDF with `dvisvgm', multipage PDF support with
`dvisvgm' and `dvipdfmx' driver
2018-12-19
- * fix : wrong scaling of repeatedly embedded external graphics; JS-related
+ * fix: wrong scaling of repeatedly embedded external graphics; JS-related
issue in case of side-by-side animations in one SVG
2018-11-30
- * fix : `setTimeout' JS method (used by timeline feature) differs bewteen
+ * fix: `setTimeout' JS method (used by timeline feature) differs between
browsers and PDF viewers
2018-11-29
- * fix : SVG usability issues on touch (mobile) devices; documentation
+ * fix: SVG usability issues on touch (mobile) devices; documentation
updated
2018-11-20
- * fix : `autoplay' (non-functional in SVG output); documentation
+ * fix: `autoplay' (non-functional in SVG output); documentation
updated (additions in section on SVG)
2018-11-19
- * new : support for `dvisvgm' output driver
+ * new: support for `dvisvgm' output driver
2018-08-22
- * new : `export' package option
+ * new: `export' package option
2018-06-27
- * fix : documentation fixed (repository)
+ * fix: documentation fixed (repository)
2018-06-07
- * fix : adjustments after migration to GitLab
+ * fix: adjustments after migration to GitLab
2018-02-28
* fix: test for XeTeX; test for eTeX removed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/animate/README.txt new/doc/latex/animate/README.txt
--- old/doc/latex/animate/README.txt 2019-03-07 23:25:34.000000000 +0100
+++ new/doc/latex/animate/README.txt 2020-03-24 21:52:05.000000000 +0100
@@ -44,12 +44,15 @@
* Package options: width=<h-size>, height=<v-size>, totalheight=<v-size>,
keepaspectratio, scale=<factor>, nomouse,
hiresbb,pagebox,interpolate,
- autopause, autoplay, autoresume, controls[=all | none | ...],
+ autopause, autoplay, autoresume,
+ controls[=all | none | ...],
+ controlsaligned=left[+<indent>] | center | right[+<indent>],
final, draft,
buttonsize=<size>,
buttonbg=<colour>, buttonfg=<colour>, buttonalpha=<opacity>,
loop, palindrome, step,
poster[=first | <num> | last | none],
+ alttext=none | {<alternative description>},
method=icon | widget | ocg,
dvipdfmx, dvisvgm, xetex,
type=[<file ext>],
@@ -79,6 +82,7 @@
buttonbg=<colour>, buttonfg=<colour>, buttonalpha=<opacity>,
loop, palindrome, step, measure,
poster[=first | <num> | last | none],
+ alttext=none | {<alternative description>},
begin={<begin text>}, end={<end text>},
timeline=<timeline file>,
method=icon | widget | ocg,
@@ -91,12 +95,11 @@
3. Requirements
===============
- * e-TeX
- * pdfTeX, version >= 1.20, or LuaLaTeX, version >= 0.95
- * Ghostscript, version >= 9.15 or Adobe Distiller
- * dvipdfmx, version >= 20080607
- * dvisvgm, version >= 2.6.2
- * Acrobat Reader (version >= 7), PDF-XChange, Foxit Reader
+Recent versions of
+ * Ghostscript or Adobe Distiller
+ * dvipdfmx
+ * dvisvgm
+ * Acrobat Reader, PDF-XChange, Foxit Reader
* Blink-based (Chromium, Chrome, Opera, ...) web browsers or Firefox
Binary files old/doc/latex/animate/animate.pdf and new/doc/latex/animate/animate.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/animate.doc.tlpobj new/tlpkg/tlpobj/animate.doc.tlpobj
--- old/tlpkg/tlpobj/animate.doc.tlpobj 2019-03-08 02:24:15.000000000 +0100
+++ new/tlpkg/tlpobj/animate.doc.tlpobj 2020-03-26 01:55:59.000000000 +0100
@@ -1,9 +1,9 @@
name animate.doc
category Package
-revision 50278
+revision 54543
shortdesc doc files of animate
relocated 1
-docfiles size=962
+docfiles size=960
RELOC/doc/latex/animate/ChangeLog
RELOC/doc/latex/animate/README.txt
RELOC/doc/latex/animate/animate.pdf
++++++ animate.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/animate/animate.sty new/tex/latex/animate/animate.sty
--- old/tex/latex/animate/animate.sty 2019-03-07 23:25:34.000000000 +0100
+++ new/tex/latex/animate/animate.sty 2020-03-25 22:10:11.000000000 +0100
@@ -13,15 +13,13 @@
\NeedsTeXFormat{LaTeX2e}
-\def\@anim@version{2019/03/06}
+\def\@anim@version{2020/03/25}
\ProvidesPackage{animate}
[\@anim@version\space PDF & SVG animations from files and inline graphics]
\RequirePackage{xkeyval}
\RequirePackage{ifthen}
-\RequirePackage{ifpdf}
-\RequirePackage{ifluatex}
-\RequirePackage{ifxetex}
+\RequirePackage{iftex}
\RequirePackage{ifdraft}
\RequirePackage{calc}
@@ -146,81 +144,6 @@
\if@anim@dvisvgm
\setboolean{@anim@export}{false}
-
- \AtBeginDocument{%
- % Add PS and PDF file inclusion (PDF files as of dvisvgm-2.4) to and
- % fix scaling/rotation/transformation in dvisvgm graphics driver
- \xdef\Gin@extensions{.eps,.pdf,\Gin@extensions}%
- \def\Ginclude@pdf#1{\@anim@include@psorpdf{#1}{pdffile}}%
- \def\Ginclude@eps#1{\let\Gin@page\@empty\@anim@include@psorpdf{#1}{PSfile}}%
- \def\@anim@include@psorpdf#1#2{% code taken from dvips.def
- \message{<#1>}%
- \bgroup%
- \def\@tempa{!}%
- \dimen@\Gin@req@width%
- \dimen(a)ii.1bp%
- \divide\dimen@\dimen@ii%
- \@tempdima\Gin@req@height%
- \divide\@tempdima\dimen@ii%
- \special{#2="#1"\GPT@space%
- \ifx\Gin@page\@empty\else page=\Gin@page\GPT@space\fi%
- llx=\Gin@llx\GPT@space%
- lly=\Gin@lly\GPT@space%
- urx=\Gin@urx\GPT@space%
- ury=\Gin@ury\GPT@space%
- \ifx\Gin@scalex\@tempa\else rwi=\number\dimen@\GPT@space\fi%
- \ifx\Gin@scaley\@tempa\else rhi=\number\@tempdima\GPT@space\fi%
- \ifGin@clip clip\fi}%
- \egroup}%
- \@namedef{Gin@rule@.ps}#1{{eps}{.ps}{#1}}%
- \@namedef{Gin@rule@.eps}#1{{eps}{.eps}{#1}}%
- \@namedef{Gin@rule@.mps}#1{{eps}{.mps}{#1}}%
- \@namedef{Gin@rule@.pdf}#1{{pdf}{.xbb}{#1}}%
- % BoundingBox determination (from dvipdfmx.def)
- \def\Gread@pdf#1{%
- \Gread@generic{#1}\Gread@extractbb@aux%
- }%
- \def\Gread@extractbb@aux#1{%
- \ifeof\@inputcheck%
- \immediate\openin\@inputcheck=%
- "|extractbb %
- \ifx\Gin@page\@empty\else -p \Gin@page\GPT@space\fi
- \ifx\Gin@pagebox\@empty\else -B \Gin@pagebox\GPT@space\fi
- -O \Gin@base\Gin@ext"%
- \fi%
- \Gread@true%
- \let\@tempb\Gread@false%
- \ifeof\@inputcheck%
- \@latex@error%
- {Cannot run pipe command. Try --shell-escape^^J%
- (--enable-pipes in MikTeX) option}%
- {}%
- \else%
- \loop%
- \read\@inputcheck to\@tempa%
- \ifeof\@inputcheck%
- \Gread@false%
- \else%
- \expandafter\Gread@find@bb\@tempa:.\\%
- \fi%
- \ifGread@%
- \repeat%
- \immediate\closein\@inputcheck%
- \fi%
- }%
- % PS scaling and rotation (from dvips.def)
- \def\Grot@start{%
- \special{ps: gsave currentpoint
- currentpoint translate \Grot@angle\GPT@space neg
- rotate neg exch neg exch translate}}%
- \def\Grot@end{\special{ps: currentpoint grestore moveto}}%
- \def\Gscale@start{\special{ps: currentpoint currentpoint translate
- \Gscale@x\GPT@space \Gscale@y\GPT@space scale neg exch neg exch
- translate}}%
- \def\Gscale@end{\special{ps: currentpoint currentpoint translate
- 1 \Gscale@x\GPT@space div 1 \Gscale@y\GPT@space div scale
- neg exch neg exch translate}}%
- }
\fi
\if@anim@export
@@ -270,7 +193,7 @@
\if@anim@dvisvgm
\setboolean{@anim@export}{false}
- \def\@anim@updatebbox#1#2#3{\special{dvisvgm:bbox #1 #2 #3}}
+ \def\@anim@updatebbox#1#2#3{\special{dvisvgm:bbox #1 #2 #3 transform}}
%approach similar to OCGs, that is, putting the frame content in an svg group,
% <g id='...'>...</g>, whose visibility is then manipulated by JavaScript
@@ -1279,7 +1202,7 @@
\fi
%determines file type of the sequence
-\def\zap@finalspace#1 \@nil{#1}
+\def\zap@finalspace#1 \@nil{\unquote@name{#1}}
\ifpdf
\def\@anim@getpath#1#2{% #2: empty | user provided file extension
\ifx\@empty#2\@empty%
@@ -1469,7 +1392,9 @@
\setlength{\@anim@tmpdimb}{\z@}%
\vskip 0.1\@anim@tmpdima%
\hbox to \@anim@animwidth {%
- \hss%
+ \if@anim@ctrlleft\hspace{\@anim@ctrlsindent}\fi%
+ \ifnum\if@anim@ctrlright\@ne\else%
+ \if@anim@ctrlcentre\@ne\else\z@\fi\fi=\@ne\hss\fi%
\setboolean{@anim@controls@firstgrp}{false}%
\if@anim@controls@stop%
\setboolean{@anim@controls@firstgrp}{true}%
@@ -1490,7 +1415,9 @@
\if@anim@controls@firstgrp\hskip 0.3\@anim@tmpdima\fi%
\frame{\phantom{\rule{3\@anim@tmpdima}{\@anim@tmpdima}}}%
\fi%
- \hss%
+ \ifnum\if@anim@ctrlleft\@ne\else%
+ \if@anim@ctrlcentre\@ne\else\z@\fi\fi=\@ne\hss\fi%
+ \if@anim@ctrlright\hspace{\@anim@ctrlsindent}\fi%
}%
\fi%
}%
@@ -1748,7 +1675,9 @@
\setlength{\@anim@tmpdima}{\@anim@btnsize}%
\vskip 0.1\@anim@tmpdima%
\hbox to \@anim@animwidth {%
- \hss%
+ \if@anim@ctrlleft\hspace{\@anim@ctrlsindent}\fi%
+ \ifnum\if@anim@ctrlright\@ne\else%
+ \if@anim@ctrlcentre\@ne\else\z@\fi\fi=\@ne\hss\fi%
\def\@anim@tooltip{}%
\setboolean{@anim@controls@firstgrp}{false}%
\if@anim@controls@stop%
@@ -1796,7 +1725,9 @@
\@anim@makebutton{Plus}{#2}%
\@anim@buttonwidget{#1}{Plus}{Plus:#2}%
\fi%
- \hss%
+ \ifnum\if@anim@ctrlleft\@ne\else%
+ \if@anim@ctrlcentre\@ne\else\z@\fi\fi=\@ne\hss\fi%
+ \if@anim@ctrlright\hspace{\@anim@ctrlsindent}\fi%
}%
\fi%
}%
@@ -1959,7 +1890,7 @@
/BS <</W 0>>%
/H/N%
/T (anm#1)%
- /Contents (animation by animate[\@anim@version])%
+ \@anim@alttext% %/Contents (...)
/AA <<%
/PV <</S/JavaScript/JS \@anim@pojscriptobj>>% PageVisible
/PO <</S/JavaScript/JS \@anim@pojscriptobj>>% PageOpen
@@ -2951,6 +2882,13 @@
\define@key{anim@user}{buttonalpha}{%button opacity
\xdef\@anim@alpha{#1}%
}
+\define@key{anim@user}{alttext}{%
+ \ifthenelse{\equal{#1}{none}}{%
+ \gdef\@anim@alttext{}%
+ }{%
+ \xdef\@anim@alttext{/Contents (#1)}%
+ }%
+}
\newboolean{@anim@controls}
\newboolean{@anim@controls@play}
@@ -2998,6 +2936,39 @@
\setboolean{@anim@controls@speed}{true}%
}
+\def\@anim@parse@ctrlsalignarg#1#2#3+#4\@nil{%
+ \ifthenelse{\equal{#3}{}}{}{\def#1{#3}}%
+ \ifthenelse{\equal{#4}{}}{#2=\z@}{\@anim@getalignindent#2#4\@nil}%
+}
+\def\@anim@getalignindent#1#2+\@nil{#1=#2}
+
+\newboolean{@anim@ctrlleft}
+\newboolean{@anim@ctrlright}
+\newboolean{@anim@ctrlcentre}
+\define@key{anim@user}{controlsaligned}{%
+ \@anim@parse@ctrlsalignarg\@anim@tmpvar\@anim@tmpdima#1+\@nil%
+ \ifthenelse{\equal{\@anim@tmpvar}{left}}{%
+ \setboolean{@anim@ctrlleft}{true}%
+ \setboolean{@anim@ctrlright}{false}%
+ \setboolean{@anim@ctrlcentre}{false}%
+ \xdef\@anim@ctrlsindent{\the\@anim@tmpdima}%
+ }{%
+ \ifthenelse{\equal{\@anim@tmpvar}{right}}{%
+ \setboolean{@anim@ctrlleft}{false}%
+ \setboolean{@anim@ctrlright}{true}%
+ \setboolean{@anim@ctrlcentre}{false}%
+ \xdef\@anim@ctrlsindent{\the\@anim@tmpdima}%
+ }{%
+ \ifthenelse{\equal{\@anim@tmpvar}{center}}{%
+ \setboolean{@anim@ctrlleft}{false}%
+ \setboolean{@anim@ctrlright}{false}%
+ \setboolean{@anim@ctrlcentre}{true}%
+ \xdef\@anim@ctrlsindent{\z@}%
+ }{}%
+ }%
+ }%
+}
+
\newboolean{@anim@loop}
\define@key{anim@user}{loop}[true]{%
\setboolean{@anim@loop}{#1}%
@@ -3146,6 +3117,7 @@
\let\@anim@usrwd\@anim@pkgwd%
\let\@anim@usrht\@anim@pkght%
\let\@anim@usrtht\@anim@pkgtht%
+ \let\@anim@alttext\@anim@@alttext%
\global\let\@anim@bg\@anim@@bg%
\global\let\@anim@fg\@anim@@fg%
\global\let\@anim@@@fg\@anim@@@@fg%
@@ -3159,6 +3131,10 @@
\global\let\if@anim@controls@step=\if@anim@@controls@step%
\global\let\if@anim@controls@stop=\if@anim@@controls@stop%
\global\let\if@anim@controls@speed=\if@anim@@controls@speed%
+ \global\let\if@anim@ctrlleft=\if@anim@@ctrlleft%
+ \global\let\if@anim@ctrlright=\if@anim@@ctrlright%
+ \global\let\if@anim@ctrlcentre=\if@anim@@ctrlcentre%
+ \global\let\@anim@ctrlsindent\@anim@@ctrlsindent%
\global\let\if@anim@loop=\if@anim@@loop%
\global\let\if@anim@autoplay=\if@anim@@autoplay%
\global\let\if@anim@autoresume=\if@anim@@autoresume%
@@ -3352,6 +3328,14 @@
\define@key{anim@pkg}{buttonsize}{%
\gdef\@anim@@btnsize{#1}%
}
+\edef\@anim@@alttext{/Contents(animation by animate[\@anim@version])}
+\define@key{anim@pkg}{alttext}{%
+ \ifthenelse{\equal{#1}{none}}{%
+ \gdef\@anim@@alttext{}%
+ }{%
+ \xdef\@anim@@alttext{/Contents (#1)}%
+ }%
+}
\newboolean{@anim@@controls}
\newboolean{@anim@@controls@play}
@@ -3399,6 +3383,25 @@
\setboolean{@anim@@controls@speed}{true}%
}
+\newboolean{@anim@@ctrlleft}
+\newboolean{@anim@@ctrlright}
+\newboolean{@anim@@ctrlcentre}
+\setboolean{@anim@@ctrlcentre}{true}
+\def\@anim@@ctrlsindent{\z@}
+\define@key{anim@pkg}{controlsaligned}{%
+ \@anim@parse@ctrlsalignarg\@anim@tmpvar\@anim@tmpdima#1+\@nil%
+ \setboolean{@anim@@ctrlcentre}{false}%
+ \ifthenelse{\equal{\@anim@tmpvar}{left}}{%
+ \setboolean{@anim@@ctrlleft}{true}%
+ \edef\@anim@@ctrlsindent{\the\@anim@tmpdima}%
+ }{%
+ \ifthenelse{\equal{\@anim@tmpvar}{right}}{%
+ \setboolean{@anim@@ctrlright}{true}%
+ \edef\@anim@@ctrlsindent{\the\@anim@tmpdima}%
+ }{\setboolean{@anim@@ctrlcentre}{true}}%
+ }%
+}
+
\newboolean{@anim@@loop}
\setboolean{@anim@@loop}{false}%
\define@key{anim@pkg}{loop}[true]{%
@@ -3611,6 +3614,7 @@
%JS initialisation
\gdef\@anim@@jsinit#1{% #1: @anim@num
+ \if@anim@dvisvgm\else var curdoc=this;\fi
if(!a#1_fr){$%
a#1_fr=new Array();$%
\ifnum\@anim@method>\z@%
@@ -3710,11 +3714,11 @@
if(f<-1){$%
\ifcase\@anim@method %icon based
a#1_wid.buttonSetIcon(blnk);$%
- this.dirty=false;$%
+ curdoc.dirty=false;$%
\or %widget based
a#1_on=0;$%
a#1_fr[0].display=display.hidden;$%
- this.dirty=false;$%
+ curdoc.dirty=false;$%
\or %ocg based
a#1_on=0;$%
\if@anim@dvisvgm
@@ -3738,12 +3742,12 @@
\fi%
\ifcase\@anim@method %icon based
a#1_wid.buttonSetIcon(a#1_fr[f]);$%
- this.dirty=false;$%
+ curdoc.dirty=false;$%
\or %widget based
a#1_fr[a#1_on].display=display.hidden;$%
a#1_fr[f].display=display.visible;$%
a#1_on=f;$%
- this.dirty=false;$%
+ curdoc.dirty=false;$%
\or%ocg based
\if@anim@dvisvgm
a#1_fr[a#1_on].setAttribute('visibility','hidden');$%
@@ -3871,7 +3875,7 @@
a#1_btnPlayLeft.display=display.visible;$%
a#1_btnPauseRight.display=display.hidden;$%
a#1_btnPlayRight.display=display.visible;$%
- this.dirty=false;$%
+ curdoc.dirty=false;$%
\fi%
\fi%
};$%
@@ -3896,7 +3900,7 @@
a#1_btnPlayLeft.display=display.hidden;$%
a#1_btnPauseRight.display=display.visible;$%
a#1_btnPlayRight.display=display.hidden;$%
- this.dirty=false;$%
+ curdoc.dirty=false;$%
\fi%
\fi%
};$%
@@ -3921,7 +3925,7 @@
a#1_btnPlayLeft.display=display.hidden;$%
a#1_btnPauseRight.display=display.visible;$%
a#1_btnPlayRight.display=display.hidden;$%
- this.dirty=false;$%
+ curdoc.dirty=false;$%
\fi%
\fi%
};$%
@@ -4097,14 +4101,15 @@
if(!a#1_isPaused)a#1_playsRight=true;$%
\fi
%re-display poster frame
- if(!a#1_isPaused){% i.e. if stopped
- %poster=none
- \ifnum\@anim@poster=\@anim@mtwo a#1_seekFrame(-2);\fi%
- %poster=<num>|first
- \ifnum\@anim@poster>\@anim@mone a#1_seekFrame(\@anim@poster);\fi%
- %poster=last
- \ifnum\@anim@poster=\@anim@mone a#1_seekFrame(\@anim@maxframe);\fi%
- }$%
+ \ifnum\@anim@poster=\@anim@mtwo %poster=none
+ if(!a#1_isPaused&&a#1_idx!=-2)a#1_seekFrame(-2);$% not paused == stopped
+ \fi%
+ \ifnum\@anim@poster>\@anim@mone %poster=<num>|first
+ if(!a#1_isPaused&&a#1_idx!=\@anim@poster)a#1_seekFrame(\@anim@poster);$%
+ \fi%
+ \ifnum\@anim@poster=\@anim@mone %poster=last
+ if(!a#1_isPaused&&a#1_idx!=\@anim@maxframe)a#1_seekFrame(\@anim@maxframe);$%
+ \fi%
}
%animation PDF widget's PageClose and PageInvisible code as PDF stream object
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/animate.tlpobj new/tlpkg/tlpobj/animate.tlpobj
--- old/tlpkg/tlpobj/animate.tlpobj 2019-03-08 02:24:16.000000000 +0100
+++ new/tlpkg/tlpobj/animate.tlpobj 2020-03-26 01:56:00.000000000 +0100
@@ -1,6 +1,6 @@
name animate
category Package
-revision 50278
+revision 54543
shortdesc Create PDF and SVG animations from graphics files and inline graphics
relocated 1
longdesc The package provides an interface to create portable,
@@ -12,6 +12,5 @@
RELOC/tex/latex/animate/animate.sty
catalogue-contact-repository https://gitlab.com/agrahn/animate
catalogue-ctan /macros/latex/contrib/animate
-catalogue-date 2019-03-07 19:34:24 +0100
catalogue-license lppl
catalogue-topics graphics-motion
++++++ anonymouspro.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/anonymouspro/AnonymousPro-01.etx new/doc/fonts/anonymouspro/AnonymousPro-01.etx
--- old/doc/fonts/anonymouspro/AnonymousPro-01.etx 2014-01-05 23:57:34.000000000 +0100
+++ new/doc/fonts/anonymouspro/AnonymousPro-01.etx 2019-07-13 23:37:34.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% AnonymousPro.dtx (with options: `anp-enc01')
%%
-%% Copyright (C) 2013-2014 Arash Esbati <esbati'at'gmx.de>
+%% Copyright (C) 2013-2019 Arash Esbati <arash'at'gnu.org>
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -22,7 +22,7 @@
%%% date = "2013-12-29",
%%% time = "15:24:42 +01:00",
%%% filename = "AnonymousPro-01.etx",
-%%% email = "esbati'at'gmx.de",
+%%% email = "arash'at'gnu.org",
%%% URL = "",
%%% checksum = "",
%%% codetable = "ISO/ASCII",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/anonymouspro/AnonymousPro-02.etx new/doc/fonts/anonymouspro/AnonymousPro-02.etx
--- old/doc/fonts/anonymouspro/AnonymousPro-02.etx 2014-01-05 23:57:34.000000000 +0100
+++ new/doc/fonts/anonymouspro/AnonymousPro-02.etx 2019-07-13 23:37:34.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% AnonymousPro.dtx (with options: `anp-enc02')
%%
-%% Copyright (C) 2013-2014 Arash Esbati <esbati'at'gmx.de>
+%% Copyright (C) 2013-2019 Arash Esbati <arash'at'gnu.org>
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -22,7 +22,7 @@
%%% date = "2013-12-29",
%%% time = "15:24:42 +01:00",
%%% filename = "AnonymousPro-02.etx",
-%%% email = "esbati'at'gmx.de",
+%%% email = "arash'at'gnu.org",
%%% URL = "",
%%% checksum = "",
%%% codetable = "ISO/ASCII",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/anonymouspro/AnonymousPro-03.etx new/doc/fonts/anonymouspro/AnonymousPro-03.etx
--- old/doc/fonts/anonymouspro/AnonymousPro-03.etx 2014-01-05 23:57:34.000000000 +0100
+++ new/doc/fonts/anonymouspro/AnonymousPro-03.etx 2019-07-13 23:37:34.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% AnonymousPro.dtx (with options: `anp-enc03')
%%
-%% Copyright (C) 2013-2014 Arash Esbati <esbati'at'gmx.de>
+%% Copyright (C) 2013-2019 Arash Esbati <arash'at'gnu.org>
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -22,7 +22,7 @@
%%% date = "2013-12-29",
%%% time = "15:24:42 +01:00",
%%% filename = "AnonymousPro-03.etx",
-%%% email = "esbati'at'gmx.de",
+%%% email = "arash'at'gnu.org",
%%% URL = "",
%%% checksum = "",
%%% codetable = "ISO/ASCII",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/anonymouspro/AnonymousPro-drv.tex new/doc/fonts/anonymouspro/AnonymousPro-drv.tex
--- old/doc/fonts/anonymouspro/AnonymousPro-drv.tex 2014-01-05 23:57:34.000000000 +0100
+++ new/doc/fonts/anonymouspro/AnonymousPro-drv.tex 2019-07-13 23:37:34.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% AnonymousPro.dtx (with options: `anp-drv')
%%
-%% Copyright (C) 2013-2014 Arash Esbati <esbati'at'gmx.de>
+%% Copyright (C) 2013-2019 Arash Esbati <arash'at'gnu.org>
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License (LPPL), either version 1.3c of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/anonymouspro/AnonymousPro-map.tex new/doc/fonts/anonymouspro/AnonymousPro-map.tex
--- old/doc/fonts/anonymouspro/AnonymousPro-map.tex 2014-01-05 23:57:34.000000000 +0100
+++ new/doc/fonts/anonymouspro/AnonymousPro-map.tex 2019-07-13 23:37:34.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% AnonymousPro.dtx (with options: `anp-map')
%%
-%% Copyright (C) 2013-2014 Arash Esbati <esbati'at'gmx.de>
+%% Copyright (C) 2013-2019 Arash Esbati <arash'at'gnu.org>
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License (LPPL), either version 1.3c of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/anonymouspro/AnonymousPro-symbols.etx new/doc/fonts/anonymouspro/AnonymousPro-symbols.etx
--- old/doc/fonts/anonymouspro/AnonymousPro-symbols.etx 2014-01-05 23:57:34.000000000 +0100
+++ new/doc/fonts/anonymouspro/AnonymousPro-symbols.etx 2019-07-13 23:37:34.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% AnonymousPro.dtx (with options: `anp-sym')
%%
-%% Copyright (C) 2013-2014 Arash Esbati <esbati'at'gmx.de>
+%% Copyright (C) 2013-2019 Arash Esbati <arash'at'gnu.org>
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -22,7 +22,7 @@
%%% date = "2013-11-29",
%%% time = "16:45:46 +01:00",
%%% filename = "AnonymousPro-symbols.etx",
-%%% email = "esbati'at'gmx.de",
+%%% email = "arash'at'gnu.org",
%%% URL = "",
%%% checksum = "",
%%% codetable = "ISO/ASCII",
Binary files old/doc/fonts/anonymouspro/AnonymousPro.pdf and new/doc/fonts/anonymouspro/AnonymousPro.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/anonymouspro/README new/doc/fonts/anonymouspro/README
--- old/doc/fonts/anonymouspro/README 2014-01-05 23:57:34.000000000 +0100
+++ new/doc/fonts/anonymouspro/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-Anonymous Pro fonts for LaTeX (January 2014)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-This work provides the necessary files to use the monowidth Anonymous Pro
-fonts with LaTeX. Anonymous Pro is a set of four truetype fonts provided
-by Mark Simonson under the Open Font License (OFL). The truetype fonts are
-copyright (c) 2009 Mark Simonson:
-
- http://www.marksimonson.com/fonts/view/anonymous-pro
-
-The LaTeX-package is released under the LaTeX Project Public License v1.3c
-or later, copyright (c) 2013-2014 Arash Esbati:
-
- http://www.latex-project.org/lppl.txt
-
-
-;; Local Variables:
-;; mode: text
-;; fill-column: 75
-;; End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/anonymouspro/README.md new/doc/fonts/anonymouspro/README.md
--- old/doc/fonts/anonymouspro/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/anonymouspro/README.md 2019-07-13 23:37:34.000000000 +0200
@@ -0,0 +1,32 @@
+# Anonymous Pro fonts for LaTeX #
+
+This work provides the necessary files to use the monowidth Anonymous
+Pro fonts with LaTeX. Anonymous Pro is a set of four truetype fonts
+provided by
+[Mark Simonson](http://www.marksimonson.com/fonts/view/anonymous-pro)
+under the Open Font License [(OFL)](http://scripts.sil.org/OFL),
+version 1.1. The truetype fonts are copyright (c) 2009 Mark Simonson.
+
+The LaTeX package is released under the LaTeX Project Public License
+[(LPPL)](http://www.latex-project.org/lppl.txt) v1.3c or later,
+copyright (c) 2013-2019 Arash Esbati.
+
+ v2.2, 2019/07/07
+ * Add the `scaled' key
+
+ v2.1, 2014/03/22
+ * Remap `visiblespace' to Anonymous Pro glyph `openbox' (uni2423)
+ in `anonymouspro-fixlatin.mtx' which looks less heavy
+ * Minor documentation updates
+
+ v2.0, 2013/12/29
+ * Reorganize the fontinst driver file so that all glyphs are
+ available from the fonts
+ * Updated documentation and added a font table
+
+ v1.1, 2013/12/12
+ * Regenerate .afm and .pfb from .ttf with FontForge (was
+ ttftopt1). Now the fonts pass `t1lint' without warnings
+
+ v1.0, 2013/12/06
+ * Initial version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/anonymouspro/anonymouspro-fixlatin.mtx new/doc/fonts/anonymouspro/anonymouspro-fixlatin.mtx
--- old/doc/fonts/anonymouspro/anonymouspro-fixlatin.mtx 2014-04-15 00:44:51.000000000 +0200
+++ new/doc/fonts/anonymouspro/anonymouspro-fixlatin.mtx 2019-07-13 23:37:34.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% AnonymousPro.dtx (with options: `anp-fixlatin')
%%
-%% Copyright (C) 2013-2014 Arash Esbati <esbati'at'gmx.de>
+%% Copyright (C) 2013-2019 Arash Esbati <arash'at'gnu.org>
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -22,7 +22,7 @@
%%% date = "2013-12-29",
%%% time = "15:24:42 +01:00",
%%% filename = "anonymouspro-fixlatin.mtx",
-%%% email = "esbati'at'gmx.de",
+%%% email = "arash'at'gnu.org",
%%% URL = "",
%%% checksum = "",
%%% codetable = "ISO/ASCII",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/anonymouspro/anonymouspro-fixtextcomp.mtx new/doc/fonts/anonymouspro/anonymouspro-fixtextcomp.mtx
--- old/doc/fonts/anonymouspro/anonymouspro-fixtextcomp.mtx 2014-01-05 23:57:34.000000000 +0100
+++ new/doc/fonts/anonymouspro/anonymouspro-fixtextcomp.mtx 2019-07-13 23:37:34.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% AnonymousPro.dtx (with options: `anp-fixtextcomp')
%%
-%% Copyright (C) 2013-2014 Arash Esbati <esbati'at'gmx.de>
+%% Copyright (C) 2013-2019 Arash Esbati <arash'at'gnu.org>
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -22,7 +22,7 @@
%%% date = "2013-12-29",
%%% time = "15:24:42 +01:00",
%%% filename = "anonymouspro-fixtextcomp.mtx",
-%%% email = "esbati'at'gmx.de",
+%%% email = "arash'at'gnu.org",
%%% URL = "",
%%% checksum = "",
%%% codetable = "ISO/ASCII",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/anonymouspro.doc.tlpobj new/tlpkg/tlpobj/anonymouspro.doc.tlpobj
--- old/tlpkg/tlpobj/anonymouspro.doc.tlpobj 2019-02-28 03:14:48.000000000 +0100
+++ new/tlpkg/tlpobj/anonymouspro.doc.tlpobj 2019-07-14 01:53:35.000000000 +0200
@@ -1,6 +1,6 @@
name anonymouspro.doc
category Package
-revision 33441
+revision 51631
shortdesc doc files of anonymouspro
relocated 1
docfiles size=111
@@ -13,7 +13,7 @@
RELOC/doc/fonts/anonymouspro/AnonymousPro.pdf
RELOC/doc/fonts/anonymouspro/FONTLOG.txt
RELOC/doc/fonts/anonymouspro/OFL.txt
- RELOC/doc/fonts/anonymouspro/README
+ RELOC/doc/fonts/anonymouspro/README.md
RELOC/doc/fonts/anonymouspro/README_Mark-Simonson.txt
RELOC/doc/fonts/anonymouspro/anonymouspro-fixlatin.mtx
RELOC/doc/fonts/anonymouspro/anonymouspro-fixtextcomp.mtx
++++++ anonymouspro.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/anonymouspro/AnonymousPro-01.enc new/fonts/enc/dvips/anonymouspro/AnonymousPro-01.enc
--- old/fonts/enc/dvips/anonymouspro/AnonymousPro-01.enc 2014-04-15 00:44:51.000000000 +0200
+++ new/fonts/enc/dvips/anonymouspro/AnonymousPro-01.enc 2019-07-13 23:37:34.000000000 +0200
@@ -2,7 +2,7 @@
% @psencodingfile{
% author = "See file AnonymousPro-01.etx",
% version = "See file AnonymousPro-01.etx",
-% date = "generated 2014/03/22",
+% date = "generated 2019/07/12",
% filename = "AnonymousPro-01.enc",
% email = "See file AnonymousPro-01.etx",
% codetable = "ISO/ASCII",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/anonymouspro/AnonymousPro-02.enc new/fonts/enc/dvips/anonymouspro/AnonymousPro-02.enc
--- old/fonts/enc/dvips/anonymouspro/AnonymousPro-02.enc 2014-04-15 00:44:51.000000000 +0200
+++ new/fonts/enc/dvips/anonymouspro/AnonymousPro-02.enc 2019-07-13 23:37:34.000000000 +0200
@@ -2,7 +2,7 @@
% @psencodingfile{
% author = "See file AnonymousPro-02.etx",
% version = "See file AnonymousPro-02.etx",
-% date = "generated 2014/03/22",
+% date = "generated 2019/07/12",
% filename = "AnonymousPro-02.enc",
% email = "See file AnonymousPro-02.etx",
% codetable = "ISO/ASCII",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/anonymouspro/AnonymousPro-03.enc new/fonts/enc/dvips/anonymouspro/AnonymousPro-03.enc
--- old/fonts/enc/dvips/anonymouspro/AnonymousPro-03.enc 2014-04-15 00:44:51.000000000 +0200
+++ new/fonts/enc/dvips/anonymouspro/AnonymousPro-03.enc 2019-07-13 23:37:34.000000000 +0200
@@ -2,7 +2,7 @@
% @psencodingfile{
% author = "See file AnonymousPro-03.etx",
% version = "See file AnonymousPro-03.etx",
-% date = "generated 2014/03/22",
+% date = "generated 2019/07/12",
% filename = "AnonymousPro-03.enc",
% email = "See file AnonymousPro-03.etx",
% codetable = "ISO/ASCII",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/enc/dvips/anonymouspro/AnonymousPro-symbols.enc new/fonts/enc/dvips/anonymouspro/AnonymousPro-symbols.enc
--- old/fonts/enc/dvips/anonymouspro/AnonymousPro-symbols.enc 2014-04-15 00:44:51.000000000 +0200
+++ new/fonts/enc/dvips/anonymouspro/AnonymousPro-symbols.enc 2019-07-13 23:37:34.000000000 +0200
@@ -2,7 +2,7 @@
% @psencodingfile{
% author = "See file AnonymousPro-symbols.etx",
% version = "See file AnonymousPro-symbols.etx",
-% date = "generated 2014/03/22",
+% date = "generated 2019/07/12",
% filename = "AnonymousPro-symbols.enc",
% email = "See file AnonymousPro-symbols.etx",
% codetable = "ISO/ASCII",
Binary files old/fonts/tfm/public/anonymouspro/AnonymousPro-Bold-base.tfm and new/fonts/tfm/public/anonymouspro/AnonymousPro-Bold-base.tfm differ
Binary files old/fonts/tfm/public/anonymouspro/AnonymousPro-BoldItalic-base.tfm and new/fonts/tfm/public/anonymouspro/AnonymousPro-BoldItalic-base.tfm differ
Binary files old/fonts/tfm/public/anonymouspro/AnonymousPro-Italic-base.tfm and new/fonts/tfm/public/anonymouspro/AnonymousPro-Italic-base.tfm differ
Binary files old/fonts/tfm/public/anonymouspro/AnonymousPro-Regular-base.tfm and new/fonts/tfm/public/anonymouspro/AnonymousPro-Regular-base.tfm differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/anonymouspro/AnonymousPro.sty new/tex/latex/anonymouspro/AnonymousPro.sty
--- old/tex/latex/anonymouspro/AnonymousPro.sty 2014-04-15 00:44:51.000000000 +0200
+++ new/tex/latex/anonymouspro/AnonymousPro.sty 2019-07-13 23:37:34.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% AnonymousPro.dtx (with options: `package')
%%
-%% Copyright (C) 2013-2014 Arash Esbati <esbati'at'gmx.de>
+%% Copyright (C) 2013-2019 Arash Esbati <arash'at'gnu.org>
%%
%% This work may be distributed and/or modified under the conditions
%% of the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -17,17 +17,20 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{AnonymousPro}
- [2014/03/22 v2.1 Support for AnonymousPro Fonts (AE)]
+ [2019/07/07 v2.2 Support for AnonymousPro Fonts (AE)]
\RequirePackage{kvoptions}
\SetupKeyvalOptions{%
family = ANP, %
prefix = ANP@ %
}
-\DeclareStringOption[1.0]{scale}
+\DeclareStringOption[1.0]{scale}[1.0]
+\define(a)key{ANP}{scaled}[1.0]{%
+ \renewcommand*\ANP@scale{#1}%
+}
\DeclareBoolOption[false]{ttdefault}
\ProcessKeyvalOptions*
\ifANP@ttdefault
- \renewcommand{\ttdefault}{AnonymousPro}%
+ \renewcommand{\ttdefault}{AnonymousPro}
\fi
\newcommand\ANP@family{%
\fontencoding{U}\fontfamily{AnonymousPro}\selectfont}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/anonymouspro/t1anonymouspro.fd new/tex/latex/anonymouspro/t1anonymouspro.fd
--- old/tex/latex/anonymouspro/t1anonymouspro.fd 2014-04-15 00:44:51.000000000 +0200
+++ new/tex/latex/anonymouspro/t1anonymouspro.fd 2019-07-13 23:37:34.000000000 +0200
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{t1anonymouspro.fd}
- [2014/03/22 Fontinst v1.933 font definitions for T1/AnonymousPro.]
+ [2019/07/12 Fontinst v1.933 font definitions for T1/AnonymousPro.]
\expandafter\ifx\csname ANP@scale\endcsname\relax
\let\ANP@@scale\@empty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/anonymouspro/ts1anonymouspro.fd new/tex/latex/anonymouspro/ts1anonymouspro.fd
--- old/tex/latex/anonymouspro/ts1anonymouspro.fd 2014-04-15 00:44:51.000000000 +0200
+++ new/tex/latex/anonymouspro/ts1anonymouspro.fd 2019-07-13 23:37:34.000000000 +0200
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ts1anonymouspro.fd}
- [2014/03/22 Fontinst v1.933 font definitions for TS1/AnonymousPro.]
+ [2019/07/12 Fontinst v1.933 font definitions for TS1/AnonymousPro.]
\expandafter\ifx\csname ANP@scale\endcsname\relax
\let\ANP@@scale\@empty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/anonymouspro/uanonymouspro.fd new/tex/latex/anonymouspro/uanonymouspro.fd
--- old/tex/latex/anonymouspro/uanonymouspro.fd 2014-04-15 00:44:51.000000000 +0200
+++ new/tex/latex/anonymouspro/uanonymouspro.fd 2019-07-13 23:37:34.000000000 +0200
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{uanonymouspro.fd}
- [2014/03/22 Fontinst v1.933 font definitions for U/AnonymousPro.]
+ [2019/07/12 Fontinst v1.933 font definitions for U/AnonymousPro.]
\expandafter\ifx\csname ANP@scale\endcsname\relax
\let\ANP@@scale\@empty
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/anonymouspro.tlpobj new/tlpkg/tlpobj/anonymouspro.tlpobj
--- old/tlpkg/tlpobj/anonymouspro.tlpobj 2019-02-28 03:14:48.000000000 +0100
+++ new/tlpkg/tlpobj/anonymouspro.tlpobj 2019-07-14 01:53:35.000000000 +0200
@@ -1,13 +1,13 @@
name anonymouspro
category Package
-revision 33441
+revision 51631
shortdesc Use AnonymousPro fonts with LaTeX
relocated 1
longdesc The fonts are a monowidth set, designed for use by coders. They
longdesc appear as a set of four TrueType, or Adobe Type 1 font files,
longdesc and LaTeX support is also provided.
execute addMap AnonymousPro.map
-runfiles size=312
+runfiles size=308
RELOC/fonts/afm/public/anonymouspro/AnonymousPro-Bold.afm
RELOC/fonts/afm/public/anonymouspro/AnonymousPro-BoldItalic.afm
RELOC/fonts/afm/public/anonymouspro/AnonymousPro-Italic.afm
@@ -22,7 +22,6 @@
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Bold-03.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Bold-Symbols-base.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Bold-Symbols-u.tfm
- RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Bold-base.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Bold-t1.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Bold-ts1.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Bold.tfm
@@ -31,7 +30,6 @@
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-BoldItalic-03.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-BoldItalic-Symbols-base.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-BoldItalic-Symbols-u.tfm
- RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-BoldItalic-base.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-BoldItalic-t1.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-BoldItalic-ts1.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-BoldItalic.tfm
@@ -41,7 +39,6 @@
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Italic-03.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Italic-Symbols-base.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Italic-Symbols-u.tfm
- RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Italic-base.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Italic-t1.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Italic-ts1.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Italic.tfm
@@ -50,7 +47,6 @@
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Regular-03.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Regular-Symbols-base.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Regular-Symbols-u.tfm
- RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Regular-base.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Regular-t1.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Regular-ts1.tfm
RELOC/fonts/tfm/public/anonymouspro/AnonymousPro-Regular.tfm
@@ -83,7 +79,7 @@
RELOC/tex/latex/anonymouspro/uanonymouspro.fd
catalogue-contact-home http://www.marksimonson.com/fonts/view/anonymous-pro
catalogue-ctan /fonts/anonymouspro
-catalogue-date 2017-04-18 05:31:40 +0200
-catalogue-license lppl1.3
+catalogue-date 2019-07-12 23:17:50 +0200
+catalogue-license lppl1.3c
catalogue-topics font font-mono font-ttf font-type1
-catalogue-version 2.1
+catalogue-version 2.2
++++++ apa.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apa.doc.tlpobj new/tlpkg/tlpobj/apa.doc.tlpobj
--- old/tlpkg/tlpobj/apa.doc.tlpobj 2019-02-28 03:14:57.000000000 +0100
+++ new/tlpkg/tlpobj/apa.doc.tlpobj 2020-03-04 23:48:59.000000000 +0100
@@ -1,6 +1,6 @@
name apa.doc
category Package
-revision 42428
+revision 54080
shortdesc doc files of apa
relocated 1
docfiles size=29
++++++ apa.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apa.tlpobj new/tlpkg/tlpobj/apa.tlpobj
--- old/tlpkg/tlpobj/apa.tlpobj 2019-02-28 03:14:57.000000000 +0100
+++ new/tlpkg/tlpobj/apa.tlpobj 2020-03-04 23:48:59.000000000 +0100
@@ -1,6 +1,6 @@
name apa
category Package
-revision 42428
+revision 54080
shortdesc American Psychological Association format
relocated 1
longdesc A LaTeX class to format text according to the American
@@ -8,19 +8,20 @@
longdesc specifications for manuscripts or to the APA journal look found
longdesc in journals like the Journal of Experimental Psychology etc. In
longdesc addition, it provides regular LaTeX-like output with a few
-longdesc enhancements and APA-motivated changes. Note that the apa6
-longdesc (covering the 6th edition of the manual) is now commonly in
-longdesc use. Apacite, which used to work with this class, has now been
+longdesc enhancements and APA-motivated changes. Note that the apa7
+longdesc class (covering the 7th edition of the manual) and apa6
+longdesc (covering the 6th edition of the manual) are now commonly in
+longdesc use. Apacite, which used to work with this class, has been
longdesc updated for use with apa6.
runfiles size=18
RELOC/tex/latex/apa/apa.cls
RELOC/tex/latex/apa/dutch.apa
RELOC/tex/latex/apa/english.apa
RELOC/tex/latex/apa/greek.apa
+catalogue-alias apa5
catalogue-also mslapa
catalogue-contact-home http://users.uoa.gr/~aprotopapas/CV/apacls.html
catalogue-ctan /macros/latex/contrib/apa
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license lppl
-catalogue-topics psychology journalpub
+catalogue-topics class apa psychology journalpub
catalogue-version 1.3.4
++++++ apa6.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apa6/README new/doc/latex/apa6/README
--- old/doc/latex/apa6/README 2017-06-06 01:14:07.000000000 +0200
+++ new/doc/latex/apa6/README 2020-01-13 22:25:18.000000000 +0100
@@ -3,7 +3,7 @@
apa6 - A LaTeX class for formatting documents in compliance with the
American Psychological Association's Publication Manual, 6th edition
-Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License (LPPL), either
Binary files old/doc/latex/apa6/apa6.pdf and new/doc/latex/apa6/apa6.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas new/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas
--- old/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas 2017-06-06 01:14:07.000000000 +0200
+++ new/doc/latex/apa6/pseudoTeX/TeX2WordForapa6.bas 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -360,7 +360,7 @@
End Sub
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apa6/pseudoTeX/apa6.ptex new/doc/latex/apa6/pseudoTeX/apa6.ptex
--- old/doc/latex/apa6/pseudoTeX/apa6.ptex 2017-06-06 01:14:07.000000000 +0200
+++ new/doc/latex/apa6/pseudoTeX/apa6.ptex 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -375,7 +375,7 @@
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apa6/samples/bibliography.bib new/doc/latex/apa6/samples/bibliography.bib
--- old/doc/latex/apa6/samples/bibliography.bib 2017-06-06 01:14:07.000000000 +0200
+++ new/doc/latex/apa6/samples/bibliography.bib 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -190,7 +190,7 @@
}
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apa6/samples/longsample.tex new/doc/latex/apa6/samples/longsample.tex
--- old/doc/latex/apa6/samples/longsample.tex 2017-06-21 00:17:04.000000000 +0200
+++ new/doc/latex/apa6/samples/longsample.tex 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -34,14 +34,14 @@
\usepackage[american]{babel}
\usepackage{csquotes}
-\usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex}
+\usepackage[style=apa6,sortcites=true,sorting=nyt,backend=biber]{biblatex}
\DeclareLanguageMapping{american}{american-apa}
\addbibresource{bibliography.bib}
\title{Sample APA-Style Document Using the \textsf{apa6} Package}
\shorttitle{Sample Document}
-\author{Brian D. Beitzel}
+\author{Brian D.\ Beitzel}
\affiliation{SUNY Oneonta}
\leftheader{Beitzel}
@@ -50,11 +50,11 @@
\keywords{APA style, demonstration}
-\authornote{Brian D. Beitzel, Department of Educational Psychology,
+\authornote{Brian D.\ Beitzel, Department of Educational Psychology,
Counseling and Special Education, SUNY Oneonta.
Correspondence concerning this article should be addressed to Brian
- D. Beitzel, Department of Educational Psychology, Counseling and
+ D.\ Beitzel, Department of Educational Psychology, Counseling and
Special Education, SUNY Oneonta, 366 Fitzelle Hall, Oneonta, NY
13820. E-mail: beitzebd(a)oneonta.edu}
@@ -185,7 +185,7 @@
\end{document}
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apa6/samples/shortsample.tex new/doc/latex/apa6/samples/shortsample.tex
--- old/doc/latex/apa6/samples/shortsample.tex 2017-06-06 01:14:07.000000000 +0200
+++ new/doc/latex/apa6/samples/shortsample.tex 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -32,13 +32,13 @@
\usepackage[american]{babel}
\usepackage{csquotes}
-\usepackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex}
+\usepackage[style=apa6,sortcites=true,sorting=nyt,backend=biber]{biblatex}
\DeclareLanguageMapping{american}{american-apa}
\addbibresource{bibliography.bib}
\title{Sample APA-Style Document Using the \textsf{apa6} Package}
-\author{Brian D. Beitzel}
+\author{Brian D.\ Beitzel}
\affiliation{SUNY Oneonta}
\leftheader{Beitzel}
@@ -132,7 +132,7 @@
\end{document}
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apa6.doc.tlpobj new/tlpkg/tlpobj/apa6.doc.tlpobj
--- old/tlpkg/tlpobj/apa6.doc.tlpobj 2019-02-28 03:14:57.000000000 +0100
+++ new/tlpkg/tlpobj/apa6.doc.tlpobj 2020-01-15 01:54:34.000000000 +0100
@@ -1,6 +1,6 @@
name apa6.doc
category Package
-revision 48546
+revision 53406
shortdesc doc files of apa6
relocated 1
docfiles size=163
++++++ apa6.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/apa6.cls new/tex/latex/apa6/apa6.cls
--- old/tex/latex/apa6/apa6.cls 2018-09-02 23:14:05.000000000 +0200
+++ new/tex/latex/apa6/apa6.cls 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -27,7 +27,7 @@
%%
%% ----------------------------------------------------------------------
%%
-\ProvidesClass{apa6}[2018/09/01 v2.33 APA formatting (6th edition)]
+\ProvidesClass{apa6}[2020/01/13 v2.34 APA formatting (6th edition)]
\NeedsTeXFormat{LaTeX2e}
\DeclareOption{man}{%
@@ -188,7 +188,7 @@
\ClassInfo{apa6}{No bibliography package was specified; defaulting to (but not loading) Biblatex}
}{%
\def\def@biblatex{\@biblatexmode}% the selected bibliography package is Biblatex
- \RequirePackage[style=apa,sortcites=true,sorting=nyt,backend=biber]{biblatex}
+ \RequirePackage[style=apa6,sortcites=true,sorting=nyt,backend=biber]{biblatex}
\@ifundefined{def@man}{%
\defbibheading{bibliography}{\section*{\normalfont\refname}}%
}{%
@@ -231,6 +231,8 @@
}
+\renewcommand\and{\vspace{0.25in}\\}
+
\long\def\ifapamodeman#1#2{\@ifundefined{def@man}{#2}{#1}}
\long\def\ifapamodejou#1#2{\@ifundefined{def@jou}{#2}{#1}}
@@ -785,7 +787,7 @@
\@ifundefined{@title}{%
\ClassWarningNoLine{apa6}{Title not defined}\def\@title{Title}}{}
\@ifundefined{@shorttitle}{%
- \ClassWarningNoLine{apa6}{Short title not defined}\def\@shorttitle{INSERT SHORTTITLE COMMAND IN PREAMBLE}}{}
+ \ClassWarningNoLine{apa6}{Short title not defined}\def\@shorttitle{INSERT SHORTTITLE COMMAND IN PREAMBLE}}{}
\@ifundefined{@affil}{%
\ClassWarningNoLine{apa6}{Affiliation not defined}\def\@affil{Affiliation}}{}
\@ifundefined{@abstract}{%
@@ -1772,7 +1774,7 @@
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAamerican.txt new/tex/latex/apa6/config/APAamerican.txt
--- old/tex/latex/apa6/config/APAamerican.txt 2017-06-06 01:14:07.000000000 +0200
+++ new/tex/latex/apa6/config/APAamerican.txt 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Footnotes}
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAbritish.txt new/tex/latex/apa6/config/APAbritish.txt
--- old/tex/latex/apa6/config/APAbritish.txt 2017-06-06 01:14:07.000000000 +0200
+++ new/tex/latex/apa6/config/APAbritish.txt 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Footnotes}
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAczech.txt new/tex/latex/apa6/config/APAczech.txt
--- old/tex/latex/apa6/config/APAczech.txt 2017-06-06 01:14:07.000000000 +0200
+++ new/tex/latex/apa6/config/APAczech.txt 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Poznámky}% Footnotes
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAdutch.txt new/tex/latex/apa6/config/APAdutch.txt
--- old/tex/latex/apa6/config/APAdutch.txt 2017-06-06 01:14:07.000000000 +0200
+++ new/tex/latex/apa6/config/APAdutch.txt 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Voetnoten}% Footnotes
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAendfloat.cfg new/tex/latex/apa6/config/APAendfloat.cfg
--- old/tex/latex/apa6/config/APAendfloat.cfg 2017-06-06 01:14:07.000000000 +0200
+++ new/tex/latex/apa6/config/APAendfloat.cfg 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -99,7 +99,7 @@
\xdef\ef@endsidetabletest{\string\\end\string\{sidewaystable\string\}}
\xdef\ef@endlongtabletest{\string\\end\string\{longtable\string\}}}%
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAenglish.txt new/tex/latex/apa6/config/APAenglish.txt
--- old/tex/latex/apa6/config/APAenglish.txt 2017-06-06 01:14:07.000000000 +0200
+++ new/tex/latex/apa6/config/APAenglish.txt 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Footnotes}
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAgerman.txt new/tex/latex/apa6/config/APAgerman.txt
--- old/tex/latex/apa6/config/APAgerman.txt 2017-06-06 01:14:07.000000000 +0200
+++ new/tex/latex/apa6/config/APAgerman.txt 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Fußnoten}% Footnotes
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAgreek.txt new/tex/latex/apa6/config/APAgreek.txt
--- old/tex/latex/apa6/config/APAgreek.txt 2017-06-06 01:14:07.000000000 +0200
+++ new/tex/latex/apa6/config/APAgreek.txt 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Uposhmei'wseis}% Footnotes
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAngerman.txt new/tex/latex/apa6/config/APAngerman.txt
--- old/tex/latex/apa6/config/APAngerman.txt 2017-06-06 01:14:07.000000000 +0200
+++ new/tex/latex/apa6/config/APAngerman.txt 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Fußnoten}% Footnotes
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apa6/config/APAturkish.txt new/tex/latex/apa6/config/APAturkish.txt
--- old/tex/latex/apa6/config/APAturkish.txt 2017-06-06 01:14:07.000000000 +0200
+++ new/tex/latex/apa6/config/APAturkish.txt 2020-01-13 22:25:18.000000000 +0100
@@ -10,7 +10,7 @@
%% apa6 - A LaTeX class for formatting documents in compliance with the
%% American Psychological Association's Publication Manual, 6th edition
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -35,7 +35,7 @@
\renewcommand{\notesname}{Dipnotlar}% Footnotes
%%
-%% Copyright (C) 2011-2017 by Brian D. Beitzel <brian at beitzel.com>
+%% Copyright (C) 2011-2020 by Brian D. Beitzel <brian at beitzel.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apa6.tlpobj new/tlpkg/tlpobj/apa6.tlpobj
--- old/tlpkg/tlpobj/apa6.tlpobj 2019-02-28 03:14:58.000000000 +0100
+++ new/tlpkg/tlpobj/apa6.tlpobj 2020-01-15 01:54:34.000000000 +0100
@@ -1,6 +1,6 @@
name apa6
category Package
-revision 48546
+revision 53406
shortdesc Format documents in APA style (6th edition)
relocated 1
longdesc The class formats documents in APA style (6th Edition). It
@@ -24,7 +24,6 @@
RELOC/tex/latex/apa6/config/APAngerman.txt
RELOC/tex/latex/apa6/config/APAturkish.txt
catalogue-ctan /macros/latex/contrib/apa6
-catalogue-date 2018-09-02 09:12:12 +0200
catalogue-license lppl1.3c
catalogue-topics class apa psychology journalpub
-catalogue-version 2.33
+catalogue-version 2.34
++++++ apacite.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apacite.doc.tlpobj new/tlpkg/tlpobj/apacite.doc.tlpobj
--- old/tlpkg/tlpobj/apacite.doc.tlpobj 2019-02-28 03:14:58.000000000 +0100
+++ new/tlpkg/tlpobj/apacite.doc.tlpobj 2020-03-04 23:49:00.000000000 +0100
@@ -1,6 +1,6 @@
name apacite.doc
category Package
-revision 31264
+revision 54080
shortdesc doc files of apacite
relocated 1
docfiles size=177
++++++ apacite.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apacite.tlpobj new/tlpkg/tlpobj/apacite.tlpobj
--- old/tlpkg/tlpobj/apacite.tlpobj 2019-02-28 03:14:58.000000000 +0100
+++ new/tlpkg/tlpobj/apacite.tlpobj 2020-03-04 23:49:00.000000000 +0100
@@ -1,6 +1,6 @@
name apacite
category Package
-revision 31264
+revision 54080
shortdesc Citation style following the rules of the APA
relocated 1
longdesc Apacite provides a BibTeX style and a LaTeX package which are
@@ -30,7 +30,6 @@
RELOC/tex/latex/apacite/spanish.apc
RELOC/tex/latex/apacite/swedish.apc
catalogue-ctan /biblio/bibtex/contrib/apacite
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
-catalogue-topics psychology journalpub bibtex-sty bibtex-supp
+catalogue-topics psychology journalpub bibtex-sty bibtex-supp apa
catalogue-version 6.03
++++++ apalike-german.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apalike-german.doc.tlpobj new/tlpkg/tlpobj/apalike-german.doc.tlpobj
--- old/tlpkg/tlpobj/apalike-german.doc.tlpobj 2019-02-28 03:14:59.000000000 +0100
+++ new/tlpkg/tlpobj/apalike-german.doc.tlpobj 2020-03-04 23:49:00.000000000 +0100
@@ -1,6 +1,6 @@
name apalike-german.doc
category Package
-revision 47002
+revision 54080
shortdesc doc files of apalike-german
relocated 1
docfiles size=20
++++++ apalike-german.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apalike-german.tlpobj new/tlpkg/tlpobj/apalike-german.tlpobj
--- old/tlpkg/tlpobj/apalike-german.tlpobj 2019-02-28 03:14:59.000000000 +0100
+++ new/tlpkg/tlpobj/apalike-german.tlpobj 2020-03-04 23:49:00.000000000 +0100
@@ -1,6 +1,6 @@
name apalike-german
category Package
-revision 47002
+revision 54080
shortdesc A copy of apalike.bst with German localization
relocated 1
longdesc A copy of apalike.bst (which is part of the base BibTeX
@@ -10,6 +10,5 @@
catalogue-contact-home https://ingram-braun.net/public/programming/tex/apalike-german-bst-bibtex-b…
catalogue-contact-repository https://github.com/CarlOrff/apalike-german
catalogue-ctan /biblio/bibtex/contrib/apalike-german
-catalogue-date 2018-03-17 14:53:38 +0100
catalogue-license lppl1.3c
-catalogue-topics bibtex-sty german
+catalogue-topics bibtex-sty german apa
++++++ apalike2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apalike2.tlpobj new/tlpkg/tlpobj/apalike2.tlpobj
--- old/tlpkg/tlpobj/apalike2.tlpobj 2019-02-28 03:14:59.000000000 +0100
+++ new/tlpkg/tlpobj/apalike2.tlpobj 2020-03-04 23:49:00.000000000 +0100
@@ -1,6 +1,6 @@
name apalike2
category Package
-revision 15878
+revision 54080
shortdesc Bibliography style that approaches APA requirements
relocated 1
longdesc Described as a "local adaptation" of apalike (which is part of
@@ -8,6 +8,5 @@
runfiles size=7
RELOC/bibtex/bst/apalike2/apalike2.bst
catalogue-ctan /biblio/bibtex/contrib/apalike2
-catalogue-date 2016-11-03 05:37:55 +0100
catalogue-license knuth
-catalogue-topics psychology journalpub bibtex-sty
+catalogue-topics apa psychology journalpub bibtex-sty
++++++ appendix.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/appendix/README new/doc/latex/appendix/README
--- old/doc/latex/appendix/README 2009-09-10 01:39:55.000000000 +0200
+++ new/doc/latex/appendix/README 2020-02-08 23:16:20.000000000 +0100
@@ -5,11 +5,14 @@
of appendices. Also (sub)appendices environments are provided that can be
used, for example, for per chapter/section appendices.
+Changes v1.2c (2020-02-08)
+- Fix clash with hyperref
+
Changes v1.2b (2009/09/02)
- New maintainer (Will Robertson)
Changes v1.2a (2004/04/16)
-- Updated contact details
+- Updated contact details
- Changed license from LPPL v1.0 to LPPL v1.3
Changes in version 1.2 (2002/08/06)
@@ -23,19 +26,20 @@
- Addition of a subappendices environment for per chapter/section appendices
- Appendices environment now restores chapter/section numbering at the end
------------------------------------------------------------------
+-----------------------------------------------------------------
Author: Peter Wilson, Herries Press
Maintainer: Will Robertson (will dot robertson at latex-project dot org)
Copyright 1998--2004 Peter R. Wilson
-
+ Copyright 2009--2020 Will Robertson
+
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
- version 1.3c of this license or (at your option) any
+ version 1.3c of this license or (at your option) any
later version: <http://www.latex-project.org/lppl.txt>
-
+
This work has the LPPL maintenance status "maintained".
The Current Maintainer of this work is Will Robertson.
-
+
This work consists of the files:
README (this file)
appendix.dtx
@@ -44,17 +48,17 @@
and the derived files:
appendix.sty
------------------------------------------------------------------
+-----------------------------------------------------------------
To install the package:
- run: latex appendix.ins (which will generate appendix.sty)
- Move appendix.sty to a location where LaTeX will find it
(typically in a local texmf tree at tex/latex/appendix) and refresh
the file database. See the FAQ on CTAN at help/uk-tex-faq or
- http://www.tug.ac.uk/faq for more information on this.
+ https://texfaq.org/ for more information on this.
- To obtain the user manual:
o run: latex appendix.dtx
o run: makeindex -s gind.ist appendix
o run: latex appendix.dtx
- o Print appendix.dvi for a hardcopy of the package manual
+ o Print appendix.dvi for a hardcopy of the package manual
Binary files old/doc/latex/appendix/appendix.pdf and new/doc/latex/appendix/appendix.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/appendix.doc.tlpobj new/tlpkg/tlpobj/appendix.doc.tlpobj
--- old/tlpkg/tlpobj/appendix.doc.tlpobj 2019-02-28 03:14:59.000000000 +0100
+++ new/tlpkg/tlpobj/appendix.doc.tlpobj 2020-02-09 01:54:35.000000000 +0100
@@ -1,8 +1,8 @@
name appendix.doc
category Package
-revision 42428
+revision 53718
shortdesc doc files of appendix
relocated 1
-docfiles size=46
+docfiles size=79
RELOC/doc/latex/appendix/README
RELOC/doc/latex/appendix/appendix.pdf
++++++ appendix.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/appendix/appendix.sty new/tex/latex/appendix/appendix.sty
--- old/tex/latex/appendix/appendix.sty 2009-09-10 01:39:55.000000000 +0200
+++ new/tex/latex/appendix/appendix.sty 2020-02-08 23:16:20.000000000 +0100
@@ -10,6 +10,7 @@
%% Author: Peter Wilson, Herries Press
%% Maintainer: Will Robertson (will dot robertson at latex-project dot org)
%% Copyright 1998--2004 Peter R. Wilson
+%% Copyright 2009--2020 Will Robertson
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -23,8 +24,15 @@
%% -----------------------------------------------------------------
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{appendix}[2009/09/02 v1.2b extra appendix facilities]
-
+\ProvidesPackage{appendix}[2020/02/08 v1.2c extra appendix facilities]
+\begingroup\expandafter\expandafter\expandafter\endgroup
+ \expandafter\ifx\csname appendix\endcsname\relax
+ \PackageWarningNoLine{appendix}{%
+ No \protect\appendix\space command in this document class!%
+ \MessageBreak
+ Trying to create an appendix will probably fail%
+ }%
+ \fi
\newif\if@chapter@pp\@chapter@ppfalse
\newif\if@knownclass@pp\@knownclass@ppfalse
\@ifundefined{chapter}{%
@@ -188,7 +196,7 @@
\else
\renewcommand{\theHsection}{\theH(a)pps.\Alph{section}}%
\fi
- \def\Hy@chapapp{\appendixname}%
+ \xdef\Hy@chapapp{\Hy@appendixstring}%
\fi
\restoreapp
}
@@ -250,7 +258,7 @@
\else
\renewcommand{\theHsubsection}{\theH(a)pps.\setthesubsection}%
\fi
- \def\Hy@chapapp{\appendixname}%
+ \xdef\Hy@chapapp{\Hy@appendixstring}%
\fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/appendix.tlpobj new/tlpkg/tlpobj/appendix.tlpobj
--- old/tlpkg/tlpobj/appendix.tlpobj 2019-02-28 03:14:59.000000000 +0100
+++ new/tlpkg/tlpobj/appendix.tlpobj 2020-02-09 01:54:35.000000000 +0100
@@ -1,6 +1,6 @@
name appendix
category Package
-revision 42428
+revision 53718
shortdesc Extra control of appendices
relocated 1
longdesc The appendix package provides various ways of formatting the
@@ -15,8 +15,8 @@
longdesc instead of the \appendix command.
runfiles size=3
RELOC/tex/latex/appendix/appendix.sty
+catalogue-contact-repository https://github.com/wspr/herries-press/
catalogue-ctan /macros/latex/contrib/appendix
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl
+catalogue-license lppl1.3c
catalogue-topics appendix headings
-catalogue-version 1.2b
+catalogue-version 1.2c
++++++ apxproof.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/apxproof/README.md new/doc/latex/apxproof/README.md
--- old/doc/latex/apxproof/README.md 2019-01-29 23:13:34.000000000 +0100
+++ new/doc/latex/apxproof/README.md 2019-10-09 23:56:43.000000000 +0200
@@ -20,12 +20,12 @@
few other packages, which should be provided by all reasonable LaTeX
distributions:
- `amsthm`
- - `bibunits`
- `environ`
- `etoolbox`
- `fancyvrb`
- `ifthen`
- `kvoptions`
+ - `bibunits` (optional, only if the `bibliography` option is set to `separate`)
## Manual installation
Binary files old/doc/latex/apxproof/apxproof.pdf and new/doc/latex/apxproof/apxproof.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apxproof.doc.tlpobj new/tlpkg/tlpobj/apxproof.doc.tlpobj
--- old/tlpkg/tlpobj/apxproof.doc.tlpobj 2019-02-28 03:15:00.000000000 +0100
+++ new/tlpkg/tlpobj/apxproof.doc.tlpobj 2019-10-10 02:04:12.000000000 +0200
@@ -1,6 +1,6 @@
name apxproof.doc
category Package
-revision 49865
+revision 52324
shortdesc doc files of apxproof
relocated 1
docfiles size=144
++++++ apxproof.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/apxproof/apxproof.sty new/tex/latex/apxproof/apxproof.sty
--- old/tex/latex/apxproof/apxproof.sty 2019-01-29 23:13:34.000000000 +0100
+++ new/tex/latex/apxproof/apxproof.sty 2019-10-09 23:56:43.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% apxproof.dtx (with options: `package')
%%
-%% Copyright (C) 2016-2017 by Pierre Senellart
+%% Copyright (C) 2016-2019 by Pierre Senellart
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -27,8 +27,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{apxproof}
- [2019/01/28 v1.1.1 Automatic proofs in appendix]
-\RequirePackage{bibunits}
+ [2019/10/08 v1.2.0 Automatic proofs in appendix]
\RequirePackage{environ}
\RequirePackage{etoolbox}
\RequirePackage{fancyvrb}
@@ -66,6 +65,7 @@
package apxproof}
}}}
\ifthenelse{\equal{\axp@bibliography}{separate}}{
+ \RequirePackage{bibunits}
\message{apxproof: Separate bibliography for appendix material}
}{\ifthenelse{\equal{\axp@bibliography}{common}}{
\message{apxproof: Common bibliography for appendix and main text}
@@ -81,6 +81,22 @@
\errmessage{Error: unsupported option repeqn=\axp@repeqn\ for
package apxproof}
}}
+\def\axp@newtheoremrep@definetheorem#1#2#3#4{%
+ \expandafter\let\csname #1\endcsname\undefined
+ \ifcsname c@#1\endcsname
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname c@axp@#1\endcsname\csname c@#1\endcsname
+ \expandafter\let\csname c@#1\endcsname\undefined
+ \fi
+ \axp@newtheorem{#1}{#2}{#3}{#4}%
+ \ifcsname c@axp@#1\endcsname
+ \ifx\relax#2\relax
+ \expandafter\expandafter\expandafter\let\expandafter\expandafter
+ \csname c@#1\endcsname\csname c@axp@#1\endcsname
+ \else
+ \fi
+ \fi
+}
\def\axp@newtheorem{\@ifstar\@@axp@newtheorem\@axp@newtheorem}
\def\@axp@newtheorem#1#2#3#4{%
\ifx\relax#4\relax
@@ -99,11 +115,7 @@
\@oparg{\axp@newtheoremrep{#1}[#2]{#3}}[]%
}
\newenvironment{proofsketch}{\begin{axp@oldproof}[Proof sketch]}{\end{axp@oldproof}}
-\AtBeginDocument{%
- \def\thmhead#1#2#3{%
- \thmname{#1}\thmnumber{\@ifnotempty{#1}{ }\@upn{#2}}%
- \thmnote{ #3}}%
-}
+\newcommand{\mainbodyrepeatedtheorem}{}
\newcommand{\appendixrefname}{References for the Appendix}
\newcommand{\appendixbibliographystyle}{alpha}
\newcommand{\appendixbibliographyprelim}{}
@@ -112,8 +124,8 @@
\let\axp@oldproof\proof
\let\endaxp@oldproof\endproof
\newcommand{\axp@redefinelabels}{%
- \providecommand\label@in@display{}
- \ifthenelse{\equal{\axp@appendix}{inline}}{
+ \providecommand\label@in@display{}%
+ \ifthenelse{\equal{\axp@appendix}{inline}}{%
\let\axp@oldlabel\label
\let\axp@oldlabel@in@display\label@in@display
\renewcommand\label[1]{%
@@ -146,19 +158,18 @@
\def\@@axp@newtheorem#1#2{%
\spnewtheorem*{#1}{#2}{\upshape\bfseries}{\itshape}%
}
+\renewenvironment{proofsketch}{\begin{axp@oldproof}[sketch]}{\end{axp@oldproof}}
\def\(a)thmcountersep{.}
-\def\@Opargbegintheorem#1#2#3#4{#4\trivlist
- \item[\hskip\labelsep{#3#1}]{#3 #2\@thmcounterend\ }}
-\def\@spopargbegintheorem#1#2#3#4#5{\trivlist
- \item[\hskip\labelsep{#4#1\ #2}]{#4 #3\@thmcounterend\ }#5}
\fi
\ifthenelse{\equal{\axp@appendix}{inline}}{
\def\axp@newtheoremrep#1[#2]#3[#4]{%
- \expandafter\let\csname #1\endcsname\undefined
- \expandafter\let\csname c@#1\endcsname\undefined
- \axp@newtheorem{#1}{#2}{#3}{#4}%
+ \axp@newtheoremrep@definetheorem{#1}{#2}{#3}{#4}%
\NewEnviron{#1rep}[1][]{%
- \begin{#1}[##1]\axp@redefinelabels\BODY\end{#1}%
+ \ifx\relax##1\relax
+ \begin{#1}\axp@redefinelabels\BODY\end{#1}%
+ \else
+ \begin{#1}[##1]\axp@redefinelabels\BODY\end{#1}%
+ \fi
}
}
\let\inlineproof\proof
@@ -212,9 +223,7 @@
\newcounter{axp@equation}
\newcounter{axp@equationx}
\def\axp@newtheoremrep#1[#2]#3[#4]{%
- \expandafter\let\csname #1\endcsname\undefined
- \expandafter\let\csname c@#1\endcsname\undefined
- \axp@newtheorem{#1}{#2}{#3}{#4}%
+ \axp@newtheoremrep@definetheorem{#1}{#2}{#3}{#4}%
\expandafter\pretocmd\csname #1\endcsname{\noproofinappendix}{}{}%
\axp@newtheorem*{axp@#1rp}{#3}%
\axp@forward@setup{#1}{#2}{#3}{#4}%
@@ -224,10 +233,12 @@
}{}%
\addtocounter{axp@rpcounter}{1}%
\ifx\relax##1\relax
- \axp@with@forward{#1}{\begin{#1}}\label{axp@r\roman{axp@rpcounter}}\BODY\end{#1}%
+ \axp@with@forward{#1}{\begin{#1}}\label{axp@r\roman{axp@rpcounter}}%
\else
- \axp@with@forward{#1}{\begin{#1}[##1]}\label{axp@r\roman{axp@rpcounter}}\BODY\end{#1}%
+ \axp@with@forward{#1}{\begin{#1}[##1]}\label{axp@r\roman{axp@rpcounter}}%
\fi
+ \mainbodyrepeatedtheorem
+ \BODY\end{#1}%
\global\toggletrue{axp@seenreptheorem}%
\global\expandafter\let\csname rplet\roman{axp@rpcounter}%
\endcsname
@@ -239,16 +250,40 @@
\noexpand\setcounter{equation}{\theaxp@equation}%
}%
}{}%
- \immediate\write\axp@proofsfile{%
+ \immediate\write\axp@proofsfile{{%
+ \ifdefined\theopargself
+ \noexpand\theopargself
+ \else
+ \noexpand\pretocmd{\noexpand\@begintheorem}{%
+ \noexpand\patchcmd{\noexpand\thmhead}{\noexpand\@acmplainnotefont}{}{}{}%
+ \noexpand\patchcmd{\noexpand\thmhead}{\noexpand\the\noexpand\thm@notefont}{}{}{}%
+ \noexpand\patchcmd{\noexpand\thmhead}{(}{}{}{}%
+ \noexpand\patchcmd{\noexpand\thmhead}{)}{}{}{}%
+ }{}{}
+ \fi
\noexpand\begin{axp@#1rp}
- [\noexpand\ref{axp@r\roman{axp@rpcounter}}%
- \@ifnotempty{##1}{ \unexpanded{##1}}]%
+ [%
+ \noexpand\ref{axp@r\roman{axp@rpcounter}}%
+ \@ifnotempty{##1}{%
+ \ifdefined\theopargself
+ \else
+ \ifdefined\@acmplainnotefont
+ \noexpand\@acmplainnotefont
+ \else
+ \noexpand\ifdefined\noexpand\thm@notefont
+ \noexpand\the\noexpand\thm@notefont
+ \noexpand\fi
+ \fi
+ \fi
+ {} (\unexpanded{##1})%
+ }%
+ ]%
\noexpand\axp@forward@target{axp@fw@r\roman{axp@rpcounter}}{}%
\noexpand\axp@redefinelabels
\expandafter\noexpand\csname rplet\roman{axp@rpcounter}%
\endcsname
\noexpand\end{axp@#1rp}
- }%
+ }}%
\ifthenelse{\equal{\axp@repeqn}{same}}{%
\immediate\write\axp@proofsfile{%
\noexpand\setcounter{equation}{\value{axp@equationx}}%
@@ -384,11 +419,13 @@
\let\axp@oldtableofcontents\tableofcontents
\def\tableofcontents{{\let\section\axp@oldsection\axp@oldtableofcontents}}
\ifthenelse{\equal{\axp@appendix}{append}}{
- \let\axp@oldbibliography\bibliography
- \renewcommand\bibliography[1]{%
- \defaultbibliography{#1}%
- \axp@oldbibliography{#1}%
- }
+ \ifthenelse{\equal{\axp@bibliography}{separate}}{
+ \let\axp@oldbibliography\bibliography
+ \renewcommand\bibliography[1]{%
+ \defaultbibliography{#1}%
+ \axp@oldbibliography{#1}%
+ }
+ }{}
\AtEndDocument{
\appendixprelim
\appendix
@@ -429,29 +466,12 @@
\newcommand{\refname}{REFERENCES}
\renewcommand{\appendixrefname}{REFERENCES FOR THE APPENDIX}
\fi
- \@ifclassloaded{acmart}{
- \newtheoremstyle{mystyle}
- {.5\baselineskip\(a)plus.2\baselineskip
- \(a)minus.2\baselineskip}
- {.5\baselineskip\(a)plus.2\baselineskip
- \(a)minus.2\baselineskip}
- {\@acmplainbodyfont}
- {\@acmplainindent}
- {\@acmplainheadfont}
- {.}
- {.5em}
- {\thmname{#1}\thmnumber{ #2}\thmnote{ {\@acmplainheadfont #3}}}
- \theoremstyle{mystyle}
- }{}
\ifdefined\lipics@opterrshort
\renewcommand{\appendixbibliographyprelim}{%
\global\let\@oldbiblabel\@biblabel
\def\@biblabel{\hspace*{-2em}\small\@oldbiblabel}%
}
\fi
- \@ifclassloaded{llncs}{
- \renewenvironment{proofsketch}{\begin{axp@oldproof}[sketch]}{\end{axp@oldproof}}
- }{}
}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/apxproof.tlpobj new/tlpkg/tlpobj/apxproof.tlpobj
--- old/tlpkg/tlpobj/apxproof.tlpobj 2019-02-28 03:15:01.000000000 +0100
+++ new/tlpkg/tlpobj/apxproof.tlpobj 2019-10-10 02:04:12.000000000 +0200
@@ -1,6 +1,6 @@
name apxproof
category Package
-revision 49865
+revision 52324
shortdesc Proofs in appendix
relocated 1
longdesc The package makes it easier to write articles where proofs and
@@ -12,14 +12,15 @@
longdesc stated in the main text, can section the appendix automatically
longdesc based on the sectioning of the main text, and supports a
longdesc separate bibliography for the appendix material. It depends on
-longdesc the following other packages: amsthm, bibunits, environ,
-longdesc etoolbox, fancyvrb, ifthen, and kvoptions.
+longdesc the following other packages: amsthm, bibunits (if the
+longdesc bibliography option is set to separate), environ, etoolbox,
+longdesc fancyvrb, ifthen, and kvoptions.
runfiles size=4
RELOC/tex/latex/apxproof/apxproof.sty
catalogue-contact-bugs https://github.com/PierreSenellart/apxproof/issues
catalogue-contact-repository https://github.com/PierreSenellart/apxproof
catalogue-ctan /macros/latex/contrib/apxproof
-catalogue-date 2019-01-28 22:56:21 +0100
+catalogue-date 2019-10-08 10:32:50 +0200
catalogue-license lppl1.3
catalogue-topics proof appendix
-catalogue-version 1.1.1
+catalogue-version 1.2.0
++++++ arabluatex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/arabluatex/arabluatex.el new/doc/lualatex/arabluatex/arabluatex.el
--- old/doc/lualatex/arabluatex/arabluatex.el 2019-03-22 21:50:44.000000000 +0100
+++ new/doc/lualatex/arabluatex/arabluatex.el 2020-03-04 00:05:43.000000000 +0100
@@ -2,7 +2,7 @@
;; This file is part of the `arabluatex' package
;; ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-;; Copyright (C) 2016--2019 Robert Alessi
+;; Copyright (C) 2016--2020 Robert Alessi
;; Please send error reports and suggestions for improvements to Robert
;; Alessi <alessi(a)robertalessi.net>
Binary files old/doc/lualatex/arabluatex/arabluatex.pdf and new/doc/lualatex/arabluatex/arabluatex.pdf differ
Binary files old/doc/lualatex/arabluatex/samples/al-Jahiz.pdf and new/doc/lualatex/arabluatex/samples/al-Jahiz.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/lualatex/arabluatex/samples/al-Jahiz.tex new/doc/lualatex/arabluatex/samples/al-Jahiz.tex
--- old/doc/lualatex/arabluatex/samples/al-Jahiz.tex 2018-08-27 23:40:31.000000000 +0200
+++ new/doc/lualatex/arabluatex/samples/al-Jahiz.tex 2020-03-04 00:05:43.000000000 +0100
@@ -5,10 +5,10 @@
%
\documentclass[fontsize=12pt, paper=letter, DIV=classic]{scrartcl}
\usepackage{fontspec}
-\setmainfont{Old Standard}
-\usepackage{newunicodechar}
-\newunicodechar{ǧ}{ǧ} % Old Standard does include ǧ/Ǧ
-\newunicodechar{Ǧ}{Ǧ} %
+\usepackage[english]{babel}
+\babelfont{rm}{Old Standard}
+\babelfont{sf}{NewComputerModern Sans}
+\babelfont{tt}{NewComputerModern Mono}
\usepackage{filecontents}
\usepackage{xcolor}
Binary files old/doc/lualatex/arabluatex/samples/exporting.pdf and new/doc/lualatex/arabluatex/samples/exporting.pdf differ
Binary files old/doc/lualatex/arabluatex/samples/template-01.pdf and new/doc/lualatex/arabluatex/samples/template-01.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arabluatex.doc.tlpobj new/tlpkg/tlpobj/arabluatex.doc.tlpobj
--- old/tlpkg/tlpobj/arabluatex.doc.tlpobj 2019-03-25 02:24:03.000000000 +0100
+++ new/tlpkg/tlpobj/arabluatex.doc.tlpobj 2020-03-24 01:56:30.000000000 +0100
@@ -1,9 +1,9 @@
name arabluatex.doc
category Package
-revision 50571
+revision 54512
shortdesc doc files of arabluatex
relocated 1
-docfiles size=233
+docfiles size=227
RELOC/doc/lualatex/arabluatex/arabluatex.el
RELOC/doc/lualatex/arabluatex/arabluatex.pdf
RELOC/doc/lualatex/arabluatex/samples/al-Jahiz.pdf
++++++ arabluatex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/arabluatex/arabluatex-patch.sty new/tex/lualatex/arabluatex/arabluatex-patch.sty
--- old/tex/lualatex/arabluatex/arabluatex-patch.sty 2019-03-22 21:50:44.000000000 +0100
+++ new/tex/lualatex/arabluatex/arabluatex-patch.sty 2020-03-04 00:05:43.000000000 +0100
@@ -11,7 +11,7 @@
%% This file is part of the `arabluatex' package
%%
%% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-%% Copyright (C) 2016--2019 Robert Alessi
+%% Copyright (C) 2016--2020 Robert Alessi
%%
%% Please send error reports and suggestions for improvements to Robert
%% Alessi <alessi(a)robertalessi.net>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/arabluatex/arabluatex.lua new/tex/lualatex/arabluatex/arabluatex.lua
--- old/tex/lualatex/arabluatex/arabluatex.lua 2019-03-24 22:12:01.000000000 +0100
+++ new/tex/lualatex/arabluatex/arabluatex.lua 2020-03-15 22:32:29.000000000 +0100
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2019 Robert Alessi
+Copyright (C) 2016--2020 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi(a)robertalessi.net>
@@ -56,6 +56,7 @@
local cmdargs = lpeg.Cs(spce^-1 * bsqbracketsii * bcbracesii * bsqbrackets^-1)
local arbargs = lpeg.Cs(spce^-1 * bsqbrackets^-1 * bcbraces)
local baytargs = lpeg.Cs(spce * bcbraces * bsqbrackets^-1 * bcbraces)
+local arind = lpeg.Cs(dblbkslash * lpeg.P("arind") * spce^-1 * bsqbracketsii)
local function protectarb(str)
str = string.gsub(str, "(\\arb%s?)(%[.-%])(%b{})", "\\al@brk{\\arb%2%3}")
@@ -268,7 +269,7 @@
end
str = string.gsub(str, "(\\arb%s?)(%b{})", function(tag, body)
body = string.sub(body, 2, -2)
- return string.format("%s", body)
+ return string.format("\\al@brk{%s{%s}}", tag, body)
end)
str = string.gsub(str, "\\@rb", "\\arb")
str = "\\arb{"..str.."}"
@@ -655,6 +656,20 @@
return str
end
+local function processarind(str, mode)
+ str = gsub(str, arind * bcbraces, function(tag, arg)
+ arg = string.sub(arg, 2, -2)
+ if mode == "trans" then
+ return string.format("%s{\\txtrans{%s}}", tag, arg)
+ else
+ arg = novoc(arg)
+ arg = string.gsub(arg, "\\arabicfont%s?{}", "")
+ return string.format("%s{\\txarb{%s}}", tag, arg)
+ end
+ end)
+ return str
+end
+
-- The following functions produce a copy of the original .tex source
-- file in which all arabtex strings are replaced with Unicode
-- equivalents
@@ -709,7 +724,7 @@
bbody = string.sub(bbody, 2, -2)
if tonumber(bbody) ~= nil then
bbody = arabluatex.abjadify(bbody)
- return string.format("\\oline*{\\arb[novoc]{%s}}", bbody)
+ return string.format("\\aoline*{\\arb[novoc]{%s}}", bbody)
else
return string.format("%s{%s}", btag, bbody)
end
@@ -743,15 +758,9 @@
return string.format("%s{\\arb[trans]{\\uc{%s}}}", tag, body)
end
end)
- str = string.gsub(str, "(\\begin%s?{arab})(%b[])", function(tag, body)
- if string.find(body, "trans") then
- return string.format("\\par\\bgroup\\setLR\\arb%s{", body)
- else
- return string.format("\\par\\bgroup\\setRL\\arb%s{", body)
- end
- end)
- str = string.gsub(str, "(\\begin%s?{arab})", "\\par\\bgroup\\arbpardir\\arb{")
- str = string.gsub(str, "\\end%s?{arab}", "}\\egroup\\par")
+ str = string.gsub(str, "(\\begin%s?{arab})(%b[])", "\\bgroup\\arb%2{")
+ str = string.gsub(str, "(\\begin%s?{arab})", "\\bgroup\\arb{")
+ str = string.gsub(str, "\\end%s?{arab}", "}\\egroup")
-- This does not work, while the following two do. Look into this later.
-- str = gsub(str, lpeg.Cs("\\arb") * spcenc * bsqbrackets^-1 * bcbraces, function(tag, opt, body)
-- body = string.sub(body, 2, -2)
@@ -836,6 +845,14 @@
t = string.gsub(t, "(\\@al@ob)", "{")
t = string.gsub(t, "(\\@al@cb@sp)", "} ")
t = string.gsub(t, "(\\@al@cb)(%s?)", "}")
+ t = string.gsub(t, "(\\bgroup%s?)(\\txarb%s?)(%b{})(\\egroup%s?)", function(tagio, tag, body, tagic)
+ body = string.sub(body, 2, -2)
+ return string.format("\\begin{txarab}%s\\end{txarab}", body)
+ end)
+ t = string.gsub(t, "(\\bgroup%s?)(\\txtrans%s?)(%b{})(\\egroup%s?)", function(tagio, tag, body, tagic)
+ body = string.sub(body, 2, -2)
+ return string.format("\\begin{txarabtr}%s\\end{txarabtr}", body)
+ end)
t = gsub(t, lpeg.Cs("\\begin") * spcenc^-1 * bcbraces * cmdargs,
"\n%1%2%3\n")
t = string.gsub(t, "(\\\\)(%s?)", "%1\n")
@@ -892,6 +909,7 @@
str = protectarb(str)
str = breakcmd(str)
str = holdcmd(str)
+ str = processarind(str)
if scheme == "buckwalter" then
str = processbuckw(str)
else end
@@ -920,6 +938,7 @@
str = protectarb(str)
str = breakcmd(str)
str = holdcmd(str)
+ str = processarind(str)
if scheme == "buckwalter" then
str = processbuckw(str)
else end
@@ -950,6 +969,7 @@
str = protectarb(str)
str = breakcmd(str)
str = holdcmd(str)
+ str = processarind(str)
if scheme == "buckwalter" then
str = processbuckw(str)
else end
@@ -979,6 +999,7 @@
str = protectarb(str)
str = breakcmd(str)
str = holdcmd(str)
+ str = processarind(str, "trans")
if scheme == "buckwalter" then
str = processbuckw(str)
end
@@ -1162,12 +1183,12 @@
function arabluatex.aemph(str, opt)
if tex.textdir == "TRT" then
- str = "\\oline{\\textdir TRT{}"..str.."}"
+ str = "\\aoline{\\textdir TRT{}"..str.."}"
elseif tex.textdir == "TLT" then
if opt == "over" then
- str = "\\oline{"..str.."}"
+ str = "\\aoline{"..str.."}"
else
- str = "\\uline{"..str.."}"
+ str = "\\auline{"..str.."}"
end
end
return str
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/arabluatex/arabluatex.sty new/tex/lualatex/arabluatex/arabluatex.sty
--- old/tex/lualatex/arabluatex/arabluatex.sty 2019-03-24 22:12:01.000000000 +0100
+++ new/tex/lualatex/arabluatex/arabluatex.sty 2020-03-23 23:25:35.000000000 +0100
@@ -11,7 +11,7 @@
%% This file is part of the `arabluatex' package
%%
%% ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-%% Copyright (C) 2016--2019 Robert Alessi
+%% Copyright (C) 2016--2020 Robert Alessi
%%
%% Please send error reports and suggestions for improvements to Robert
%% Alessi <alessi(a)robertalessi.net>
@@ -41,15 +41,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{arabluatex}
- [2019/03/24 v1.17 An ArabTeX-like interface for LuaLaTeX]
-\RequirePackage{ifluatex}
-\ifluatex\else
- \PackageError{arabluatex}{lualatex needed}{%
- Package `arabluatex' needs LuaTeX.\MessageBreak
- So you should use `lualatex' to process your document.\MessageBreak
- See documentation of `arabluatex' for further information.}%
- \expandafter\expandafter\expandafter\csname endinput\endcsname
-\fi
+ [2020/03/23 v1.20 ArabTeX for LuaLaTeX]
+\RequirePackage{iftex}
+\RequireLuaTeX
\RequirePackage{xkeyval}
\DeclareOptionX{voc}{\def\al@mode{voc}}
\DeclareOptionX{fullvoc}{\def\al@mode{fullvoc}}
@@ -76,14 +70,14 @@
\RequirePackage{xparse}
\RequirePackage{adjustbox}
\RequirePackage{xstring}
-\PassOptionsToPackage{normalem}{ulem}
-\RequirePackage{ulem}
+\RequirePackage{lua-ul}
\providebool{al@rlmode}
\luadirect{dofile(kpse.find_file("arabluatex.lua"))}
\AtBeginDocument{\ifdefined\arabicfont\relax\else
-\PackageWarning{arabluatex}{\string\arabicfont\ is not defined.^^J
- I will try to load Amiri}%
-\newfontfamily\arabicfont[Script=Arabic]{Amiri}\fi}%
+ \PackageInfo{arabluatex}{%
+ \string\arabicfont\ is not defined.\MessageBreak
+ arabluatex will try to load Amiri}%
+ \newfontfamily\arabicfont{Amiri}[Script=Arabic]\fi}%
\AtBeginDocument{\def\setRL{\booltrue{al@rlmode}\pardir TRT%
\textdir TRT}}
\AtBeginDocument{\def\setLR{\boolfalse{al@rlmode}\pardir TLT%
@@ -99,9 +93,12 @@
{\luadirect{arabluatex.mkarbbreak(\luastringN{#2}, "out")}}
{\luadirect{arabluatex.mkarbbreak(\luastringN{#2}, "dflt")}}
}
-\def\oline{\@ifstar\@oline\@@oline}
-\def\@oline#1{\ensuremath{\overline{\mbox{#1}}}}
-\def\@@oline{\bgroup \ULdepth=-3ex \ULset}
+\newunderlinetype\@aoverLine{\leaders\vrule height 3ex depth -2.9ex}
+\def\aoline{\@ifstar\@aoline\@@aoline}
+\def\@aoline#1{\ensuremath{\overline{\mbox{#1}}}}
+\def\@@aoline#1{{\@aoverLine#1}}
+\newunderlinetype\@aunderLine{\leaders\vrule height -.65ex depth .75ex}
+\def\auline#1{{\@aunderLine#1}}
\AtBeginDocument{\ifdef{\aemph}%
{\RenewDocumentCommand{\aemph}{s m}{%
\IfBooleanTF{#1}{%
@@ -149,6 +146,7 @@
\bgroup\SetTranslitStyle{\relax}%
\IfBooleanTF{#1}{\txtrans{#2}}{\arb[trans]{\uc{#2}}}\egroup}
\NewDocumentCommand{\txarb}{+m}{%
+ \ifvmode\leavevmode\fi%
\bgroup\textdir TRT\arabicfont#1\egroup}
\NewDocumentCommand{\txtrans}{+m}{%
\bgroup\textdir TLT\al@trans@font\al@trans@style#1\egroup}
@@ -156,19 +154,26 @@
\par%
\booltrue{al@rlmode}%
\pardir TRT\textdir TRT\arabicfont}{\par}
+\NewDocumentEnvironment{txarabtr}{}{%
+ \par%
+ \pardir TLT\textdir TLT%
+ \al@trans@font\al@trans@style}{\par}
\NewDocumentCommand{\arb}{O{\al@mode} +m}%
{\edef\@tempa{#1}%
\ifx\@tempa\al@mode@voc%
+ \ifvmode\leavevmode\fi%
\bgroup\booltrue{al@rlmode}\textdir TRT\arabicfont%
\luadirect{tex.sprint(arabluatex.processvoc(\luastringN{#2},
\luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup%
\else%
\ifx\@tempa\al@mode@fullvoc%
+ \ifvmode\leavevmode\fi%
\bgroup\booltrue{al@rlmode}\textdir TRT\arabicfont%
\luadirect{tex.sprint(arabluatex.processfullvoc(\luastringN{#2},
\luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup%
\else%
\ifx\@tempa\al@mode@novoc%
+ \ifvmode\leavevmode\fi%
\bgroup\booltrue{al@rlmode}\textdir TRT\arabicfont%
\luadirect{tex.sprint(arabluatex.processnovoc(\luastringN{#2},
\luastringO{\al@arb@rules}, \luastringO{\al@input@scheme}))}\egroup%
@@ -190,7 +195,7 @@
\NewDocumentCommand{\newarbmark}{m m m}{%
\luadirect{arabluatex.newarbmark(\luastringN{#1}, \luastringN{#2},
\luastringN{#3})}}
-\NewDocumentEnvironment{arab}{O{\al@mode} +b}%
+\NewDocumentEnvironment{arab}{!O{\al@mode} +b}%
{\par\edef\@tempa{#1}%
\ifx\@tempa\al@mode@voc%
\booltrue{al@rlmode}%
@@ -232,7 +237,7 @@
trans}{\def\al@mode{#1}}
\presetkeys[al]{verse}{metre={}, utf=false,
delim=false}{}
-\NewDocumentEnvironment{arabverse}{O{}}%
+\NewDocumentEnvironment{arabverse}{!O{}}%
{\bgroup\setkeys[al]{verse}[width, gutter, color, utf, delim,
metre]{#1}%
\if@pkg@export\ifal@verse@export%
@@ -265,6 +270,21 @@
\if@pkg@export\ifal@verse@export%
\ArbOutFile{\end{arabverse}}
\else\fi\else\fi\egroup}
+\newif\ifal@warp@bayt
+\al@warp@bayttrue
+\NewDocumentCommand{\StretchBayt}{O{true}}{
+ \edef\oarg@true{true}
+ \edef\oarg@false{false}
+ \edef\@tempa{#1}
+ \ifx\@tempa\oarg@true\al@warp@bayttrue
+ \else
+ \ifx\@tempa\oarg@false\al@warp@baytfalse
+ \else
+ \PackageError{arabluatex}{\string\StretchBayt\space must be
+ either 'true' or 'false'}{}
+ \fi
+ \fi
+}
\NewDocumentCommand{\arb@utf}{m}{%
\ifal@verse@utf\txarb{#1}\else\arb{#1}\fi}
\def\al@hemistich@delim{*}
@@ -274,7 +294,11 @@
\IfBooleanTF{#1}{\relax}{\relax}%
\ifdefined\savenotes\savenotes\else\fi%
\edef\al@tatweel{--}%
- \adjustbox{width=\al@bayt@width, height=\Height}{\arb@utf{#2}}%
+ \ifal@warp@bayt%
+ \adjustbox{width=\al@bayt@width, height=\Height}{\arb@utf{#2}}%
+ \else%
+ \makebox[\al@bayt@width][s]{\arb@utf{#2}}%
+ \fi%
\IfNoValueTF{#3}{%
\ifal@verse@delim\makebox[\al@gutter@width][c]{\al@hemistich@delim}%
\else%
@@ -290,24 +314,69 @@
\fi%
\else%
\ifx\al@mode\al@mode@trans%
- \adjustbox{width=\al@gutter@width, height=\Height}{\arb@utf{#3}}%
+ \ifal@warp@bayt%
+ \adjustbox{width=\al@gutter@width, height=\Height}{\arb@utf{#3}}%
+ \else%
+ \makebox[\al@gutter@width][s]{\arb@utf{#3}}%
+ \fi%
\else%
\makebox[\al@gutter@width][s]{\arb@utf{#3}}%
\fi\fi}%
- \adjustbox{width=\al@bayt@width, height=\Height}{\arb@utf{#4}}%
+ \ifal@warp@bayt%
+ \adjustbox{width=\al@bayt@width, height=\Height}{\arb@utf{#4}}%
+ \else%
+ \makebox[\al@bayt@width][s]{\arb@utf{#4}}%
+ \fi%
\ifdefined\spewnotes\spewnotes\else\fi%
}
+\NewDocumentCommand{\SetDefaultIndex}{m}{
+ \edef\@tempa{#1}
+ \ifx\@tempa\empty
+ \def\al@default@index{\jobname}
+ \else
+ \def\al@default@index{#1}
+ \fi
+}
+\def\al@index@mode{\al@mode}
+\NewDocumentCommand{\SetIndexMode}{m}{
+ \def\al@index@mode{#1}
+}
+\define@cmdkeys[al]{index}[alind@]{index,root,form}
+\NewDocumentCommand{\arind}{o m}{%
+ \IfNoValueTF{#1}{%
+ \ifdefined\al@default@index%
+ \csname index\endcsname[\al@default@index]{#2}%
+ \else%
+ \csname index\endcsname{#2}%
+ \fi%
+ }{%
+ \bgroup
+ \setkeys[al]{index}{#1}%
+ \def\al@one{%
+ \ifdefined\alind@root!\LR{\alind@root}\else!\LR{1}\fi}%
+ \def\al@two{%
+ \ifdefined\alind@form @\arb[\al@index@mode]{\alind@form}\else\fi}%
+ \ifdefined\alind@index%
+ \csname index\endcsname[\alind@index]{#2\al@one\al@two}%
+ \else%
+ \ifdefined\al@default@index%
+ \csname index\endcsname[\al@default@index]{#2\al@one\al@two}%
+ \else%
+ \csname index\endcsname{#2\al@one\al@two}%
+ \fi%
+ \fi%
+ \egroup}}
\AtBeginDocument{%
\ifdefined\abjad%
\RenewDocumentCommand{\abjad}{m}%
{\ifbool{al@rlmode}%
- {\oline*{%
+ {\aoline*{%
\luadirect{tex.sprint(arabluatex.abjadify(\luastring{#1}))}}}
{\luadirect{tex.sprint(arabluatex.abjadify(\luastring{#1}))}}}
\else%
\NewDocumentCommand{\abjad}{m}%
{\ifbool{al@rlmode}%
- {\oline*{%
+ {\aoline*{%
\luadirect{tex.sprint(arabluatex.abjadify(\luastring{#1}))}}}
{\luadirect{tex.sprint(arabluatex.abjadify(\luastring{#1}))}}}
\fi}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/arabluatex/arabluatex_fullvoc.lua new/tex/lualatex/arabluatex/arabluatex_fullvoc.lua
--- old/tex/lualatex/arabluatex/arabluatex_fullvoc.lua 2019-03-22 21:50:44.000000000 +0100
+++ new/tex/lualatex/arabluatex/arabluatex_fullvoc.lua 2020-03-04 00:05:43.000000000 +0100
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2019 Robert Alessi
+Copyright (C) 2016--2020 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi(a)robertalessi.net>
@@ -38,6 +38,7 @@
{a="w\"'", b="ؤ"},
{a="i\"'", b="إ"},
{a="y\"'", b="ئ"},
+ -- moved below (end of 'final' section)
{a="ؤ([^uaiUAI])", b="ؤْ%1"},
{a="ؤ(%p*)$", b="ؤْ%1"},
{a="ؤ(%p*%s)", b="ؤْ%1"},
@@ -47,6 +48,9 @@
{a="ئ([^uaiUAI])", b="ئْ%1"},
{a="ئ(%p*)$", b="ئْ%1"},
{a="ئ(%p*%s)", b="ئْ%1"},
+ {a="ء([^uaiUAI])", b="ءْ%1"},
+ {a="ء(%p*)$", b="ءْ%1"},
+ {a="ء(%p*%s)", b="ءْ%1"},
-- hamza takes tašdīd too
{a="''([Uu])", b="ؤؤ%1"},
{a="''([Aa])", b="أأ%1"},
@@ -129,22 +133,40 @@
{a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"},
{a="(i)(')(%p*)$", b="%1ئْ%3"},
{a="(i)(')(%p*%s)", b="%1ئْ%3"},
---
+-- the following was wrong for it broke the taḫfīfu 'l-hamzati
+-- (look into this later):
+-- moved here from above:
+ -- {a="ؤ([^uaiUAI])", b="ؤْ%1"},
+ -- {a="ؤ(%p*)$", b="ؤْ%1"},
+ -- {a="ؤ(%p*%s)", b="ؤْ%1"},
+ -- {a="أ([^uaiUAI])", b="أْ%1"},
+ -- {a="أ(%p*)$", b="أْ%1"},
+ -- {a="أ(%p*%s)", b="أْ%1"},
+ -- {a="ئ([^uaiUAI])", b="ئْ%1"},
+ -- {a="ئ(%p*)$", b="ئْ%1"},
+ -- {a="ئ(%p*%s)", b="ئْ%1"},
+ -- {a="ء([^uaiUAI])", b="ءْ%1"},
+ -- {a="ء(%p*)$", b="ءْ%1"},
+ -- {a="ء(%p*%s)", b="ءْ%1"},
-- middle
{a="([UIwy])(')", b="%1ء"}, --new
-- {a="([Iy])(')", b="%1ئ"}, --included in the above line
- {a="([^uai])(')([uU])", b="%1ؤ%3"},
- {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
- {a="([^uai])(')([iI])", b="%1ئ%3"},
- {a="(u)(')([uU])", b="%1ؤ%3"},
+ -- hamza is alone after letters of prolongation or sukūn
+ -- {a="([^uai])(')([uU])", b="%1ؤ%3"},
+ -- {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
+ -- {a="([^uai])(')([iI])", b="%1ئ%3"},
+ {a="([^uai])(')(%_?[uaiUAYI])", b="%1ء%3"},
+ {a="(u)(')([UI])", b="%1ء%3"},
+ {a="(u)(')([u])", b="%1ؤ%3"},
{a="(u)(')(%_?[aAY])", b="%1ؤ%3"},
- {a="(u)(')([iI])", b="%1ئ%3"},
+ {a="(u)(')([i])", b="%1ئ%3"},
{a="(a)(')(%_?[aAY])", b="%1أ%3"},
{a="(a)(')([uU])", b="%1ؤ%3"},
{a="(a)(')([iI])", b="%1ئ%3"},
+ {a="(i)(')([UI])", b="%1ء%3"},
{a="(i)(')(%_?[aAY])", b="%1ئ%3"},
- {a="(i)(')([uU])", b="%1ئ%3"},
- {a="(i)(')([iI])", b="%1ئ%3"},
+ {a="(i)(')([u])", b="%1ئ%3"},
+ {a="(i)(')([i])", b="%1ئ%3"},
{a="(a)(')([^uaiUAI])", b="%1أْ%3"},
{a="(u)(')([^uaiUAI])", b="%1ؤْ%3"},
{a="(i)(')([^uaiUAI])", b="%1ئْ%3"}
@@ -166,6 +188,7 @@
{a="w\"'", b="ؤ"},
{a="i\"'", b="إ"},
{a="y\"'", b="ئ"},
+ -- moved below (end of 'final' section)
{a="ؤ([^uaiUAI])", b="ؤْ%1"},
{a="ؤ(%p*)$", b="ؤْ%1"},
{a="ؤ(%p*%s)", b="ؤْ%1"},
@@ -175,6 +198,9 @@
{a="ئ([^uaiUAI])", b="ئْ%1"},
{a="ئ(%p*)$", b="ئْ%1"},
{a="ئ(%p*%s)", b="ئْ%1"},
+ {a="ء([^uaiUAI])", b="ءْ%1"},
+ {a="ء(%p*)$", b="ءْ%1"},
+ {a="ء(%p*%s)", b="ءْ%1"},
-- hamza takes tašdīd too
{a="''([Uu])", b="ؤؤ%1"},
{a="''([Aa])", b="أأ%1"},
@@ -269,6 +295,21 @@
{a="(i)(')([uai]N?)(%p*%s)", b="%1ئ%3%4"},
{a="(i)(')(%p*)$", b="%1ئْ%3"},
{a="(i)(')(%p*%s)", b="%1ئْ%3"},
+-- the following was wrong for it broke the taḫfīfu 'l-hamzati
+-- (look into this later):
+-- moved here from above:
+ -- {a="ؤ([^uaiUAI])", b="ؤْ%1"},
+ -- {a="ؤ(%p*)$", b="ؤْ%1"},
+ -- {a="ؤ(%p*%s)", b="ؤْ%1"},
+ -- {a="أ([^uaiUAI])", b="أْ%1"},
+ -- {a="أ(%p*)$", b="أْ%1"},
+ -- {a="أ(%p*%s)", b="أْ%1"},
+ -- {a="ئ([^uaiUAI])", b="ئْ%1"},
+ -- {a="ئ(%p*)$", b="ئْ%1"},
+ -- {a="ئ(%p*%s)", b="ئْ%1"},
+ -- {a="ء([^uaiUAI])", b="ءْ%1"},
+ -- {a="ء(%p*)$", b="ءْ%1"},
+ -- {a="ء(%p*%s)", b="ءْ%1"},
--
-- middle
{a="([Uw])(')", b="%1ء"}, --new
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/arabluatex/arabluatex_novoc.lua new/tex/lualatex/arabluatex/arabluatex_novoc.lua
--- old/tex/lualatex/arabluatex/arabluatex_novoc.lua 2019-03-22 21:50:44.000000000 +0100
+++ new/tex/lualatex/arabluatex/arabluatex_novoc.lua 2020-03-04 00:05:43.000000000 +0100
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2019 Robert Alessi
+Copyright (C) 2016--2020 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi(a)robertalessi.net>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/arabluatex/arabluatex_trans.lua new/tex/lualatex/arabluatex/arabluatex_trans.lua
--- old/tex/lualatex/arabluatex/arabluatex_trans.lua 2019-03-22 21:50:44.000000000 +0100
+++ new/tex/lualatex/arabluatex/arabluatex_trans.lua 2020-03-04 00:05:43.000000000 +0100
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2019 Robert Alessi
+Copyright (C) 2016--2020 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi(a)robertalessi.net>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/lualatex/arabluatex/arabluatex_voc.lua new/tex/lualatex/arabluatex/arabluatex_voc.lua
--- old/tex/lualatex/arabluatex/arabluatex_voc.lua 2019-03-22 21:50:44.000000000 +0100
+++ new/tex/lualatex/arabluatex/arabluatex_voc.lua 2020-03-04 00:05:43.000000000 +0100
@@ -2,7 +2,7 @@
This file is part of the `arabluatex' package
ArabLuaTeX -- Processing ArabTeX notation under LuaLaTeX
-Copyright (C) 2016--2019 Robert Alessi
+Copyright (C) 2016--2020 Robert Alessi
Please send error reports and suggestions for improvements to Robert
Alessi <alessi(a)robertalessi.net>
@@ -202,7 +202,7 @@
-- taḫfīfu 'l-hamza
{a="'u'([^uaiUAI])", b="أU%1"},
{a="'i'([^uaiUAI])", b="إI%1"},
- {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أْ%2"},
+ {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أ%2"},
{a="^u'([^uaiUAI])", b="اU%1"},
{a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1اU%2"},
{a="^i'([^uaiUAI])", b="اI%1"},
@@ -276,18 +276,22 @@
-- middle
{a="([UIwy])(')", b="%1ء"}, --new
-- {a="([Iy])(')", b="%1ئ"}, -- included in the above line
- {a="([^uai])(')([uU])", b="%1ؤ%3"},
- {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
- {a="([^uai])(')([iI])", b="%1ئ%3"},
- {a="(u)(')([uU])", b="%1ؤ%3"},
+ -- hamza is alone after letters of prolongation or sukūn
+ -- {a="([^uai])(')([uU])", b="%1ؤ%3"},
+ -- {a="([^uai])(')(%_?[aAY])", b="%1أ%3"},
+ -- {a="([^uai])(')([iI])", b="%1ئ%3"},
+ {a="([^uai])(')(%_?[uaiUAYI])", b="%1ء%3"},
+ {a="(u)(')([UI])", b="%1ء%3"},
+ {a="(u)(')([u])", b="%1ؤ%3"},
{a="(u)(')(%_?[aAY])", b="%1ؤ%3"},
- {a="(u)(')([iI])", b="%1ئ%3"},
+ {a="(u)(')([i])", b="%1ئ%3"},
{a="(a)(')(%_?[aAY])", b="%1أ%3"},
{a="(a)(')([uU])", b="%1ؤ%3"},
{a="(a)(')([iI])", b="%1ئ%3"},
+ {a="(i)(')([UI])", b="%1ء%3"},
{a="(i)(')(%_?[aAY])", b="%1ئ%3"},
- {a="(i)(')([uU])", b="%1ئ%3"},
- {a="(i)(')([iI])", b="%1ئ%3"},
+ {a="(i)(')([u])", b="%1ئ%3"},
+ {a="(i)(')([i])", b="%1ئ%3"},
{a="(a)(')([^uaiUAI])", b="%1أ%3"},
{a="(u)(')([^uaiUAI])", b="%1ؤ%3"},
{a="(i)(')([^uaiUAI])", b="%1ئ%3"}
@@ -321,7 +325,7 @@
-- taḫfīfu 'l-hamza
{a="'u'([^uaiUAI])", b="أU%1"},
{a="'i'([^uaiUAI])", b="إI%1"},
- {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أْ%2"},
+ {a="([wf]a)%-\'([^uaiUAIl][^%-])", b="%1أ%2"},
{a="^u'([^uaiUAI])", b="اU%1"},
{a="([^uaiUAIYN][%s%(%[%<])u'([^uaiUAI])", b="%1اU%2"},
{a="^i'([^uaiUAI])", b="اI%1"},
@@ -895,6 +899,7 @@
}
null = {
+ {a="%&", b=""}, -- That is ^^^^200d, the zero-width joiner
{a="%|", b=""},
{a="^%-", b=""},
{a="([^0-9])(%-)", b="%1"},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/arabluatex.tlpobj new/tlpkg/tlpobj/arabluatex.tlpobj
--- old/tlpkg/tlpobj/arabluatex.tlpobj 2019-03-25 02:24:03.000000000 +0100
+++ new/tlpkg/tlpobj/arabluatex.tlpobj 2020-03-24 01:56:30.000000000 +0100
@@ -1,6 +1,6 @@
name arabluatex
category Package
-revision 50571
+revision 54512
shortdesc ArabTeX for LuaLaTeX
relocated 1
longdesc This package provides for LuaLaTeX an ArabTeX-like interface to
@@ -16,7 +16,7 @@
longdesc files, in addition to printed books, TEI xml compliant critical
longdesc editions and/or lexicons that can be searched, analyzed and
longdesc correlated in various ways.
-runfiles size=44
+runfiles size=45
RELOC/tex/lualatex/arabluatex/arabluatex-patch.sty
RELOC/tex/lualatex/arabluatex/arabluatex.lua
RELOC/tex/lualatex/arabluatex/arabluatex.sty
@@ -28,7 +28,6 @@
catalogue-contact-home http://www.robertalessi.net/arabluatex
catalogue-contact-repository http://git.robertalessi.net/arabluatex
catalogue-ctan /macros/luatex/latex/arabluatex
-catalogue-date 2019-03-24 19:58:51 +0100
-catalogue-license gpl3+cc-by-sa-4
+catalogue-license gpl3+ cc-by-sa-4
catalogue-topics multilingual arabic luatex
-catalogue-version 1.17
+catalogue-version 1.20
++++++ arara.doc.tar.xz ++++++
++++ 4055 lines of diff (skipped)
++++++ arara.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-a/arara.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-a.new.3606/arara.tar.xz differ: char 25, line 1
++++++ archaeologie.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/archaeologie/Makefile new/doc/latex/archaeologie/Makefile
--- old/doc/latex/archaeologie/Makefile 2018-09-25 22:43:45.000000000 +0200
+++ new/doc/latex/archaeologie/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,60 +0,0 @@
-MAKE = make
-NAME = archaeologie
-NAMEtypeout = $(CYAN)*** $(NAME) ***$(NC)
-BIB = $(NAME)
-PFX = biblatex-
-SHELL = bash
-PWD = $(shell pwd)
-TEMP := $(shell mktemp -d -t tmp.XXXXXXXXXX)
-TDIR = $(TEMP)/$(NAME)
-VERS = $(shell /bin/date "+%Y-%m-%d---%H-%M-%S")
-LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL)
-# Colors
-RED = \033[0;31m
-CYAN = \033[0;36m
-NC = \033[0m
-
-.PHONY: all clean cleanall zip install uninstall
-# Just create the PDF
-all: $(NAME).pdf
- @echo -e "$(NAMEtypeout)\n$(RED) * all up to date * $(NC)"
- @exit 0
-
-# How to create the PDF
-$(NAME).pdf: $(NAME).dtx
- latexmk -lualatex -f $(NAME).dtx
-
-
-# clean all temporary files
-clean:
- rm -f {$(NAME),$(BIB)}.{sectionbibs.aux,thm,bibexample,biographies.aux,xdv,aux,mw,bbl,bcf,blg,doc,fdb_latexmk,fls,glo,gls,hd,idx,ilg,ind,listing,log,nav,out,run.xml,snm,synctex.gz,toc,vrb}
- rm -f $(NAME).markdown.{in,lua,out}
- rm -f *.{log,aux}
- rm -rf _markdown_*
- @echo -e "$(NAMEtypeout) \n $(RED)cleaned temp files $(NC)"
-
-# clean all files
-cleanbundle: clean
- rm -f *.{{b,c,d,l}bx,ins,pdf,zip,bib}
- @echo -e "$(NAMEtypeout) \n $(RED)cleaned all files $(NC)"
-
-# zip files up for sending etc.
-ctan: all
- rm -f $(NAME)*.zip
- mkdir $(TDIR)
- cp $(NAME).{dtx,pdf} README.md Makefile $(TDIR)
- cd $(TEMP); zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)
- @echo -e "$(NAMEtypeout) \n $(RED)files zipped $(NC)"
-
-# install in your local TEX folder
-install: all
- sudo mkdir -p $(LOCAL)/{tex,source,doc}/latex/$(PFX)$(NAME)
- sudo cp $(NAME).{dtx,ins} $(LOCAL)/source/latex/$(PFX)$(NAME)
- sudo cp $(BIB).{b,c,d}bx {english,german,italian,french,spanish}-$(NAME).lbx $(LOCAL)/tex/latex/$(PFX)$(NAME)
- sudo cp $(NAME).pdf $(NAME)-*.bib $(LOCAL)/doc/latex/$(PFX)$(NAME)
- sudo mktexlsr
- @echo -e "$(NAMEtypeout) \n $(RED)all files installed$(NC)"
-
-uninstall:
- sudo rm -r $(LOCAL)/{tex,source,doc}/latex/$(PFX)$(NAME)
- sudo mktexlsr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/archaeologie/README.md new/doc/latex/archaeologie/README.md
--- old/doc/latex/archaeologie/README.md 2018-09-25 22:43:45.000000000 +0200
+++ new/doc/latex/archaeologie/README.md 2020-02-16 23:09:12.000000000 +0100
@@ -4,12 +4,12 @@
bibLaTeX-style for archaeologists, historians and philologists.
---
-Copyright (c) 2016-2018 Lukas C. Bossert
+Copyright (c) 2015-2020 Lukas C. Bossert
Copyright (c) 2015 Lukas C. Bossert | Johannes Friedl
-* Email: [info@biblatex-archaeologie.de](mailto:info@biblatex-archaeologie.de)
-* Website: [www.biblatex-archaeologie.de](http://www.biblatex-archaeologie.de)
+* Email: [info@biblatex.texografie.de](mailto:info@biblatex.texografie.de)
+* Website: [www.biblatex-archaeologie.texografie.de](http://www.biblatex-archaeologie.t…
This citation-style covers the citation and bibliography rules of
the [__German Archaeological Institute__ (DAI)](http://www.dainst.org/dai/meldungen).
@@ -82,18 +82,44 @@
Further options of this makefile are:
* `clean`: deletes all unnecessary files
-* `cleanbundle`: deletes all files except `.dtx`, `.pl`, `.md`. You will get the plain version of this bundle.
+* `cleanbundle`: deletes all files except `.dtx`, `.md`. You will get the plain version of this bundle.
This might be helpful if you send the bundle to someone else.
* `ctan`: this will create a zip file which can be used to send to CTAN.
+* `files`: will only create the files from the `.dtx`-scratch.
* `uninstall`: will erase the locally installed files.
This bundle is constantly updated. For hints, errors or suggestions use the GitHub repository [https://github.com/LukasCBossert/biblatex-archaeologie](https://github.com/….
## Changelog
-All notable changes to this project will be documented in the README.md.
+All notable changes to this project will be documented in the [README.md](https://github.com/LukasCBossert/biblatex-archaeologie/blob/mast….
This project **does not** adhere to [Semantic Versioning](http://semver.org/).
The markdown syntax is inspired by the conventions proposed by [keepachangelog.com](http://keepachangelog.com/).
+## v2.4.4 (2020-02-15)
+### *Fixed*
+* corrected the use of the `maintitlepunct` in the bibmacro `maintitle+title+volumes`
+
+## v2.4.3 (2019-12-03)
+### *Fixed*
+* Spelling error in Italian language for Dresden and München. Thanks to Matteo Turri. (Feedback always welcome!)
+* Some code refactoring for better literate programming.
+
+## v2.4.2 (2019-05-01)
+
+### *Fixed*
+* Handling ranges of years for `inreferences` [see issue no. 150](https://github.com/LukasCBossert/biblatex-archaeologie/issues/150)
+
+### *Changed*
+* Renaming `\labelnamepunct` to `\nametitledelim` (biblatex 3.12 compatibility)
+
+## v2.4.1 (2019-04-11)
+
+### *Fixed*
+* some errors in the documentation
+
+### *Changed*
+* default sorting template changed to `ndymdt`, as suggested in https://tex.stackexchange.com/a/46879/98739 [see issue no. 148](https://github.com/LukasCBossert/biblatex-archaeologie/issues/148)
+
## v2.4.0 (2018-09-25)
### *Fixed*
@@ -211,6 +237,3 @@
## v2.2 (2016-09-25)
* *added* <br> `uniqueme` for variant translations of ancient works.
* *added* <br> bibliography-file `archaeologie-examples.bib` included
-
-[current release]: http://www.biblatex-archaeologie.de
-[unreleased]: http://github.com/LukasCBossert/biblatex-archaeologie
Binary files old/doc/latex/archaeologie/archaeologie.pdf and new/doc/latex/archaeologie/archaeologie.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/archaeologie.doc.tlpobj new/tlpkg/tlpobj/archaeologie.doc.tlpobj
--- old/tlpkg/tlpobj/archaeologie.doc.tlpobj 2019-02-28 03:15:10.000000000 +0100
+++ new/tlpkg/tlpobj/archaeologie.doc.tlpobj 2020-02-17 01:55:15.000000000 +0100
@@ -1,9 +1,8 @@
name archaeologie.doc
category Package
-revision 48763
+revision 53813
shortdesc doc files of archaeologie
relocated 1
-docfiles size=299
- RELOC/doc/latex/archaeologie/Makefile
+docfiles size=251
RELOC/doc/latex/archaeologie/README.md
RELOC/doc/latex/archaeologie/archaeologie.pdf
++++++ archaeologie.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bib/archaeologie/archaeologie-bibancient.bib new/bibtex/bib/archaeologie/archaeologie-bibancient.bib
--- old/bibtex/bib/archaeologie/archaeologie-bibancient.bib 2018-09-25 22:43:45.000000000 +0200
+++ new/bibtex/bib/archaeologie/archaeologie-bibancient.bib 2019-05-01 00:34:21.000000000 +0200
@@ -1,3 +1,9 @@
+%% Additional bibliography file
+%% provided by biblatex-archaeologie
+%%
+%%
+%% Encoding: UTF-8
+%%
@book{Acc, title = {}, author = {}, shortauthor = {Accius}, shorthand = {Acc.}, options = {ancient}, keywords = {ancient}}
@book{AchTat, title = {}, author = {}, shortauthor = {Achilleus Tatios}, shorthand = {Ach. Tat.}, options = {ancient}, keywords = {ancient}}
@book{Ael:Ep, title = {Epistulae rusticae}, author = {Claudius Aelianus}, shortauthor = {Aelian}, shorthand = {Ael. Ep.}, options = {ancient}, keywords = {ancient}}
@@ -594,3 +600,4 @@
@book{Zenob, title = {}, author = {}, shortauthor = {Zenobios}, shorthand = {Zenob.}, options = {ancient}, keywords = {ancient}}
@book{Zenod, title = {}, author = {}, shortauthor = {Zenodotos}, shorthand = {Zenod.}, options = {ancient}, keywords = {ancient}}
@book{Zos, title = {}, author = {}, shortauthor = {Zosimos}, shorthand = {Zos.}, options = {ancient}, keywords = {ancient}}
+%% created by Lukas C. Bossert // digitales-altertum|de
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bib/archaeologie/archaeologie-bibcorpora.bib new/bibtex/bib/archaeologie/archaeologie-bibcorpora.bib
--- old/bibtex/bib/archaeologie/archaeologie-bibcorpora.bib 2018-09-25 22:43:45.000000000 +0200
+++ new/bibtex/bib/archaeologie/archaeologie-bibcorpora.bib 2019-05-01 00:34:21.000000000 +0200
@@ -1,3 +1,9 @@
+%% Additional bibliography file
+%% provided by biblatex-archaeologie
+%%
+%%
+%% Encoding: UTF-8
+%%
@Book{ABV,
author = {Beazley, J. D.},
title = {Attic Black-figure Vase-painters},
@@ -308,3 +314,4 @@
options = {corpus},
shorthand = LSJ-short,
}
+%% created by Lukas C. Bossert // digitales-altertum|de
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bib/archaeologie/archaeologie-examples.bib new/bibtex/bib/archaeologie/archaeologie-examples.bib
--- old/bibtex/bib/archaeologie/archaeologie-examples.bib 2018-09-25 22:43:45.000000000 +0200
+++ new/bibtex/bib/archaeologie/archaeologie-examples.bib 2019-05-01 00:34:21.000000000 +0200
@@ -1,3 +1,6 @@
+%% Additional bibliography file
+%% provided by biblatex-archaeologie
+%%
%%
%% Encoding: UTF-8
%%
@@ -773,3 +776,4 @@
shorthand = {EAOR I--VII},
}
+%% created by Lukas C. Bossert // digitales-altertum|de
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib new/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib
--- old/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib 2018-09-25 22:43:45.000000000 +0200
+++ new/bibtex/bib/archaeologie/archaeologie-lstabbrv.bib 2019-05-01 00:34:21.000000000 +0200
@@ -1,20 +1,9 @@
-%%%%%%%%%%%%%%%%%%%%
+%% Additional bibliography file
+%% provided by biblatex-archaeologie
%%
-%% Liste der Abkürzungen für Zeitschriften, Reihen,
-%% Lexika und häufig zitierte Werke
%%
-%%%%%%%%%%%%%%%%%%%%
+%% Encoding: UTF-8
%%
-%% Manche Kürzel konnten nicht genau umgesetzt werden.
-%% Alle Umlaute, Akzente, etc. werden weggelassen, bzw.
-%% geändert: "ü-> ue", etc.
-%% Diese sind mit "*Abweichung!" gekennzeichnet
-%%
-%%%%%%%%%%%%%%%%%%%%
-%%
-%% Kurzname
-%%
-%%%%%%%%%%%%%%%%%%%%
@String {AA-short = {AA}}
@String {AAA-short = {AAA}}
@String {AAcque-short = {AAcque}}
@@ -1605,11 +1594,6 @@
@String {ZSav-short = {ZSav}}
@String {ZSchwA-short = {ZSchwA}}
@String {ZVerglSprF-short = {ZVerglSprF}}
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% %%
-%% Langname %%
-%% %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@String {AA = {Archäologischer Anzeiger}}
@String {AAA = {Αρχαιολογικά Ανάλεκτα εξ Αθηνών}}
@String {AAcque = {Archeologia delle acque. Rivista semestrale di antropologia, archeologia, etnografia, storia dell'acqua}}
@@ -3205,3 +3189,4 @@
%% Stand April 2014, Deutsches Archäologisches Institut
%% Bearbeitung: Lukas C. Bossert (2015)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% created by Lukas C. Bossert // digitales-altertum|de
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bib/archaeologie/archaeologie-lstlocations.bib new/bibtex/bib/archaeologie/archaeologie-lstlocations.bib
--- old/bibtex/bib/archaeologie/archaeologie-lstlocations.bib 2018-09-25 22:43:45.000000000 +0200
+++ new/bibtex/bib/archaeologie/archaeologie-lstlocations.bib 2019-12-03 23:04:22.000000000 +0100
@@ -1,4 +1,10 @@
-@String{Aix-la-Chapelle= {\iflanguage{english}{Aix-la-Chapelle}{\iflanguage{italian}{}{\iflanguage{french}{Aix-la-Chapelle}{\iflanguage{spanish}{Aquisgrán}{\iflanguage{ngerman}{Aachen}{\iflanguage{german}{Aachen}{}}}}}}}}
+%% Additional bibliography file
+%% provided by biblatex-archaeologie
+%%
+%%
+%% Encoding: UTF-8
+%%
+@String{Aix-la-Chapelle= {\iflanguage{english}{Aix-la-Chapelle}{\iflanguage{italian}{Aquisgrana}{\iflanguage{french}{Aix-la-Chapelle}{\iflanguage{spanish}{Aquisgrán}{\iflanguage{ngerman}{Aachen}{\iflanguage{german}{Aachen}{}}}}}}}}
@String{Athens= {\iflanguage{english}{Athens}{\iflanguage{italian}{Atene}{\iflanguage{french}{Athènes}{\iflanguage{spanish}{Atenas}{\iflanguage{ngerman}{Athen}{\iflanguage{german}{Athen}{}}}}}}}}
@String{Augsburg= {\iflanguage{english}{Augsburg}{\iflanguage{italian}{Augusta}{\iflanguage{french}{Augsbourg}{\iflanguage{spanish}{Ausburgo}{\iflanguage{ngerman}{Augsburg}{\iflanguage{german}{Augsburg}{}}}}}}}}
@String{Basle= {\iflanguage{english}{Basle}{\iflanguage{italian}{Basilea}{\iflanguage{french}{Basel}{\iflanguage{spanish}{Basilea}{\iflanguage{ngerman}{Basel}{\iflanguage{german}{Basel}{}}}}}}}}
@@ -6,7 +12,7 @@
@String{Brussels= {\iflanguage{english}{Brussels}{\iflanguage{italian}{Bruxelles}{\iflanguage{french}{Bruxelles}{\iflanguage{spanish}{Bruselas}{\iflanguage{ngerman}{Brüssel}{\iflanguage{german}{Brüssel}{}}}}}}}}
@String{Cologne= {\iflanguage{english}{Cologne}{\iflanguage{italian}{Colonia}{\iflanguage{french}{Cologne}{\iflanguage{spanish}{Colonia}{\iflanguage{ngerman}{Köln}{\iflanguage{german}{Köln}{}}}}}}}}
@String{Copenhagen= {\iflanguage{english}{Copenhagen}{\iflanguage{italian}{Copenaghen}{\iflanguage{french}{Copenhague}{\iflanguage{spanish}{Copenhague}{\iflanguage{ngerman}{Kopenhagen}{\iflanguage{german}{Kopenhagen}{}}}}}}}}
-@String{Dresden= {\iflanguage{english}{Dresden}{\iflanguage{italian}{Desda}{\iflanguage{french}{Dresde}{\iflanguage{spanish}{Dresde}{\iflanguage{ngerman}{Dresden}{\iflanguage{german}{Dresden}{}}}}}}}}
+@String{Dresden= {\iflanguage{english}{Dresden}{\iflanguage{italian}{Dresda}{\iflanguage{french}{Dresde}{\iflanguage{spanish}{Dresde}{\iflanguage{ngerman}{Dresden}{\iflanguage{german}{Dresden}{}}}}}}}}
@String{Florence= {\iflanguage{english}{Florence}{\iflanguage{italian}{Firenze}{\iflanguage{french}{Florence}{\iflanguage{spanish}{Firenze}{\iflanguage{ngerman}{Florenz}{\iflanguage{german}{Florenz}{}}}}}}}}
@String{Frankfurt= {\iflanguage{english}{Frankfurt}{\iflanguage{italian}{Francoforte sul Meno}{\iflanguage{french}{Francfort-sur-le-Main}{\iflanguage{spanish}{Francfort del Meno}{\iflanguage{ngerman}{Frankfurt am Main}{\iflanguage{german}{Frankfurt am Main}{}}}}}}}}
@String{Freiburg= {\iflanguage{english}{Freiburg}{\iflanguage{italian}{Friburgo in Brisgovia}{\iflanguage{french}{Fribourg-en-Brisgau}{\iflanguage{spanish}{Friburgo de Brisgovia}{\iflanguage{ngerman}{Freiburg \parentext{i. Breisgau}}{\iflanguage{german}{Freiburg \parentext{i. Breisgau}}{}}}}}}}}
@@ -17,7 +23,7 @@
@String{Louvain= {\iflanguage{english}{Louvain}{\iflanguage{italian}{Lovanio}{\iflanguage{french}{Louvain}{\iflanguage{spanish}{Lovaina}{\iflanguage{ngerman}{Löwen}{\iflanguage{german}{Löwen}{}}}}}}}}
@String{Mainz= {\iflanguage{english}{Mainz}{\iflanguage{italian}{Magonza}{\iflanguage{french}{Mayence}{\iflanguage{spanish}{Maguncia}{\iflanguage{ngerman}{Mainz am Rhein}{\iflanguage{german}{Mainz am Rhein}{}}}}}}}}
@String{Milano= {\iflanguage{english}{Milano}{\iflanguage{italian}{Milano}{\iflanguage{french}{Milan}{\iflanguage{spanish}{Milán}{\iflanguage{ngerman}{Mailand}{\iflanguage{german}{Mailand}{}}}}}}}}
-@String{Munich= {\iflanguage{english}{Munich}{\iflanguage{italian}{Monaco \parentext{di Bavaria}}{\iflanguage{french}{Munich}{\iflanguage{spanish}{Múnich}{\iflanguage{ngerman}{München}{\iflanguage{german}{München}{}}}}}}}}
+@String{Munich= {\iflanguage{english}{Munich}{\iflanguage{italian}{Monaco di Baviera}{\iflanguage{french}{Munich}{\iflanguage{spanish}{Múnich}{\iflanguage{ngerman}{München}{\iflanguage{german}{München}{}}}}}}}}
@String{Naples= {\iflanguage{english}{Naples}{\iflanguage{italian}{Napoli}{\iflanguage{french}{Naples}{\iflanguage{spanish}{Napoli}{\iflanguage{ngerman}{Neapel}{\iflanguage{german}{Neapel}{}}}}}}}}
@String{Paris= {\iflanguage{english}{Paris}{\iflanguage{italian}{Parigi}{\iflanguage{french}{Paris}{\iflanguage{spanish}{París}{\iflanguage{ngerman}{Paris}{\iflanguage{german}{Paris}{}}}}}}}}
@String{Regensburg= {\iflanguage{english}{Regensburg}{\iflanguage{italian}{Ratisbona}{\iflanguage{french}{Ratisbonne}{\iflanguage{spanish}{Ratisbona}{\iflanguage{ngerman}{Regensburg}{\iflanguage{german}{Regensburg}{}}}}}}}}
@@ -27,3 +33,4 @@
@String{Trier= {\iflanguage{english}{Trier}{\iflanguage{italian}{Treviri}{\iflanguage{french}{Trèves}{\iflanguage{spanish}{Trèveris}{\iflanguage{ngerman}{Trier}{\iflanguage{german}{Trier}{}}}}}}}}
@String{Tuebingen= {\iflanguage{english}{Tuebingen}{\iflanguage{italian}{Tubinga}{\iflanguage{french}{Tubingue}{\iflanguage{spanish}{Tubinga}{\iflanguage{ngerman}{Tübingen}{\iflanguage{german}{Tübingen}{}}}}}}}}
@String{Vienna= {\iflanguage{english}{Vienna}{\iflanguage{italian}{Vienna}{\iflanguage{french}{Vienne}{\iflanguage{spanish}{Viena}{\iflanguage{ngerman}{Wien}{\iflanguage{german}{Wien}{}}}}}}}}
+%% created by Lukas C. Bossert // digitales-altertum|de
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bib/archaeologie/archaeologie-lstpublishers.bib new/bibtex/bib/archaeologie/archaeologie-lstpublishers.bib
--- old/bibtex/bib/archaeologie/archaeologie-lstpublishers.bib 2018-09-25 22:43:45.000000000 +0200
+++ new/bibtex/bib/archaeologie/archaeologie-lstpublishers.bib 2019-05-01 00:34:21.000000000 +0200
@@ -1,3 +1,9 @@
+%% Additional bibliography file
+%% provided by biblatex-archaeologie
+%%
+%%
+%% Encoding: UTF-8
+%%
@String { AWi = {Artemis \& Winkler} }
@String { CHB = {C.\ H.~Beck} }
@String { COUP = {Cornell University Press} }
@@ -28,3 +34,4 @@
@String { WBG = {Wissenschaftliche Buchgesellschaft} }
@String { WdG = {Walter de Gruyter} }
@String { YUP = {Yale University Press} }
+%% created by Lukas C. Bossert // digitales-altertum|de
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/archaeologie/archaeologie.bbx new/tex/latex/archaeologie/archaeologie.bbx
--- old/tex/latex/archaeologie/archaeologie.bbx 2018-09-25 22:43:45.000000000 +0200
+++ new/tex/latex/archaeologie/archaeologie.bbx 2020-02-16 23:09:12.000000000 +0100
@@ -8,13 +8,13 @@
%% ----------------------------------------------------------------
%% biblatex-archaeologie ---
%% Author: Lukas C. Bossert
-%% E-mail: info(a)biblatex-archaeologie.de
+%% E-mail: info(a)biblatex.texografie.de
%% License: Released under the LaTeX Project Public License v1.3c or later
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\archDate{2018/09/25}
-\def\archVersion{2.4.0}
+\def\archDate{2020/02/15}
+\def\archVersion{2.4.4}
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesFile{archaeologie.bbx}
[\archVersion\space\archDate Base settings for bibliography style of biblatex-archaeologie]
@@ -32,7 +32,7 @@
language=auto,%
bibencoding=utf8,%
dateabbrev=false, %
- sorting=nyt,%
+ sorting=ndymdt,%
alldates=comp,%
labeldateparts=true,%
labeldate=year,%
@@ -130,7 +130,7 @@
\DeclareNameAlias{author}{given-family}}
\DeclareBibliographyOption{inreferences}[true]{%
\PackageWarningNoLine{biblatex-archaeologie}{%
- The option 'inreferences' for is deprecated,\MessageBreak
+ The option 'inreferences' is deprecated,\MessageBreak
use 'inreferencesasfullcite' instead.}%
\booltrue{bbx:inreferencesasfullcite}}
\DeclareBibliographyOption{inreferencesasfullcite}[true]{\csuse{bool#1}{bbx:inreferencesasfullcite}
@@ -294,14 +294,15 @@
\newcommand*{\locationdelim}{\addnbspace\textendash\addspace}
\renewcommand{\multinamedelim}{\addnbspace\textendash\addspace}
\renewcommand{\finalnamedelim}{\multinamedelim}
-\renewcommand*\relateddelim{\addnbspace\textendash\addspace}%
+\renewcommand*{\relateddelim}{\addnbspace\textendash\addspace}%
\newcommand*{\relateddelimmultivolume}{\addcomma\par\nobreak}
\newcommand*{\volnumdelim}{\addcomma\space}
\newcommand*{\yearnumdelim}{\addslash}
\newcommand*{\jourvoldelim}{\addnbspace}
+\renewcommand*{\nametitledelim}{\addcomma\addspace}
\renewcommand{\finentrypunct}{%http://tex.stackexchange.com/a/14159/98739
\ifbool{bbx:counter}%
- {\addspace$\vert$ \addspace\scshape%
+ {\addspace\vrule\addspace\scshape%
\iflanguage{ngerman}%
{wurde \ifnumequal{\value{citecounter}}
{0}
@@ -536,8 +537,7 @@
\DeclareBibliographyAlias{incollection}{inbook}
\DeclareBibliographyAlias{manual}{book}
\DeclareBibliographyAlias{mathesis}{thesis}
-
-\DeclareSortingTemplate{nyt}{
+\DeclareSortingTemplate{ndymdt}{
\sort{
\field{presort}
}
@@ -545,26 +545,36 @@
\field{sortkey}
}
\sort{
- \field{sortshorthand}
- \field{shorthand}
- \field{sortname}
- \field{author}
- \field{editor}
- \field{translator}
- \field{sorttitle}
- \field{title}
+ \field{sortshorthand}
+ \field{shorthand}
+ \field{sortname}
+ \field{author}
+ \field{editor}
+ \field{translator}
}
- \sort{
+ \sort[direction=ascending]{
\field{sortyear}
\field{year}
+ \literal{9999}
+ }
+ \sort[direction=ascending]{
+ \field[padside=left,padwidth=2,padchar=0]{month}
+ \literal{99}
+ }
+ \sort[direction=ascending]{
+ \field[padside=left,padwidth=2,padchar=0]{day}
+ \literal{99}
}
\sort{
- \field{sorttitle}
- \field{title}
+ \field{pubstate}
}
\sort{
- \field{volume}
- \literal{0}
+ \field{sorttitle}
+ \field{title}
+ }
+ \sort[direction=ascending]{
+ \field[padside=left,padwidth=4,padchar=0]{volume}
+ \literal{9999}
}
}
\DeclareSortingTemplate{shortseries}{\sort{\field{shortseries}}}
@@ -725,7 +735,6 @@
\setunit{\addcomma\newline\nobreak}}%
{\newunit}%
}
- %-----------------------
\renewbibmacro*{eprint}{%
\usebibmacro{bbx:parunit}%
\iffieldundef{eprinttype}%
@@ -830,7 +839,6 @@
\iffieldundef{pubstate}%
{\usebibmacro{date}}%
{\printfield{pubstate}}}
- %-----------------------
\newbibmacro*{pages}{%
\printfield{pages}%
\isdot}
@@ -867,7 +875,10 @@
\setunit{\addspace}%
\ifnameundef{author}%
{}
- {\printtext[parens]{\printnames[name:initials]{labelname}}}}
+ {\printtext[parens]{%
+ \ifbool{bbx:bibfullname}
+ {\printnames[author]{labelname}}
+ {\printnames[name:initials]{labelname}}}}}
\newbibmacro*{maintitle+title+volumes}{%
\iffieldsequal{maintitle}{title}%
{\clearfield{maintitle}%
@@ -877,10 +888,11 @@
{}%
{\usebibmacro{maintitle}%
\usebibmacro{volume}%
- \clearfield{volume}}%
+ \clearfield{volume}%
\iffieldundef{title}%
{}%
- {\usebibmacro{title}}%
+ {\setunit*{\maintitlepunct}}}%
+ \usebibmacro{title}%
\ifbool{cbx:ancient}%
{\usebibmacro{translation}}%
{\usebibmacro{volume}}}%
@@ -1034,7 +1046,7 @@
{}%
{\usebibmacro{maintitle}%
\usebibmacro{volume}%
- \setunit{\maintitlepunct}}%
+ \setunit*{\maintitlepunct}}%
\usebibmacro{booktitle}%
\usebibmacro{volume}%
\newunit
@@ -1090,7 +1102,7 @@
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author}%
- \setunit*{\labelnamepunct}\newblock
+ \setunit*{\nametitledelim}\newblock
\usebibmacro{title}%
\newunit\newblock
\usebibmacro{translation}%
@@ -1114,7 +1126,7 @@
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}\newblock
+ \setunit*{\nametitledelim}\newblock
\usebibmacro{maintitle+title+volumes}%
\newunit\newblock
\ifbool{bbx:yearseries}%
@@ -1144,7 +1156,7 @@
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}\newblock
+ \setunit*{\nametitledelim}\newblock
\usebibmacro{title}%
\setunit{\addspace}
\printtext[parens]{\printfield{type}%
@@ -1165,7 +1177,7 @@
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}\newblock
+ \setunit*{\nametitledelim}\newblock
\usebibmacro{maintitle+title+volumes}%
\usebibmacro{event+venue+date}%
\setunit*{\addspace}%
@@ -1194,7 +1206,7 @@
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}\newblock
+ \setunit*{\nametitledelim}\newblock
\usebibmacro{title}%
\newunit\newblock
\usebibmacro{intranslation}%
@@ -1229,7 +1241,7 @@
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}\newblock
+ \setunit*{\nametitledelim}\newblock
\usebibmacro{title}%
\newunit\newblock
\bibstring{talk}%
@@ -1255,7 +1267,7 @@
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}\newblock
+ \setunit*{\nametitledelim}\newblock
\usebibmacro{title}%
\newunit\newblock
\usebibmacro{intranslation}%
@@ -1309,7 +1321,7 @@
\usebibmacro{bibindex}%
\usebibmacro{begentry}%
\usebibmacro{author/editor}%
- \setunit*{\labelnamepunct}\newblock
+ \setunit*{\nametitledelim}\newblock
\iffieldundef{title}%
{}%
{\usebibmacro{title}}%
@@ -1338,7 +1350,6 @@
\renewcommand*{\makelabel}[1]{##1\hss}}}%
{\endlist}%
{\item\usebibmacro{kicklabel}}
- %-----------------------
\def\do#1{%
\defbibenvironment{#1}
{\list%
@@ -1354,12 +1365,11 @@
{\item\usebibmacro{kicklabelfield}{#1}}%
}
\docsvlist{shortjournal,shortseries}
-
\providecommand*{\ifdateyearsequal}[2]{%
\ifboolexpr{ test {\iffieldsequal{#1year}{#2year}}
and test {\iffieldsequal{#1dateera}{#2dateera}}}}
%%
-%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de
+%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de
%%
%% End of file `archaeologie.bbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/archaeologie/archaeologie.cbx new/tex/latex/archaeologie/archaeologie.cbx
--- old/tex/latex/archaeologie/archaeologie.cbx 2018-09-25 22:43:45.000000000 +0200
+++ new/tex/latex/archaeologie/archaeologie.cbx 2020-02-16 23:09:12.000000000 +0100
@@ -8,17 +8,16 @@
%% ----------------------------------------------------------------
%% biblatex-archaeologie ---
%% Author: Lukas C. Bossert
-%% E-mail: info(a)biblatex-archaeologie.de
+%% E-mail: info(a)biblatex.texografie.de
%% License: Released under the LaTeX Project Public License v1.3c or later
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\archDate{2018/09/25}
-\def\archVersion{2.4.0}
+\def\archDate{2020/02/15}
+\def\archVersion{2.4.4}
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesFile{archaeologie.cbx}
[\archVersion\space\archDate Base settings for citation style of biblatex-archaeologie]
-
\newbool{cbx:yearinparens}
\newbool{cbx:seenote}
\newbool{cbx:uniqueme}
@@ -33,12 +32,10 @@
}%
{\addspace}%
{\newunitpunct}}
-
\newrobustcmd*{\cbx@nametracker@global}[1]{%
\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}
{}
{\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}}
-
\newrobustcmd*{\cbx@nametracker@context}[1]{%
\iftoggle{blx@footnote}
{\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection}
@@ -47,20 +44,16 @@
{\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}
{}
{\listcsxadd{cbx@bseen@names@\the\c@refsection}{#1}}}}
-
\newrobustcmd*{\cbx@ifnameseen@global}[1]{%
\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}}
-
\newrobustcmd*{\cbx@ifnameseen@context}[1]{%
\iftoggle{blx@footnote}%
{\xifinlistcs{#1}{cbx@fseen@names@\the\c@refsection}}%
{\xifinlistcs{#1}{cbx@bseen@names@\the\c@refsection}}}
-
\DeclareBibliographyOption[boolean]{nametracker}[true]{%
\ifcsdef{blx@opt@nametracker@#1}
{\csuse{blx@opt@nametracker@#1}}
{\blx@err@invopt{nametracker=#1}{}}}
-
\def\blx@opt@nametracker@true{%
\let\cbx@ifnameseen\cbx@ifnameseen@global
\let\cbx@nametracker\cbx@nametracker@global}
@@ -72,7 +65,6 @@
\def\blx@opt@nametracker@context{%
\let\cbx@ifnameseen\cbx@ifnameseen@context
\let\cbx@nametracker\cbx@nametracker@context}
-
\appto\blx@secinit{
\ifcsundef{cbx@bseen@names@\the\c@refsection}
{\global\cslet{cbx@bseen@names@\the\c@refsection}\@empty}
@@ -80,11 +72,9 @@
\ifcsundef{cbx@fseen@names@\the\c@refsection}
{\global\cslet{cbx@fseen@names@\the\c@refsection}\@empty}
{}}
-
\InitializeCitationStyle{%
\global\cslet{cbx@bseen@names@\the\c@refsection}\@empty
\global\cslet{cbx@fseen@names@\the\c@refsection}\@empty}
-
\DeclareBibliographyOption{yearinparens}[true]{%
\ifstrequal{#1}{true}%
{\DeclareFieldFormat{citeyear}{\mkbibparens{##1}}%
@@ -108,7 +98,6 @@
\DeclareFieldFormat{multipostnote}{\mknormrange{#1}}
\DeclareFieldFormat{shorttitle}{#1}
\DeclareFieldFormat{pages}{#1}
-
\DeclareNameFormat{labelname}{%
\ifcase\value{uniquename}%
\usebibmacro{name:family}
@@ -136,8 +125,7 @@
{\namepartsuffix}%
\fi
\usebibmacro{name:andothers}}
-
- \DeclareNameFormat{name:family}{%
+\DeclareNameFormat{name:family}{%
\ifcase\value{uniquename}%
\usebibmacro{name:family}
{\namepartfamily}
@@ -164,8 +152,7 @@
{\namepartsuffix}%
\fi
\usebibmacro{name:andothers}}
-
- \DeclareNameFormat{name:initials}{%
+\DeclareNameFormat{name:initials}{%
\ifnum\value{uniquename}=2%
\usebibmacro{name:given-family}
{\namepartfamily}
@@ -185,8 +172,7 @@
{\namepartprefixi}
{\namepartsuffixi}}%
\fi
- \usebibmacro{name:andothers}}
-
+\usebibmacro{name:andothers}}
\def\cbx@arch@citeauthorformat@family{%
\DeclareNameAlias{citeauthor}{name:family}}
@@ -195,7 +181,6 @@
\def\cbx@arch@citeauthorformat@initials{%
\DeclareNameAlias{citeauthor}{name:initials}}
-
\DeclareNameFormat{citeauthor:firstfulltheninitials}{%
\cbx@ifnameseen{\thefield{hash}}
{\ifnum\value{uniquename}=2
@@ -224,7 +209,6 @@
{\namepartsuffix}%
\cbx@nametracker{\thefield{hash}}}%
\usebibmacro{name:andothers}}
-
\DeclareNameFormat{citeauthor:firstinitialsthenfamily}{%
\cbx@ifnameseen{\thefield{hash}}
{}
@@ -258,7 +242,6 @@
{\namepartsuffix}%
\fi
\usebibmacro{name:andothers}}
-
\DeclareNameFormat{citeauthor:firstfullthenfamily}{%
\cbx@ifnameseen{\thefield{hash}}
{\ifcase\value{uniquename}%
@@ -308,7 +291,6 @@
Value 'firstfull' for 'citeauthorformat' is deprecated,\MessageBreak
use 'firstfulltheninitials' instead.}%
\cbx@arch@citeauthorformat@firstfulltheninitials}
-
\ExecuteBibliographyOptions{%
citetracker=true,
idemtracker=true,
@@ -386,7 +368,7 @@
\setunit{\addspace}%
\printfield{volume}%
\usebibmacro{edition}%
- \printfield[parens]{year}%
+ \printtext[parens]{\printdate}%
\setunit{\addspace}%
\iffieldundef{postnote}%
{\printfield{pages}}%
@@ -484,7 +466,6 @@
\usebibmacro{cite}}%
{\multicitedelim}%
{\usebibmacro{postnote}}
- %-----------------------
\DeclareCiteCommand{\footcite}[\mkbibfootnote]
{\usebibmacro{prenote}}%
{\usebibmacro{citeindex}%
@@ -653,7 +634,6 @@
{\addspace\printfield[parens]{origyear}}}}}}}%
{\multicitedelim}%
{\usebibmacro{postnote}}%
-
\DeclareCiteCommand*{\citetitle}
{\boolfalse{citetracker}%
\boolfalse{pagetracker}%
@@ -667,8 +647,7 @@
{\printtext[emph]{\usebibmacro{cite:title}}}}%
{\multicitedelim}%
{\usebibmacro{postnote}}%
-
%%
-%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de
+%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de
%%
%% End of file `archaeologie.cbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/archaeologie/archaeologie.dbx new/tex/latex/archaeologie/archaeologie.dbx
--- old/tex/latex/archaeologie/archaeologie.dbx 2018-09-25 22:43:45.000000000 +0200
+++ new/tex/latex/archaeologie/archaeologie.dbx 2020-02-16 23:09:12.000000000 +0100
@@ -8,13 +8,13 @@
%% ----------------------------------------------------------------
%% biblatex-archaeologie ---
%% Author: Lukas C. Bossert
-%% E-mail: info(a)biblatex-archaeologie.de
+%% E-mail: info(a)biblatex.texografie.de
%% License: Released under the LaTeX Project Public License v1.3c or later
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\archDate{2018/09/25}
-\def\archVersion{2.4.0}
+\def\archDate{2020/02/15}
+\def\archVersion{2.4.4}
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesFile{archaeologie.dbx}
[\archVersion\space\archDate Bibliographical data model of biblatex-archaeologie]
@@ -33,6 +33,6 @@
\DeclareDatamodelFields[type=field,datatype=verbatim]{eventdatelanguage}
\DeclareDatamodelEntryfields[proceedings,inproceedings]{eventdatelanguage}
%%
-%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de
+%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de
%%
%% End of file `archaeologie.dbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/archaeologie/english-archaeologie.lbx new/tex/latex/archaeologie/english-archaeologie.lbx
--- old/tex/latex/archaeologie/english-archaeologie.lbx 2018-09-25 22:43:45.000000000 +0200
+++ new/tex/latex/archaeologie/english-archaeologie.lbx 2020-02-16 23:09:12.000000000 +0100
@@ -8,19 +8,17 @@
%% ----------------------------------------------------------------
%% biblatex-archaeologie ---
%% Author: Lukas C. Bossert
-%% E-mail: info(a)biblatex-archaeologie.de
+%% E-mail: info(a)biblatex.texografie.de
%% License: Released under the LaTeX Project Public License v1.3c or later
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\archDate{2018/09/25}
-\def\archVersion{2.4.0}
+\def\archDate{2020/02/15}
+\def\archVersion{2.4.4}
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesFile{english-archaeologie.lbx}
[\archVersion\space\archDate Generic English conventions required by the biblatex-archaeologie style]
-
\InheritBibliographyExtras{english}
-
\DeclareBibliographyStrings{%
inherit = {english},
magthesis = {{}{}},% FIXME!
@@ -49,7 +47,6 @@
fromswedish = {{from\addspace Swedish}{from\addspace Swedish}},
owntranslation = {{own\addspace trans\adddot}{own\addspace translation}},
}
-
\protected\gdef\lbx@us@mkdaterangetrunc@long#1#2{%
\begingroup
\blx@metadateinfo{#2}%
@@ -83,7 +80,6 @@
\enddateuncertainprint
\dateeraprint{#2endyear}}}}}%
\endgroup}
-
\protected\gdef\lbx@us@mkdaterangetrunc@short#1#2{%
\begingroup
\blx@metadateinfo{#2}%
@@ -113,7 +109,6 @@
\enddateuncertainprint
\dateeraprint{#2endyear}}}}}%
\endgroup}
-
\protected\gdef\lbx@us@mkdaterangetruncextra@long#1#2{%
\begingroup
\blx@metadateinfo{#2}%
@@ -149,7 +144,6 @@
\enddateuncertainprint
\dateeraprint{#2endyear}}}}}%
\endgroup}
-
\protected\gdef\lbx@us@mkdaterangetruncextra@short#1#2{%
\begingroup
\blx@metadateinfo{#2}%
@@ -181,8 +175,7 @@
\enddateuncertainprint
\dateeraprint{#2endyear}}}}}%
\endgroup}
-
%%
-%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de
+%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de
%%
%% End of file `english-archaeologie.lbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/archaeologie/french-archaeologie.lbx new/tex/latex/archaeologie/french-archaeologie.lbx
--- old/tex/latex/archaeologie/french-archaeologie.lbx 2018-09-25 22:43:45.000000000 +0200
+++ new/tex/latex/archaeologie/french-archaeologie.lbx 2020-02-16 23:09:12.000000000 +0100
@@ -8,22 +8,20 @@
%% ----------------------------------------------------------------
%% biblatex-archaeologie ---
%% Author: Lukas C. Bossert
-%% E-mail: info(a)biblatex-archaeologie.de
+%% E-mail: info(a)biblatex.texografie.de
%% License: Released under the LaTeX Project Public License v1.3c or later
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\archDate{2018/09/25}
-\def\archVersion{2.4.0}
+\def\archDate{2020/02/15}
+\def\archVersion{2.4.4}
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesFile{french-archaeologie.lbx}
[\archVersion\space\archDate French conventions required by the biblatex-archaeologie style]
\ProvidesFile{italien-archaeologie.lbx}
[\archVersion\space\archDate Italian conventions required by the biblatex-archaeologie style]
-
\InheritBibliographyExtras{french}
\DefineBibliographyExtras{french}{\restorecommand\mkbibnamefamily}
-
\DeclareBibliographyStrings{%
inherit = {french},
magthesis = {{}{}},% FIXME!
@@ -54,8 +52,7 @@
fromswedish = {{depuis\addspace le\addspace suédois}{depuis\addspace le\addspace suédois}},
owntranslation = {{??}{??}},% FIXME!
}
-
%%
-%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de
+%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de
%%
%% End of file `french-archaeologie.lbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/archaeologie/german-archaeologie.lbx new/tex/latex/archaeologie/german-archaeologie.lbx
--- old/tex/latex/archaeologie/german-archaeologie.lbx 2018-09-25 22:43:45.000000000 +0200
+++ new/tex/latex/archaeologie/german-archaeologie.lbx 2020-02-16 23:09:12.000000000 +0100
@@ -8,19 +8,17 @@
%% ----------------------------------------------------------------
%% biblatex-archaeologie ---
%% Author: Lukas C. Bossert
-%% E-mail: info(a)biblatex-archaeologie.de
+%% E-mail: info(a)biblatex.texografie.de
%% License: Released under the LaTeX Project Public License v1.3c or later
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\archDate{2018/09/25}
-\def\archVersion{2.4.0}
+\def\archDate{2020/02/15}
+\def\archVersion{2.4.4}
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesFile{german-archaeologie.lbx}
[\archVersion\space\archDate German conventions required by the biblatex-archaeologie style]
-
\InheritBibliographyExtras{ngerman}
-
\DeclareBibliographyStrings{%
inherit = {ngerman},
magthesis = {{Magisterarbeit}{Mag.-Arbeit}},%
@@ -36,8 +34,7 @@
translationof = {{\"Ubersetzung\addspace von}{\"Ubers\adddot\addspace von}},
owntranslation = {{eigene\addspace\"Ubersetzung}{eig\adddot\addspace\"Ubers\adddot}},
}
-
%%
-%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de
+%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de
%%
%% End of file `german-archaeologie.lbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/archaeologie/italian-archaeologie.lbx new/tex/latex/archaeologie/italian-archaeologie.lbx
--- old/tex/latex/archaeologie/italian-archaeologie.lbx 2018-09-25 22:43:45.000000000 +0200
+++ new/tex/latex/archaeologie/italian-archaeologie.lbx 2020-02-16 23:09:12.000000000 +0100
@@ -8,16 +8,15 @@
%% ----------------------------------------------------------------
%% biblatex-archaeologie ---
%% Author: Lukas C. Bossert
-%% E-mail: info(a)biblatex-archaeologie.de
+%% E-mail: info(a)biblatex.texografie.de
%% License: Released under the LaTeX Project Public License v1.3c or later
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\archDate{2018/09/25}
-\def\archVersion{2.4.0}
+\def\archDate{2020/02/15}
+\def\archVersion{2.4.4}
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\InheritBibliographyExtras{italian}
-
\DeclareBibliographyStrings{%
inherit = {italian},
magthesis = {{}{}},% FIXME!
@@ -36,8 +35,7 @@
forthcoming = {{prossimo}{prossimo}},
owntranslation = {{??}{??}},% FIXME!
}
-
%%
-%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de
+%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de
%%
%% End of file `italian-archaeologie.lbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/archaeologie/spanish-archaeologie.lbx new/tex/latex/archaeologie/spanish-archaeologie.lbx
--- old/tex/latex/archaeologie/spanish-archaeologie.lbx 2018-09-25 22:43:45.000000000 +0200
+++ new/tex/latex/archaeologie/spanish-archaeologie.lbx 2020-02-16 23:09:12.000000000 +0100
@@ -8,13 +8,13 @@
%% ----------------------------------------------------------------
%% biblatex-archaeologie ---
%% Author: Lukas C. Bossert
-%% E-mail: info(a)biblatex-archaeologie.de
+%% E-mail: info(a)biblatex.texografie.de
%% License: Released under the LaTeX Project Public License v1.3c or later
%% See: http://www.latex-project.org/lppl.txt
%% ----------------------------------------------------------------
%%
-\def\archDate{2018/09/25}
-\def\archVersion{2.4.0}
+\def\archDate{2020/02/15}
+\def\archVersion{2.4.4}
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesFile{spanish-archaeologie.lbx}
[\archVersion\space\archDate Spanish conventions required by the biblatex-archaeologie style]
@@ -33,6 +33,6 @@
owntranslation = {{??}{??}},% FIXME!
}
%%
-%% Copyright (C) 2018 Lukas C. Bossert // digitales-altertum.de
+%% Copyright (C) 2019 Lukas C. Bossert // digitales-altertum.de
%%
%% End of file `spanish-archaeologie.lbx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/archaeologie.tlpobj new/tlpkg/tlpobj/archaeologie.tlpobj
--- old/tlpkg/tlpobj/archaeologie.tlpobj 2019-02-28 03:15:10.000000000 +0100
+++ new/tlpkg/tlpobj/archaeologie.tlpobj 2020-02-17 01:55:16.000000000 +0100
@@ -1,6 +1,6 @@
name archaeologie
category Package
-revision 48763
+revision 53813
shortdesc A citation-style which covers rules of the German Archaeological Institute
relocated 1
longdesc This citation-style covers the citation and bibliography rules
@@ -27,7 +27,6 @@
catalogue-contact-home http://biblatex-archaeologie.de
catalogue-contact-repository https://github.com/LukasCBossert/biblatex-archaeologie
catalogue-ctan /macros/latex/contrib/biblatex-contrib/archaeologie
-catalogue-date 2018-09-25 15:26:45 +0200
catalogue-license lppl1.3
catalogue-topics humanities biblatex
-catalogue-version 2.4.0
+catalogue-version 2.4.4
1
0
Hello community,
here is the log from the commit of package gcc for openSUSE:Factory checked in at 2020-05-29 21:16:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gcc (Old)
and /work/SRC/openSUSE:Factory/.gcc.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gcc"
Fri May 29 21:16:32 2020 rev:64 rq:806858 version:10
Changes:
--------
--- /work/SRC/openSUSE:Factory/gcc/gcc.changes 2019-05-25 13:14:51.484456516 +0200
+++ /work/SRC/openSUSE:Factory/.gcc.new.3606/gcc.changes 2020-05-29 21:19:39.459469823 +0200
@@ -1,0 +2,11 @@
+Mon May 18 09:08:26 UTC 2020 - Richard Biener <rguenther(a)suse.com>
+
+- Sync separate_bi{32,64} macros with the GCC side, honoring
+ %disable_32bit. [bsc#1170466]
+
+-------------------------------------------------------------------
+Tue Mar 31 08:46:16 UTC 2020 - Richard Biener <rguenther(a)suse.com>
+
+- Switch gcc to default 10.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gcc.spec ++++++
--- /var/tmp/diff_new_pack.zSMUdp/_old 2020-05-29 21:19:40.171471969 +0200
+++ /var/tmp/diff_new_pack.zSMUdp/_new 2020-05-29 21:19:40.175471980 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gcc
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,12 +19,14 @@
Name: gcc
%define separate_bi32 0
%define separate_bi64 0
-%ifarch ppc
+%if 0%{!?disable_32bit:1}
+%ifarch ppc sparcv9
%define separate_bi64 1
%endif
-%ifarch x86_64 s390x ppc64
+%ifarch x86_64 s390x ppc64 sparc64
%define separate_bi32 1
%endif
+%endif
# Ada currently fails to build on a few platforms, enable it only
# on those that work
# Note that AdaCore only supports %ix86, x86_64 and ia64
@@ -39,10 +41,10 @@
%else
%define build_d 0
%endif
-Url: http://gcc.gnu.org/
-%define gcc_version 9
-%define gcc_suffix 9
-Version: 9
+URL: http://gcc.gnu.org/
+%define gcc_version 10
+%define gcc_suffix 10
+Version: 10
Release: 0
Summary: The system GNU C Compiler
License: GPL-3.0-or-later
1
0
Hello community,
here is the log from the commit of package python-numpy for openSUSE:Factory checked in at 2020-05-29 21:16:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-numpy (Old)
and /work/SRC/openSUSE:Factory/.python-numpy.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-numpy"
Fri May 29 21:16:14 2020 rev:91 rq:805383 version:1.18.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-numpy/python-numpy.changes 2020-05-11 13:26:15.115218142 +0200
+++ /work/SRC/openSUSE:Factory/.python-numpy.new.3606/python-numpy.changes 2020-05-29 21:19:34.731455573 +0200
@@ -1,0 +2,5 @@
+Wed May 13 09:13:22 UTC 2020 - Matej Cepl <mcepl(a)suse.com>
+
+- Reorganize check section to pass
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-numpy.spec ++++++
--- /var/tmp/diff_new_pack.05w8KW/_old 2020-05-29 21:19:36.019459455 +0200
+++ /var/tmp/diff_new_pack.05w8KW/_new 2020-05-29 21:19:36.023459466 +0200
@@ -251,14 +251,10 @@
export PATH="%{buildroot}%{_bindir}:$PATH"
mkdir testing
pushd testing
-%ifarch ppc64 ppc64le
-%pytest_arch -n auto --pyargs numpy || echo "Warning: ignore check error for PowerPC bypass boo#1148173"
-%else
-%pytest_arch -n auto --pyargs numpy
-%endif
+%python_expand export PYTHONPATH=%{_python_sysconfig_path $python stdlib}:%{$python_sitearch}
+%pytest_arch -n auto --pyargs numpy %{buildroot}%{$python_sitearch}/numpy
popd
%endif
-
%if %{without hpc}
%post
%python_install_alternative f2py
1
0
Hello community,
here is the log from the commit of package guile for openSUSE:Factory checked in at 2020-05-29 21:16:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/guile (Old)
and /work/SRC/openSUSE:Factory/.guile.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "guile"
Fri May 29 21:16:02 2020 rev:60 rq:800453 version:3.0.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/guile/guile.changes 2019-09-30 15:49:08.158855396 +0200
+++ /work/SRC/openSUSE:Factory/.guile.new.3606/guile.changes 2020-05-29 21:19:29.471439719 +0200
@@ -1,0 +2,89 @@
+Tue May 5 09:21:02 UTC 2020 - Martin Liška <mliska(a)suse.cz>
+
+- Add gcc10-x86-disable-one-test.patch in order to fix
+ boo#1170836.
+
+-------------------------------------------------------------------
+Fri Mar 27 15:44:09 UTC 2020 - Jonathan Brielmaier <jbrielmaier(a)opensuse.org>
+
+- Update to version 3.0.2:
+ Changes compared to 3.0.1:
+ * New (srfi srfi-171) module
+ * Fix heap corruption when allocating structs (caused problems when
+ building Guix on openSUSE)
+ * Fix race condition between 'abort-to-prompt' and stack marking
+ * Ensure weak sets are occasionally vacuumed
+ * Interpret dynamic library name as literal file name first
+ * <libguile.h> includes <libguile/hooks.h> again
+ * Fix fixpoint computation in compute-significant-bits
+ * Fix compilation '--without-threads'
+ * 'tmpnam' is now deprecated
+- Remove patch:
+ * guile-3.0-fix-compile-crash.patch: patch included in release
+
+-------------------------------------------------------------------
+Sun Mar 22 15:03:51 UTC 2020 - Jonathan Brielmaier <jbrielmaier(a)opensuse.org>
+
+- Add patch from upstream to fix build of Guix with more then two threads:
+ * guile-3.0-fix-compile-crash.patch
+
+-------------------------------------------------------------------
+Mon Mar 9 10:21:27 UTC 2020 - Jonathan Brielmaier <jbrielmaier(a)suse.de>
+
+- Update to version 3.0.1:
+ Changes compared to 3.0.0:
+ * Export constructor and predicate for '&quit-exception'
+ * (texinfo plain-text) now exports '*line-width*' fluid
+ * R7RS support recognizes the '.sld' extension
+ * 'hash' correctly handles keywords, ports, hash tables, etc.
+ * 'include' no longer rejects relative file names
+ * Reduce GC pressure when using bignums
+ * Fix expansion of 'error' calls with a non-constant argument
+ * Improve source location information for top-level references
+ * Web client treats TLS "premature termination" error as EOF
+ * Fix bug restoring a JIT continuation from the interpreter
+ * Export C symbols 'scm_sym_lambda', 'scm_sym_quote', etc. again
+ * Fix build on IA64 and on platforms where the stack grows upwards
+ * texinfo properly renders @acronym in plain text
+ * Compiler now optimizes (logior 0 INT)
+ * Fix Readline configure check for the sake of libedit
+ * Provided 'GUILE_PKG' Autoconf macro now detects Guile 3.0
+
+-------------------------------------------------------------------
+Thu Jan 16 11:55:13 UTC 2020 - Jonathan Brielmaier <jbrielmaier(a)suse.de>
+
+- Update to version 3.0.0:
+ Major changes compared to 2.2.x:
+ * Just-in-time code generation on x86_64, i586, armv7l, and aarch64
+ * Lower-level bytecode
+ * Add support for R7RS
+ * Interleaved internal definitions and expressions allowed
+ * Record unification
+ * Reimplementation of exceptions to be more aligned with R6RS-style
+ * `guard' no longer unwinds the stack for clause tests
+ * Optimization of top-level bindings within a compilation unit (-O3
+ is now differnt then -O2)
+ * By default, GOOPS classes are not redefinable
+ * Define top-level bindings for aux syntax: `else', `=>', `...', `_'
+ * Conventional gettext alias is now `G_'
+ * Add --r6rs command-line option
+ * Add #:re-export-and-replace argument to `define-module'
+ * `define-module' #:autoload no longer pulls in the whole module
+ * Improve SRFI-43 vector-fill!
+ * `iota' in core and SRFI-1 `iota' are the same
+ * Improved Transport Layer Security (TLS) support in (web client)
+ * New deprecations
+ * scm_t_uint8, etc deprecated in favor of C99 stdint.h
+ * The two-argument form of `record-constructor'
+ * Incompatible changes
+ * All code deprecated in Guile 2.2 has been removed.
+ * Remove "self" field from vtables and "redefined" field from
+ classes
+ * VM hook manipulation simplified
+ * New effective version 3.0. pkg-config is now guile-3.0
+* Rename patch:
+ * guile-2.2-gc_pkgconfig_private.patch to
+ guile-3.0-gc_pkgconfig_private.patch: Adapt to 3.0 changes.
+* Set guilemaj to 3 and guilemin to 0
+
+-------------------------------------------------------------------
Old:
----
guile-2.2-gc_pkgconfig_private.patch
guile-2.2.6.tar.xz
guile-2.2.6.tar.xz.sig
New:
----
gcc10-x86-disable-one-test.patch
guile-3.0-gc_pkgconfig_private.patch
guile-3.0.2.tar.xz
guile-3.0.2.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ guile.spec ++++++
--- /var/tmp/diff_new_pack.FlQGXy/_old 2020-05-29 21:19:31.203444939 +0200
+++ /var/tmp/diff_new_pack.FlQGXy/_new 2020-05-29 21:19:31.207444951 +0200
@@ -17,13 +17,13 @@
# define the name used for versioning libs and directories.
-%define guilemaj 2
-%define guilemin 2
+%define guilemaj 3
+%define guilemin 0
%define guilevers %{guilemaj}.%{guilemin}
%define libgver 1
%define gsuff %{guilemaj}_%{guilemin}-%{libgver}
Name: guile
-Version: %{guilevers}.6
+Version: %{guilevers}.2
Release: 0
Summary: GNU's Ubiquitous Intelligent Language for Extension
License: GFDL-1.3-only AND GPL-3.0-or-later AND LGPL-3.0-or-later
@@ -33,10 +33,11 @@
Source1: https://ftp.gnu.org/gnu/guile/%{name}-%{version}.tar.xz.sig
Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=guile&downloa…
Source3: guile-rpmlintrc
-# Fix the resulting /usr/lib64/pkgconfig/guile-2.2.pc
-Patch0: guile-2.2-gc_pkgconfig_private.patch
-# test fails always with heap error
+# Fix the resulting /usr/lib64/pkgconfig/guile-3.0.pc
+Patch0: guile-3.0-gc_pkgconfig_private.patch
+# The out-of-memory test is flaky, so disable it
Patch1: disable-test-out-of-memory.patch
+Patch2: gcc10-x86-disable-one-test.patch
BuildRequires: gmp-devel
BuildRequires: libffi-devel
BuildRequires: libltdl-devel
@@ -102,6 +103,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
# remove broken prebuilt objects
rm -r prebuilt/32-bit-big-endian
++++++ gcc10-x86-disable-one-test.patch ++++++
diff --git a/test-suite/tests/numbers.test b/test-suite/tests/numbers.test
index 59e370e..6b07655 100644
--- a/test-suite/tests/numbers.test
+++ b/test-suite/tests/numbers.test
@@ -5309,7 +5309,7 @@
d))))))))
(with-test-prefix "fractions"
- (for '((1/10 16/3 10/7)) ;; denominators
+ (for '((1/10 16/3)) ;; denominators
(lambda (d)
(for '((0 1 2 5 1/2 3/2 5/2)) ;; multiples
(lambda (m)
@@ -5319,7 +5319,7 @@
d))))))))
(with-test-prefix "mixed types"
- (for `((10 ,big 12.0 10/7 +inf.0 -inf.0 +nan.0)) ;; denominators
+ (for `((10 ,big 12.0 +inf.0 -inf.0 +nan.0)) ;; denominators
(lambda (d)
(for `((25 ,(* 3/2 big) 130.0 15/7
0 0.0 -0.0 +inf.0 -inf.0 +nan.0)) ;; numerators
++++++ guile-2.2-gc_pkgconfig_private.patch -> guile-3.0-gc_pkgconfig_private.patch ++++++
--- /work/SRC/openSUSE:Factory/guile/guile-2.2-gc_pkgconfig_private.patch 2018-12-10 12:24:33.366753539 +0100
+++ /work/SRC/openSUSE:Factory/.guile.new.3606/guile-3.0-gc_pkgconfig_private.patch 2020-05-29 21:19:28.135435693 +0200
@@ -1,6 +1,6 @@
---- guile-2.2.4/meta/guile-2.2.pc.in.orig 2018-11-27 17:28:06.487792308 +0100
-+++ guile-2.2.4/meta/guile-2.2.pc.in 2018-11-27 17:28:26.664200511 +0100
-@@ -22,9 +22,9 @@
+--- guile/meta/guile-3.0.pc.in.orig 2020-01-07 12:00:08.392929733 +0100
++++ guile/meta/guile-3.0.pc.in 2020-01-07 12:00:19.241097989 +0100
+@@ -22,7 +22,7 @@
Name: GNU Guile
Description: GNU's Ubiquitous Intelligent Language for Extension
Version: @GUILE_VERSION@
@@ -9,6 +9,3 @@
Libs.private: @LIB_CLOCK_GETTIME@ @LIBGMP@ @LIBLTDL@ @LIBFFI_LIBS@ \
@LIBUNISTRING@ @GUILE_LIBS@ @LIBICONV@ @LIBINTL@ @LIBSOCKET@ \
@SERVENT_LIB@ @HOSTENT_LIB@ @GETADDRINFO_LIB@ @INET_NTOP_LIB@ \
-- @INET_PTON_LIB@
-+ @INET_PTON_LIB@ @BDW_GC_LIBS@
- Cflags: -I${pkgincludedir}/@GUILE_EFFECTIVE_VERSION@ @GUILE_CFLAGS@ @BDW_GC_CFLAGS@
++++++ guile-2.2.6.tar.xz -> guile-3.0.2.tar.xz ++++++
/work/SRC/openSUSE:Factory/guile/guile-2.2.6.tar.xz /work/SRC/openSUSE:Factory/.guile.new.3606/guile-3.0.2.tar.xz differ: char 26, line 1
++++++ guile.keyring ++++++
++++ 5072 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/guile/guile.keyring
++++ and /work/SRC/openSUSE:Factory/.guile.new.3606/guile.keyring
1
0
Hello community,
here is the log from the commit of package texlive-filesystem for openSUSE:Factory checked in at 2020-05-29 21:15:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-filesystem (Old)
and /work/SRC/openSUSE:Factory/.texlive-filesystem.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-filesystem"
Fri May 29 21:15:55 2020 rev:45 rq:798522 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-filesystem/texlive-filesystem.changes 2020-03-25 23:43:06.379989871 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-filesystem.new.3606/texlive-filesystem.changes 2020-05-29 21:19:15.951398969 +0200
@@ -1,0 +2,10 @@
+Tue Apr 28 06:46:38 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- No pstools anymore in texlive database
+
+-------------------------------------------------------------------
+Mon Apr 20 10:21:45 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Update to TeXLive 2020
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-filesystem.spec ++++++
++++ 17993 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-filesystem/texlive-filesystem.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-filesystem.new.3606/texlive-filesystem.spec
++++++ collection-basic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-basic.tlpobj new/tlpkg/tlpobj/collection-basic.tlpobj
--- old/tlpkg/tlpobj/collection-basic.tlpobj 2019-03-11 02:24:52.000000000 +0100
+++ new/tlpkg/tlpobj/collection-basic.tlpobj 2020-03-09 00:28:36.000000000 +0100
@@ -1,6 +1,6 @@
name collection-basic
category Collection
-revision 50324
+revision 54186
shortdesc Essential programs and files
relocated 1
longdesc These files are regarded as basic for any TeX system, covering
@@ -13,28 +13,30 @@
depend colorprofiles
depend dvipdfmx
depend dvips
+depend ec
depend enctex
depend etex
depend etex-pkg
depend glyphlist
depend graphics-def
-depend gsftopk
depend hyph-utf8
depend hyphen-base
-depend ifluatex
-depend ifxetex
+depend hyphenex
+depend ifplatform
+depend iftex
depend knuth-lib
depend knuth-local
depend kpathsea
depend lua-alt-getopt
+depend luahbtex
depend luatex
depend makeindex
depend metafont
depend mflogo
depend mfware
+depend modes
depend pdftex
depend plain
-depend tetex
depend tex
depend tex-ini-files
depend texlive-common
++++++ collection-bibtexextra.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-bibtexextra.tlpobj new/tlpkg/tlpobj/collection-bibtexextra.tlpobj
--- old/tlpkg/tlpobj/collection-bibtexextra.tlpobj 2019-03-28 02:24:18.000000000 +0100
+++ new/tlpkg/tlpobj/collection-bibtexextra.tlpobj 2020-03-15 02:47:19.000000000 +0100
@@ -1,17 +1,20 @@
name collection-bibtexextra
category Collection
-revision 50619
+revision 54297
shortdesc BibTeX additional styles
relocated 1
longdesc Additional BibTeX styles and bibliography data(bases), notably
longdesc including BibLaTeX.
depend collection-latex
+depend aaai-named
depend aichej
depend ajl
depend amsrefs
+depend annotate
depend apacite
depend apalike2
depend archaeologie
+depend authordate
depend beebe
depend besjournals
depend bestpapers
@@ -22,8 +25,10 @@
depend bibhtml
depend biblatex
depend biblatex-abnt
+depend biblatex-ajc2020unofficial
depend biblatex-anonymous
depend biblatex-apa
+depend biblatex-apa6
depend biblatex-archaeology
depend biblatex-arthistory-bonn
depend biblatex-bath
@@ -39,11 +44,13 @@
depend biblatex-ext
depend biblatex-fiwi
depend biblatex-gb7714-2015
+depend biblatex-german-legal
depend biblatex-gost
depend biblatex-historian
depend biblatex-ieee
depend biblatex-ijsra
depend biblatex-iso690
+depend biblatex-jura2
depend biblatex-juradiss
depend biblatex-lni
depend biblatex-luh-ipw
@@ -70,6 +77,7 @@
depend biblatex-swiss-legal
depend biblatex-trad
depend biblatex-true-citepages-omit
+depend biblatex2bibitem
depend biblist
depend bibtexperllibs
depend bibtopic
@@ -81,6 +89,7 @@
depend cell
depend chbibref
depend chicago
+depend chicagoa
depend chicago-annote
depend chembst
depend chscite
@@ -110,6 +119,9 @@
depend ijqc
depend inlinebib
depend iopart-num
+depend is-bst
+depend jbact
+depend jmb
depend jneurosci
depend jurabib
depend ksfh_nat
@@ -127,6 +139,7 @@
depend notex-bst
depend oscola
depend perception
+depend plainyr
depend pnas2009
depend rsc
depend showtags
++++++ collection-binextra.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-binextra.tlpobj new/tlpkg/tlpobj/collection-binextra.tlpobj
--- old/tlpkg/tlpobj/collection-binextra.tlpobj 2019-03-11 02:24:52.000000000 +0100
+++ new/tlpkg/tlpobj/collection-binextra.tlpobj 2020-04-15 01:54:41.000000000 +0200
@@ -1,11 +1,11 @@
name collection-binextra
category Collection
-revision 50324
+revision 54732
shortdesc TeX auxiliary programs
relocated 1
-longdesc Various useful, but non-essential, support programs. Includes
+longdesc Myriad additional TeX-related support programs. Includes
longdesc programs and macros for DVI file manipulation, literate
-longdesc programming, patgen, and the TeX Works Editor.
+longdesc programming, patgen, and plenty more.
depend collection-basic
depend a2ping
depend adhocfilelist
@@ -15,7 +15,9 @@
depend bibtexu
depend bundledoc
depend checklistings
+depend chklref
depend chktex
+depend clojure-pamphlet
depend cluttex
depend ctan-o-mat
depend ctan_chk
@@ -40,8 +42,9 @@
depend dvisvgm
depend findhyph
depend fragmaster
+depend git-latexdiff
+depend gsftopk
depend hook-pre-commit-pkg
-depend hyphenex
depend installfont
depend ketcindy
depend lacheck
@@ -57,6 +60,7 @@
depend ltxfileinfo
depend ltximg
depend listings-ext
+depend luajittex
depend make4ht
depend match_parens
depend mflua
@@ -67,7 +71,7 @@
depend pdfjam
depend pdflatexpicscale
depend pdftex-quiet
-depend pdftools
+depend pdftosrc
depend pdfxup
depend pfarrei
depend pkfix
@@ -86,9 +90,11 @@
depend texdoc
depend texdoctk
depend texfot
+depend texlive-scripts-extra
depend texliveonfly
depend texloganalyser
depend texosquery
+depend texplate
depend texware
depend tie
depend tlcockpit
@@ -97,3 +103,4 @@
depend web
depend xindex
depend xindy
+depend xpdfopen
++++++ collection-context.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-context.tlpobj new/tlpkg/tlpobj/collection-context.tlpobj
--- old/tlpkg/tlpobj/collection-context.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-context.tlpobj 2020-03-04 23:50:30.000000000 +0100
@@ -1,6 +1,6 @@
name collection-context
category Collection
-revision 47139
+revision 54074
shortdesc ConTeXt and packages
relocated 1
longdesc Hans Hagen's powerful ConTeXt system, http://pragma-ade.com.
++++++ collection-fontsextra.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-fontsextra.tlpobj new/tlpkg/tlpobj/collection-fontsextra.tlpobj
--- old/tlpkg/tlpobj/collection-fontsextra.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-fontsextra.tlpobj 2020-03-07 01:10:03.000000000 +0100
@@ -1,6 +1,6 @@
name collection-fontsextra
category Collection
-revision 49909
+revision 54138
shortdesc Additional fonts
relocated 1
depend collection-basic
@@ -9,10 +9,10 @@
depend accanthis
depend adforn
depend adfsymbols
-depend aecc
depend alegreya
depend algolrevived
depend allrunes
+depend almendra
depend almfixed
depend anonymouspro
depend antiqua
@@ -42,6 +42,7 @@
depend berenisadf
depend beuron
depend bguq
+depend bitter
depend blacklettert1
depend boisik
depend bookhands
@@ -61,6 +62,7 @@
depend cherokee
depend chivo
depend cinzel
+depend clara
depend clearsans
depend cm-lgc
depend cm-mf-extra-bold
@@ -71,6 +73,7 @@
depend cmpica
depend cmsrb
depend cmtiup
+depend cmupint
depend cochineal
depend coelacanth
depend comfortaa
@@ -92,6 +95,7 @@
depend dice
depend dictsym
depend dingbat
+depend domitian
depend doublestroke
depend dozenal
depend drm
@@ -112,9 +116,11 @@
depend epigrafica
depend epsdice
depend erewhon
+depend erewhon-math
depend esrelation
depend esstix
depend esvect
+depend etbb
depend eulervm
depend euxm
depend fbb
@@ -131,10 +137,12 @@
depend fontawesome5
depend fontmfizz
depend fonts-churchslavonic
+depend forum
depend fourier
depend fouriernc
depend frcursive
depend frederika2016
+depend garamond-libre
depend garamond-math
depend genealogy
depend gentium-tug
@@ -142,6 +150,7 @@
depend gfsbodoni
depend gfscomplutum
depend gfsdidot
+depend gfsdidotclassic
depend gfsneohellenic
depend gfsneohellenicmath
depend gfssolomos
@@ -171,6 +180,7 @@
depend kpfonts
depend kurier
depend lato
+depend lexend
depend lfb
depend libertine
depend libertinegc
@@ -182,11 +192,15 @@
depend librebaskerville
depend librebodoni
depend librecaslon
+depend librefranklin
depend libris
depend linearA
+depend linguisticspro
depend lobster2
+depend logix
depend lxfonts
depend ly1
+depend marcellus
depend mathabx
depend mathabx-type1
depend mathdesign
@@ -198,7 +212,9 @@
depend missaali
depend mnsymbol
depend montserrat
+depend mpfonts
depend mweights
+depend newcomputermodern
depend newpx
depend newtx
depend newtxsf
@@ -207,6 +223,7 @@
depend nimbus15
depend nkarta
depend noto
+depend noto-emoji
depend obnov
depend ocherokee
depend ocr-b
@@ -227,12 +244,14 @@
depend playfair
depend plex
depend plex-otf
+depend poiretone
depend poltawski
depend prodint
depend punk
depend punk-latex
depend punknova
depend pxtxalfa
+depend qualitype
depend quattrocento
depend raleway
depend recycle
@@ -244,6 +263,7 @@
depend sansmathfonts
depend sauter
depend sauterfonts
+depend scholax
depend schulschriften
depend semaphor
depend shobhika
@@ -253,6 +273,7 @@
depend sourceserifpro
depend starfont
depend staves
+depend step
depend stickstoo
depend stix
depend stix2-otf
@@ -263,9 +284,13 @@
depend tempora
depend tengwarscript
depend tfrupee
+depend theanodidot
+depend theanomodern
+depend theanooldstyle
depend tinos
depend tpslifonts
depend trajan
+depend twemoji-colr
depend txfontsb
depend txuprcal
depend typicons
++++++ collection-fontsrecommended.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-fontsrecommended.tlpobj new/tlpkg/tlpobj/collection-fontsrecommended.tlpobj
--- old/tlpkg/tlpobj/collection-fontsrecommended.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-fontsrecommended.tlpobj 2020-03-04 23:50:30.000000000 +0100
@@ -1,6 +1,6 @@
name collection-fontsrecommended
category Collection
-revision 35830
+revision 54074
shortdesc Recommended fonts
relocated 1
longdesc Recommended fonts, including the base 35 PostScript fonts,
@@ -13,7 +13,6 @@
depend cm-super
depend cmextra
depend courier
-depend ec
depend euro
depend euro-ce
depend eurosym
@@ -37,7 +36,7 @@
depend txfonts
depend utopia
depend wasy
-depend wasy2-ps
+depend wasy-type1
depend wasysym
depend zapfchan
depend zapfding
++++++ collection-fontutils.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-fontutils.tlpobj new/tlpkg/tlpobj/collection-fontutils.tlpobj
--- old/tlpkg/tlpobj/collection-fontutils.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-fontutils.tlpobj 2020-03-04 23:50:30.000000000 +0100
@@ -1,6 +1,6 @@
name collection-fontutils
category Collection
-revision 37105
+revision 54074
shortdesc Graphics and font utilities
relocated 1
longdesc Programs for conversion between font formats, testing fonts,
@@ -16,7 +16,7 @@
depend lcdftypetools
depend metatype1
depend ps2pk
-depend pstools
+depend ps2eps
depend psutils
depend dvipsconfig
depend fontinst
++++++ collection-formatsextra.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-formatsextra.tlpobj new/tlpkg/tlpobj/collection-formatsextra.tlpobj
--- old/tlpkg/tlpobj/collection-formatsextra.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-formatsextra.tlpobj 2020-03-04 23:50:30.000000000 +0100
@@ -1,6 +1,6 @@
name collection-formatsextra
category Collection
-revision 44177
+revision 54074
shortdesc Additional formats
relocated 1
longdesc Collected TeX `formats', i.e., large-scale macro packages
++++++ collection-games.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-games.tlpobj new/tlpkg/tlpobj/collection-games.tlpobj
--- old/tlpkg/tlpobj/collection-games.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-games.tlpobj 2020-03-04 23:50:30.000000000 +0100
@@ -1,6 +1,6 @@
name collection-games
category Collection
-revision 48514
+revision 54074
shortdesc Games typesetting
relocated 1
longdesc Setups for typesetting various games, including chess.
@@ -18,6 +18,7 @@
depend hanoi
depend havannah
depend hexgame
+depend hmtrump
depend horoscop
depend jigsaw
depend labyrinth
++++++ collection-humanities.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-humanities.tlpobj new/tlpkg/tlpobj/collection-humanities.tlpobj
--- old/tlpkg/tlpobj/collection-humanities.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-humanities.tlpobj 2020-03-04 23:50:30.000000000 +0100
@@ -1,6 +1,6 @@
name collection-humanities
category Collection
-revision 45363
+revision 54074
shortdesc Humanities packages
relocated 1
longdesc Packages for law, linguistics, social sciences, humanities,
++++++ collection-langarabic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langarabic.tlpobj new/tlpkg/tlpobj/collection-langarabic.tlpobj
--- old/tlpkg/tlpobj/collection-langarabic.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langarabic.tlpobj 2020-03-20 18:32:42.000000000 +0100
@@ -1,6 +1,6 @@
name collection-langarabic
category Collection
-revision 50080
+revision 54405
shortdesc Arabic
relocated 1
longdesc Support for Arabic and Persian.
@@ -28,3 +28,4 @@
depend simurgh
depend tram
depend xepersian
+depend xepersian-hm
++++++ collection-langchinese.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langchinese.tlpobj new/tlpkg/tlpobj/collection-langchinese.tlpobj
--- old/tlpkg/tlpobj/collection-langchinese.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langchinese.tlpobj 2020-03-04 23:50:30.000000000 +0100
@@ -1,6 +1,6 @@
name collection-langchinese
category Collection
-revision 49876
+revision 54074
shortdesc Chinese
relocated 1
longdesc Support for Chinese; additional packages in collection-langcjk.
@@ -19,6 +19,7 @@
depend impatient-cn
depend latex-notes-zh-cn
depend lshort-chinese
+depend nanicolle
depend njurepo
depend pgfornament-han
depend texlive-zh-cn
++++++ collection-langcjk.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langcjk.tlpobj new/tlpkg/tlpobj/collection-langcjk.tlpobj
--- old/tlpkg/tlpobj/collection-langcjk.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langcjk.tlpobj 2020-03-09 00:28:36.000000000 +0100
@@ -1,12 +1,12 @@
name collection-langcjk
category Collection
-revision 45194
+revision 54191
shortdesc Chinese/Japanese/Korean (base)
relocated 1
longdesc Packages supporting a combination of Chinese, Japanese, Korean,
-longdesc including macros, fonts, documentation. Also Thai in the c90
+longdesc including macros, fonts, documentation. Also Thai in the c90
longdesc encoding, since there is some overlap in those fonts; standard
-longdesc Thai support is in collection-langother. Additional packages
+longdesc Thai support is in collection-langother. Additional packages
longdesc for CJK are in their individual language collections.
depend collection-basic
depend adobemapping
++++++ collection-langcyrillic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langcyrillic.tlpobj new/tlpkg/tlpobj/collection-langcyrillic.tlpobj
--- old/tlpkg/tlpobj/collection-langcyrillic.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langcyrillic.tlpobj 2020-03-04 23:50:30.000000000 +0100
@@ -1,6 +1,6 @@
name collection-langcyrillic
category Collection
-revision 44895
+revision 54074
shortdesc Cyrillic
relocated 1
longdesc Support for Cyrillic scripts (Bulgarian, Russian, Serbian,
@@ -51,3 +51,4 @@
depend texlive-ru
depend texlive-sr
depend ukrhyph
+depend xecyrmongolian
++++++ collection-langczechslovak.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langczechslovak.tlpobj new/tlpkg/tlpobj/collection-langczechslovak.tlpobj
--- old/tlpkg/tlpobj/collection-langczechslovak.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langczechslovak.tlpobj 2020-03-04 23:50:30.000000000 +0100
@@ -1,6 +1,6 @@
name collection-langczechslovak
category Collection
-revision 32550
+revision 54074
shortdesc Czech/Slovak
relocated 1
longdesc Support for Czech/Slovak.
++++++ collection-langenglish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langenglish.tlpobj new/tlpkg/tlpobj/collection-langenglish.tlpobj
--- old/tlpkg/tlpobj/collection-langenglish.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langenglish.tlpobj 2020-04-12 01:55:23.000000000 +0200
@@ -1,12 +1,11 @@
name collection-langenglish
category Collection
-revision 46126
+revision 54689
shortdesc US and UK English
relocated 1
longdesc Support for, and documentation in, English.
depend collection-basic
depend hyphen-english
-depend FAQ-en
depend MemoirChapStyles
depend Type1fonts
depend amscls-doc
@@ -59,9 +58,11 @@
depend tamethebeast
depend tds
depend tex-font-errors-cheatsheet
+depend tex-nutshell
depend tex-overview
depend tex-refs
depend texbytopic
+depend texonly
depend titlepages
depend tlc2
depend undergradmath
++++++ collection-langeuropean.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langeuropean.tlpobj new/tlpkg/tlpobj/collection-langeuropean.tlpobj
--- old/tlpkg/tlpobj/collection-langeuropean.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langeuropean.tlpobj 2020-03-26 23:29:30.000000000 +0100
@@ -1,6 +1,6 @@
name collection-langeuropean
category Collection
-revision 46803
+revision 54568
shortdesc Other European languages
relocated 1
longdesc Support for a number of European languages; others (Greek,
@@ -52,6 +52,7 @@
depend hyphen-latin
depend hyphen-latvian
depend hyphen-lithuanian
+depend hyphen-macedonian
depend hyphen-norwegian
depend hyphen-occitan
depend hyphen-piedmontese
++++++ collection-langfrench.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langfrench.tlpobj new/tlpkg/tlpobj/collection-langfrench.tlpobj
--- old/tlpkg/tlpobj/collection-langfrench.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langfrench.tlpobj 2020-04-12 01:55:23.000000000 +0200
@@ -1,11 +1,13 @@
name collection-langfrench
category Collection
-revision 49728
+revision 54675
shortdesc French
relocated 1
longdesc Support for French and Basque.
depend collection-basic
depend aeguill
+depend annee-scolaire
+depend apprendre-a-programmer-en-tex
depend apprends-latex
depend babel-basque
depend babel-french
@@ -17,11 +19,11 @@
depend droit-fr
depend e-french
depend epslatex-fr
+depend expose-expl3-dunkerque-2019
depend facture
depend formation-latex-ul
depend frenchmath
depend frletter
-depend guide-latex-fr
depend hyphen-basque
depend hyphen-french
depend impatient-fr
++++++ collection-langgerman.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langgerman.tlpobj new/tlpkg/tlpobj/collection-langgerman.tlpobj
--- old/tlpkg/tlpobj/collection-langgerman.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langgerman.tlpobj 2020-03-04 23:50:30.000000000 +0100
@@ -1,6 +1,6 @@
name collection-langgerman
category Collection
-revision 48599
+revision 54074
shortdesc German
relocated 1
longdesc Support for German.
@@ -18,7 +18,6 @@
depend etdipa
depend etoolbox-de
depend fifinddo-info
-depend geometry-de
depend german
depend germbib
depend germkorr
@@ -38,6 +37,7 @@
depend milog
depend presentations
depend r_und_s
+depend schulmathematik
depend templates-fenn
depend templates-sommer
depend termcal-de
++++++ collection-langgreek.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langgreek.tlpobj new/tlpkg/tlpobj/collection-langgreek.tlpobj
--- old/tlpkg/tlpobj/collection-langgreek.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langgreek.tlpobj 2020-03-07 01:10:03.000000000 +0100
@@ -1,6 +1,6 @@
name collection-langgreek
category Collection
-revision 44192
+revision 54139
shortdesc Greek
relocated 1
longdesc Support for Greek.
@@ -8,7 +8,6 @@
depend babel-greek
depend begingreek
depend betababel
-depend bgreek
depend cbfonts
depend cbfonts-fd
depend gfsbaskerville
++++++ collection-langitalian.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langitalian.tlpobj new/tlpkg/tlpobj/collection-langitalian.tlpobj
--- old/tlpkg/tlpobj/collection-langitalian.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langitalian.tlpobj 2020-03-04 23:50:30.000000000 +0100
@@ -1,6 +1,6 @@
name collection-langitalian
category Collection
-revision 30372
+revision 54074
shortdesc Italian
relocated 1
longdesc Support for Italian.
@@ -21,3 +21,4 @@
depend lshort-italian
depend psfrag-italian
depend texlive-it
+depend verifica
++++++ collection-langjapanese.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langjapanese.tlpobj new/tlpkg/tlpobj/collection-langjapanese.tlpobj
--- old/tlpkg/tlpobj/collection-langjapanese.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langjapanese.tlpobj 2020-03-04 23:50:30.000000000 +0100
@@ -1,24 +1,28 @@
name collection-langjapanese
category Collection
-revision 49995
+revision 54074
shortdesc Japanese
relocated 1
-longdesc Support for Japanese; additional packages in
+longdesc Support for Japanese; additional packages are in
longdesc collection-langcjk.
depend collection-langcjk
depend ascmac
depend babel-japanese
depend bxbase
depend bxcjkjatype
+depend bxghost
depend bxjaholiday
depend bxjalipsum
depend bxjaprnind
+depend bxjatoucs
depend bxjscls
depend bxorigcapt
depend bxwareki
depend convbkmk
depend endnotesj
depend gentombow
+depend haranoaji
+depend haranoaji-extra
depend ifptex
depend ifxptex
depend ipaex
@@ -48,6 +52,7 @@
depend pxjodel
depend pxrubrica
depend pxufont
+depend texlive-ja
depend uplatex
depend uptex
depend uptex-base
++++++ collection-langkorean.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langkorean.tlpobj new/tlpkg/tlpobj/collection-langkorean.tlpobj
--- old/tlpkg/tlpobj/collection-langkorean.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langkorean.tlpobj 2020-03-04 23:50:31.000000000 +0100
@@ -1,6 +1,6 @@
name collection-langkorean
category Collection
-revision 42106
+revision 54074
shortdesc Korean
relocated 1
longdesc Support for Korean; additional packages in collection-langcjk.
@@ -13,6 +13,7 @@
depend kotex-utils
depend lshort-korean
depend nanumtype1
+depend pmhanguljamo
depend uhc
depend unfonts-core
depend unfonts-extra
++++++ collection-langother.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langother.tlpobj new/tlpkg/tlpobj/collection-langother.tlpobj
--- old/tlpkg/tlpobj/collection-langother.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langother.tlpobj 2020-03-09 00:28:36.000000000 +0100
@@ -1,11 +1,11 @@
name collection-langother
category Collection
-revision 46722
+revision 54191
shortdesc Other languages
relocated 1
longdesc Support for languages not otherwise listed, including Indic,
longdesc Thai, Vietnamese, Hebrew, Indonesian, African languages, and
-longdesc plenty more. The split is made simply on the basis of the size
+longdesc plenty more. The split is made simply on the basis of the size
longdesc of the support, to keep both collection sizes and the number of
longdesc collections reasonable.
depend collection-basic
@@ -45,14 +45,17 @@
depend hyphen-turkmen
depend latex-mr
depend latexbangla
+depend latino-sine-flexione
depend lshort-thai
depend lshort-vietnamese
depend ntheorem-vn
depend padauk
+depend quran-ur
depend sanskrit
depend sanskrit-t1
depend thaienum
depend thaispec
+depend unicode-alphabets
depend velthuis
depend vntex
depend wnri
++++++ collection-langpolish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langpolish.tlpobj new/tlpkg/tlpobj/collection-langpolish.tlpobj
--- old/tlpkg/tlpobj/collection-langpolish.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langpolish.tlpobj 2020-03-04 23:50:31.000000000 +0100
@@ -1,6 +1,6 @@
name collection-langpolish
category Collection
-revision 44371
+revision 54074
shortdesc Polish
relocated 1
longdesc Support for Polish.
++++++ collection-langportuguese.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langportuguese.tlpobj new/tlpkg/tlpobj/collection-langportuguese.tlpobj
--- old/tlpkg/tlpobj/collection-langportuguese.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langportuguese.tlpobj 2020-03-04 23:50:31.000000000 +0100
@@ -1,6 +1,6 @@
name collection-langportuguese
category Collection
-revision 47524
+revision 54074
shortdesc Portuguese
relocated 1
longdesc Support for Portuguese.
@@ -13,5 +13,6 @@
depend latex-via-exemplos
depend latexcheat-ptbr
depend lshort-portuguese
+depend numberpt
depend ordinalpt
depend xypic-tut-pt
++++++ collection-langspanish.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-langspanish.tlpobj new/tlpkg/tlpobj/collection-langspanish.tlpobj
--- old/tlpkg/tlpobj/collection-langspanish.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-langspanish.tlpobj 2020-03-07 01:10:03.000000000 +0100
@@ -1,13 +1,12 @@
name collection-langspanish
category Collection
-revision 40587
+revision 54141
shortdesc Spanish
relocated 1
longdesc Support for Spanish.
depend collection-basic
depend babel-catalan
depend babel-galician
-depend babel-spanglish
depend babel-spanish
depend es-tex-faq
depend hyphen-catalan
@@ -17,5 +16,4 @@
depend latex2e-help-texinfo-spanish
depend latexcheat-esmx
depend lshort-spanish
-depend spanish-mx
depend texlive-es
++++++ collection-latex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-latex.tlpobj new/tlpkg/tlpobj/collection-latex.tlpobj
--- old/tlpkg/tlpobj/collection-latex.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-latex.tlpobj 2020-03-04 23:50:31.000000000 +0100
@@ -1,6 +1,6 @@
name collection-latex
category Collection
-revision 41614
+revision 54074
shortdesc LaTeX fundamental packages
relocated 1
longdesc These packages are either mandated by the core LaTeX team, or
@@ -9,28 +9,52 @@
depend ae
depend amscls
depend amsmath
+depend atbegshi
+depend atveryend
+depend auxhook
depend babel
depend babel-english
depend babelbib
+depend bigintcalc
+depend bitset
+depend bookmark
depend carlisle
depend colortbl
+depend epstopdf-pkg
+depend etexcmds
depend fancyhdr
depend fix2col
depend geometry
+depend gettitlestring
depend graphics
depend graphics-cfg
+depend grfext
+depend hycolor
depend hyperref
+depend intcalc
+depend kvdefinekeys
+depend kvoptions
+depend kvsetkeys
+depend l3backend
+depend l3kernel
depend latex
depend latex-bin
depend latex-fonts
depend latexconfig
+depend letltxmacro
+depend ltxcmds
depend ltxmisc
depend mfnfss
depend mptopdf
depend natbib
depend oberdiek
+depend pdfescape
depend pslatex
depend psnfss
depend pspicture
+depend refcount
+depend rerunfilecheck
+depend stringenc
depend tools
+depend uniquecounter
depend url
++++++ collection-latexextra.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-latexextra.tlpobj new/tlpkg/tlpobj/collection-latexextra.tlpobj
--- old/tlpkg/tlpobj/collection-latexextra.tlpobj 2019-04-06 23:32:30.000000000 +0200
+++ new/tlpkg/tlpobj/collection-latexextra.tlpobj 2020-04-12 01:55:23.000000000 +0200
@@ -1,6 +1,6 @@
name collection-latexextra
category Collection
-revision 50814
+revision 54665
shortdesc LaTeX additional packages
relocated 1
longdesc A very large collection of add-on packages for LaTeX.
@@ -16,6 +16,8 @@
depend a5comb
depend abraces
depend abstract
+depend accessibility
+depend accsupp
depend achemso
depend acro
depend acronym
@@ -32,7 +34,7 @@
depend akletter
depend alertmessage
depend alnumsec
-depend alterqcm
+depend alphalph
depend altfont
depend amsaddr
depend animate
@@ -42,18 +44,23 @@
depend appendix
depend appendixnumberbeamer
depend apptools
+depend arabicfront
depend arcs
+depend arraycols
depend arrayjobx
depend arraysort
depend arydshln
depend asciilist
+depend askinclude
depend assignment
depend assoccnt
+depend atenddvi
depend attachfile
depend aurl
depend authoraftertitle
depend authorarchive
depend authorindex
+depend autofancyhdr
depend autonum
depend autopdf
depend avremu
@@ -66,6 +73,7 @@
depend beamer2thesis
depend beamer-rl
depend beameraudience
+depend beamerauxtheme
depend beamercolorthemeowl
depend beamerdarkthemes
depend beamerposter
@@ -82,10 +90,10 @@
depend beamertheme-upenn-bc
depend beamerthemejltree
depend beamerthemenirma
+depend bearwear
depend beton
depend bewerbung
depend bez123
-depend bezos
depend bhcexam
depend bibletext
depend bigfoot
@@ -133,6 +141,7 @@
depend carbohydrates
depend cases
depend casyl
+depend catchfile
depend catchfilebetweentags
depend catechis
depend catoptions
@@ -145,6 +154,7 @@
depend cellprops
depend cellspace
depend censor
+depend centeredline
depend changebar
depend changelayout
depend changelog
@@ -153,6 +163,7 @@
depend chappg
depend chapterfolder
depend cheatsheet
+depend checkend
depend chet
depend chextras
depend childdoc
@@ -161,6 +172,7 @@
depend chngcntr
depend chronology
depend circ
+depend circledsteps
depend classics
depend classpack
depend clefval
@@ -225,6 +237,7 @@
depend crossreftools
depend csquotes
depend css-colors
+depend csvmerge
depend csvsimple
depend cuisine
depend currency
@@ -308,6 +321,7 @@
depend documentation
depend doi
depend dotarrow
+depend dotlessi
depend dotseqn
depend download
depend dox
@@ -340,6 +354,7 @@
depend eemeir
depend efbox
depend egplot
+depend ehhline
depend elegantbook
depend elegantnote
depend elegantpaper
@@ -351,12 +366,14 @@
depend elzcards
depend emarks
depend embedall
+depend embedfile
depend embrac
depend emptypage
depend emulateapj
depend endfloat
depend endheads
depend endnotes
+depend endnotes-hy
depend engpron
depend engrec
depend enotez
@@ -376,6 +393,7 @@
depend erw-l3
depend esami
depend esdiff
+depend esindex
depend esint
depend esint-type1
depend etaremune
@@ -418,6 +436,7 @@
depend fbox
depend fcolumn
depend fetchcls
+depend fewerfloatpages
depend ffslides
depend fgruler
depend fibeamer
@@ -457,6 +476,8 @@
depend fnumprint
depend foilhtml
depend fontaxes
+depend fontsetup
+depend fontsize
depend fonttable
depend footmisc
depend footmisx
@@ -493,6 +514,7 @@
depend genmpage
depend getfiledate
depend getitems
+depend gindex
depend ginpenc
depend gitfile-info
depend gitinfo
@@ -516,6 +538,7 @@
depend glossaries-polish
depend glossaries-portuges
depend glossaries-serbian
+depend glossaries-slovene
depend glossaries-spanish
depend gmdoc
depend gmdoc-enhance
@@ -548,9 +571,11 @@
depend histogr
depend hitec
depend hletter
+depend hobsub
depend hpsdiss
depend hrefhide
depend hvindex
+depend hvqrurl
depend hypdvips
depend hyper
depend hyperbar
@@ -565,7 +590,6 @@
depend ifmtarg
depend ifnextok
depend ifoddpage
-depend ifplatform
depend ifthenx
depend iitem
depend image-gallery
@@ -575,6 +599,7 @@
depend indextools
depend inline-images
depend inlinedef
+depend inputenx
depend inputtrc
depend interactiveworkbook
depend interfaces
@@ -617,10 +642,16 @@
depend l3build
depend labbook
depend labels
+depend labels4easylist
depend labelschanged
depend lastpackage
depend lastpage
+depend latex-amsmath-dev
+depend latex-base-dev
+depend latex-bin-dev
+depend latex-graphics-dev
depend latex-tds
+depend latex-tools-dev
depend latex-uni8
depend latexcolors
depend latexdemo
@@ -647,6 +678,7 @@
depend lipsum
depend lisp-on-tex
depend listing
+depend listingsutf8
depend listlbls
depend listliketab
depend listofsymbols
@@ -669,7 +701,6 @@
depend ltabptch
depend ltxdockit
depend ltxguidex
-depend ltxindex
depend ltxkeys
depend ltxnew
depend ltxtools
@@ -677,7 +708,9 @@
depend luatodonotes
depend macroswap
depend magaz
+depend magicnum
depend makecookbook
+depend makerobust
depend mailing
depend mailmerge
depend makebarcode
@@ -696,7 +729,7 @@
depend marginfix
depend marginnote
depend markdown
-depend mathalfa
+depend mathalpha
depend mathastext
depend mathexam
depend mathfam256
@@ -708,6 +741,7 @@
depend mcite
depend mciteplus
depend mdframed
+depend media4svg
depend media9
depend medstarbeamer
depend meetingmins
@@ -717,6 +751,7 @@
depend menu
depend menukeys
depend metalogox
+depend metastr
depend method
depend metre
depend mfirstuc
@@ -732,6 +767,7 @@
depend minted
depend minutes
depend mla-paper
+depend mleftright
depend mlist
depend mmap
depend mnotes
@@ -845,6 +881,7 @@
depend paralist
depend paresse
depend parnotes
+depend parsa
depend parselines
depend pas-cours
depend pas-cv
@@ -857,11 +894,13 @@
depend pbox
depend pbsheet
depend pdf14
+depend pdfcolmk
depend pdfcomment
depend pdfcprot
depend pdfmarginpar
depend pdfoverlay
depend pdfpagediff
+depend pdfpc
depend pdfpc-movie
depend pdfprivacy
depend pdfreview
@@ -884,18 +923,22 @@
depend philex
depend phonenumbers
depend photo
+depend picture
depend piff
depend pkgloader
depend placeins
depend plantslabels
depend plates
depend plweb
+depend pmboxdraw
depend polynom
depend polynomial
depend polytable
depend postcards
depend poster-mac
+depend powerdot
depend ppr-prv
+depend practicalreports
depend preprint
depend pressrelease
depend prettyref
@@ -920,6 +963,7 @@
depend qstest
depend qsymbols
depend quicktype
+depend quiz2socrative
depend quotchap
depend quoting
depend quotmark
@@ -963,6 +1007,7 @@
depend roundbox
depend rterface
depend rtkinenc
+depend rulerbox
depend rulercompass
depend rvwrite
depend sanitize-umlaut
@@ -974,14 +1019,19 @@
depend scalebar
depend scalerel
depend scanpages
+depend schedule
+depend scontents
depend scrlttr2copy
+depend sdaps
depend sdrt
depend secdot
+depend secnum
depend sectionbox
depend sectionbreak
depend sectsty
depend seealso
depend selectp
+depend selinput
depend semantic
depend semantic-markup
depend semioneside
@@ -1024,6 +1074,9 @@
depend snapshot
depend snotez
depend soul
+depend soulpos
+depend soulutf8
+depend spacingtricks
depend spark-otf
depend sparklines
depend sphack
@@ -1050,6 +1103,7 @@
depend stubs
depend studenthandouts
depend subdepth
+depend subdocs
depend subeqn
depend subeqnarray
depend subfigmat
@@ -1133,6 +1187,7 @@
depend tocvsec2
depend todo
depend todonotes
+depend tokcycle
depend tokenizer
depend toolbox
depend topfloat
@@ -1140,6 +1195,7 @@
depend totcount
depend totpages
depend translations
+depend transparent
depend trfsigns
depend trimspaces
depend trivfloat
@@ -1190,6 +1246,7 @@
depend volumes
depend vpe
depend vruler
+depend vtable
depend vwcol
depend wallcalendar
depend wallpaper
@@ -1222,6 +1279,7 @@
depend xhfill
depend xifthen
depend xint
+depend xkcdcolors
depend xltabular
depend xmpincl
depend xnewcommand
@@ -1246,5 +1304,6 @@
depend zebra-goodies
depend zed-csp
depend ziffer
+depend zref
depend zwgetfdate
depend zwpagelayout
++++++ collection-latexrecommended.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-latexrecommended.tlpobj new/tlpkg/tlpobj/collection-latexrecommended.tlpobj
--- old/tlpkg/tlpobj/collection-latexrecommended.tlpobj 2019-03-24 02:24:09.000000000 +0100
+++ new/tlpkg/tlpobj/collection-latexrecommended.tlpobj 2020-03-04 23:50:31.000000000 +0100
@@ -1,12 +1,14 @@
name collection-latexrecommended
category Collection
-revision 50559
+revision 54074
shortdesc LaTeX recommended packages
relocated 1
longdesc A collection of recommended add-on packages for LaTeX which
-longdesc have widespread use.
+longdesc have widespread use, and the release candidate formats
+longdesc latex-dev, etc.
depend collection-latex
depend anysize
+depend attachfile2
depend beamer
depend booktabs
depend breqn
@@ -28,12 +30,14 @@
depend fontspec
depend footnotehyper
depend fp
+depend grffile
+depend hologo
depend index
+depend infwarerr
depend jknapltx
depend koma-script
depend latexbug
depend l3experimental
-depend l3kernel
depend l3packages
depend lineno
depend listings
@@ -45,12 +49,15 @@
depend metalogo
depend microtype
depend ms
+depend newfloat
depend ntgclass
depend parskip
+depend pdflscape
depend pdfpages
+depend pdftexcmds
depend polyglossia
-depend powerdot
depend psfrag
+depend ragged2e
depend rcs
depend sansmath
depend section
++++++ collection-luatex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-luatex.tlpobj new/tlpkg/tlpobj/collection-luatex.tlpobj
--- old/tlpkg/tlpobj/collection-luatex.tlpobj 2019-04-06 23:32:30.000000000 +0200
+++ new/tlpkg/tlpobj/collection-luatex.tlpobj 2020-04-15 01:54:41.000000000 +0200
@@ -1,25 +1,31 @@
name collection-luatex
category Collection
-revision 50788
+revision 54741
shortdesc LuaTeX packages
relocated 1
longdesc Packages for LuaTeX, a Unicode-aware extension of pdfTeX, using
longdesc Lua as an embedded scripting and extension language.
longdesc http://luatex.org/
depend collection-basic
+depend addliga
depend auto-pst-pdf-lua
+depend barracuda
depend bezierplot
depend checkcites
depend chickenize
depend combofont
depend cstypo
depend ctablestack
+depend emoji
+depend emojicite
depend enigma
depend interpreter
depend kanaparser
+depend lua-uca
+depend lua-ul
depend lua-visual-debug
-depend lua2dox
depend luacode
+depend luacolor
depend luahyphenrules
depend luaimageembed
depend luaindex
@@ -41,6 +47,8 @@
depend luaxml
depend nodetree
depend odsfile
+depend optex
+depend pdfarticle
depend placeat
depend plantuml
depend selnolig
++++++ collection-mathscience.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-mathscience.tlpobj new/tlpkg/tlpobj/collection-mathscience.tlpobj
--- old/tlpkg/tlpobj/collection-mathscience.tlpobj 2019-04-06 23:32:30.000000000 +0200
+++ new/tlpkg/tlpobj/collection-mathscience.tlpobj 2020-04-16 01:56:54.000000000 +0200
@@ -1,19 +1,20 @@
name collection-mathscience
category Collection
-revision 50760
+revision 54754
shortdesc Mathematics, natural sciences, computer science packages
relocated 1
-depend collection-fontsrecommended
-depend collection-latex
depend 12many
depend SIstyle
depend SIunits
+depend accents
depend alg
depend algobox
depend algorithm2e
depend algorithmicx
depend algorithms
+depend algxpar
depend aligned-overset
+depend amscdx
depend amstex
depend apxproof
depend autobreak
@@ -34,6 +35,7 @@
depend calculation
depend cascade
depend ccfonts
+depend ccool
depend chemarrow
depend chemcompounds
depend chemcono
@@ -42,11 +44,15 @@
depend chemgreek
depend chemmacros
depend chemnum
+depend chemplants
depend chemschemex
depend chemsec
depend chemstyle
depend clrscode
depend clrscode3e
+depend codeanatomy
+depend collection-fontsrecommended
+depend collection-latex
depend commath
depend complexity
depend computational-complexity
@@ -58,6 +64,7 @@
depend delim
depend delimseasy
depend delimset
+depend derivative
depend diffcoeff
depend digiconfigs
depend dijkstra
@@ -73,6 +80,7 @@
depend eqexpl
depend eqnarray
depend eqnnumwarn
+depend euclideangeometry
depend extarrows
depend extpfeil
depend faktor
@@ -84,6 +92,7 @@
depend gastex
depend gene-logic
depend ghsystem
+depend glosmathtools
depend gotoh
depend grundgesetze
depend gu
@@ -101,24 +110,29 @@
depend karnaugh-map
depend karnaughmap
depend kvmap
+depend letterswitharrows
+depend lie-hasse
depend logicproof
depend longdivision
depend lpform
depend lplfitch
depend lstbayes
+depend mathcommand
depend mathcomp
depend mathfixs
+depend mathlig
depend mathpartir
depend mathpunctspace
depend matlab-prettifier
+depend matrix-skeleton
depend mattens
depend memorygraphs
depend mgltex
depend mhchem
depend mhequ
depend miller
+depend mismath
depend multiobjective
-depend mychemistry
depend natded
depend nath
depend nicematrix
@@ -129,17 +143,23 @@
depend ot-tableau
depend oubraces
depend perfectcut
+depend physconst
depend physics
+depend physunits
+depend pinoutikz
depend pm-isomath
depend polexpr
depend prftree
depend proba
+depend proof-at-the-end
depend prooftrees
+depend pseudo
depend pseudocode
depend pythonhighlight
depend qsharp
depend rank-2-roots
depend rec-thy
+depend rest-api
depend revquantum
depend ribbonproofs
depend rmathbr
@@ -150,6 +170,7 @@
depend sesamanuel
depend sfg
depend shuffle
+depend simplebnf
depend simpler-wick
depend simplewick
depend siunitx
@@ -167,12 +188,14 @@
depend struktex
depend substances
depend subsupscripts
+depend subtext
depend susy
depend syllogism
depend sympytexpackage
depend synproof
depend t-angles
depend tablor
+depend tensind
depend tensor
depend tex-ewd
depend textgreek
@@ -186,4 +209,5 @@
depend xymtex
depend yhmath
depend youngtab
+depend yquant
depend ytableau
++++++ collection-music.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-music.tlpobj new/tlpkg/tlpobj/collection-music.tlpobj
--- old/tlpkg/tlpobj/collection-music.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-music.tlpobj 2020-04-12 01:55:23.000000000 +0200
@@ -1,6 +1,6 @@
name collection-music
category Collection
-revision 49621
+revision 54666
shortdesc Music packages
relocated 1
longdesc Music-related fonts and packages.
@@ -9,6 +9,8 @@
depend autosp
depend bagpipe
depend chordbars
+depend chordbox
+depend ddphonism
depend figbas
depend gchords
depend gregoriotex
@@ -22,6 +24,7 @@
depend lilyglyphs
depend lyluatex
depend m-tx
+depend musical
depend musicography
depend musixguit
depend musixtex
++++++ collection-pictures.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-pictures.tlpobj new/tlpkg/tlpobj/collection-pictures.tlpobj
--- old/tlpkg/tlpobj/collection-pictures.tlpobj 2019-04-06 23:32:30.000000000 +0200
+++ new/tlpkg/tlpobj/collection-pictures.tlpobj 2020-04-16 01:56:54.000000000 +0200
@@ -1,11 +1,10 @@
name collection-pictures
category Collection
-revision 50810
+revision 54750
shortdesc Graphics, pictures, diagrams
relocated 1
longdesc Including TikZ, pict, etc., but MetaPost and PStricks are
longdesc separate.
-depend collection-basic
depend adigraph
depend aobs-tikz
depend askmaps
@@ -27,8 +26,10 @@
depend callouts
depend celtic
depend chemfig
-depend combinedgraphics
+depend circuit-macros
depend circuitikz
+depend collection-basic
+depend combinedgraphics
depend curve
depend curve2e
depend curves
@@ -36,8 +37,9 @@
depend diagmac2
depend ditaa
depend doc-pictex
-depend dottex
depend dot2texi
+depend dottex
+depend dpcircling
depend dratex
depend drs
depend duotenzor
@@ -71,6 +73,7 @@
depend hobby
depend hvfloat
depend istgame
+depend kblocks
depend knitting
depend knittingpattern
depend ladder
@@ -102,6 +105,7 @@
depend pgfgantt
depend pgfkeyx
depend pgfmolbio
+depend pgfmorepages
depend pgfopts
depend pgfornament
depend pgfplots
@@ -118,8 +122,8 @@
depend ptolemaicastronomy
depend pxpgfmark
depend qcircuit
-depend quantikz
depend qrcode
+depend quantikz
depend randbild
depend randomwalk
depend realhats
@@ -127,11 +131,12 @@
depend rviewport
depend sa-tikz
depend schemabloc
-depend scsnowman
depend scratch
depend scratch3
+depend scsnowman
depend setdeck
depend signchart
+depend simpleoptics
depend smartdiagram
depend spath3
depend spectralsequences
@@ -139,7 +144,6 @@
depend table-fct
depend texdraw
depend ticollege
-depend tipfr
depend tikz-3dplot
depend tikz-bayesnet
depend tikz-cd
@@ -159,10 +163,12 @@
depend tikz-optics
depend tikz-page
depend tikz-palattice
+depend tikz-planets
depend tikz-qtree
depend tikz-relay
depend tikz-sfc
depend tikz-timing
+depend tikz-trackschematic
depend tikz-truchet
depend tikzcodeblocks
depend tikzducks
@@ -172,23 +178,20 @@
depend tikzmarmots
depend tikzorbital
depend tikzpagenodes
-depend tikzpfeile
depend tikzpeople
+depend tikzpfeile
depend tikzposter
depend tikzscale
depend tikzsymbols
depend timing-diagrams
-depend tqft
+depend tipfr
depend tkz-base
-depend tkz-berge
depend tkz-doc
depend tkz-euclide
depend tkz-fct
-depend tkz-graph
-depend tkz-kiviat
-depend tkz-linknodes
depend tkz-orm
depend tkz-tab
+depend tqft
depend tsemlines
depend tufte-latex
depend venndiagram
++++++ collection-plaingeneric.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-plaingeneric.tlpobj new/tlpkg/tlpobj/collection-plaingeneric.tlpobj
--- old/tlpkg/tlpobj/collection-plaingeneric.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-plaingeneric.tlpobj 2020-04-15 01:54:41.000000000 +0200
@@ -1,6 +1,6 @@
name collection-plaingeneric
category Collection
-revision 50044
+revision 54723
shortdesc Plain (La)TeX packages
relocated 1
longdesc Add-on packages and macros that work with plain TeX, often
@@ -17,6 +17,7 @@
depend catcodes
depend chronosys
depend colorsep
+depend compare
depend cweb-old
depend dinat
depend dirtree
@@ -27,6 +28,9 @@
depend epigram
depend epsf
depend epsf-dvipdfmx
+depend expkv
+depend expkv-cs
+depend expkv-def
depend fenixpar
depend figflow
depend fixpdfmag
@@ -36,7 +40,6 @@
depend fontch
depend fontname
depend gates
-depend genmisc
depend getoptk
depend gfnotation
depend gobble
@@ -44,14 +47,13 @@
depend gtl
depend hlist
depend hyplain
-depend ifetex
-depend iftex
depend insbox
depend js-misc
depend kastrup
depend lambda-lists
depend langcode
depend lecturer
+depend letterspacing
depend librarian
depend listofitems
depend mathdots
@@ -62,8 +64,10 @@
depend multido
depend navigator
depend newsletr
+depend nth
depend ofs
depend olsak-misc
+depend outerhbox
depend path
depend pdf-trans
depend pitex
@@ -74,11 +78,14 @@
depend plstmary
depend poormanlog
depend present
+depend random
depend randomlist
depend resumemac
+depend ruler
depend schemata
depend shade
depend simplekv
+depend swrule
depend systeme
depend tabto-generic
depend termmenu
++++++ collection-pstricks.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-pstricks.tlpobj new/tlpkg/tlpobj/collection-pstricks.tlpobj
--- old/tlpkg/tlpobj/collection-pstricks.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-pstricks.tlpobj 2020-03-22 01:54:55.000000000 +0100
@@ -1,6 +1,6 @@
name collection-pstricks
category Collection
-revision 49316
+revision 54455
shortdesc PSTricks
relocated 1
longdesc PSTricks core and all add-on packages.
@@ -96,20 +96,19 @@
depend pst-soroban
depend pst-spectra
depend pst-spinner
-depend pst-spirograph
depend pst-stru
depend pst-support
depend pst-text
depend pst-thick
depend pst-tools
depend pst-tree
+depend pst-turtle
depend pst-tvz
depend pst-uml
depend pst-vectorian
depend pst-vehicle
depend pst-venn
depend pst-vowel
-depend pst-vue3d
depend pst2pdf
depend pstricks
depend pstricks-add
++++++ collection-publishers.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-publishers.tlpobj new/tlpkg/tlpobj/collection-publishers.tlpobj
--- old/tlpkg/tlpobj/collection-publishers.tlpobj 2019-04-06 23:32:30.000000000 +0200
+++ new/tlpkg/tlpobj/collection-publishers.tlpobj 2020-03-20 18:32:42.000000000 +0100
@@ -1,6 +1,6 @@
name collection-publishers
category Collection
-revision 50819
+revision 54407
shortdesc Publisher styles, theses, etc.
relocated 1
depend collection-latex
@@ -23,11 +23,13 @@
depend apa
depend apa6
depend apa6e
+depend apa7
depend arsclassica
depend articleingud
depend asaetr
depend ascelike
depend asmeconf
+depend asmejour
depend aucklandthesis
depend bangorcsthesis
depend bangorexam
@@ -39,6 +41,7 @@
depend br-lex
depend brandeis-dissertation
depend brandeis-problemset
+depend brandeis-thesis
depend cascadilla
depend cesenaexam
depend chem-journal
@@ -81,8 +84,12 @@
depend hagenberg-thesis
depend har2nat
depend hecthese
+depend hep-paper
depend hithesis
+depend hitszthesis
+depend hitszbeamer
depend hobete
+depend hu-berlin-bundle
depend hustthesis
depend icsv
depend ieeepes
@@ -90,6 +97,7 @@
depend ijsra
depend imac
depend imtekda
+depend inkpaper
depend iodhbwm
depend iscram
depend jacow
@@ -101,6 +109,7 @@
depend ksp-thesis
depend ku-template
depend langsci
+depend langsci-avm
depend limecv
depend lion-msc
depend llncsconf
@@ -110,6 +119,7 @@
depend matc3mem
depend mcmthesis
depend mentis
+depend mlacls
depend mnras
depend modeles-factures-belges-assocs
depend msu-thesis
@@ -133,12 +143,14 @@
depend philosophersimprint
depend pittetd
depend pkuthss
-depend powerdot-FUBerlin
+depend powerdot-fuberlin
depend powerdot-tuliplab
depend pracjourn
depend procIAGssymp
depend proposal
+depend prtec
depend ptptex
+depend quantumarticle
depend resphilosophica
depend resumecls
depend revtex
@@ -154,6 +166,7 @@
depend sduthesis
depend seuthesis
depend seuthesix
+depend shortmathj
depend soton
depend sphdthesis
depend spie
@@ -170,12 +183,14 @@
depend thesis-gwu
depend thesis-qom
depend thesis-titlepage-fhac
+depend thuaslogos
depend thucoursework
depend thuthesis
depend timbreicmc
depend tlc-article
depend topletter
depend toptesi
+depend tuda-ci
depend tudscr
depend tugboat
depend tugboat-plain
@@ -197,10 +212,13 @@
depend umbclegislation
depend umthesis
depend umich-thesis
+depend unam-thesis
depend unamth-template
depend unamthesis
+depend unifith
depend unitn-bimrep
depend univie-ling
+depend unizgklasa
depend unswcover
depend uothesis
depend urcls
@@ -214,4 +232,5 @@
depend xduthesis
depend wsemclassic
depend yathesis
+depend yazd-thesis
depend york-thesis
++++++ collection-xetex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/collection-xetex.tlpobj new/tlpkg/tlpobj/collection-xetex.tlpobj
--- old/tlpkg/tlpobj/collection-xetex.tlpobj 2019-02-28 03:27:54.000000000 +0100
+++ new/tlpkg/tlpobj/collection-xetex.tlpobj 2020-03-04 23:50:31.000000000 +0100
@@ -1,6 +1,6 @@
name collection-xetex
category Collection
-revision 49732
+revision 54074
shortdesc XeTeX and packages
relocated 1
longdesc Packages for XeTeX, the Unicode/OpenType-enabled TeX by
@@ -38,6 +38,7 @@
depend xecolor
depend xecyr
depend xeindex
+depend xelatex-dev
depend xesearch
depend xespotcolor
depend xetex
++++++ scheme-basic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scheme-basic.tlpobj new/tlpkg/tlpobj/scheme-basic.tlpobj
--- old/tlpkg/tlpobj/scheme-basic.tlpobj 2019-02-28 04:04:53.000000000 +0100
+++ new/tlpkg/tlpobj/scheme-basic.tlpobj 2020-03-09 00:29:05.000000000 +0100
@@ -1,11 +1,11 @@
name scheme-basic
category Scheme
-revision 25923
+revision 54191
shortdesc basic scheme (plain and latex)
relocated 1
longdesc This is the basic TeX Live scheme: it is a small set of files
longdesc sufficient to typeset plain TeX or LaTeX documents in
-longdesc PostScript or PDF, using the Computer Modern fonts. This
-longdesc scheme corresponds to collection-basic and collection-latex.
+longdesc PostScript or PDF, using the Computer Modern fonts. This scheme
+longdesc corresponds to collection-basic and collection-latex.
depend collection-basic
depend collection-latex
++++++ scheme-context.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scheme-context.tlpobj new/tlpkg/tlpobj/scheme-context.tlpobj
--- old/tlpkg/tlpobj/scheme-context.tlpobj 2019-03-02 02:26:09.000000000 +0100
+++ new/tlpkg/tlpobj/scheme-context.tlpobj 2020-03-04 23:53:46.000000000 +0100
@@ -1,6 +1,6 @@
name scheme-context
category Scheme
-revision 50183
+revision 54074
shortdesc ConTeXt scheme
relocated 1
longdesc This is the TeX Live scheme for installing ConTeXt.
++++++ scheme-full.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scheme-full.tlpobj new/tlpkg/tlpobj/scheme-full.tlpobj
--- old/tlpkg/tlpobj/scheme-full.tlpobj 2019-02-28 04:04:53.000000000 +0100
+++ new/tlpkg/tlpobj/scheme-full.tlpobj 2020-03-04 23:53:46.000000000 +0100
@@ -1,6 +1,6 @@
name scheme-full
category Scheme
-revision 44177
+revision 54074
shortdesc full scheme (everything)
relocated 1
longdesc This is the full TeX Live scheme: it installs everything
++++++ scheme-gust.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scheme-gust.tlpobj new/tlpkg/tlpobj/scheme-gust.tlpobj
--- old/tlpkg/tlpobj/scheme-gust.tlpobj 2019-02-28 04:04:53.000000000 +0100
+++ new/tlpkg/tlpobj/scheme-gust.tlpobj 2020-03-04 23:53:46.000000000 +0100
@@ -1,12 +1,11 @@
name scheme-gust
category Scheme
-revision 44177
+revision 54074
shortdesc GUST TeX Live scheme
relocated 1
longdesc This is the GUST TeX Live scheme: it is a set of files
longdesc sufficient to typeset Polish plain TeX, LaTeX and ConTeXt
longdesc documents in PostScript or PDF.
-depend FAQ-en
depend Type1fonts
depend amslatex-primer
depend amstex
++++++ scheme-infraonly.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scheme-infraonly.tlpobj new/tlpkg/tlpobj/scheme-infraonly.tlpobj
--- old/tlpkg/tlpobj/scheme-infraonly.tlpobj 2019-02-28 04:04:53.000000000 +0100
+++ new/tlpkg/tlpobj/scheme-infraonly.tlpobj 2020-03-09 00:29:05.000000000 +0100
@@ -1,13 +1,13 @@
name scheme-infraonly
category Scheme
-revision 41515
+revision 54191
shortdesc infrastructure-only scheme (no TeX at all)
relocated 1
longdesc This is the TeX Live scheme for infrastructure only, with no
-longdesc TeX engines at all. It is useful for automated testing, where
+longdesc TeX engines at all. It is useful for automated testing, where
longdesc the actual programs and packages to be tested are installed
longdesc separately afterwards, with tlmgr install.
depend texlive.infra
depend kpathsea
depend hyphen-base
-depend tetex
+depend texlive-scripts
++++++ scheme-medium.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scheme-medium.tlpobj new/tlpkg/tlpobj/scheme-medium.tlpobj
--- old/tlpkg/tlpobj/scheme-medium.tlpobj 2019-02-28 04:04:53.000000000 +0100
+++ new/tlpkg/tlpobj/scheme-medium.tlpobj 2020-03-04 23:53:46.000000000 +0100
@@ -1,6 +1,6 @@
name scheme-medium
category Scheme
-revision 44177
+revision 54074
shortdesc medium scheme (small + more packages and languages)
relocated 1
longdesc This is the medium TeX Live collection: it contains plain TeX,
++++++ scheme-minimal.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scheme-minimal.tlpobj new/tlpkg/tlpobj/scheme-minimal.tlpobj
--- old/tlpkg/tlpobj/scheme-minimal.tlpobj 2019-02-28 04:04:53.000000000 +0100
+++ new/tlpkg/tlpobj/scheme-minimal.tlpobj 2020-03-09 00:29:05.000000000 +0100
@@ -1,10 +1,10 @@
name scheme-minimal
category Scheme
-revision 13822
+revision 54191
shortdesc minimal scheme (plain only)
relocated 1
longdesc This is the minimal TeX Live scheme, with support for only
-longdesc plain TeX. (No LaTeX macros.) LuaTeX is included because Lua
-longdesc scripts are used in TeX Live infrastructure. This scheme
+longdesc plain TeX. (No LaTeX macros.) LuaTeX is included because Lua
+longdesc scripts are used in TeX Live infrastructure. This scheme
longdesc corresponds exactly to collection-basic.
depend collection-basic
++++++ scheme-small.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scheme-small.tlpobj new/tlpkg/tlpobj/scheme-small.tlpobj
--- old/tlpkg/tlpobj/scheme-small.tlpobj 2019-02-28 04:04:53.000000000 +0100
+++ new/tlpkg/tlpobj/scheme-small.tlpobj 2020-03-09 00:29:05.000000000 +0100
@@ -1,10 +1,10 @@
name scheme-small
category Scheme
-revision 41825
+revision 54191
shortdesc small scheme (basic + xetex, metapost, a few languages)
relocated 1
longdesc This is a small TeX Live scheme, corresponding to MacTeX's
-longdesc BasicTeX variant. It adds XeTeX, MetaPost, various
+longdesc BasicTeX variant. It adds XeTeX, MetaPost, various
longdesc hyphenations, and some recommended packages to scheme-basic.
depend collection-basic
depend collection-latex
++++++ scheme-tetex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scheme-tetex.tlpobj new/tlpkg/tlpobj/scheme-tetex.tlpobj
--- old/tlpkg/tlpobj/scheme-tetex.tlpobj 2019-02-28 04:04:53.000000000 +0100
+++ new/tlpkg/tlpobj/scheme-tetex.tlpobj 2020-03-04 23:53:46.000000000 +0100
@@ -1,11 +1,10 @@
name scheme-tetex
category Scheme
-revision 44187
+revision 54074
shortdesc teTeX scheme (more than medium, but nowhere near full)
relocated 1
longdesc TeX Live scheme nearly equivalent to the teTeX distribution
longdesc that was maintained by Thomas Esser.
-depend FAQ-en
depend SIunits
depend acronym
depend amslatex-primer
@@ -21,7 +20,6 @@
depend dvidvi
depend dviljk
depend patgen
-depend pdftools
depend seetexk
depend tie
depend web
@@ -41,6 +39,7 @@
depend tamethebeast
depend tds
depend tex-refs
+depend xpdfopen
depend collection-basic
depend collection-context
depend collection-fontsrecommended
++++++ update.texlive ++++++
--- /var/tmp/diff_new_pack.8ysSkT/_old 2020-05-29 21:19:21.439415511 +0200
+++ /var/tmp/diff_new_pack.8ysSkT/_new 2020-05-29 21:19:21.443415523 +0200
@@ -134,6 +134,14 @@
fi
#
+# Check for scriplets
+#
+for run in /var/run/texlive/scriptlets/* ; do
+ test -e "$run" || break
+ bash $run < /dev/null 1>&4 2>&4
+done
+
+#
# Language and hyphenation setup
#
cnf_ldat=$(TEXMF=$TEXMFSYSCONFIG kpsewhich language.dat 2> /dev/null)
1
0
Hello community,
here is the log from the commit of package libqt5-qtxmlpatterns for openSUSE:Factory checked in at 2020-05-29 21:15:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtxmlpatterns (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtxmlpatterns.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtxmlpatterns"
Fri May 29 21:15:52 2020 rev:41 rq:809461 version:5.15.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtxmlpatterns/libqt5-qtxmlpatterns.changes 2020-01-30 09:40:47.941470783 +0100
+++ /work/SRC/openSUSE:Factory/.libqt5-qtxmlpatterns.new.3606/libqt5-qtxmlpatterns.changes 2020-05-29 21:18:35.151276000 +0200
@@ -1,0 +2,56 @@
+Tue May 26 11:35:30 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com>
+
+- Update to version 5.15.0:
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed May 20 17:05:28 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com>
+
+- Update to version 5.15.0-rc2:
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed May 6 11:43:28 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-rc:
+ * New bugfix release
+ * For the changes between 5.14.2 and 5.15.0 please see:
+ http://code.qt.io/cgit/qt/qtxmlpatterns.git/plain/dist/changes-5.15.0/?h=5.…
+
+-------------------------------------------------------------------
+Fri Apr 24 07:11:45 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta4:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Tue Apr 14 06:48:02 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta3:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Tue Mar 24 12:14:10 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta2:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Fri Feb 28 09:59:28 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta1:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed Feb 19 10:17:04 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-alpha:
+ * New feature release
+ * For more details please see:
+ https://wiki.qt.io/New_Features_in_Qt_5.15
+
+-------------------------------------------------------------------
Old:
----
qtxmlpatterns-everywhere-src-5.14.1.tar.xz
New:
----
qtxmlpatterns-everywhere-src-5.15.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtxmlpatterns.spec ++++++
--- /var/tmp/diff_new_pack.n2BhpK/_old 2020-05-29 21:18:36.147279002 +0200
+++ /var/tmp/diff_new_pack.n2BhpK/_new 2020-05-29 21:18:36.147279002 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtxmlpatterns
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,11 +19,11 @@
%define qt5_snapshot 0
%define libname libQt5XmlPatterns5
%define base_name libqt5
-%define real_version 5.14.1
-%define so_version 5.14.1
-%define tar_version qtxmlpatterns-everywhere-src-5.14.1
+%define real_version 5.15.0
+%define so_version 5.15.0
+%define tar_version qtxmlpatterns-everywhere-src-5.15.0
Name: libqt5-qtxmlpatterns
-Version: 5.14.1
+Version: 5.15.0
Release: 0
Summary: Qt 5 XmlPatterns Library
# Legal:
@@ -32,7 +32,7 @@
License: (LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)) AND GPL-3.0-only WITH Qt-GPL-exception-1.0
Group: Development/Libraries/X11
URL: https://www.qt.io
-Source: https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules…
+Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules…
Source1: baselibs.conf
BuildRequires: libQt5Core-private-headers-devel >= %{version}
BuildRequires: libqt5-qtbase-devel >= %{version}
++++++ qtxmlpatterns-everywhere-src-5.14.1.tar.xz -> qtxmlpatterns-everywhere-src-5.15.0.tar.xz ++++++
++++ 18949 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package libqt5-qtx11extras for openSUSE:Factory checked in at 2020-05-29 21:15:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtx11extras (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtx11extras"
Fri May 29 21:15:49 2020 rev:39 rq:809433 version:5.15.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtx11extras/libqt5-qtx11extras.changes 2020-01-30 09:40:46.353469932 +0100
+++ /work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new.3606/libqt5-qtx11extras.changes 2020-05-29 21:18:30.883263136 +0200
@@ -1,0 +2,56 @@
+Tue May 26 11:34:51 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com>
+
+- Update to version 5.15.0:
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed May 20 17:04:21 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com>
+
+- Update to version 5.15.0-rc2:
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed May 6 11:43:25 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-rc:
+ * New bugfix release
+ * For the changes between 5.14.2 and 5.15.0 please see:
+ http://code.qt.io/cgit/qt/qtx11extras.git/plain/dist/changes-5.15.0/?h=5.15…
+
+-------------------------------------------------------------------
+Fri Apr 24 07:11:44 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta4:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Tue Apr 14 06:48:01 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta3:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Tue Mar 24 12:14:09 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta2:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Fri Feb 28 09:59:27 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta1:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed Feb 19 10:17:03 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-alpha:
+ * New feature release
+ * For more details please see:
+ https://wiki.qt.io/New_Features_in_Qt_5.15
+
+-------------------------------------------------------------------
Old:
----
qtx11extras-everywhere-src-5.14.1.tar.xz
New:
----
qtx11extras-everywhere-src-5.15.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtx11extras.spec ++++++
--- /var/tmp/diff_new_pack.W7P3H8/_old 2020-05-29 21:18:33.731271720 +0200
+++ /var/tmp/diff_new_pack.W7P3H8/_new 2020-05-29 21:18:33.731271720 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtx11extras
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,17 +19,17 @@
%define qt5_snapshot 0
%define libname libQt5X11Extras5
%define base_name libqt5
-%define real_version 5.14.1
-%define so_version 5.14.1
-%define tar_version qtx11extras-everywhere-src-5.14.1
+%define real_version 5.15.0
+%define so_version 5.15.0
+%define tar_version qtx11extras-everywhere-src-5.15.0
Name: libqt5-qtx11extras
-Version: 5.14.1
+Version: 5.15.0
Release: 0
Summary: Qt 5 X11 Extras Addon
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
Group: Development/Libraries/X11
URL: https://www.qt.io
-Source: https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules…
+Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules…
Source1: baselibs.conf
BuildRequires: fdupes
BuildRequires: libQt5Gui-private-headers-devel >= %{version}
++++++ qtx11extras-everywhere-src-5.14.1.tar.xz -> qtx11extras-everywhere-src-5.15.0.tar.xz ++++++
++++ 8255 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package libqt5-qtwebview for openSUSE:Factory checked in at 2020-05-29 21:15:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebview (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebview.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebview"
Fri May 29 21:15:44 2020 rev:15 rq:809432 version:5.15.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebview/libqt5-qtwebview.changes 2020-01-31 23:55:56.719609741 +0100
+++ /work/SRC/openSUSE:Factory/.libqt5-qtwebview.new.3606/libqt5-qtwebview.changes 2020-05-29 21:18:21.971236275 +0200
@@ -1,0 +2,56 @@
+Tue May 26 11:34:06 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com>
+
+- Update to version 5.15.0:
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed May 20 17:03:28 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com>
+
+- Update to version 5.15.0-rc2:
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed May 6 11:43:22 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-rc:
+ * New bugfix release
+ * For the changes between 5.14.2 and 5.15.0 please see:
+ http://code.qt.io/cgit/qt/qtwebview.git/plain/dist/changes-5.15.0/?h=5.15.0
+
+-------------------------------------------------------------------
+Fri Apr 24 07:11:44 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta4:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Tue Apr 14 06:48:01 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta3:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Tue Mar 24 12:14:08 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta2:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Fri Feb 28 09:59:26 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta1:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed Feb 19 10:17:02 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-alpha:
+ * New feature release
+ * For more details please see:
+ https://wiki.qt.io/New_Features_in_Qt_5.15
+
+-------------------------------------------------------------------
Old:
----
qtwebview-everywhere-src-5.14.1.tar.xz
New:
----
qtwebview-everywhere-src-5.15.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebview.spec ++++++
--- /var/tmp/diff_new_pack.d3oj3M/_old 2020-05-29 21:18:24.039242508 +0200
+++ /var/tmp/diff_new_pack.d3oj3M/_new 2020-05-29 21:18:24.043242520 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtwebview
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,17 +19,17 @@
%define qt5_snapshot 0
%define libname libQt5WebView5
%define base_name libqt5
-%define real_version 5.14.1
-%define so_version 5.14.1
-%define tar_version qtwebview-everywhere-src-5.14.1
+%define real_version 5.15.0
+%define so_version 5.15.0
+%define tar_version qtwebview-everywhere-src-5.15.0
Name: libqt5-qtwebview
-Version: 5.14.1
+Version: 5.15.0
Release: 0
Summary: Qt 5 WebView Library
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
Group: Development/Libraries/X11
URL: https://www.qt.io
-Source: https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules…
+Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules…
BuildRequires: libQt5Core-private-headers-devel >= %{version}
BuildRequires: libqt5-qtwebengine-private-headers-devel >= %{version}
BuildRequires: pkgconfig
++++++ qtwebview-everywhere-src-5.14.1.tar.xz -> qtwebview-everywhere-src-5.15.0.tar.xz ++++++
++++ 8563 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package libqt5-qtwebsockets for openSUSE:Factory checked in at 2020-05-29 21:15:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebsockets (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebsockets"
Fri May 29 21:15:41 2020 rev:34 rq:809431 version:5.15.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebsockets/libqt5-qtwebsockets.changes 2020-01-30 09:40:45.425469436 +0100
+++ /work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new.3606/libqt5-qtwebsockets.changes 2020-05-29 21:18:16.663220277 +0200
@@ -1,0 +2,56 @@
+Tue May 26 11:32:32 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com>
+
+- Update to version 5.15.0:
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed May 20 17:02:30 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com>
+
+- Update to version 5.15.0-rc2:
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed May 6 11:43:20 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-rc:
+ * New bugfix release
+ * For the changes between 5.14.2 and 5.15.0 please see:
+ http://code.qt.io/cgit/qt/qtwebsockets.git/plain/dist/changes-5.15.0/?h=5.1…
+
+-------------------------------------------------------------------
+Fri Apr 24 07:11:43 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta4:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Tue Apr 14 06:48:00 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta3:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Tue Mar 24 12:14:07 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta2:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Fri Feb 28 09:59:25 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta1:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed Feb 19 10:17:01 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-alpha:
+ * New feature release
+ * For more details please see:
+ https://wiki.qt.io/New_Features_in_Qt_5.15
+
+-------------------------------------------------------------------
Old:
----
qtwebsockets-everywhere-src-5.14.1.tar.xz
New:
----
qtwebsockets-everywhere-src-5.15.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebsockets.spec ++++++
--- /var/tmp/diff_new_pack.sqkq49/_old 2020-05-29 21:18:18.851226872 +0200
+++ /var/tmp/diff_new_pack.sqkq49/_new 2020-05-29 21:18:18.855226884 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtwebsockets
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,17 +19,17 @@
%define qt5_snapshot 0
%define libname libQt5WebSockets5
%define base_name libqt5
-%define real_version 5.14.1
-%define so_version 5.14.1
-%define tar_version qtwebsockets-everywhere-src-5.14.1
+%define real_version 5.15.0
+%define so_version 5.15.0
+%define tar_version qtwebsockets-everywhere-src-5.15.0
Name: libqt5-qtwebsockets
-Version: 5.14.1
+Version: 5.15.0
Release: 0
Summary: Qt 5 WebSockets Library
License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
Group: Development/Libraries/X11
URL: https://www.qt.io
-Source: https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules…
+Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules…
Source1: baselibs.conf
BuildRequires: libQt5Core-private-headers-devel >= %{version}
BuildRequires: pkgconfig
++++++ qtwebsockets-everywhere-src-5.14.1.tar.xz -> qtwebsockets-everywhere-src-5.15.0.tar.xz ++++++
++++ 9477 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package libqt5-qtwebengine for openSUSE:Factory checked in at 2020-05-29 21:15:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebengine (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebengine"
Fri May 29 21:15:37 2020 rev:59 rq:809430 version:5.15.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebengine/libqt5-qtwebengine.changes 2020-04-27 23:30:47.278634301 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new.3606/libqt5-qtwebengine.changes 2020-05-29 21:17:47.887133545 +0200
@@ -1,0 +2,28 @@
+Wed May 27 08:47:23 UTC 2020 - Fabian Vogt <fvogt(a)suse.com>
+
+- Can't use system VPX on Leap 15.2
+
+-------------------------------------------------------------------
+Tue May 26 11:27:19 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com>
+
+- Update to version 5.15.0:
+ * No changelog available
+
+-------------------------------------------------------------------
+Thu May 21 10:35:41 UTC 2020 - Callum Farmer <callumjfarmer13(a)gmail.com>
+
+- Update to version 5.15.0-rc2:
+ * No changelog available
+ * Removed some-more-includes-gcc10.patch: contained in upstream
+
+-------------------------------------------------------------------
+Wed May 6 11:43:17 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-rc:
+ * New bugfix release
+ * For the changes between 5.14.2 and 5.15.0 please see:
+ http://code.qt.io/cgit/qt/qtwebengine.git/plain/dist/changes-5.15.0/?h=5.15…
+- Drop patches, now upstream:
+ * QTBUG-82186.patch
+
+-------------------------------------------------------------------
@@ -5,0 +34,17 @@
+- Rebase icu-v67.patch on 5.15.0-beta4
+
+-------------------------------------------------------------------
+Fri Apr 24 07:11:42 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta4:
+ * New bugfix release
+ * No changelog available
+- Refresh QTBUG-82186.patch
+
+-------------------------------------------------------------------
+Tue Apr 14 06:47:59 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta3:
+ * New bugfix release
+ * No changelog available
+- Refresh fix1163766.patch
@@ -18,0 +64,17 @@
+Tue Mar 24 12:14:06 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta2:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Fri Feb 28 09:59:24 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-beta1:
+ * New bugfix release
+ * No changelog available
+- Drop patches, now upstream:
+ * fix-missing-designerplugin.patch
+ * QTBUG-81574.patch
+
+-------------------------------------------------------------------
@@ -28,0 +91,13 @@
+
+-------------------------------------------------------------------
+Wed Feb 19 10:17:00 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de>
+
+- Update to 5.15.0-alpha:
+ * New feature release
+ * For more details please see:
+ https://wiki.qt.io/New_Features_in_Qt_5.15
+- Add patch to fix building the designer plugin:
+ * fix-missing-designerplugin.patch
+- Move designer plugin into -devel subpackage
+- Add packages for new Qt PDF module (which is technically separate
+ from WebEngine, but shares the source tarball)
Old:
----
QTBUG-81574.patch
QTBUG-82186.patch
qtwebengine-everywhere-src-5.14.1.tar.xz
some-more-includes-gcc10.patch
New:
----
qtwebengine-everywhere-src-5.15.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebengine.spec ++++++
--- /var/tmp/diff_new_pack.F06hmQ/_old 2020-05-29 21:18:06.591189920 +0200
+++ /var/tmp/diff_new_pack.F06hmQ/_new 2020-05-29 21:18:06.595189932 +0200
@@ -20,49 +20,35 @@
%define qt5_snapshot 0
%if %{?suse_version} > 1500 || 0%{?sle_version} > 150100
-%bcond_without system_vpx
-%else
-%bcond_with system_vpx
-%endif
-%if 0%{?suse_version} > 1500
-# Needs ICU >= 63
+%bcond_without system_harfbuzz
%bcond_without system_icu
%else
+%bcond_with system_harfbuzz
%bcond_with system_icu
%endif
-%if %{?suse_version} >= 1330 || (0%{?is_opensuse} && 0%{?sle_version} >= 120200)
-%bcond_without system_ffmpeg
+%if %{?suse_version} > 1500 || 0%{?sle_version} > 150200
+%bcond_without system_vpx
%else
-%bcond_with system_ffmpeg
+%bcond_with system_vpx
%endif
-%if %{?suse_version} >= 1320 || (0%{?suse_version} == 1315 && 0%{?sle_version} >= 120200)
+%bcond_without system_ffmpeg
%bcond_without system_minizip
-%else
-%bcond_with system_minizip
-%endif
-# Not even in Tumbleweed as of 2019-03-22
-%bcond_with system_harfbuzz
-# This is just overall condition to contain everything we can't provide on SLE12
-%if 0%{?suse_version} >= 1320 || 0%{?is_opensuse}
-%bcond_with sle_bundles
-%else
-%bcond_without sle_bundles
-%endif
+
# spellchecking dictionary directory
%global _qtwebengine_dictionaries_dir %{_libqt5_datadir}/qtwebengine_dictionaries
Name: libqt5-qtwebengine
-Version: 5.14.1
+Version: 5.15.0
Release: 0
Summary: Qt 5 WebEngine Library
License: LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
Group: Development/Libraries/X11
URL: https://www.qt.io
%define base_name libqt5
-%define real_version 5.14.1
-%define so_version 5.14.1
-%define tar_version qtwebengine-everywhere-src-5.14.1
-Source: https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules…
+%define real_version 5.15.0
+%define so_version 5.15.0
+%define tar_version qtwebengine-everywhere-src-5.15.0
+Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules…
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM armv6-ffmpeg-no-thumb.patch - Fix ffmpeg configuration for armv6
Patch1: armv6-ffmpeg-no-thumb.patch
@@ -70,12 +56,6 @@
Patch2: disable-gpu-when-using-nouveau-boo-1005323.diff
# PATCH-FIX-UPSTREAM 0001-fix-build-after-y2038-changes-in-glibc.patch
Patch3: 0001-fix-build-after-y2038-changes-in-glibc.patch
-# PATCH-FIX-UPSTREAM https://codereview.qt-project.org/c/qt/qtwebengine/+/290321
-Patch4: QTBUG-81574.patch
-# PATCH-FIX-UPSTREAM https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/291216
-Patch5: QTBUG-82186.patch
-# PATCH-FIX-OPENSUSE
-Patch6: some-more-includes-gcc10.patch
Patch7: fix1163766.patch
# PATCH-FIX-UPSTREAM https://chromium-review.googlesource.com/c/v8/v8/+/2136489
Patch8: icu-v67.patch
@@ -94,6 +74,8 @@
BuildRequires: krb5
BuildRequires: krb5-devel
BuildRequires: libQt5QuickControls2-devel
+# For building pdf exmples...
+BuildRequires: libqt5-qtsvg-devel
BuildRequires: libcap-devel
BuildRequires: libgcrypt-devel
BuildRequires: libicu-devel
@@ -180,17 +162,16 @@
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xtst)
BuildRequires: pkgconfig(zlib)
-%if !%{with sle_bundles}
BuildRequires: yasm-devel
-%endif
%if %{with system_minizip}
BuildRequires: pkgconfig(minizip)
%endif
%if %{with system_harfbuzz}
-BuildRequires: pkgconfig(harfbuzz) >= 2.0.0
+BuildRequires: pkgconfig(harfbuzz) >= 2.2.0
%endif
%if %{with system_icu}
-BuildRequires: pkgconfig(icu-i18n) >= 63.0
+BuildRequires: pkgconfig(icu-uc) >= 64.0
+BuildRequires: pkgconfig(icu-i18n) >= 64.0
%endif
%if %{with system_vpx}
BuildRequires: pkgconfig(vpx) >= 1.8.0
@@ -245,7 +226,7 @@
the exact Qt version.
%package examples
-Summary: Qt5 location examples
+Summary: Qt5 WebEngine examples
Group: Development/Libraries/X11
Requires: libqt5-qtquickcontrols2
Recommends: %{name}-devel
@@ -253,6 +234,57 @@
%description examples
Examples for the libqt5-qtwebengine module.
+%package -n libQt5Pdf5
+Summary: Qt5 PDF library
+Group: Development/Libraries/X11
+
+%description -n libQt5Pdf5
+Main library of the Qt PDF module.
+
+%package -n libQt5PdfWidgets5
+Summary: Qt5 PDF library for Qt Widgets
+Group: Development/Libraries/X11
+
+%description -n libQt5PdfWidgets5
+Library of the Qt PDF module with support for Qt Widgets.
+
+%package -n libqt5-qtpdf-imports
+Summary: Qt5 PDF module for QML
+Group: Development/Libraries/X11
+
+%description -n libqt5-qtpdf-imports
+Qt Quick module for the Qt PDF library.
+
+%package -n libqt5-qtpdf-devel
+Summary: Development files for the Qt5 PDF library
+Group: Development/Libraries/X11
+Requires: libQt5Pdf5 = %{version}
+Requires: libQt5PdfWidgets5 = %{version}
+
+%description -n libqt5-qtpdf-devel
+You need this package if you want to compile programs with Qt PDF.
+
+%package -n libqt5-qtpdf-private-headers-devel
+Summary: Non-ABI stable experimental API for the Qt5 PDF library
+Group: Development/Libraries/C and C++
+BuildArch: noarch
+Requires: libqt5-qtpdf-devel = %{version}
+%requires_ge libqt5-qtbase-private-headers-devel
+
+%description -n libqt5-qtpdf-private-headers-devel
+This package provides private headers of libqt5-qtpdf that are normally
+not used by application development and that do not have any ABI or
+API guarantees. The packages that build against these have to require
+the exact Qt version.
+
+%package -n libqt5-qtpdf-examples
+Summary: Qt5 PDF examples
+Group: Development/Libraries/X11
+Recommends: libqt5-qtpdf-devel
+
+%description -n libqt5-qtpdf-examples
+Examples for the libqt5-qtpdf module.
+
%prep
%setup -q -n %{tar_version}
sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro
@@ -268,16 +300,6 @@
mkdir .git
%endif
-%if 0%{?suse_version} < 1330
-# WE checks the version of GCC qtbase was built with, not the version it's building with.
-# ARGH!
-echo "QT_GCC_MAJOR_VERSION = 7" > qtwebengine_new.pro
-echo "QT_GCC_MINOR_VERSION = 2" >> qtwebengine_new.pro
-echo "QT_CONFIG += c++14" >> qtwebengine_new.pro
-cat qtwebengine.pro >> qtwebengine_new.pro
-mv qtwebengine{_new,}.pro
-%endif
-
%ifnarch x86_64
RPM_OPT_FLAGS="$RPM_OPT_FLAGS "
export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / }
@@ -311,11 +333,6 @@
# processes instead of its defaults.
export NINJAFLAGS="%{_smp_mflags}"
-%if 0%{?suse_version} < 1330
- export CC=gcc-7
- export CXX=g++-7
-%endif
-
make %{_smp_mflags} VERBOSE=1
%install
@@ -341,8 +358,11 @@
mkdir -p %{buildroot}%{_qtwebengine_dictionaries_dir}
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
+%post -n libQt5Pdf5 -p /sbin/ldconfig
+%postun -n libQt5Pdf5 -p /sbin/ldconfig
+%post -n libQt5PdfWidgets5 -p /sbin/ldconfig
+%postun -n libQt5PdfWidgets5 -p /sbin/ldconfig
%if 0%{?suse_version} >= 1500
%filetriggerin -- %{_datadir}/hunspell
@@ -358,36 +378,86 @@
%endif
%files
-%defattr(-,root,root,755)
%license LICENSE.*
-%{_libqt5_libdir}/libQt*Web*.so.*
-%{_datadir}/qt5/
-%dir %{_libqt5_libexecdir}
+%{_libqt5_libdir}/libQt5WebEngine.so.*
+%{_libqt5_libdir}/libQt5WebEngineCore.so.*
+%{_libqt5_libdir}/libQt5WebEngineWidgets.so.*
+%dir %{_datadir}/qt5/
+%dir %{_datadir}/qt5/translations/
+%{_datadir}/qt5/translations/qtwebengine_locales/
+%dir %{_datadir}/qt5/resources/
+%{_datadir}/qt5/resources/qtwebengine_*
+%if %{without system_icu}
+%{_datadir}/qt5/resources/icudtl.dat
+%endif
%dir %{_qtwebengine_dictionaries_dir}
+%dir %{_libqt5_libexecdir}
%{_libqt5_libexecdir}/QtWebEngineProcess
%{_libqt5_archdatadir}/qml/QtWebEngine/
-%{_libqt5_plugindir}/designer/
%{_libqt5_bindir}/qwebengine_convert_dict
%files private-headers-devel
-%defattr(-,root,root,755)
%license LICENSE.*
-%{_libqt5_includedir}/*/%{so_version}
+%{_libqt5_includedir}/QtWebEngine*/%{so_version}
%files devel
-%defattr(-,root,root,755)
-%license LICENSE.*
-%exclude %{_libqt5_includedir}/*/%{so_version}
-%{_libqt5_includedir}/*/
-%{_libqt5_libdir}/cmake/Qt5*/
-%{_libqt5_libdir}/libQt*Web*.so
-%{_libqt5_libdir}/libQt*Web*.prl
-%{_libqt5_libdir}/qt5/mkspecs/modules/qt_lib_*.pri
-%{_libqt5_libdir}/pkgconfig/Qt*Web*.pc
+%exclude %{_libqt5_includedir}/QtWebEngine*/%{so_version}
+%{_libqt5_includedir}/QtWebEngine*/
+%{_libqt5_libdir}/libQt5WebEngine*.so
+%{_libqt5_libdir}/libQt5WebEngine*.prl
+%{_libqt5_libdir}/pkgconfig/Qt5WebEngine*.pc
+%{_libqt5_libdir}/qt5/mkspecs/modules/qt_lib_webengine*.pri
+%dir %{_libqt5_libdir}/cmake/Qt5Designer/
+%{_libqt5_libdir}/cmake/Qt5Designer/Qt5Designer_QWebEngineViewPlugin.cmake
+%dir %{_libqt5_plugindir}/designer/
+%{_libqt5_plugindir}/designer/libqwebengineview.so
+%{_libqt5_libdir}/cmake/Qt5WebEngine*/
%files examples
-%defattr(-,root,root,755)
%license LICENSE.*
-%{_libqt5_examplesdir}/
+%dir %{_libqt5_examplesdir}
+%{_libqt5_examplesdir}/webengine*/
+
+%files -n libQt5Pdf5
+%license LICENSE.*
+%{_libqt5_libdir}/libQt5Pdf.so.*
+%{_libqt5_archdatadir}/plugins/imageformats/libqpdf.so
+# Not quite sure what this would be used by
+%dir %{_libqt5_libdir}/cmake/
+%dir %{_libqt5_libdir}/cmake/Qt5Gui/
+%{_libqt5_libdir}/cmake/Qt5Gui/Qt5Gui_QPdfPlugin.cmake
+
+%files -n libQt5PdfWidgets5
+%license LICENSE.*
+%{_libqt5_libdir}/libQt5PdfWidgets.so.*
+
+%files -n libqt5-qtpdf-imports
+%license LICENSE.*
+%{_libqt5_archdatadir}/qml/QtQuick/Pdf/
+
+%files -n libqt5-qtpdf-private-headers-devel
+%license LICENSE.*
+%{_libqt5_includedir}/QtPdf/%{so_version}
+%{_libqt5_includedir}/QtPdfWidgets/%{so_version}
+
+%files -n libqt5-qtpdf-devel
+%license LICENSE.*
+%exclude %{_libqt5_includedir}/QtPdf*/%{so_version}
+%{_libqt5_includedir}/QtPdf/
+%{_libqt5_includedir}/QtPdfWidgets/
+%{_libqt5_libdir}/cmake/Qt5Pdf/
+%{_libqt5_libdir}/cmake/Qt5PdfWidgets/
+%{_libqt5_libdir}/libQt5Pdf.so
+%{_libqt5_libdir}/libQt5PdfWidgets.so
+%{_libqt5_libdir}/libQt5Pdf.prl
+%{_libqt5_libdir}/libQt5PdfWidgets.prl
+%{_libqt5_libdir}/qt5/mkspecs/modules/qt_lib_pdf*.pri
+%{_libqt5_libdir}/pkgconfig/Qt5Pdf.pc
+%{_libqt5_libdir}/pkgconfig/Qt5PdfWidgets.pc
+
+%files -n libqt5-qtpdf-examples
+%license LICENSE.*
+%dir %{_libqt5_examplesdir}
+%{_libqt5_examplesdir}/pdf*/
%changelog
++++++ fix1163766.patch ++++++
--- /var/tmp/diff_new_pack.F06hmQ/_old 2020-05-29 21:18:06.655190113 +0200
+++ /var/tmp/diff_new_pack.F06hmQ/_new 2020-05-29 21:18:06.655190113 +0200
@@ -6,12 +6,12 @@
seccomp filters disallow a new kernel syscall to get time
used on i586
-Index: qtwebengine-everywhere-src-5.14.1/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+Index: qtwebengine-everywhere-src-5.15.0-beta3/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
===================================================================
---- qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-+++ qtwebengine-everywhere-src-5.14.1/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
-@@ -1422,5 +1422,13 @@
- #define __NR_memfd_create 356
+--- qtwebengine-everywhere-src-5.15.0-beta3.orig/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
++++ qtwebengine-everywhere-src-5.15.0-beta3/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h
+@@ -1710,5 +1710,13 @@
+ #define __NR_clone3 435
#endif
+#if !defined(__NR_clock_gettime64)
@@ -24,10 +24,10 @@
+
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_
-Index: qtwebengine-everywhere-src-5.14.1/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+Index: qtwebengine-everywhere-src-5.15.0-beta3/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
===================================================================
---- qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+++ qtwebengine-everywhere-src-5.14.1/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+--- qtwebengine-everywhere-src-5.15.0-beta3.orig/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ qtwebengine-everywhere-src-5.15.0-beta3/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
@@ -151,6 +151,11 @@ ResultExpr EvaluateSyscallImpl(int fs_de
if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) {
return RestrictClockID();
@@ -40,11 +40,11 @@
if (sysno == __NR_clone) {
return RestrictCloneToThreadsAndEPERMFork();
-Index: qtwebengine-everywhere-src-5.14.1/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_ime_policy_linux.cc
+Index: qtwebengine-everywhere-src-5.15.0-beta3/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_ime_policy_linux.cc
===================================================================
---- qtwebengine-everywhere-src-5.14.1.orig/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_ime_policy_linux.cc
-+++ qtwebengine-everywhere-src-5.14.1/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_ime_policy_linux.cc
-@@ -30,6 +30,9 @@ ResultExpr ImeProcessPolicy::EvaluateSys
+--- qtwebengine-everywhere-src-5.15.0-beta3.orig/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_ime_policy_linux.cc
++++ qtwebengine-everywhere-src-5.15.0-beta3/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_ime_policy_linux.cc
+@@ -31,6 +31,9 @@ ResultExpr ImeProcessPolicy::EvaluateSys
#if defined(__NR_clock_gettime)
case __NR_clock_gettime:
#endif
@@ -52,5 +52,5 @@
+ case __NR_clock_gettime64:
+#endif
return Allow();
- default:
- auto* broker_process = SandboxLinux::GetInstance()->broker_process();
+ // https://crbug.com/991435
+ #if defined(__NR_getrusage)
++++++ qtwebengine-everywhere-src-5.14.1.tar.xz -> qtwebengine-everywhere-src-5.15.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtwebengine/qtwebengine-everywhere-src-5.14.1.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new.3606/qtwebengine-everywhere-src-5.15.0.tar.xz differ: char 25, line 1
1
0